25259 Commits

Author SHA1 Message Date
Jessica Wang
dd326af83d CLOUDSTACK-7850: UI > Instances > detailView > Attach ISO option > ISO dropdown > should list only ISOs belonging to the same zone. 2014-11-05 13:29:12 -08:00
pdion891
b532e4f52c CLOUDSTACK-7822: fix tests CA cert 2014-11-05 10:54:21 -05:00
Sanjay Tripathi
b844155240 CLOUDSTACK-7842: Wrong size column is getting updated with snapshot physical size in snapshot_store_ref table.
Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table.
2014-11-05 16:42:28 +05:30
Rajani Karuturi
083feab7c0 Merge branch '4.5'
* 4.5:
  CLOUDSTACK-7837: [UI] Make the Source CIDR column wide enough to fit the CIDR value without ellipsizing
2014-11-05 16:26:08 +05:30
Mihaela Stoica
6490694231 CLOUDSTACK-7837: [UI] Make the Source CIDR column wide enough to fit the CIDR value without ellipsizing
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2014-11-05 16:17:09 +05:30
Rajani Karuturi
4c5f792ca9 Merge branch '4.5' 2014-11-05 15:20:34 +05:30
Rajani Karuturi
2b1ca20b9b Merge branch '4.5' 2014-11-05 15:19:46 +05:30
Gaurav Aradhye
2cd4ad201a CLOUDSTACK-7800: Correcting code related to unplug NIC on VMware
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-05 12:57:40 +05:30
Gaurav Aradhye
fce9f96399 CLOUDSTACK-7800: Correcting code related to unplug NIC on VMware
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-05 12:57:00 +05:30
Rajani Karuturi
c3e5964dcb Fixed CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work
In ConfigurationVo, changed the setter to do the encryption if required
like the getter. Called the setter in constructor as well.

Removed references of encryption check in different places.

Reviewed-by: Santhosh Edukulla

This closes #35
2014-11-05 11:49:38 +05:30
Sheng Yang
c15ed74f63 CLOUDSTACK-7841: Gracefully reload haproxy config
The old way would disconnect all the existing connections through haproxy when
reload the config.

This new way would ensure that all the existing connections would still alive
after reload the config.
2014-11-04 16:41:46 -08:00
Sheng Yang
4b3217fe57 CLOUDSTACK-7841: Gracefully reload haproxy config
The old way would disconnect all the existing connections through haproxy when
reload the config.

This new way would ensure that all the existing connections would still alive
after reload the config.
2014-11-04 16:40:47 -08:00
Jessica Wang
6839652109 CLOUDSTACK-7383: UI > Instances > detailView > snapshot option > hide this option when hypervisor is LXC. 2014-11-04 14:44:12 -08:00
Jessica Wang
a43fba64da CLOUDSTACK-7383: UI > Instances > detailView > snapshot option > hide this option when hypervisor is LXC. 2014-11-04 14:42:29 -08:00
Mihaela Stoica
4e80253b36 CLOUDSTACK-7645
[UI] Fix incorrect strings 'label.no' and 'label.added.network.offering'
2014-11-04 13:05:15 -08:00
vetrivelc
03fa319473 Fixes: [UI] Added missing label to properties.file.
Signed-off-by: vetrivelc <vetrivel.chinnasamy@citrix.com>
2014-11-04 13:01:22 -08:00
Gabor Apati-Nagy
1f21f399ab CLOUDSTACK-7840: UI control tip for 'Add Primary Storage' -> 'Provider' seems wrong
-Removed the invalid help text.
2014-11-04 12:37:09 -08:00
Gabor Apati-Nagy
fad6c7514f CLOUDSTACK-7838: UI - Update category names on Resources tab of a Zone -Changed wording: "Storage" -> "Primary Storage Used", "CPU" -> "CPU allocated", Memory -> "Memory Allocated" 2014-11-04 12:31:24 -08:00
Gabor Apati-Nagy
2a1793283a CLOUDSTACK-7720: No IP Address Validation for Acquire new secondary IP
-Removed required constraint from the IP address field (this is an optional field)
2014-11-04 12:28:24 -08:00
Jessica Wang
4d62dbb8ba CLOUDSTACK-7384: UI > Instances > detailView > change service offering option > hide it when VM state is Running and hyperviror is LXC. 2014-11-04 11:35:43 -08:00
Jessica Wang
25e514a28e CLOUDSTACK-7384: UI > Instances > detailView > change service offering option > hide it when VM state is Running and hyperviror is LXC. 2014-11-04 11:33:15 -08:00
Sanjay Tripathi
a53d39c1b6 CLOUDSTACK-7835: Deleted volumes with null UUID and no removed timestamp in database still appear.
Also removed CREATING -> DESTROY via DESTROYREQUESTED, which was causing the volume to get stuck in expunging
state.
2014-11-04 17:57:31 +05:30
Koushik Das
0327c2b13e CLOUDSTACK-7421
Unnecessary exception in MS logs while removing default NIC from VM. Following changes are made:
1. Changed the exception from CloudRuntimeException to InvalidParameterValueExecption.
2. Moved out validation logic to UserVMManagerImpl from VirtualMachineManagerImpl.
3. Handling InvalidParameterValueException from async API calls so that they are not logged as ERROR in MS logs.
2014-11-04 17:34:07 +05:30
Sanjay Tripathi
9168d826da CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs
failed to migrate to the other host in the cluster.

