Commit Graph

16989 Commits

Author SHA1 Message Date
Rohit Yadav ddb794d960 cli: generate verbs on the fly, fix autocompletion whitespace bug
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-26 17:14:09 -08:00
Pranav Saxena 1509a210ca Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-01-26 23:48:57 +05:30
Isaac Chiang 76b28805e6 CloudStack-965: When a detailview action is prohibited, the operation dialog box should not show up in the mean time 2013-01-26 23:46:44 +05:30
Rohit Yadav a4c778e115 test_vm_life_cycle: Don't wait a lot poll for change every expunge_cycle interval
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 23:40:01 -08:00
Kelven Yang 1450547987 Put usage server under Spring 2013-01-25 23:00:55 -08:00
Rohit Yadav 221ac72a2e test_vm_life_cycle: Consider 600s threshold for expunge.delay as per server logic
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 19:01:23 -08:00
Rohit Yadav bc40ed85e5 test_vm_life_cycle: Fix expunging logic as in mgmt server
Sets expunge interval to 600 if it's less than that

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 17:43:37 -08:00
Kelven Yang 767f54cc9a Make nonoss build work under Spring 2013-01-25 17:18:36 -08:00
Kelven Yang 2b67fc8441 Add nonossComponentContext.xml.in for nooss composition of CloudStack 2013-01-25 15:48:25 -08:00
Kelven Yang af4485ae9e Put nonoss under Spring framework 2013-01-25 15:41:48 -08:00
frank 301b0b9090 CloudStack CLOUDSTACK-723
Enhanced baremetal servers support on Cisco UCS

init
2013-01-25 15:00:09 -08:00
Min Chen fc7d07305f Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4)
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-25 14:21:41 -08:00
Min Chen 17c419ceb4 Fix a bug in listHosts that returns wrong zoneId for host. 2013-01-25 14:18:25 -08:00
Min Chen 2c9e314477 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-01-25 14:15:22 -08:00
Edison Su e9bca76a32 set local storage as up 2013-01-25 13:07:36 -08:00
Edison Su a18baf8c83 fix compile 2013-01-25 10:24:25 -08:00
Brian Federle 8f11f631a4 Instance wizard: Fix back button state
Fix case where select SG step is shown on back, instead of select guest network.
2013-01-25 08:58:07 -08:00
Kishan Kavala 0ab39fd162 added missing bracket 2013-01-25 19:32:30 +05:30
Kishan Kavala cd9e4e999e added missing bracket 2013-01-25 19:32:13 +05:30
Kishan Kavala c6ae19d12f Merge branch 'master' into regions 2013-01-25 18:49:47 +05:30
Kishan Kavala de20cb6c1a Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:45:01 +05:30
Kishan Kavala 1f57d925eb Apply API refactoring changes. Make changes to Regions API to work with new code 2013-01-25 18:41:59 +05:30
Pranav Saxena 44ceff4224 CLOUDSTACK-1064:A type error occurs when trying to add account/register template: this is because of accounts conext being undefined 2013-01-25 16:42:42 +05:30
Pranav Saxena 9deea9bb55 CLOUDSTACK-1063:SG Enabled Advanced Zone -Add Guest Networks- When user tries to add a guest Network with scope as Account , he should NOT be presented with Offering for shared security group enabled 2013-01-25 15:49:29 +05:30
Edison Su cb25eed37a forget to check in code 2013-01-25 00:25:14 -08:00
Prachi Damle df5c4c3048 Fixing VPC unit test to use Spring 2013-01-24 23:05:31 -08:00
Radhika PC 25c0d84c16 Document procedure to choose default System Offering for System VMs
Signed-off-by: Radhika PC <radhika.puthiyetath@citrix.com>
2013-01-24 21:32:46 -06:00
Rohit Yadav f56b96ad19 merge: Fast forward merge branch 'javelin'
FF merge commit due to recent merge of master and then Edison's commit.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:30:28 -08:00
Rohit Yadav 356866c72b Merge branch 'master' into javelin
- Fixed new join dao impls as spring components
- Fixed component context xml to load api rate limit checker
- Fixed root pom.xml for duplicate plugin
- Fixed list data centers method
- Fixed following conflicts:
	api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
	api/src/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/DeleteTemplateCmd.java
	api/src/org/apache/cloudstack/api/command/user/template/ExtractTemplateCmd.java
	plugins/api/discovery/src/org/apache/cloudstack/discovery/ApiDiscoveryServiceImpl.java
	server/src/com/cloud/api/ApiDBUtils.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/swift/SwiftManagerImpl.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 19:18:53 -08:00
Edison Su 6f5655cb03 generalize storage orchestration: DataObjectManager will handle all the object life cycle management 2013-01-24 18:30:08 -08:00
Kelven Yang f8e5740c31 A workaround to injection problems in servlets (ConsoleProxyServlet and RegisterCompletionServlet) classes 2013-01-24 18:04:48 -08:00
anthony d7201dfe1f CLOUDSTACK-737
add xenserver support in UI
     only XenServer and KVM clusters are allowed in security enabled zone.
     only shared security enabled networks are allowed in security enabled zone.
2013-01-24 17:26:51 -08:00
Rohit Yadav b63b7ddf60 UserContext: Threadsafe singleton, inject using ComponentContext, spring di failsafe
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 17:00:12 -08:00
Min Chen 4ccbdbd23d Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-cloudstack 2013-01-24 16:46:10 -08:00
Min Chen b6f780fa33 Fix StoragePool unit testcase. 2013-01-24 16:11:35 -08:00
Min Chen f85ac65645 Fix Snapshot unit testcase. 2013-01-24 16:05:03 -08:00
Rohit Yadav e5b23e387d AccountManagerImpl: Fix method to check and return systemuser, spring injection failsafe
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:41:04 -08:00
Rohit Yadav 753b884044 spring: Fix component annotation for VolumeDaoImpl and CfgServerImpl
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 15:40:40 -08:00
Brian Federle a2b2d45e40 Conditionally show select SG step
Only show select security group step if at least one guest network
with SecurityGroup service is selected.
2013-01-24 14:57:43 -08:00
Rohit Yadav 6f90a86b13 cli: fix cloudmonkey's pipe-ability
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 14:47:45 -08:00
Alex Huang 1567a112fa unit test works again 2013-01-24 14:36:44 -08:00
Rohit Yadav 71257d6bb4 cli: give filter option only when output 'tabularized' is enabled
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 11:28:49 -08:00
Rohit Yadav 531c2f030c api: Fix annotations on iso related cmd
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-24 10:33:04 -08:00
Pranav Saxena f1aee2cc50 CLOUDSTACK-1029:Enter the token to specified project is malfunctioned 2013-01-24 14:13:53 +05:30
Kelven Yang a26e075f0e Remove final modifer to ListS3Cmd class as it conflicts with Spring injection 2013-01-23 18:24:03 -08:00
Rohit Yadav afb7e289fe cli: Fix development status to stable. cloudmonkey v1 at its most stable form
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-23 18:15:51 -08:00
Prachi Damle d182e64897 GenericDao maintains a map of VO interface -> DaoImpl. Since cloud-engine is not yet a separate service, we need to introduce dummy interfaces to load both CloudStack API daoImpls and engine daoImpls 2013-01-23 17:59:15 -08:00
Prachi Damle 057097d0e0 Planner should set the pool information in the destination for volumes that are not yet ready. 2013-01-23 17:31:00 -08:00
Alex Huang 6088cbfe47 nonoss compiled up til netscaler 2013-01-23 17:18:55 -08:00
Alex Huang 8e2a96923c delete some old sql files 2013-01-23 17:18:54 -08:00