You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2013/09/05 06:53:09 UTC
git commit: updated refs/heads/master to 0fb2014
Updated Branches:
refs/heads/master ae231444b -> 0fb2014d1
CLOUDSTACK-4531: Resolved ssh error for basic zone. Public ip should be used for ssh instead of ipaddress of nic
Signed-off-by: venkataswamybabu budumuru <ve...@citrix.com>
(cherry picked from commit 4f3b411d4cf9a6986337dea98cd902b25efefb95)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0fb2014d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0fb2014d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0fb2014d
Branch: refs/heads/master
Commit: 0fb2014d19832a6e747a5c0775cd7c16f5ff786b
Parents: ae23144
Author: Girish Shilamkar <gi...@clogeny.com>
Authored: Tue Aug 27 23:56:28 2013 -0400
Committer: venkataswamybabu budumuru <ve...@citrix.com>
Committed: Thu Sep 5 10:20:17 2013 +0530
----------------------------------------------------------------------
tools/marvin/marvin/integration/lib/base.py | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0fb2014d/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 782ad6b..f3d57d8 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -410,9 +410,16 @@ class VirtualMachine:
#program ssh access over NAT via PF
if mode.lower() == 'advanced':
cls.access_ssh_over_nat(apiclient, services, virtual_machine, allow_egress=allow_egress)
+
elif mode.lower() == 'basic':
- virtual_machine.ssh_ip = virtual_machine.nic[0].ipaddress
- virtual_machine.public_ip = virtual_machine.nic[0].ipaddress
+
+ if virtual_machine.publicip is not None:
+ vm_ssh_ip = virtual_machine.publicip #EIP/ELB (netscaler) enabled zone
+ else:
+ vm_ssh_ip = virtual_machine.nic[0].ipaddress #regular basic zone with security group
+
+ virtual_machine.ssh_ip = vm_ssh_ip
+ virtual_machine.public_ip = vm_ssh_ip
return VirtualMachine(virtual_machine.__dict__, services)
def start(self, apiclient):