cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edi...@apache.org
Subject [07/50] [abbrv] git commit: updated refs/heads/4.2 to a23322b
Date Mon, 26 Aug 2013 23:32:43 GMT
CLOUDSTACK-4473: allow_egress referenced before assignment

When deploying with networkids allow_egress gets no default value. This
is a regression caused by fix for CLOUDSTACK-4418

Signed-off-by: Prasanna Santhanam <tsp@apache.org>


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

Branch: refs/heads/4.2
Commit: e39156e4d6f572bbfaf08c7f3ccf2d99bee0b5e1
Parents: 5b319ba
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Fri Aug 23 16:41:38 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Fri Aug 23 17:03:19 2013 +0530

----------------------------------------------------------------------
 test/integration/smoke/test_nic.py          | 11 ++++-------
 tools/marvin/marvin/integration/lib/base.py |  2 ++
 2 files changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e39156e4/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py b/test/integration/smoke/test_nic.py
index b28e1b8..583fc29 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -152,9 +152,8 @@ class TestNic(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 zone.networktype != 'Advanced':
+                self.skipTest("Cannot run this test with a basic zone, please use advanced!")
 
             #if local storage is enabled, alter the offerings to use localstorage
             #this step is needed for devcloud
@@ -224,13 +223,11 @@ class TestNic(cloudstackTestCase):
             self.cleanup.insert(0, self.test_network2)
         except Exception as ex:
             self.debug("Exception during NIC test SETUP!: " + str(ex))
-            self.assertEqual(True, False, "Exception during NIC test SETUP!: " + str(ex))
 
     @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
+        """Test to add and update added nic to a virtual machine"""
+
         try:
             self.virtual_machine = VirtualMachine.create(
                                         self.apiclient,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e39156e4/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 91cfebd..3016ee4 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -344,8 +344,10 @@ class VirtualMachine:
 
         if networkids:
             cmd.networkids = networkids
+            allow_egress = False
         elif "networkids" in services:
             cmd.networkids = services["networkids"]
+            allow_egress = False
         else:
             # When no networkids are passed, network
             # is created using the "defaultOfferingWithSourceNAT"


Mime
View raw message