apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,780 Commits 304 Branches 324 Tags
Commit Graph

7421 Commits

Author SHA1 Message Date
Daan Hoogland
6f970c6ff9 static nat capabilities parsing cleanup and testing 2013-09-26 15:18:52 +02:00
Edison Su
81ff4795df fix compile errors 2013-09-25 17:59:54 -07:00
Edison Su
a9aad4f388 add sourcetemplateid for template created from volume/snapshot 
Conflicts:

	server/src/com/cloud/template/TemplateManagerImpl.java
 2013-09-25 16:35:31 -07:00
Edison Su
d1a14fbf95 disk resize NPE, if the new disk offering doesn't have tags, then NPE 2013-09-25 16:29:01 -07:00
Edison Su
49d8e44491 CLOUDSTACK-4459: one more try, bypass libvirt to find volume if libvirt call failed 
Conflicts:

	server/src/com/cloud/template/TemplateManagerImpl.java
 2013-09-25 16:16:10 -07:00
Edison Su
a82b179878 add table lock on snapshot, during taking snapshot 
Conflicts:

	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
 2013-09-25 16:03:59 -07:00
Edison Su
7b6aebc102 add test 
Conflicts:

	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
 2013-09-25 15:58:46 -07:00
Edison Su
b3ac12e171 delete snapshot_store_ref if the snapshot is in error state 2013-09-25 15:51:55 -07:00
Abhinandan Prateek
77bec4f2ad Cloudstack-2997: the maxconn setting is masked by wrong conditions 2013-09-25 21:09:24 +05:30
Wei Zhou
98c79cc313 CLOUDSTACK-4732: search network name for virtual router when listRouters by keyword 2013-09-24 15:01:14 +02:00
Wei Zhou
e61f1bb158 fix issue: listHosts with hahost throws exception 
(cherry picked from commit a206f423a3851a4d090f58b05e2936dd68c528d0)
 2013-09-24 11:59:35 +02:00
Alena Prokharchyk
2fa5a5ae97 CLOUDSTACK-4704: 41-42 db upgrade - populate vpc_service_map table with the services/providers supported by VPC 
(cherry picked from commit 798f34a49cbfbb3a475f3dadf62d1ac1b8dfa510)

Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
 2013-09-23 14:18:41 +02:00
Abhinandan Prateek
c7cc79181b Revert "Cleanup DefaultUserAuthenticator and removed masking _name variable" 
This reverts commit 4d01ce8fc766423d795955bd5784b56969ce11a8.
 2013-09-20 19:33:50 +05:30
Darren Shepherd
4d01ce8fc7 Cleanup DefaultUserAuthenticator and removed masking _name variable 2013-09-20 17:40:00 +05:30
Alena Prokharchyk
94e744fe0c CLOUDSTACK-4573: fixed decrement resource count for VPC networks 2013-09-19 17:20:22 -07:00
Laszlo Hornyak
88954053c3 do not instantiate Long just for toString 
replaced Long object instantiation with static call to Long.toString in case it was only to generate a string

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2013-09-19 16:58:59 +02:00
Daan Hoogland
284742ad11 add networkofferid to search network for 2013-09-19 16:26:46 +02:00
Kelven Yang
b6d448d1fd apply https://reviews.apache.org/r/14189/ - UserVmDomRInvestigator and ManagementIPSystemVMInvestigator mask adapter name 2013-09-18 17:58:31 -07:00
Prachi Damle
62d60c2b77 CLOUDSTACK-4664: [ZWPS] High delay to start a stopped VM which has ROOT/DATA volumes migrated to Second Zone wide primary Storage(More than 10 mins) 
Changes:
- DeploymentPlanningManager needs to reuse the zone wide primary storage pool when VM's volume is READY
 2013-09-18 16:52:07 -07:00
Prachi Damle
7416383fcd CLOUDSTACK-4651: Restarting management server when volume Snapshot is still in progress for root volume of a VM , then there is no way to restart VM since the startVM job is stuck forever since the volume is in "Snapshoting" state. 
Change:
-If no volume of the VM is usable, VM cannot be deployed or started. Atleast ROOT volume should always be in usable state to start up the VM
 2013-09-18 16:52:04 -07:00
Alena Prokharchyk
d34b79c970 CLOUDSTACK-4573: fixed resource limit check when acquire public IP in VPC - update resource count for VPC public ip even when network_id is not set yet. 2013-09-18 14:43:42 -07:00
Daan Hoogland
2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Kelven Yang
832db1b398 Apply https://reviews.apache.org/r/14084/ 2013-09-17 16:29:48 -07:00
Kelven Yang
5820b071b8 CLOUDSTACK-4659: Add the missing feature back for GC VMware worker VMs 2013-09-17 14:06:52 -07:00
Min Chen
22c5ea0ebe CLOUDSTACK-4671:ListZone API failed with Assertion error if assertion is 
turned on for MS.
 2013-09-13 17:21:24 -07:00
