gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-29 00:38:51 +00:00
Code Issues Actions 20 Packages Projects Releases Wiki Activity
15,680 Commits 394 Branches 330 Tags 873 MiB
df5c4c3048
Commit Graph

15680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prachi Damle
df5c4c3048 Fixing VPC unit test to use Spring 2013-01-24 23:05:31 -08: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
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
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
Prachi Damle
e67381b76d Fix NPE with volume reservation 2013-01-23 16:41:29 -08:00
Rohit Yadav
baae73cc05 rat: Fix licenses on engine/orchestration/src.o.a.cloudstack.engine.cloud.api.db 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 16:26:55 -08:00
Rohit Yadav
ec0c6b00b4 api: Fix correct annotation value in template cmds for template id 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 16:00:39 -08:00
Rohit Yadav
9e91584d07 CLOUDSTACK-225: Fix redundant field values in class and apidocs 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 15:50:56 -08:00
Kelven Yang
45a92ba369 Fix the initialization of management server 2013-01-23 15:29:41 -08:00
Rohit Yadav
a7fd74f94a ApiDispatcher: Fix uuid->id translation and throw better debug statement 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
03d2c015ae GenericDao: Add method to find by uuid string including removed entities 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
b335684ec5 EntityManager: Implement method to search by uuid including removed entities 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
3c335bd883 cli: Fix asyncblock to search for correct key instead of hardcoded index 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
7a927e36f0 ReflectUtil: Use collections to grow list and not manual array memory management 
Fix usage in ApiDispatcher. Add two kinds of helpers:
- One that gets list of exclude cmd whose fields are not be included
- One that loops till a base class is asssignable from superclass

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
34f3e1c9a1 ApiDiscoveryServiceImpl: Fix fields variable definition from array to set 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
a8623bacd7 ApiXmlDocWriter: Fix multiple field occurence in apidocs by using set 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
cbdeeebc6c IteratorUtil: Add generic method to return sorted list out of a collection 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:41 -08:00
Rohit Yadav
8273af7cbf CopyTemplateCmd: Fix correct annotation for id param in copytemplate 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 14:57:40 -08:00
Brian Federle
31a5669c7c Hide VPC drop-down for advanced SG zones 2013-01-23 11:06:37 -08:00
Rohit Yadav
dba413a3d4 CreateNetworkOfferingCmd: Fix correct annotation for serviceofferingId param 
Thanks to Hugo for pointing this out: http://markmail.org/thread/gbu4pkanncbe4xqt

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-23 10:57:08 -08:00
Min Chen
485761f0b4 Fix a bug for listZones and listServiceOfferings for normal user, caused 
by a misuse of SearchCriteria class.
 2013-01-23 10:17:08 -08:00
Prasanna Santhanam
75b059e6e4 cloudmonkey: misses a couple of verbs for 'lock' and 'disassociate' 
The following api commands have no cloudmonkey equivalent because
cloudmonkey grammar misses the related verbs.

~/tools/cli/cloudmonkey/marvin/cloudstackAPI(branch:master*) $ ls disassociateIpAddress.py
disassociateIpAddress.py

------------------------------------------------------------
~/tools/cli/cloudmonkey/marvin/cloudstackAPI(branch:master*) $ ls lock*
lockAccount.py lockUser.py
------------------------------------------------------------

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
 2013-01-23 16:05:41 +05:30
Hugo Trippaers
1e40551cd5 Disabled test 'com.cloud.network.vpn.RemoteAccessVpnTest' as it requires 
a database connection which we don't have during unittest phase.
 2013-01-23 08:46:53 +01:00
Hugo Trippaers
363182cf76 Merge remote-tracking branch 'origin/master' into cloud-agent-with-openvswitch 2013-01-23 08:09:33 +01:00
Min Chen
c3f1a9d324 CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -08:00
Rohit Yadav
0f5c5c2078 maven: tools/devcloud should be in developer profile 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 17:06:52 -08:00
Prachi Damle
e5bf16b00f Fixing error with merge 2013-01-22 16:44:28 -08:00
Min Chen
26be5ce2df CLOUDSTACK-355: create DB view for ZoneResponse to fix count for 
listZonesByCmd.
 2013-01-22 16:39:45 -08:00
Rohit Yadav
7b11b71d81 maven: create dependency, deploydb on developer first and then on devcloud 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
(cherry picked from commit afb2770012)

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 16:32:57 -08:00
Rohit Yadav
1a695b84b4 tools: Fix devcloud artifact name, avoid confusion 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 16:32:51 -08:00
Rohit Yadav
afb2770012 maven: create dependency, deploydb on developer first and then on devcloud 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 16:30:35 -08:00
Rohit Yadav
a736f6b44f tools: Fix devcloud artifact name, avoid confusion 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-22 16:19:45 -08:00