Updated Branches: refs/heads/master 02c15528c -> e2051de98
CLOUDSTACK-5187: Fix test_vpc_vm_life_cycle recover tests The vms were recovered without deleting the vms first therefore the API failed. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e2051de9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e2051de9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e2051de9 Branch: refs/heads/master Commit: e2051de98e1460f8e0ce723b42331566a00e2ba1 Parents: 02c1552 Author: Girish Shilamkar <gir...@clogeny.com> Authored: Fri Nov 15 23:33:44 2013 -0500 Committer: Girish Shilamkar <gir...@clogeny.com> Committed: Fri Nov 15 23:38:57 2013 -0500 ---------------------------------------------------------------------- .../component/test_vpc_vm_life_cycle.py | 26 ++++++++------------ 1 file changed, 10 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2051de9/test/integration/component/test_vpc_vm_life_cycle.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py index 60a8971..beb5b99 100644 --- a/test/integration/component/test_vpc_vm_life_cycle.py +++ b/test/integration/component/test_vpc_vm_life_cycle.py @@ -651,15 +651,13 @@ class TestVMLifeCycleVPC(cloudstackTestCase): """ Test recover an instance in VPC networks """ - # Validate the following - # 1. Recover the virtual machines. - # 2. Vm should be in stopped state. State both the instances - # 3. Make sure that all the PF,LB and Static NAT rules on this VM - # works as expected. - # 3. Make sure that we are able to access google.com from this user Vm + self.debug("Deleted instacnes ..") + try: + self.vm_1.delete(self.apiclient) + self.vm_2.delete(self.apiclient) + except Exception as e: + self.fail("Failed to stop the virtual instances, %s" % e) - self.debug("Recovering the expunged virtual machines in account: %s" % - self.account.name) try: self.vm_1.recover(self.apiclient) self.vm_2.recover(self.apiclient) @@ -1421,15 +1419,11 @@ class TestVMLifeCycleSharedNwVPC(cloudstackTestCase): """ Test recover an instance in VPC networks """ - # Validate the following - # 1. Recover the virtual machines. - # 2. Vm should be in stopped state. State both the instances - # 3. Make sure that all the PF,LB and Static NAT rules on this VM - # works as expected. - # 3. Make sure that we are able to access google.com from this user Vm + try: + self.vm_2.delete(self.apiclient) + except Exception as e: + self.fail("Failed to destroy the virtual instances, %s" % e) - self.debug("Recovering the expunged virtual machines in account: %s" % - self.account.name) try: self.vm_2.recover(self.apiclient) except Exception as e:
