diff options
| author |   Steven Pisarski <s.pisarski@cablelabs.com> | 2018-01-23 16:18:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-01-23 16:18:51 +0000 |
| commit | 88e9754a4280690acf2ec5942b34336d469673ed (patch) | |
| tree | 284269828b606e36af90985f579095171cac9aea /snaps/provisioning/tests/ansible_utils_tests.py | |
| parent | 7cf2a28e78404a3835bfde3516d1fb7ff93aa58d (diff) | |
| parent | 7ea11eada552627b5385a6a347f23fccee484e67 (diff) | |
Merge "Added password support for SSH and Ansible Additional protections when initializing network resources Enhanced playbook runner variable support"
Diffstat (limited to 'snaps/provisioning/tests/ansible_utils_tests.py')
| -rw-r--r-- | snaps/provisioning/tests/ansible_utils_tests.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 7600002..851dd64 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -266,8 +266,9 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): retval = self.inst_creator.apply_ansible_playbook(relative_pb_path) self.assertEqual(0, retval) - ssh = ansible_utils.ssh_client(ip, user, priv_key, - self.os_creds.proxy_settings) + ssh = ansible_utils.ssh_client( + ip, user, private_key_filepath=priv_key, + proxy_settings=self.os_creds.proxy_settings) self.assertIsNotNone(ssh) scp = None try: @@ -329,13 +330,13 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): relative_pb_path = pkg_resources.resource_filename( 'snaps.provisioning.tests.playbooks', 'template_playbook.yml') - retval = self.inst_creator.apply_ansible_playbook(relative_pb_path, - variables={ - 'name': 'Foo'}) + retval = self.inst_creator.apply_ansible_playbook( + relative_pb_path, variables={'name': 'Foo'}) self.assertEqual(0, retval) - ssh = ansible_utils.ssh_client(ip, user, priv_key, - self.os_creds.proxy_settings) + ssh = ansible_utils.ssh_client( + ip, user, private_key_filepath=priv_key, + proxy_settings=self.os_creds.proxy_settings) self.assertIsNotNone(ssh) scp = None |