rhtyd commented on a change in pull request #2869: Fix some Marvin smoke tests
URL: https://github.com/apache/cloudstack/pull/2869#discussion_r225804562
##########
File path: tools/marvin/marvin/lib/base.py
##########
@@ -605,22 +605,34 @@ def create(cls, apiclient, services, templateid=None,
accountid=None,
return VirtualMachine(virtual_machine.__dict__, services)
# program ssh access over NAT via PF
- if mode.lower() == 'advanced':
- cls.access_ssh_over_nat(
- apiclient,
- services,
- virtual_machine,
- allow_egress=allow_egress,
- networkid=cmd.networkids[0] if cmd.networkids else None)
- elif mode.lower() == 'basic':
- if virtual_machine.publicip is not None:
- # EIP/ELB (netscaler) enabled zone
- vm_ssh_ip = virtual_machine.publicip
- else:
- # regular basic zone with security group
- vm_ssh_ip = virtual_machine.nic[0].ipaddress
- virtual_machine.ssh_ip = vm_ssh_ip
- virtual_machine.public_ip = vm_ssh_ip
+ retries = 5
+ interval = 30
+ while retries > 0:
Review comment:
Rewrite this using `wait_until`.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
