cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanj...@apache.org
Subject [1/2] git commit: updated refs/heads/master to d3dc053
Date Thu, 11 Feb 2016 07:48:01 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 3d9919ecf -> d3dc053b7


CLOUDSTACK-8728: Testcase to Verify if VRs IP changes if it is destroyed and re created in
Basic Zone
	-Merging the testcase in exsiting testcase by adding support for
	basic zone
	-Merging two commits into single commit


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

Branch: refs/heads/master
Commit: 775ebc6ece557cc86ff11a8580a44d4d7cd17b9a
Parents: 3ded3e9
Author: Priti Sarap <priti.sarap@clogeny.com>
Authored: Wed Aug 12 17:28:04 2015 +0530
Committer: Priti Sarap <priti.sarap@clogeny.com>
Committed: Thu Oct 15 16:32:47 2015 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_routers.py | 53 ++++++++++++++++++++++-------
 1 file changed, 40 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/775ebc6e/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index 4478c7b..c6aa496 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -313,7 +313,14 @@ class TestRouterServices(cloudstackTestCase):
         self.debug("Haproxy process status: %s" % res)
         return
 
-    @attr(tags=["advanced", "advancedns", "smoke", "dvs"], required_hardware="false")
+    @attr(
+        tags=[
+            "advanced",
+            "basic",
+            "advancedns",
+            "smoke",
+            "dvs"],
+        required_hardware="false")
     def test_03_restart_network_cleanup(self):
         """Test restart network
         """
@@ -323,20 +330,30 @@ class TestRouterServices(cloudstackTestCase):
         # 2. New router should have the same public IP
 
         # Find router associated with user account
-        list_router_response = list_routers(
-            self.apiclient,
-            account=self.account.name,
-            domainid=self.account.domainid
-        )
+        if self.zone.networktype.lower() == "basic":
+            list_router_response = list_routers(
+                self.apiclient,
+                listall="true"
+            )
+        else:
+            list_router_response = list_routers(
+                self.apiclient,
+                account=self.account.name,
+                domainid=self.account.domainid
+            )
         self.assertEqual(
             isinstance(list_router_response, list),
             True,
             "Check list response returns a valid list"
         )
+
         router = list_router_response[0]
 
         # Store old values before restart
-        old_publicip = router.publicip
+        if self.zone.networktype.lower == "basic":
+            old_publicip = router.guestipaddress
+        else:
+            old_publicip = router.publicip
 
         timeout = 10
         # Network should be in Implemented or Setup stage before restart
@@ -371,11 +388,17 @@ class TestRouterServices(cloudstackTestCase):
         self.apiclient.restartNetwork(cmd)
 
         # Get router details after restart
-        list_router_response = list_routers(
-            self.apiclient,
-            account=self.account.name,
-            domainid=self.account.domainid
-        )
+        if self.zone.networktype.lower() == "basic":
+            list_router_response = list_routers(
+                self.apiclient,
+                listall="true"
+            )
+        else:
+            list_router_response = list_routers(
+                self.apiclient,
+                account=self.account.name,
+                domainid=self.account.domainid
+            )
         self.assertEqual(
             isinstance(list_router_response, list),
             True,
@@ -383,8 +406,12 @@ class TestRouterServices(cloudstackTestCase):
         )
         router = list_router_response[0]
 
+        if self.zone.networktype.lower() == "basic":
+            new_publicip = router.guestipaddress
+        else:
+            new_publicip = router.publicip
         self.assertEqual(
-            router.publicip,
+            new_publicip,
             old_publicip,
             "Public IP of the router should remain same after network restart"
         )


Mime
View raw message