Commit Graph

8809 Commits

Author SHA1 Message Date
Koushik Das 8378485e56 CLOUDSTACK-7869: Add simulator support for findHostsForMigration API 2014-11-08 13:46:54 +05:30
Sanjay Tripathi 1c9775b0df CLOUDSTACK-7859: Host tags are not getting removed in cloud.host_tags table when a Host is deleted from CS. 2014-11-07 17:34:16 +05:30
Sanjay Tripathi 330bd2748e CLOUDSTACK-7859: Host tags are not getting removed in cloud.host_tags table when a Host is deleted from CS. 2014-11-07 17:32:25 +05:30
Mike Tutkowski 9338abb6f3 Check to see if the Map<String, String> of capabilities passed back from the storage driver is null. 2014-11-06 19:49:44 -07:00
Mike Tutkowski ebb96f5e2f Handle the case where the volume a snapshot was created from is removed from the database 2014-11-06 19:44:46 -07:00
Edison Su 812b0122e2 CLOUDSTACK-7683: hold a db lock during vm expunge 2014-11-06 15:37:15 -08:00
Edison Su ffdb38c496 there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min 2014-11-06 15:30:19 -08:00
Edison Su 1fb28c2959 CS-21296: hidden snapshot.backup.rightafter, as it's not needed 2014-11-06 15:29:56 -08:00
Edison Su 103a4dd54d CLOUDSTACK-7683: hold a db lock during vm expunge 2014-11-06 15:22:34 -08:00
Mike Tutkowski 92d9ef9c17 Handle the case where a snapshot is associated with a deleted volume 2014-11-06 15:34:39 -07:00
Pierre-Luc Dion f5c3a71ef9 commented unit tests for CertService until certs issues fixed 2014-11-06 09:39:45 -05:00
pdion891 b532e4f52c CLOUDSTACK-7822: fix tests CA cert 2014-11-05 10:54:21 -05:00
pdion891 f86eb522e2 commented broken unit test 2014-11-05 10:46:36 -05:00
pdion891 ddb2d9c60e CLOUDSTACK-7822: merge, test sslcert ca 2014-11-05 08:49:42 -05:00
Sanjay Tripathi 5a67fe7369 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:44:54 +05:30
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 4c5f792ca9 Merge branch '4.5' 2014-11-05 15:20:34 +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
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 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
Min Chen 07ba078ee6 CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning 2014-11-03 11:19:06 -08:00
Min Chen 684889f0b5 CLOUDSTACK-7833: VM Async work jobs log "Was unable to find lock for the key vm_instance" errors as warning 2014-11-03 10:52:47 -08:00
Kishan Kavala e427d0004c CLOUDSTACK-7267: For LXC volumes, show unsupported operation error for template creation from ROOT volume 2014-11-03 17:20:21 +05:30
Kishan Kavala 99010f463b CLOUDSTACK-7265: For LXC volumes, show unsupported operation error for volume snapshot 2014-11-03 17:20:00 +05:30
Kishan Kavala d6fdb7c6bc CLOUDSTACK-7253: For LXC Vms, show unsupported error for console access 2014-11-03 17:19:15 +05:30
Santhosh Edukulla 1aef5cba66 Fixed Coverity Issues 2014-11-03 16:45:30 +05:30
Santhosh Edukulla 1c01da3e08 CLOUDSTACK-7828.Avoid marking IPs already in Allocated as Allocated again. Use row lock to ensure that prev state is either Allocating or Free. This will inturn avoid logging duplicate events 2014-11-03 12:40:13 +05:30
amoghvk efc9632c1b CLOUDSTACK:6915 search including removed 2014-10-31 15:47:18 -07:00
amoghvk 6df396c9c0 Merge branch '4.5' of https://git-wip-us.apache.org/repos/asf/cloudstack into 4.5 2014-10-31 15:29:40 -07:00
amoghvk 0c153966e6 CLOUDSTACK:6915 search including removed 2014-10-31 15:29:07 -07:00
Nitin Mehta 138366804d CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event. 2014-10-31 15:25:06 -07:00
Nitin Mehta 2652195010 CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost usage event. 2014-10-31 15:24:32 -07:00
pdion891 aaa561a283 Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests"
This reverts commit 0d1fa9102d.
2014-10-31 17:14:59 -04:00
pdion891 f28ade56f2 Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests"
This reverts commit 0d1fa9102d.
2014-10-31 17:12:54 -04:00
pdion891 5b1cbc442a CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests 2014-10-31 16:43:57 -04:00
pdion891 0d1fa9102d CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests 2014-10-31 16:42:31 -04:00
Rohit Yadav f543d86eff saml: Use camelCase api names for SAML login/logout apis
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 01:24:39 +05:30
Rohit Yadav cd52bed477 saml: Use camelCase api names for SAML login/logout apis
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 85c0bd68ae8a76c231ab402dd0311e3672155f71)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2014-10-31 00:32:29 +05:30
Rohit Yadav 62f9bf0fff PR #26 CLOUDSTACK-7688, CLOUDSTACK-7747
Restricted various operations for VM with VM Snapshots #26

