From eb390fba2224fd76bf8185587acaa7596848e5bb Mon Sep 17 00:00:00 2001 From: Gaurav Aradhye Date: Thu, 5 Sep 2013 19:27:56 -0400 Subject: [PATCH] CLOUDSTACK-4531: Fixed indent problem with the patch. Signed-off-by: venkataswamybabu budumuru (cherry picked from commit 751fe8e339750c79d9a30c28f7ef8b0b87bad10a) --- tools/marvin/marvin/integration/lib/base.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py index f3d57d861bd..fa4cc8202d2 100755 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -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):