cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wid...@apache.org
Subject [31/50] git commit: updated refs/heads/CLOUDSTACK-8581 to 1a2e80b
Date Fri, 10 Jul 2015 10:08:26 GMT
Handling Basic zone failures in startVM with false condition
This closes #569


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/97ed8c3a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/97ed8c3a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/97ed8c3a

Branch: refs/heads/CLOUDSTACK-8581
Commit: 97ed8c3af5b1251be199610ea2eeccdeb5569940
Parents: 874445d
Author: pavan018 <pavanbandarupally@gmail.com>
Authored: Thu Jul 9 12:53:27 2015 +0530
Committer: sanjeev <sanjeev@apache.org>
Committed: Thu Jul 9 15:54:35 2015 +0530

----------------------------------------------------------------------
 .../component/test_resource_limits.py           |  2 +-
 test/integration/component/test_stopped_vm.py   | 68 +++++++++++---------
 2 files changed, 40 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97ed8c3a/test/integration/component/test_resource_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py
index cb06099..1bb5108 100644
--- a/test/integration/component/test_resource_limits.py
+++ b/test/integration/component/test_resource_limits.py
@@ -1448,7 +1448,7 @@ class TestMaxAccountNetworks(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "advancedns", "simulator",
-                "api", "eip"])
+                "api"])
     def test_maxAccountNetworks(self):
         """Test Limit number of guest account specific networks
         """

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/97ed8c3a/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index f83c47e..3297e74 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -1067,18 +1067,20 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
             self.apiclient,
             VirtualMachine.STOPPED)
         self.assertEqual(response[0], PASS, response[1])
-        self.debug("Checking the router state after VM deployment")
-        routers = Router.list(
-            self.apiclient,
-            account=self.account.name,
-            domainid=self.account.domainid,
-            listall=True
-        )
-        self.assertEqual(
-            routers,
-            None,
-            "List routers should return empty response"
-        )
+
+        if(self.zone.networktype == "Advanced"):
+            self.debug("Checking the router state after VM deployment")
+            routers = Router.list(
+                self.apiclient,
+                account=self.account.name,
+                domainid=self.account.domainid,
+                listall=True
+            )
+            self.assertEqual(
+                routers,
+                None,
+                "List routers should return empty response"
+            )
         self.debug(
             "Deploying another instance (startvm=true) in the account: %s" %
             self.account.name)
@@ -1097,12 +1099,19 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
             VirtualMachine.RUNNING)
         self.assertEqual(response[0], PASS, response[1])
         self.debug("Checking the router state after VM deployment")
-        routers = Router.list(
-            self.apiclient,
-            account=self.account.name,
-            domainid=self.account.domainid,
-            listall=True
-        )
+        if (self.zone.networktype == "Basic"):
+            routers = Router.list(
+                                  self.apiclient,
+                                  zoneid=self.zone.id,
+                                  listall=True
+                                 )
+        else:
+            routers = Router.list(
+                self.apiclient,
+                account=self.account.name,
+                domainid=self.account.domainid,
+                listall=True
+            )
         self.assertEqual(
             isinstance(routers, list),
             True,
@@ -1118,17 +1127,18 @@ class TestRouterStateAfterDeploy(cloudstackTestCase):
         self.debug("Destroying the running VM:%s" %
                    self.virtual_machine_2.name)
         self.virtual_machine_2.delete(self.apiclient, expunge=True)
-        routers = Router.list(
-            self.apiclient,
-            account=self.account.name,
-            domainid=self.account.domainid,
-            listall=True
-        )
-        self.assertNotEqual(
-            routers,
-            None,
-            "Router should get deleted after expunge delay+wait"
-        )
+        if(self.zone.networktype == "Advanced"):
+            routers = Router.list(
+                self.apiclient,
+                account=self.account.name,
+                domainid=self.account.domainid,
+                listall=True
+            )
+            self.assertNotEqual(
+                routers,
+                None,
+                "Router should get deleted after expunge delay+wait"
+            )
         return
 
 


Mime
View raw message