etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-4531: Fixed indent problem with the patch. 

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 751fe8e339)
This commit is contained in:
Gaurav Aradhye 2013-09-05 19:27:56 -04:00 committed by venkataswamybabu budumuru
parent 2cc1dd4e74
commit eb390fba22
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -410,16 +410,14 @@ 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':
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
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):