This closes #26
2014-10-30 15:11:57 +05:30
Anshul Gangwar d8b46b81b9 CLOUDSTACK-7767: fixed events are not generated for snapshot creation 2014-10-30 13:25:06 +05:30
Anshul Gangwar a4d8215ebb CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots.
Now they are informed that they cannot perform the operation.
 To perform operation they have to remove VM snapshots of VM.
2014-10-30 12:37:50 +05:30
Anthony Xu c78f14cbc2 fixed NPE 2014-10-29 17:05:42 -07:00
Edison Su b6d8ceda3d there is no transaction context during the mgt server start, thus causing transaction.close will delete op_lock table if aquireinlocktable is called Reviewed-by: Anthony and Min 2014-10-30 02:21:29 -07:00
Hugo Trippaers 4ebaf0a583 Bump master version to 4.6.0-SNAPSHOT after branching 4.5.0-SNAPSHOT 2014-10-29 14:54:23 +01:00
Min Chen 055901acda CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to
complete, slow compared to previous 4.3 release.
2014-10-27 17:00:42 -07:00
Sheng Yang dd7026b20e CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
In basic network, the correct network id associate with IP is source network id
rather than network id.
2014-10-27 16:49:30 -07:00
Sheng Yang 307a35a618 CLOUDSTACK-1771: Fix VR IP change when restartnetwork with cleanup=true in basic zone
In basic network, the correct network id associate with IP is source network id
rather than network id.
2014-10-27 16:46:01 -07:00
Min Chen 4f43839dae CLOUDSTACK-7797: listSupportedNetworkServices API takes more than 1 second to
complete, slow compared to previous 4.3 release.
2014-10-27 16:27:17 -07:00
Sanjay Tripathi db6a0d65aa No need to log discrepancy resource count message for Primary and secondary storage. 2014-10-27 15:26:06 +05:30
Sanjay Tripathi 4f4595cef8 No need to log discrepancy resource count message for Primary and secondary storage. 2014-10-27 15:23:36 +05:30
Sanjay Tripathi c5fa7cc494 Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
2014-10-27 13:59:59 +05:30
Sanjay Tripathi 9bcf0e1bf6 Correct the error message when tried created VM Snapshot with memory on a vGPU Instance.
"VM snapshot with MEMORY is not supported for VGU enabled VMs."
Change VGU to vGPU.
2014-10-27 13:52:28 +05:30
Frank Zhang 88561e154f fix expried certificate in unit test 2014-10-24 11:10:24 -07:00
Anthony Xu 32dc09f2c3 even xenserverinvestigator returns true, that means host is up, but XAPI may not work 2014-10-23 16:10:18 -07:00
Edison Su 10cc7f86af CS-21296: hidden snapshot.backup.rightafter, as it's not needed 2014-10-22 15:36:35 -07:00
Anthony Xu 4a13f81485 when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA. 2014-10-22 15:14:46 -07:00
Anthony Xu c52e14730e when host is pingtimeout and CCP can not determine the host status, put the host to Alert status , no VM HA. 2014-10-22 15:07:40 -07:00
Nitin Mehta ee0f0a1cff CLOUDSTACK-7771: Throw exception while restoring vm if the template is already deleted. Also fix the usage event being generated from the right template id and fix the log message which sometime showed incorrect template id.
CLOUDSTACK-4201: listServiceOfferings API needs to be able to take virtualmachineid of SystemVM and return service offerings available for the vm to change service offering
2014-10-22 15:03:25 -07:00
Mike Tutkowski 97aa02ceb0 Commits related to taking snapshots that live on primary storage 2014-10-22 12:44:33 -06:00
Anthony Xu 0141b37784 CLOUDSTACK-7761:
Revert "when system VM ping times out, stop system VM"

