Skip to content

Commit 4f3b411

Browse files
Girish ShilamkarCloudStack-QA
Girish Shilamkar
authored and
CloudStack-QA
committed
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 <[email protected]>
1 parent 9f870ee commit 4f3b411

1 file changed

Lines changed: 9 additions & 2 deletions

File tree

  • tools/marvin/marvin/integration/lib

‎tools/marvin/marvin/integration/lib/base.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,16 @@ def create(cls, apiclient, services, templateid=None, accountid=None,
410410
#program ssh access over NAT via PF
411411
if mode.lower() == 'advanced':
412412
cls.access_ssh_over_nat(apiclient, services, virtual_machine, allow_egress=allow_egress)
413+
413414
elif mode.lower() == 'basic':
414-
virtual_machine.ssh_ip = virtual_machine.nic[0].ipaddress
415-
virtual_machine.public_ip = virtual_machine.nic[0].ipaddress
415+
416+
if virtual_machine.publicip is not None:
417+
vm_ssh_ip = virtual_machine.publicip #EIP/ELB (netscaler) enabled zone
418+
else:
419+
vm_ssh_ip = virtual_machine.nic[0].ipaddress #regular basic zone with security group
420+
421+
virtual_machine.ssh_ip = vm_ssh_ip
422+
virtual_machine.public_ip = vm_ssh_ip
416423
return VirtualMachine(virtual_machine.__dict__, services)
417424

418425
def start(self, apiclient):

0 commit comments

Comments
 (0)