Migration for vGPU VMs is not supported in XS, so instead of migrating them to
new server, stopping them.
2014-11-04 17:28:22 +05:30
Sanjay Tripathi
1d503bb853 CLOUDSTACK-7835: Deleted volumes with null UUID and no removed timestamp in database still appear.
Also removed CREATING -> DESTROY via DESTROYREQUESTED, which was causing the volume to get stuck in expunging
state.
2014-11-04 17:02:50 +05:30
Sanjay Tripathi
7a8f511014 CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs
failed to migrate to the other host in the cluster.

Migration for vGPU VMs is not supported in XS, so instead of migrating them to
new server, stopping them.
2014-11-04 16:46:28 +05:30
Rohit Yadav
2d58bb6256 CVE­2014­3566: Avoid using SSLv3 on apache2 webserver used by SSVM
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-04 14:49:19 +05:30
Rohit Yadav
ce51fe32f9 CVE­2014­3566: Avoid using SSLv3 on apache2 webserver used by SSVM
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-04 14:46:22 +05:30
Gaurav Aradhye
8b636bd41e CLOUDSTACK-7800: VMware - Hot plug/unplug NIC to/from VM only when vmware tools are installed, else assert for exception
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:59:50 +05:30
Gaurrav Aradhye
9e19a9afdb Revert "CLOUDSTACK-7408: Fixed - Private key of the ssh keypair was getting corrupted"
This reverts commit e921ec6ec79c50096d58264d60c15091969ff888.

CLOUDSTACK-7408: sshClient.py - removing function load_host_keys(). This function is used to load host keys from local host keys file and to save back the host key. It is not needed while running test cases because we are connecting to unknown host anyway and don't want to use any local host key file. We have the AutoAddPolicy for missing host key file, hence whenever ssh connects to a new host, it will save the host key in memory temporarily.

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:59:04 +05:30
Gaurav Aradhye
0d6e3e48ba CLOUDSTACK-7805: test_vpc_vms_deployment.py - Removing invalid steps from test case
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:58:23 +05:30
Gaurav Aradhye
d5316d0572 CLOUDSTACK-7685: Fixed copy template method call in test_escalations_template.py. Removed unbound method of the same name as bound method from base library and changed method call accordingly
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:55:52 +05:30
Gaurav Aradhye
6d7666b135 CLOUDSTACK-7801: test_volumes.py - Fixed import and pep8 issues
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:54:40 +05:30
Gaurav Aradhye
7b48b69763 CLOUDSTACK-7802: test_vpc_network.py - Increasing polling period for network state check
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:53:59 +05:30
Gaurav Aradhye
883123630c CLOUDSTACK-7682: Fixed usage event issue. Used api client of account for which we are checking the usage
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:53:27 +05:30
Gaurav Aradhye
1f7ffb2618 CLOUDSTACK-7684: Fixed Exception not raised issue in secondary storage limits test suite test_ss_max_limits.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:52:41 +05:30
Gaurav Aradhye
bf7ce74c93 CLOUDSTACK-7691: Fixed 'Exception not raised' issue in test_project_limits.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:52:03 +05:30
Gaurav Aradhye
5d37f37436 CLOUDSTACK-7692: Fixed template register issue in test_project_usage.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:23:01 +05:30
Gaurav Aradhye
b277b1abd8 CLOUDSTACK-7728: Test script to identify product issue
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:22:07 +05:30
Prashant Kumar Mishra
9e37a51bde CLOUDSTACK-7632:Automation for volume life cycle testPath
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2014-11-04 11:12:16 +05:30
Frank Zhang
28d5b9827a remove duplicate import 2014-11-03 17:04:30 -08:00
Frank Zhang
c8f72780ea CLOUDSTACK-7834
Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A zone

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
2014-11-03 16:44:53 -08:00
Frank Zhang
62c5cefb82 CLOUDSTACK-7834
Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A zone
2014-11-03 16:43:09 -08:00
Jessica Wang
6a28035e73 CLOUDSTACK-3212: ui > infrastructure > zones > zone > physical network > guest > network > guest ip range - listview: add gateway, netmask field. 2014-11-03 15:56:46 -08:00
Jessica Wang
207ec2574c CLOUDSTACK-3212: ui > infrastructure > zones > zone > physical network > guest > network > guest ip range - listview: add gateway, netmask field. 2014-11-03 15:55:06 -08:00
amoghvk
37cb63f6b7 CLOUDSTACK-3608 remove duplicate entries 2014-11-03 15:32:09 -08:00
amoghvk
ddfd74dba1 CLOUDSTACK-3608 removing duplicate entries, IDs not saved anywhere else hence safe to remove 2014-11-03 15:28:11 -08:00
Rohit Yadav
84e44a4dba systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE­2014­3566)
Just prefer TLS over SSL in apache configuration in systemvm

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 88acc9bd53cbf6f8896d32576f916c20704a3403)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-04 01:50:06 +05:30
Rohit Yadav
88acc9bd53 systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVE­2014­3566)
Just prefer TLS over SSL in apache configuration in systemvm

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-11-04 01:43:55 +05:30
Anthony Xu
aa84770347 if attach volume fails, destroy the VBD device 2014-11-03 11:20:37 -08:00