Summary: Skip add/remove nic tests in basic zone, feature is for advanced Reported-by: Ryan Dietrich <ryan@betterservers.com> Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1359589195 -0700
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 @@ 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 @@ @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 @@ 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