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 <[email protected]> (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 <[email protected]> Authored: Fri Aug 23 16:41:38 2013 +0530 Committer: Prasanna Santhanam <[email protected]> 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"
