From d1c4675e5c35257b84cd69969c6e67575faf19db Mon Sep 17 00:00:00 2001 From: spisarski Date: Thu, 4 May 2017 12:43:53 -0600 Subject: Modified code to support both Python 2.7 and 3.x * Tested on Python 2.7.10 and 3.4.4 * Updated installation documentation JIRA: SNAPS-30 Change-Id: I94a37d218be8ea47bbbcfb560197737430fcb3ba Signed-off-by: spisarski --- snaps/provisioning/ansible_utils.py | 4 ++-- snaps/provisioning/tests/ansible_utils_tests.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'snaps/provisioning') diff --git a/snaps/provisioning/ansible_utils.py b/snaps/provisioning/ansible_utils.py index 39ae1e6..3fbc88f 100644 --- a/snaps/provisioning/ansible_utils.py +++ b/snaps/provisioning/ansible_utils.py @@ -1,4 +1,4 @@ -# Copyright (c) 2016 Cable Television Laboratories, Inc. ("CableLabs") +# Copyright (c) 2017 Cable Television Laboratories, Inc. ("CableLabs") # and others. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -105,4 +105,4 @@ def ssh_client(ip, user, private_key_filepath, proxy_settings=None): ssh.connect(ip, username=user, key_filename=private_key_filepath, sock=proxy_cmd) return ssh except Exception as e: - logger.warn('Unable to connect via SSH with message - ' + e.message) + logger.warning('Unable to connect via SSH with message - ' + str(e)) diff --git a/snaps/provisioning/tests/ansible_utils_tests.py b/snaps/provisioning/tests/ansible_utils_tests.py index 41bc199..1f03e09 100644 --- a/snaps/provisioning/tests/ansible_utils_tests.py +++ b/snaps/provisioning/tests/ansible_utils_tests.py @@ -111,9 +111,9 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): self.inst_creator = create_instance.OpenStackVmInstance( self.os_creds, instance_settings, self.image_creator.image_settings, keypair_settings=self.keypair_creator.keypair_settings) - except Exception as e: + except: self.tearDown() - raise Exception(e.message) + raise def tearDown(self): """ @@ -173,7 +173,7 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): retval = ansible_utils.apply_playbook('provisioning/tests/playbooks/simple_playbook.yml', [ip], user, priv_key, proxy_setting=self.os_creds.proxy_settings) - self.assertEquals(0, retval) + self.assertEqual(0, retval) ssh = ansible_utils.ssh_client(ip, user, priv_key, self.os_creds.proxy_settings) self.assertIsNotNone(ssh) @@ -184,7 +184,7 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): with open(self.test_file_local_path) as f: file_contents = f.readline() - self.assertEquals('Hello World!', file_contents) + self.assertEqual('Hello World!', file_contents) def test_apply_template_playbook(self): """ @@ -215,4 +215,4 @@ class AnsibleProvisioningTests(OSIntegrationTestCase): with open(self.test_file_local_path) as f: file_contents = f.readline() - self.assertEquals('Hello Foo!', file_contents) + self.assertEqual('Hello Foo!', file_contents) -- cgit 1.2.3-korg