apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4531: Resolved ssh error for basic zone. Public ip should be used for ssh instead of ipaddress of nic

Browse Source 
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 4f3b411d4cf9a6986337dea98cd902b25efefb95)
This commit is contained in:
Girish Shilamkar 2013-08-27 23:56:28 -04:00 committed by venkataswamybabu budumuru
parent ae231444bc
commit 0fb2014d19
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/marvin/marvin/integration/lib/base.py
View File

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