Updated Branches: refs/heads/4.2-forward 9f870eee0 -> 4f3b411d4
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]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4f3b411d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4f3b411d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4f3b411d Branch: refs/heads/4.2-forward Commit: 4f3b411d4cf9a6986337dea98cd902b25efefb95 Parents: 9f870ee Author: Girish Shilamkar <[email protected]> Authored: Tue Aug 27 23:56:28 2013 -0400 Committer: venkataswamybabu budumuru <[email protected]> Committed: Thu Sep 5 10:07:38 2013 +0530 ---------------------------------------------------------------------- tools/marvin/marvin/integration/lib/base.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f3b411d/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 782ad6b..f3d57d8 100755 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -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):