This reverts commit ee23be1942.
2014-10-21 17:21:17 -07:00
Anthony Xu 70112bd145 CLOUDSTACK-7761:
Revert "when system VM ping times out, stop system VM"

This reverts commit ee23be1942.
2014-10-21 17:19:57 -07:00
Frank Zhang ccf4c66ef1 fix expried certificate in unit test 2014-10-21 16:20:54 -07:00
Mike Tutkowski 57dacf99a2 Changed "boolean connectVolumeToHost(VolumeInfo, Host, DataStore)" to "boolean grantAccess(DataObject, Host, DataStore)"
Changed "void disconnectVolumeFromHost(VolumeInfo, Host, DataStore)" to "void revokeAccess(DataObject, Host, DataStore)"
2014-10-21 16:01:14 -06:00
Mike Tutkowski 06f6b00cd1 Snapshot support 2014-10-21 16:01:13 -06:00
Nitin Mehta e1a993d37b CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed. Also bring the logic of setting source template id to create() method than execute which was wrongly put in. 2014-10-21 09:57:02 -07:00
Nitin Mehta a72580def0 CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed.
(cherry picked from commit 287ff83552)
2014-10-20 16:50:22 -07:00
Nitin Mehta 287ff83552 CLOUDSTACK-7754: Templates source_template_id is null when it is created from Snapshot with its corresponding volume removed. Fix it by searching for volumes including removed. 2014-10-20 16:49:48 -07:00
Daan Hoogland 622041b513 rats 2014-10-17 11:56:07 +02:00
Daan Hoogland 1de0cb7094 restore barematel work after merge 2014-10-17 10:24:01 +02:00
Daan Hoogland 148efbb73f Merge remote-tracking branch 'origin/4.5' into merge-master
Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade441to450.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManager.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
	plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareStorageProcessor.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	setup/db/db/schema-441to450.sql
	test/integration/component/test_deploy_vgpu_vm.py
	tools/marvin/marvin/config/test_data.py
