Commit Graph

18392 Commits

Author SHA1 Message Date
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
Min Chen
285e8213fe Add DB index to Alert.last_sent column to speed up listAlertsCmd. 2013-01-23 12:38:37 -08:00
anthony
95aef332cc CLOUDSTACK-737,
allow to add security group enabled networks in security group enabled zone
2013-01-23 11:08:24 -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
Rohit Yadav
6482e27081 ApiDiscovery: Add mockito, unit test for ApiDiscovery service impl
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 14:28:31 -08:00
Rohit Yadav
26d8113f99 plugins: Indentation fix for pom.xml, add build/test rules for api discovery
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
2013-01-22 14:28:31 -08:00
Rohit Yadav
179db40e3a ApiDiscovery: Fix response and service impl to make them test-able 2013-01-22 14:28:30 -08:00
Chip Childers
45d21c3202 Devcloud config for basic zone + management server.
Added a devcloud config that supports having the management
server run within devcloud, using the basic zone setup.

Signed-off-by: Chip Childers <chip.childers@gmail.com>
2013-01-22 16:44:34 -05:00
Edison Su
e4e2cf6be7 skip test in cloud engine 2013-01-22 13:25:48 -08:00
Edison Su
c921118c58 add image create test case 2013-01-22 13:25:48 -08:00
Prachi Damle
aa7b3e0f6d Renaming VmInstanceVO: dataCenterIdToDeployIn to dataCenterId
Corresponding getter/setter is renamed too.

Reason is GenericDao does not update the field unless the method name matches the field name; the setter of this VO was one such case.
2013-01-22 12:56:39 -08:00
Prachi Damle
2adce8e712 Fixes to VO stuff 2013-01-22 12:54:22 -08:00
Prachi Damle
1cb0ce44df Removing BareMetalService referrences. We will load UserVMService by default. 2013-01-22 12:54:20 -08:00
Prachi Damle
434c21a149 Fixing Merge error 2013-01-22 12:54:18 -08:00
Prachi Damle
02185d4240 VO should not contain any DAO. Transient should be loaded by the caller using the Dao. 2013-01-22 12:54:16 -08:00
Prachi Damle
3cc9f3ff06 Adding defaults to new columns 2013-01-22 12:54:12 -08:00
Prachi Damle
ef4d04f289 Removing the alter table statement - data_center already has a removed column 2013-01-22 12:54:09 -08:00
Prachi Damle
e6cd47ddc0 More changes for deployVM flow. 2013-01-22 12:54:07 -08:00
Prachi Damle
94e8090bf3 Deploy, Start, Stop, Destroy VM orchestration service changes 2013-01-22 12:54:04 -08:00
Alex Huang
ee39ec82d3 Making unit tests work 2013-01-22 11:18:51 -08:00
Marcus Sorensen
2e14cf5b57 Summary: Allow for same vlan num on different physical NICs
Detail: A previous bug in the database schema did not allow the same vlan num
to exist on separate physical networks, even though this is possible and should
be allowed. To fix this, the code was changed to also disallow the same vlan
num on different physical networks, to avoid hitting the database constraint.
The database constraint has now been changed to allow only one of a vlan num
per physical nic per data center, so different physical nics can reuse vlan
numbers. This fix adjusts the code to match by removing the old fix.

BUG-ID: CLOUDSTACK-686
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1358881555 -0700
2013-01-22 12:05:55 -07:00