You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/12/28 11:22:38 UTC
[14/16] git commit: updated refs/heads/master to 67b753c
Only set L2 Gateway in NSX device if defined
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/88774a93
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/88774a93
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/88774a93
Branch: refs/heads/master
Commit: 88774a93e88d83bdf2868b382f66ecfae441a69a
Parents: 4ac2737
Author: Miguel Ferreira <mi...@me.com>
Authored: Thu Dec 24 11:08:42 2015 +0100
Committer: nvazquez <ni...@gmail.com>
Committed: Thu Dec 24 16:07:06 2015 -0300
----------------------------------------------------------------------
tools/marvin/marvin/lib/base.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88774a93/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 379ecd9..35d0b27 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -3878,7 +3878,7 @@ class NiciraNvp:
if l2gatewayserviceuuid:
cmd.l2gatewayserviceuuid = l2gatewayserviceuuid
- else:
+ elif services and 'l2gatewayserviceuuid' in services:
cmd.l2gatewayserviceuuid = services['l2gatewayserviceuuid']
return NiciraNvp(apiclient.addNiciraNvpDevice(cmd).__dict__)
@@ -4060,9 +4060,9 @@ class VpcOffering:
@classmethod
def create(cls, apiclient, services):
"""Create vpc offering"""
-
+
import logging
-
+
cmd = createVPCOffering.createVPCOfferingCmd()
cmd.name = "-".join([services["name"], random_gen()])
cmd.displaytext = services["displaytext"]