rafaelweingartner closed pull request #2457: CLOUDSTACK-10295 Marvin: add support for password-enabled templates URL: https://github.com/apache/cloudstack/pull/2457
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py index 23621991cc2..e0253896271 100755 --- a/tools/marvin/marvin/lib/base.py +++ b/tools/marvin/marvin/lib/base.py @@ -593,6 +593,10 @@ def create(cls, apiclient, services, templateid=None, accountid=None, virtual_machine = apiclient.deployVirtualMachine(cmd, method=method) + if 'password' in virtual_machine.__dict__.keys(): + if virtual_machine.password: + services['password'] = virtual_machine.password + virtual_machine.ssh_ip = virtual_machine.nic[0].ipaddress if startvm is False: virtual_machine.public_ip = virtual_machine.nic[0].ipaddress ---------------------------------------------------------------- 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: us...@infra.apache.org With regards, Apache Git Services