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-7240: Fixed expunge VM issue in test_persistent_networks.py

Browse Source 
Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com>
This commit is contained in:
Gaurav Aradhye 2014-08-05 15:04:12 +05:30 committed by Santhosh Edukulla
parent 64b9ca0a35
commit c76302cdd8
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
test/integration/component/test_persistent_networks.py
View File

@ -163,11 +163,6 @@ class TestPersistentNetworks(cloudstackTestCase):
def verifyVmExpungement(self, virtual_machine): def verifyVmExpungement(self, virtual_machine):
"""verify if vm is expunged""" """verify if vm is expunged"""
isVmExpunged = False isVmExpunged = False
try:
virtual_machine.delete(self.apiclient, expunge=True)
except Exception as e:
self.fail("Failed to delete VM: %s with error %s" % (virtual_machine.id, e))
# Verify if it is expunged # Verify if it is expunged
retriesCount = 20 retriesCount = 20
while True: while True:
@ -232,7 +227,7 @@ class TestPersistentNetworks(cloudstackTestCase):
virtual_machine = VirtualMachine.create(self.apiclient,self.services["virtual_machine"], virtual_machine = VirtualMachine.create(self.apiclient,self.services["virtual_machine"],
networkids=[network.id],serviceofferingid=self.service_offering.id, networkids=[network.id],serviceofferingid=self.service_offering.id,
accountid=self.account.name,domainid=self.domain.id) accountid=self.account.name,domainid=self.domain.id)
virtual_machine.delete(self.apiclient, expunge=True) virtual_machine.delete(self.apiclient)
except Exception as e: except Exception as e:
self.fail("vm creation failed: %s" % e) self.fail("vm creation failed: %s" % e)
@ -378,7 +373,7 @@ class TestPersistentNetworks(cloudstackTestCase):
self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id, ipaddress.ipaddress.ipaddress)) self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id, ipaddress.ipaddress.ipaddress))
# Delete VM # Delete VM
virtual_machine.delete(self.api_client, expunge=True) virtual_machine.delete(self.api_client)
# Verify VM is expunged # Verify VM is expunged
self.verifyVmExpungement(virtual_machine) self.verifyVmExpungement(virtual_machine)
@ -457,7 +452,7 @@ class TestPersistentNetworks(cloudstackTestCase):
except Exception as e: except Exception as e:
self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id, ipaddress.ipaddress.ipaddress)) self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id, ipaddress.ipaddress.ipaddress))
virtual_machine.delete(self.api_client, expunge=True) virtual_machine.delete(self.api_client)
# Verify VM is expunged # Verify VM is expunged
self.verifyVmExpungement(virtual_machine) self.verifyVmExpungement(virtual_machine)
@ -540,7 +535,7 @@ class TestPersistentNetworks(cloudstackTestCase):
except Exception as e: except Exception as e:
self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id, ipaddress.ipaddress.ipaddress)) self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id, ipaddress.ipaddress.ipaddress))
virtual_machine.delete(self.api_client, expunge=True) virtual_machine.delete(self.api_client)
# Verify VM is expunged # Verify VM is expunged
self.verifyVmExpungement(virtual_machine) self.verifyVmExpungement(virtual_machine)
@ -919,7 +914,7 @@ class TestPersistentNetworks(cloudstackTestCase):
self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id, ipaddress.ipaddress.ipaddress)) self.fail("Exception while SSHing to VM %s with IP %s" % (virtual_machine.id, ipaddress.ipaddress.ipaddress))
# Delete VM # Delete VM
virtual_machine.delete(self.api_client, expunge=True) virtual_machine.delete(self.api_client)
# Verify VM is expunged # Verify VM is expunged
self.verifyVmExpungement(virtual_machine) self.verifyVmExpungement(virtual_machine)