cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sw...@apache.org
Subject git commit: updated refs/heads/4.2-forward to 751fe8e
Date Fri, 06 Sep 2013 16:05:44 GMT
Updated Branches:
  refs/heads/4.2-forward add650518 -> 751fe8e33


CLOUDSTACK-4531: Fixed indent problem with the patch.

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/751fe8e3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/751fe8e3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/751fe8e3

Branch: refs/heads/4.2-forward
Commit: 751fe8e339750c79d9a30c28f7ef8b0b87bad10a
Parents: add6505
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Thu Sep 5 19:27:56 2013 -0400
Committer: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Committed: Fri Sep 6 21:35:18 2013 +0530

----------------------------------------------------------------------
 tools/marvin/marvin/integration/lib/base.py | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/751fe8e3/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index f3d57d8..fa4cc82 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):


Mime
View raw message