etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

(cherry picked from commit 50d4963d53)
This commit is contained in:
Gaurav Aradhye 2014-05-27 14:41:59 +05:30 committed by Daan Hoogland
parent 5cb6f7375e
commit ed77cf84f2
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/marvin/marvin/lib/base.py
View File

@ -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