apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,687 Commits 307 Branches 324 Tags
Commit Graph

6045 Commits

Author SHA1 Message Date
Kelven Yang
767f54cc9a Make nonoss build work under Spring 2013-01-25 17:18:36 -08:00
Min Chen
fc7d07305f Fix a bug in listHosts that returns wrong zoneId for host.(cherry picked from commit 17c419ceb4979ebef0cb756ad6ed15e5c95dfbd4) 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-25 14:21:41 -08:00
Edison Su
e9bca76a32 set local storage as up 2013-01-25 13:07:36 -08:00
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
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
Alex Huang
1567a112fa unit test works again 2013-01-24 14:36:44 -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
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
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
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
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
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
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
Min Chen
c3f1a9d324 CLOUDSTACK-355: fix count for listSwiftsCmd. 2013-01-22 17:14:44 -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
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
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
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
Edison Su
4fbecf15ec add unit test back, primary storage life cycle is tested 2013-01-21 17:01:00 -08:00
Min Chen
6e40c33628 CLOUDSTACK-355: create DB view for ServiceOfferingResponse to fix count 
for ListServiceOfferingsCmd.
 2013-01-21 15:25:49 -08:00
Min Chen
6db719d58b CLOUDSTACK-355: Create DB view to fix count issue for 
listDiskOfferingsCmd.
 2013-01-21 10:50:10 -08:00
Alex Huang
f27692aa7a Removed a useless class? 2013-01-21 10:25:58 -08:00
Hugo Trippaers
04d93ef0aa Use the user.home property instead of a bash thing. See 
http://docs.oracle.com/javase/tutorial/essential/environment/sysprop.html
 2013-01-21 11:56:53 +01:00
Kelven Yang
2c5859dbd4 Bring javelin back to the status of being able to start System VMs after another round of master branch merge 2013-01-18 19:15:32 -08:00
Rohit Yadav
64f13e1cd8 DatabaseCreator: Fast forward merge due to recent pull in merge of master 2013-01-18 18:16:04 -08:00
Rohit Yadav
03a3837d92 DatabaseCreator: Make it reinit db, add flags, opts, run scripts and upgrade checkers 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-18 18:09:04 -08:00
Alex Huang
fe6f0457d5 fixed unit tests from merge 2013-01-18 15:58:55 -08:00
Min Chen
2955d58976 Fix "Count" for listSnapshotPoliciesCmd. 2013-01-18 13:55:11 -08:00
Alex Huang
10d9c019a9 All merge conflicts resolved 2013-01-18 12:14:57 -08:00
Min Chen
5a865462e9 Merge branch 'api_limit' 2013-01-18 09:43:54 -08:00
Chiradeep Vittal
ce4b49d30b network-refactor merge: fix nonoss build 
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
 2013-01-18 09:38:49 -08:00
Koushik Das
e45a9f3aed CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host HA won't be triggered in case the host investigator is not able to determine the state 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 17:20:51 +05:30
Koushik Das
070856affd CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table HV version is stored in hypervisor_version column in host table wherever present Also correctly populating version column in host table with resource file version 
Signed-off-by: Koushik Das <koushik.das@citrix.com>
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
 2013-01-18 16:49:52 +05:30
Kishan Kavala
51c1ca7cbe CLOUDSTACK-1010: Fix count issue for listHosts command 2013-01-18 16:13:25 +05:30
Min Chen
2fd1d476b4 Merge branch 'master' into api_limit 2013-01-17 21:23:50 -08:00
Kelven Yang
e5507c3892 Deprecate 2.1.x migration DAOs, it breaks EntityManager's singleton assumption 2013-01-17 18:55:14 -08:00
Rohit Yadav
b45cdef5d9 DatabaseCreator: Process db props, sql and upgrade classes separately 
Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
 2013-01-17 18:25:27 -08:00