From fa05cfbc7839077bfae6390125de87602f51bbac 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 --- 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 b37ba0610e9..e0aad3c06f6 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -310,7 +310,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: @@ -320,7 +321,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, @@ -476,7 +478,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