Laszlo Hornyak
cb3a3da75d simplify setCpuUsed 
- variables inlined
- cpu utilization is not cast to float from double

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-09-11 21:33:02 -07:00
Laszlo Hornyak
d3237e75b2 simplified casting 
double values do not need a Double object to be casted to long

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Min Chen <min.chen@citrix.com>
 2013-09-11 18:27:54 -07:00
Donal Lafferty
e958f22ff3 CIFS support for secondary storage is documented here: https://cwiki.apache.org/confluence/display/CLOUDSTACK/CIFS+Support 
It was implemented by extending the NFS provider. Its validation was updated so that you can pass it a URL containing the
details of a CIFS share.  The code that mounts NFS shares was extended to allow it do the same for CIFS shares.  Otherwise,
the secondary storage code is left unchanged.
 2013-09-11 14:23:29 +05:30
Daan Hoogland
25c8cee01a CLOUDSTACK-4346 uses of parseInt and parseLong secured 2013-09-09 22:19:59 +02:00
Daan Hoogland
947f49d869 Revert "uses of parseInt and parseLong secured" 
This reverts commit f8fb422612f110512fd06ad392bf8896efb3d0b6.
 2013-09-09 22:17:10 +02:00
Daan Hoogland
f8fb422612 uses of parseInt and parseLong secured 2013-09-09 22:15:07 +02:00
Alex Huang
a05ec6df33 Fixed up the agent separation. Added comments for config packaging. 2013-09-06 15:40:39 -07:00
Alex Huang
1f5699b29f Fixed unit tests 2013-09-06 15:40:39 -07:00
Alex Huang
8f556e6d88 Made changes to configuration. Eliminated ConfigValue and only use ConfigKey 2013-09-06 15:40:38 -07:00
Alex Huang
b8e79c30a8 Compile complete 2013-09-06 15:40:37 -07:00
Alex Huang
6e8ca99466 Got all of the config stuff out of the way 2013-09-06 15:40:36 -07:00
Alex Huang
47afae8112 Merged conflicts resolved 2013-09-06 15:40:36 -07:00
Alex Huang
5b439f0748 Revert "Revert "Added missing files"" 
This reverts commit 48053001fb2303d4acfb77d23fe3733941e83781.
 2013-09-06 15:40:35 -07:00
Alex Huang
06493d5b5c Revert "Added missing files" 
This reverts commit a1dfc227e895d724f68c0206643825b3ba43116c.
 2013-09-06 15:40:35 -07:00
Alex Huang
375eadd3d3 Added missing files 2013-09-06 15:40:34 -07:00
Alex Huang
435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Alex Huang
2e5bb63f77 Moved NetworkManagerImpl to NetworkOrchestrator 2013-09-06 15:40:32 -07:00
Alex Huang
8e5249df62 Moved NetworkManager to NetworkOrchestrationService 2013-09-06 15:40:31 -07:00
Sheng Yang
ebb9a0c619 Revert "CLOUDSTACK-2792: Send "saved_password" to BACKUP router when reset password for user VM" 
This reverts commit 5a8a2a259ea6e049b3e5810ff3a432d6ca7767e1.

We would fix it in another way, since mgmt server may get state updated in
time.

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2013-09-05 14:26:52 -07:00
Kelven Yang
71b8f6061f CLOUDSTACK-4376: fix cloud-early-config to workaround vSwitch stall in VPC mode. fix potential NPE in DirectAgentAttache in processing answers from resource 2013-09-04 14:49:45 -07:00
Kelven Yang
c528e71fec CLOUDSTACK-4390, CLOUDSTACK-4358: Enable full-clone deployment by default for VMware. Apply keep-alive kick for all outstanding vCenter sessions 2013-09-04 14:49:45 -07:00
Kelven Yang
9a2148ffc3 CLOUDSTACK-3886: check in for review request https://reviews.apache.org/r/13008/ 2013-09-04 14:49:45 -07:00
Kelven Yang
f383656b21 Fix problems found in local test when JVM assertion is turned on 2013-09-04 14:49:44 -07:00
Kelven Yang
249e2e8f59 Correct DAO usage in VmwareDatacenterVO, relax assertion conditions to work with stack calling frame that is not wrapped with @DB injection 2013-09-04 14:49:44 -07:00
Prachi Damle
f31c318158 Changes required to merge to master: 
- Replace UserContext by CallContext
 2013-09-03 20:03:11 -07:00