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

Gaurav Aradhye · Girish Shilamkar · commit fa05cfbc7839 · 2014-05-27T14:41:59.000+05:30
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
@@ -310,7 +310,8 @@ def ssh_access_group(cls, apiclient, cmd):
 
     @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:
@@ -320,7 +321,8 @@ def access_ssh_over_nat(
             accountid=virtual_machine.account,
             zoneid=virtual_machine.zoneid,
             domainid=virtual_machine.domainid,
-            services=services
+            services=services,
+            networkid=networkid
         )
         FireWallRule.create(
             apiclient=apiclient,
@@ -476,7 +478,8 @@ def create(cls, apiclient, services, templateid=None, accountid=None,
                 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
