You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2014/07/28 23:13:45 UTC

[17/50] [abbrv] git commit: updated refs/heads/4.4 to 2025f35

CLOUDSTACK-6764: Marvin - Accomodating networkid parameter while deploying VM in advanced zone and account contains mor than one network

(cherry picked from commit 50d4963d5366f1c13c58b58ac3a4bac6f99973e6)


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

Branch: refs/heads/4.4
Commit: ed77cf84f2f6f3575bf069f51bfb03d26fb0de19
Parents: 5cb6f73
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue May 27 14:41:59 2014 +0530
Committer: Daan Hoogland <da...@onecht.net>
Committed: Mon Jul 28 23:12:44 2014 +0200

----------------------------------------------------------------------
 tools/marvin/marvin/lib/base.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed77cf84/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index a95d479..9a11b3d 100644
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -316,7 +316,8 @@ class VirtualMachine:
 
     @classmethod
     def access_ssh_over_nat(
-            cls, apiclient, services, virtual_machine, allow_egress=False):
+            cls, apiclient, services, virtual_machine, allow_egress=False,
+            networkid=None):
         """
         Program NAT and PF rules to open up ssh access to deployed guest
         @return:
@@ -326,7 +327,8 @@ class VirtualMachine:
             accountid=virtual_machine.account,
             zoneid=virtual_machine.zoneid,
             domainid=virtual_machine.domainid,
-            services=services
+            services=services,
+            networkid=networkid
         )
         FireWallRule.create(
             apiclient=apiclient,
@@ -482,7 +484,8 @@ class VirtualMachine:
                 apiclient,
                 services,
                 virtual_machine,
-                allow_egress=allow_egress)
+                allow_egress=allow_egress,
+                networkid=cmd.networkids[0] if cmd.networkids else None)
         elif mode.lower() == 'basic':
             if virtual_machine.publicip is not None:
                 # EIP/ELB (netscaler) enabled zone