Jessica Wang
771b8377fd
CLOUDSTACK-4619: UI > Infrastructure > zone > Using listApis to check existence of listVmwareDcs API command will show an error in the log when listVmwareDcs API command doesn't exist (in oss build).
...
So, still use listClusters to determine the existence of listVmwareDcs API command.
2013-09-09 14:02:23 -07:00
Daan Hoogland
1acec8362a
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git
2013-09-09 22:57:20 +02:00
Jessica Wang
8cb548b064
CLOUDSTACK-4629: UI > Infrastructure > zone > Add UCS Manager > change label from URL to IP Address.
2013-09-09 13:48:25 -07:00
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
Daan Hoogland
79e239e307
white space cleanup and syntax warnings auto-addressed
2013-09-09 22:08:24 +02:00
Prasanna Santhanam
433d5839a1
CLOUDSTACK-4608: Resolve the hostname to fqdn from marvin config
...
In case the marvin configuration does not contain fqdn information fetch
and compare the fqdns of hostip from `cloud`.`host` with the fqdn
available on the client.
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-09-09 11:41:13 +05:30
Min Chen
b11a8e12e8
CLOUDSTACK-4625:Snapshots and templates should be deleted from staging
...
storage after create template from snapshot on S3.
2013-09-06 17:48:40 -07: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
Min Chen
bf83efcf4b
CLOUDSTACK-4190:[Object_store_refactor] volume should be deleted from
...
staging storage after successfule volume migration, specially handle
DeleteVolume command for Vmware volume structure in secondary storage.
2013-09-06 14:39:03 -07:00
Jessica Wang
0e695ec7e0
CLOUDSTACK-4619: UI > zone detail page > check if the zone has any cluster whose hypervisor is VMware. If not, skip calling listVmwareDcs API.
2013-09-06 10:29:24 -07:00
Gaurav Aradhye
eb390fba22
CLOUDSTACK-4531: Fixed indent problem with the patch.
...
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 751fe8e339750c79d9a30c28f7ef8b0b87bad10a)
2013-09-06 21:36:42 +05:30
Wei Zhou
2cc1dd4e74
change display name in /etc/init.d/cloudstack-agent from cloud-agent to cloudstack-agent
...
(cherry picked from commit add65051826eb0311a9028ecf3785617ea191733)
2013-09-06 14:20:55 +02:00
Jayapal
137ee50477
CLOUDSTACK-4613 correcting anti spoofing security group rules
2013-09-06 15:47:02 +05:30
sanjeevneelarapu
ce479ef0d2
CLOUDSTACK-702: Tests for Multiple IP Ranges 1. Removed advanced tag from all the tests. At the movement scripts support only basic zone 2. Added a test to deploy guest vm after adding ip range in new CIDR
...
CLOUDSTACK-702: Removed test for deploying vm after adding new cidr
1.This test would block parallel execution of remianing tests
2.Removed list_Routers proc and unused code
3.Added few more debug statements
Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit daaec56d400cc37e0e43459d237ae13f4f7d0044)
2013-09-06 15:27:59 +05:30
Wei Zhou
ff5ac2676e
CLOUDSTACK-4533: fix two usage issues (db.properties and log4j-cloud.xml)
...
(1) Replacing db.properties with management server db.properties
(2) Rename log4j-cloud_usage.xml to log4j-cloud.xml
(cherry picked from commit fb97e8e617393ac86924304f2765e933cfa30a6a)
2013-09-06 08:06:39 +02:00
Marcus Sorensen
fd42c90313
Updating devcloud-kvm marvin config to enable InternalLbVM
...
upon zone deployment.
2013-09-05 22:48:26 -06:00
Jessica Wang
356a39077e
CLOUDSTACK-4089: zone wizard > hypervisor VMware > if zoneType is Basic, not show vSwitchType dropdown in Edit Traffic Type for Guest.
2013-09-05 15:37:40 -07:00
Min Chen
0720139117
Properly set template state to either Active or Inactive in
...
schema-420to430.sql.
2013-09-05 14:51:30 -07:00
Min Chen
25281ae7a7
CLOUDSTACK-4430: Add retry logic back in case of template reload needed
...
for vmware.
2013-09-05 14:36:11 -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
sanjeevneelarapu
883b9802d4
CLOUDSTACK-4203: Adding a test for migrating volumes of stopped vms to test_stopped_vm.py
...
Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
s
(cherry picked from commit dfee47e3b6c35d08cba7f28433b9e1bce12b4078)
2013-09-05 18:54:33 +05:30
Sowmya Krishnan
8b5cb374b9
CLOUDSTACK-4487 Fix adding Netscaler service provider if not already done
...
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit c1ea61a0e736ce626c0d1f21e90cf9aaf7f89964)
2013-09-05 15:08:43 +05:30
Wei Zhou
5c141a46fc
CLOUDSTACK-4610: fix incorrect value available_bytes of storage pool
2013-09-05 11:16:12 +02:00
Sanjay Tripathi
7bff499bd3
CLOUDSTACK-4434: EN: Ubuntu: Direct input "- _ ", "? /", "keyboard /" ,"keyboard -" keys are not working well for the US keyboard.
2013-09-05 13:05:21 +05:30
Sanjay Tripathi
108aab7665
CLOUDSTACK-4495: systemVM template URL is pointing to old template location in upgrade file.
2013-09-05 13:05:16 +05:30
Nitin Mehta
654c90f4e5
CLOUDSTACK-4327:
...
Check for the all the transition states for Maintenance. Also corrected the isMaintenance function for StoragePoolVo
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-09-05 12:43:36 +05:30
radhikap
4db232762c
CLOUDSTACK-4565 review comments on VPN
2013-09-05 11:43:36 +05:30
Girish Shilamkar
0fb2014d19
CLOUDSTACK-4531: Resolved ssh error for basic zone. Public ip should be used for ssh instead of ipaddress of nic
...
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 4f3b411d4cf9a6986337dea98cd902b25efefb95)
2013-09-05 10:20:17 +05:30
Kelven Yang
ae231444bc
CLOUDSTACK-4585: make run-time datastore folder migration, VM snapshot, bug in root disk controller type carried from previous version work under upgrade situation
2013-09-04 14:49:46 -07:00
Kelven Yang
e81e75c6b0
CLOUDSTACK-4362: always honor vCenter on-disk meta data to work with live migration better
2013-09-04 14:49:46 -07:00
Kelven Yang
281b94d587
CLOUDSTACK-4458: Volume attach/detach command needs to sent to hypervisor resource even when target VM is in Stopped state
2013-09-04 14:49:46 -07:00
Kelven Yang
ea13e089b8
CLOUDSTACK-4519: reimplementdestroy-volume to take consideration of on-disk snapshot
2013-09-04 14:49:46 -07:00
Kelven Yang
a4762b0904
CLOUDSTACK-4464,CLOUDSTACK-4529: use property collector to collect all information in one round, we have a few other places that need to do it the same way
2013-09-04 14:49:46 -07:00
Kelven Yang
d6bac1465a
CLOUDSTACK-4518: make folder sync resilience with possible runtime situation
2013-09-04 14:49:46 -07:00
Kelven Yang
e2cd2164d7
CLOUDSTACK-4529: use property collector to collect all information in one round
2013-09-04 14:49:46 -07:00
Kelven Yang
e929b4ceb2
CLOUDSTACK-4522: check before we do dynamic casting
2013-09-04 14:49:46 -07:00
Kelven Yang
bae2666549
CLOUDSTACK-3237: add disk chain sync logic to handle out-of-band chain changes that could happen in storage live migration and VM snapshot operations
2013-09-04 14:49:46 -07:00