2014-10-16 12:29:37 +02:00
Sanjay Tripathi 1f8cf0bee4 CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI. 2014-10-16 14:38:33 +05:30
Sanjay Tripathi ec6a666855 Config value having different category in SQL and Config.java. 2014-10-16 14:38:23 +05:30
Sanjay Tripathi 420d4e0da0 CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI. 2014-10-16 14:25:30 +05:30
Sanjay Tripathi 5025071954 Config value having different category in SQL and Config.java. 2014-10-16 14:01:23 +05:30
Sanjay Tripathi 80e0c99189 Removed duplicate code and unused imports which was causing build failure. 2014-10-16 13:53:32 +05:30
Santhosh Edukulla efe1e0a544 Fixed coverity and other resource leak issues
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
2014-10-16 12:19:51 +05:30
Jayapal 53ee4cd794 CLOUDSTACK-7728: Removed duplicate import 2014-10-16 10:05:06 +05:30
Damodar 7fe3c45142 CLOUDSTACK-7729: listVMSnapshot API not returning parent id in response 2014-10-16 09:43:04 +05:30
Jayapal e257c13f16 CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot 2014-10-16 09:38:21 +05:30
Jayapal f488a8f72c CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes 2014-10-16 09:38:21 +05:30
Bharat Kumar 080bc2e2e9 CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.
Signed-off-by: Jayapal <jayapal@apache.org>
2014-10-16 09:38:21 +05:30
Jayapal 55e11cddca CLOUDSTACK-7728: Fixed adding iptables rules for egress allow on VR reboot 2014-10-16 09:37:43 +05:30
Jayapal 7cd3438580 CLOUDSTACK-7728: Fixed adding icmp rules with different types and codes 2014-10-16 09:37:42 +05:30
Bharat Kumar 6967c6c229 CLOUDSTACK-7536 user vm can get a gateway ip when gateway ip is a part of the guest ip range.
Signed-off-by: Jayapal <jayapal@apache.org>
2014-10-16 09:37:42 +05:30
Nitin Mehta 3b442acdd7 CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller
(cherry picked from commit 42f628c61c)
2014-10-15 13:58:22 -07:00
Nitin Mehta 42f628c61c CLOUDSTACK-7532: Template status is not shown in UI/API response for non-default account users. Show it if the owner of the template is the caller 2014-10-15 13:53:39 -07:00
Mike Tutkowski e70dde09c9 Implementing snapshot-strategy support for reverting a volume to a snapshot 2014-10-14 22:04:18 -06:00
Mike Tutkowski 35a8b70799 Adding a snapshot strategy for systems that want to take snapshots that reside on their own system (as opposed to the default approach of taking a hypervisor snapshot and then copying it to secondary storage) 2014-10-14 12:26:40 -06:00
Daan Hoogland 771d052381 Merge branch 'vpc-refactor-clean-for-PR' of https://github.com/schubergphilis/cloudstack 2014-10-14 20:14:50 +02:00
wilderrodrigues 1e87d7b266 Fixing checkstyle.
Making local variable compatible with our checkstyle settings.
2014-10-14 15:25:50 +02:00
wilderrodrigues 2ed64b2356 Applying fix from commit id 6b8e0baa21
Changes by Edilson Su: if vpc public network with snat enabled, then will triger this issue.
2014-10-14 15:10:14 +02:00
Wilder Rodrigues db86bdfb2c Applygin fix from commit ID aaeadc5c44
Sheng Yang changed 2 classes, ut only one was related to the bug CLOUDSTACK-7605.
I applied the changed on the routerslist, used during the deployment of the virtual routers.

Tested Advanced Zone against the simulator. 69 happy tests in place
2014-10-14 15:08:13 +02:00
Wilder Rodrigues c81b3380df Applying the latest chances from the VPC Refactor branch onto the new one.
We will keep this branch as clean as possible to avoid problems with merge.
2014-10-14 15:08:13 +02:00
wrodrigues 3ac2e222e8 CLOUDSTACK-6278 Baremetal Advanced Networking support from commit id e06fa18ed2 by Frank Zhang
Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-14 15:08:13 +02:00
wrodrigues 4e21948f5c Fixing the NetworkHelperImpl class. It was throwing a NPE due to a hypervisor type SIMULATOR not being in the hashmap.
When the refactor took place, we should have changed first structure, then behaviour. By refactoring the deployRouter method
we changed how the templateName was retrieved.
Fixed and tested using the simulator and the following Marvin tests

test_privategateway_acl
test_routers
test_vpc_vpn
test_service_offerings
test_volumes
test_reset_vm_on_reboot
test_multipleips_per_nic

Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
2014-10-14 15:08:12 +02:00
wrodrigues 025ff72410 fixing checkstyle in the virtual network manager. problem appeared after a rebase. probably due to my saving action in the eclipse workspace
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 15:08:12 +02:00
Wilder Rodrigues 9f801d1f3a Changing the way the DAOs were being injected in the RuleApplier;
Making code clearer and simple.

Conflicts:
	server/src/com/cloud/network/rules/PrivateGatewayRules.java
	server/src/com/cloud/network/rules/VirtualNetworkApplianceFactory.java
	server/src/org/apache/cloudstack/network/topology/BasicNetworkTopology.java
	server/src/org/apache/cloudstack/network/topology/NetworkTopologyVisitor.java
2014-10-14 15:08:12 +02:00
Wilder Rodrigues 60eea3bb1a Adding fixes for the add user data and vpn rules 2014-10-14 15:08:11 +02:00
Wilder Rodrigues f2f4732854 Removing the VirtualNetworkStatus, it was not being used properly;
fixing the injection of the network DAO in the PrivateGatewayRules;
all tests that were failing in Travis have been tested before the commit.

Conflicts:
	server/src/com/cloud/network/router/NetworkHelperImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-10-14 15:08:11 +02:00