Updated Branches: refs/heads/add_remove_nics 437d30a29 -> 3dc6e8ef7
Summary: Skip add/remove nic tests in basic zone, feature is for advanced Reported-by: Ryan Dietrich <[email protected]> Signed-off-by: Marcus Sorensen <[email protected]> 1359589195 -0700 Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/3dc6e8ef Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/3dc6e8ef Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/3dc6e8ef Branch: refs/heads/add_remove_nics Commit: 3dc6e8ef7d98a6a84f00f8741019c62c619ff7e5 Parents: 437d30a Author: Marcus Sorensen <[email protected]> Authored: Wed Jan 30 16:39:55 2013 -0700 Committer: Marcus Sorensen <[email protected]> Committed: Wed Jan 30 16:39:55 2013 -0700 ---------------------------------------------------------------------- test/integration/smoke/test_nic.py | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/3dc6e8ef/test/integration/smoke/test_nic.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py index 4b31b34..6cf73ac 100644 --- a/test/integration/smoke/test_nic.py +++ b/test/integration/smoke/test_nic.py @@ -115,6 +115,10 @@ class TestDeployVM(cloudstackTestCase): zone = get_zone(self.apiclient, self.services) self.services['mode'] = zone.networktype + if self.services['mode'] != 'Advanced': + self.debug("Cannot run this test with a basic zone, please use advanced!") + return + #if local storage is enabled, alter the offerings to use localstorage #this step is needed for devcloud if zone.localstorageenabled == True: @@ -171,6 +175,9 @@ class TestDeployVM(cloudstackTestCase): @attr(tags = ["devcloud", "advanced", "advancedns", "smoke", "basic", "sg"]) def test_01_nic(self): + if self.services['mode'] != 'Advanced': + self.debug("Cannot run this test with a basic zone, please use advanced!") + return try: self.virtual_machine = VirtualMachine.create( self.apiclient, @@ -306,6 +313,10 @@ class TestDeployVM(cloudstackTestCase): self.assertEqual(True, False, "Exception during NIC test!: " + str(ex)) def tearDown(self): + if self.services['mode'] != 'Advanced': + self.debug("Cannot run this test with a basic zone, please use advanced!") + return + if self.cleaning_up == 1: return
