cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gir...@apache.org
Subject git commit: updated refs/heads/4.2 to 4df0c4a
Date Sat, 16 Nov 2013 11:22:59 GMT
Updated Branches:
  refs/heads/4.2 80dfd0f97 -> 4df0c4a7b


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/4df0c4a7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4df0c4a7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4df0c4a7

Branch: refs/heads/4.2
Commit: 4df0c4a7b5d873e68ed4228e63e466d2a64bf369
Parents: 80dfd0f
Author: Girish Shilamkar <girish@clogeny.com>
Authored: Fri Nov 15 23:33:44 2013 -0500
Committer: Girish Shilamkar <girish@clogeny.com>
Committed: Fri Nov 15 23:33:44 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/4df0c4a7/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:


Mime
View raw message