Updated Branches: refs/heads/4.2 e473e9aa6 -> 839ccf389
Automation: Add sleep for RvR state checking Because the mgmt server would update RvR state only every 30 seconds by default. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/839ccf38 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/839ccf38 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/839ccf38 Branch: refs/heads/4.2 Commit: 839ccf389f04c165c20b245d913bf877e92d9c36 Parents: e473e9a Author: Sheng Yang <[email protected]> Authored: Tue Jul 23 22:10:33 2013 -0700 Committer: Sheng Yang <[email protected]> Committed: Tue Jul 23 22:35:10 2013 -0700 ---------------------------------------------------------------------- .../component/test_redundant_router.py | 32 +++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/839ccf38/test/integration/component/test_redundant_router.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_redundant_router.py b/test/integration/component/test_redundant_router.py index d723c18..b72a588 100644 --- a/test/integration/component/test_redundant_router.py +++ b/test/integration/component/test_redundant_router.py @@ -1013,6 +1013,7 @@ class TestRvRRedundancy(cloudstackTestCase): self.debug("Deployed VM in network: %s" % self.network.id) self.cleanup = [] self.cleanup.insert(0, self.account) + self.update_waiting_time = 60; return def tearDown(self): @@ -1023,7 +1024,7 @@ class TestRvRRedundancy(cloudstackTestCase): return @attr(tags=["advanced", "advancedns", "ssh"]) - def test_stopMasterRvR(self): + def test_01_stopMasterRvR(self): """Test stop master RVR """ @@ -1079,6 +1080,9 @@ class TestRvRRedundancy(cloudstackTestCase): except Exception as e: self.fail("Failed to stop master router: %s" % e) + # wait for VR to update state + time.sleep(self.update_waiting_time) + self.debug("Listing routers for network: %s" % self.network.name) routers = Router.list( self.apiclient, @@ -1120,6 +1124,9 @@ class TestRvRRedundancy(cloudstackTestCase): except Exception as e: self.fail("Failed to start master router: %s" % e) + # wait for VR to update state + time.sleep(self.update_waiting_time) + self.debug("Checking state of the master router in %s" % self.network.name) routers = Router.list( self.apiclient, @@ -1144,7 +1151,7 @@ class TestRvRRedundancy(cloudstackTestCase): return @attr(tags=["advanced", "advancedns", "ssh"]) - def test_stopBackupRvR(self): + def test_02_stopBackupRvR(self): """Test stop backup RVR """ @@ -1199,6 +1206,9 @@ class TestRvRRedundancy(cloudstackTestCase): except Exception as e: self.fail("Failed to stop backup router: %s" % e) + # wait for VR update state + time.sleep(self.update_waiting_time) + self.debug("Checking state of the backup router in %s" % self.network.name) routers = Router.list( self.apiclient, @@ -1240,6 +1250,9 @@ class TestRvRRedundancy(cloudstackTestCase): except Exception as e: self.fail("Failed to stop master router: %s" % e) + # wait for VR to start and update state + time.sleep(self.update_waiting_time) + self.debug("Checking state of the backup router in %s" % self.network.name) routers = Router.list( self.apiclient, @@ -1264,7 +1277,7 @@ class TestRvRRedundancy(cloudstackTestCase): return @attr(tags=["advanced", "advancedns", "ssh"]) - def test_rebootMasterRvR(self): + def test_03_rebootMasterRvR(self): """Test reboot master RVR """ @@ -1313,6 +1326,9 @@ class TestRvRRedundancy(cloudstackTestCase): except Exception as e: self.fail("Failed to reboot MASTER router: %s" % e) + # wait for VR to update state + time.sleep(self.update_waiting_time) + self.debug("Checking state of the master router in %s" % self.network.name) routers = Router.list( self.apiclient, @@ -1354,7 +1370,7 @@ class TestRvRRedundancy(cloudstackTestCase): return @attr(tags=["advanced", "advancedns", "ssh"]) - def test_rebootBackupRvR(self): + def test_04_rebootBackupRvR(self): """Test reboot backup RVR """ @@ -1403,6 +1419,9 @@ class TestRvRRedundancy(cloudstackTestCase): except Exception as e: self.fail("Failed to reboot BACKUP router: %s" % e) + # wait for VR to update state + time.sleep(self.update_waiting_time) + self.debug("Checking state of the backup router in %s" % self.network.name) routers = Router.list( self.apiclient, @@ -1444,7 +1463,7 @@ class TestRvRRedundancy(cloudstackTestCase): return @attr(tags=["advanced", "advancedns", "ssh"]) - def test_stopBackupRvR_startInstance(self): + def test_05_stopBackupRvR_startInstance(self): """Test stop backup RVR and start instance """ @@ -1493,6 +1512,9 @@ class TestRvRRedundancy(cloudstackTestCase): except Exception as e: self.fail("Failed to stop BACKUP router: %s" % e) + # wait for VR to update state + time.sleep(self.update_waiting_time) + self.debug("Checking state of the backup router in %s" % self.network.name) routers = Router.list( self.apiclient,
