You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/05/27 11:14:10 UTC
git commit: updated refs/heads/master to fa05cfb
Repository: cloudstack
Updated Branches:
refs/heads/master 3e3dc7327 -> fa05cfbc7
CLOUDSTACK-6764: Marvin - Accomodating networkid parameter while deploying VM in advanced zone and account contains mor than one network
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fa05cfbc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fa05cfbc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fa05cfbc
Branch: refs/heads/master
Commit: fa05cfbc7839077bfae6390125de87602f51bbac
Parents: 3e3dc73
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Tue May 27 14:41:59 2014 +0530
Committer: Girish Shilamkar <gi...@clogeny.com>
Committed: Tue May 27 14:41:59 2014 +0530
----------------------------------------------------------------------
tools/marvin/marvin/lib/base.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa05cfbc/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index b37ba06..e0aad3c 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