You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/08/23 13:32:47 UTC
[1/2] git commit: updated refs/heads/master to 7d4a575
Updated Branches:
refs/heads/master 2444d79e5 -> 7d4a57563
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 <ts...@apache.org>
(cherry picked from commit 239ba9447109412cf48cfefc547d6b5fef83a4a9)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4a967406
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4a967406
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4a967406
Branch: refs/heads/master
Commit: 4a967406819cf054ee7b0d9f351f20a68a37cca0
Parents: 2444d79
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Aug 23 16:41:38 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Aug 23 17:02:34 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4a967406/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"
[2/2] git commit: updated refs/heads/master to 7d4a575
Posted by ts...@apache.org.
Appropriately skip the test_nic setup when in a basic zone
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/7d4a5756
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7d4a5756
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7d4a5756
Branch: refs/heads/master
Commit: 7d4a575631e03f6c1c615c41dbf55b899ead1aae
Parents: 4a96740
Author: Prasanna Santhanam <ts...@apache.org>
Authored: Fri Aug 23 16:41:38 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Fri Aug 23 17:02:35 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_nic.py | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7d4a5756/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,