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

CLOUDSTACK-7215: Make expunge=True as default parameter value while calling destroyVirtualMachine through base library

Browse Source 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
This commit is contained in:
Gaurav Aradhye 2014-07-31 20:19:15 +05:30 committed by Santhosh Edukulla
parent 2231fc8920
commit c32b19a07d
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/component/test_advancedsg_networks.py
View File

@ -1911,7 +1911,7 @@ class TestNetworksInAdvancedSG_VmOperations(cloudstackTestCase):
self.debug("SSH into VM: %s" % vm.nic[0].ipaddress) self.debug("SSH into VM: %s" % vm.nic[0].ipaddress)
vm.get_ssh_client(ipaddress=vm.nic[0].ipaddress) vm.get_ssh_client(ipaddress=vm.nic[0].ipaddress)
self.debug("SSH to VM successful, proceeding for %s operation" % value) self.debug("SSH to VM successful, proceeding for %s operation" % value)
vm.delete(self.api_client) vm.delete(self.api_client, expunge=False)
if value == "recover": if value == "recover":
vm.recover(self.api_client) vm.recover(self.api_client)
vm.start(self.api_client) vm.start(self.api_client)

2
test/integration/component/test_multiple_ips_per_nic.py
View File

@ -1042,7 +1042,7 @@ class TestVmNetworkOperations(cloudstackTestCase):
StaticNATRule.enable(self.apiclient, public_ip_2.ipaddress.id, virtual_machine.id, StaticNATRule.enable(self.apiclient, public_ip_2.ipaddress.id, virtual_machine.id,
network.id, vmguestip=ipaddress_2.ipaddress) network.id, vmguestip=ipaddress_2.ipaddress)
virtual_machine.delete(self.apiclient) virtual_machine.delete(self.apiclient, expunge=False)
virtual_machine.recover(self.apiclient) virtual_machine.recover(self.apiclient)
retriesCount = 10 retriesCount = 10

2
test/integration/component/test_ps_domain_limits.py
View File

@ -670,7 +670,7 @@ class TestMultipleChildDomain(cloudstackTestCase):
self.assertFalse(result[0], result[1]) self.assertFalse(result[0], result[1])
self.assertTrue(result[2], "Resource count does not match") self.assertTrue(result[2], "Resource count does not match")
vm_1.delete(self.apiclient) vm_1.delete(self.apiclient, expunge=False)
result = isDomainResourceCountEqualToExpectedCount( result = isDomainResourceCountEqualToExpectedCount(
self.apiclient, self.account.domainid, self.apiclient, self.account.domainid,

2
test/integration/component/test_ps_limits.py
View File

@ -199,7 +199,7 @@ class TestVolumeLimits(cloudstackTestCase):
expectedCount = self.initialResourceCount expectedCount = self.initialResourceCount
# Stopping instance # Stopping instance
try: try:
self.virtualMachine.delete(self.apiclient) self.virtualMachine.delete(self.apiclient, expunge=False)
except Exception as e: except Exception as e:
self.fail("Failed to destroy instance: %s" % e) self.fail("Failed to destroy instance: %s" % e)
response = matchResourceCount( response = matchResourceCount(

18
test/integration/component/test_vpc_vm_life_cycle.py
View File

@ -634,8 +634,8 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.debug("Destroying the virtual machines in account: %s" % self.debug("Destroying the virtual machines in account: %s" %
self.account.name) self.account.name)
try: try:
self.vm_1.delete(self.apiclient) self.vm_1.delete(self.apiclient, expunge=False)
self.vm_2.delete(self.apiclient) self.vm_2.delete(self.apiclient, expunge=False)
except Exception as e: except Exception as e:
self.fail("Failed to stop the virtual instances, %s" % e) self.fail("Failed to stop the virtual instances, %s" % e)
@ -678,8 +678,8 @@ class TestVMLifeCycleVPC(cloudstackTestCase):
self.debug("Deleted instacnes ..") self.debug("Deleted instacnes ..")
try: try:
self.vm_1.delete(self.apiclient) self.vm_1.delete(self.apiclient, expunge=False)
self.vm_2.delete(self.apiclient) self.vm_2.delete(self.apiclient, expunge=False)
except Exception as e: except Exception as e:
self.fail("Failed to stop the virtual instances, %s" % e) self.fail("Failed to stop the virtual instances, %s" % e)
@ -1399,7 +1399,7 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase):
self.cleanup.append(self.vm_2) self.cleanup.append(self.vm_2)
try: try:
self.vm_2.delete(self.apiclient) self.vm_2.delete(self.apiclient, expunge=False)
except Exception as e: except Exception as e:
self.fail("Failed to destroy the virtual instances, %s" % e) self.fail("Failed to destroy the virtual instances, %s" % e)
@ -2426,8 +2426,8 @@ class TestVMLifeCycleStoppedVPCVR(cloudstackTestCase):
self.debug("Destroying the virtual machines in account: %s" % self.debug("Destroying the virtual machines in account: %s" %
self.account.name) self.account.name)
try: try:
self.vm_1.delete(self.apiclient) self.vm_1.delete(self.apiclient, expunge=False)
self.vm_2.delete(self.apiclient) self.vm_2.delete(self.apiclient, expunge=False)
except Exception as e: except Exception as e:
self.fail("Failed to stop the virtual instances, %s" % e) self.fail("Failed to stop the virtual instances, %s" % e)
@ -3208,7 +3208,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
self.debug("Destroying the virtual machines in account: %s" % self.debug("Destroying the virtual machines in account: %s" %
self.account.name) self.account.name)
try: try:
self.vm_1.delete(self.apiclient) self.vm_1.delete(self.apiclient, expunge=False)
list_vm_response = list_virtual_machines( list_vm_response = list_virtual_machines(
self.apiclient, self.apiclient,
@ -3223,7 +3223,7 @@ class TestVMLifeCycleDiffHosts(cloudstackTestCase):
"VM state should be destroyed" "VM state should be destroyed"
) )
self.vm_2.delete(self.apiclient) self.vm_2.delete(self.apiclient, expunge=False)
list_vm_response = list_virtual_machines( list_vm_response = list_virtual_machines(
self.apiclient, self.apiclient,

3
tools/marvin/marvin/lib/base.py
View File

@ -612,10 +612,11 @@ class VirtualMachine:
[setattr(cmd, k, v) for k, v in kwargs.items()] [setattr(cmd, k, v) for k, v in kwargs.items()]
return(apiclient.updateVirtualMachine(cmd)) return(apiclient.updateVirtualMachine(cmd))
def delete(self, apiclient, **kwargs): def delete(self, apiclient, expunge=True, **kwargs):
"""Destroy an Instance""" """Destroy an Instance"""
cmd = destroyVirtualMachine.destroyVirtualMachineCmd() cmd = destroyVirtualMachine.destroyVirtualMachineCmd()
cmd.id = self.id cmd.id = self.id
cmd.expunge = expunge
[setattr(cmd, k, v) for k, v in kwargs.items()] [setattr(cmd, k, v) for k, v in kwargs.items()]
apiclient.destroyVirtualMachine(cmd) apiclient.destroyVirtualMachine(cmd)