From 0fb2014d19832a6e747a5c0775cd7c16f5ff786b Mon Sep 17 00:00:00 2001 From: Girish Shilamkar Date: Tue, 27 Aug 2013 23:56:28 -0400 Subject: [PATCH] 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 (cherry picked from commit 4f3b411d4cf9a6986337dea98cd902b25efefb95) --- tools/marvin/marvin/integration/lib/base.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index 782ad6b868a..f3d57d861bd 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):