From ed77cf84f2f6f3575bf069f51bfb03d26fb0de19 Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Tue, 27 May 2014 14:41:59 +0530 Subject: [PATCH] CLOUDSTACK-6764: Marvin - Accomodating networkid parameter while deploying VM in advanced zone and account contains mor than one network (cherry picked from commit 50d4963d5366f1c13c58b58ac3a4bac6f99973e6) --- tools/marvin/marvin/lib/base.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index a95d479f297..9a11b3d77e1 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