diff options
Diffstat (limited to 'snaps/openstack/utils/tests')
-rw-r--r-- | snaps/openstack/utils/tests/keystone_utils_tests.py | 6 | ||||
-rw-r--r-- | snaps/openstack/utils/tests/neutron_utils_tests.py | 10 | ||||
-rw-r--r-- | snaps/openstack/utils/tests/nova_utils_tests.py | 38 |
3 files changed, 27 insertions, 27 deletions
diff --git a/snaps/openstack/utils/tests/keystone_utils_tests.py b/snaps/openstack/utils/tests/keystone_utils_tests.py index 76a43ef..c072fd3 100644 --- a/snaps/openstack/utils/tests/keystone_utils_tests.py +++ b/snaps/openstack/utils/tests/keystone_utils_tests.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"); @@ -93,8 +93,8 @@ class KeystoneUtilsTests(OSComponentTestCase): """ project_settings = ProjectSettings(name=self.project_name) self.project = keystone_utils.create_project(self.keystone, project_settings) - self.assertEquals(self.project_name, self.project.name) + self.assertEqual(self.project_name, self.project.name) project = keystone_utils.get_project(keystone=self.keystone, project_name=project_settings.name) self.assertIsNotNone(project) - self.assertEquals(self.project_name, self.project.name) + self.assertEqual(self.project_name, self.project.name) diff --git a/snaps/openstack/utils/tests/neutron_utils_tests.py b/snaps/openstack/utils/tests/neutron_utils_tests.py index 5f95fc9..9a043e3 100644 --- a/snaps/openstack/utils/tests/neutron_utils_tests.py +++ b/snaps/openstack/utils/tests/neutron_utils_tests.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"); @@ -109,14 +109,16 @@ class NeutronUtilsNetworkTests(OSComponentTestCase): Tests the neutron_utils.create_neutron_net() function with an empty network name """ with self.assertRaises(Exception): - self.network = neutron_utils.create_network(self.neutron, NetworkSettings(name='')) + self.network = neutron_utils.create_network(self.neutron, self.os_creds, + network_settings=NetworkSettings(name='')) def test_create_network_null_name(self): """ Tests the neutron_utils.create_neutron_net() function when the network name is None """ with self.assertRaises(Exception): - self.network = neutron_utils.create_network(self.neutron, NetworkSettings()) + self.network = neutron_utils.create_network(self.neutron, self.os_creds, + network_settings=NetworkSettings()) class NeutronUtilsSubnetTests(OSComponentTestCase): @@ -644,7 +646,7 @@ def validate_port(neutron, port_obj, this_port_name): :return: True/False """ ports = neutron.list_ports() - for port, port_insts in ports.iteritems(): + for port, port_insts in ports.items(): for inst in port_insts: if inst['id'] == port_obj['port']['id']: return inst['name'] == this_port_name diff --git a/snaps/openstack/utils/tests/nova_utils_tests.py b/snaps/openstack/utils/tests/nova_utils_tests.py index f6c9156..0a2b24b 100644 --- a/snaps/openstack/utils/tests/nova_utils_tests.py +++ b/snaps/openstack/utils/tests/nova_utils_tests.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"); @@ -16,8 +16,6 @@ import logging import os import uuid -from Crypto.PublicKey import RSA - from snaps.openstack.utils import nova_utils from snaps.openstack.tests.os_source_file_test import OSComponentTestCase from snaps.openstack.create_flavor import FlavorSettings @@ -71,8 +69,8 @@ class NovaUtilsKeypairTests(OSComponentTestCase): self.pub_key_file_path = self.priv_key_file_path + '.pub' self.nova = nova_utils.nova_client(self.os_creds) - self.keys = RSA.generate(1024) - self.public_key = self.keys.publickey().exportKey('OpenSSH') + self.keys = nova_utils.create_keys() + self.public_key = nova_utils.public_key_openssh(self.keys) self.keypair_name = guid self.keypair = None self.floating_ip = None @@ -106,9 +104,9 @@ class NovaUtilsKeypairTests(OSComponentTestCase): """ self.keypair = nova_utils.upload_keypair(self.nova, self.keypair_name, self.public_key) result = nova_utils.keypair_exists(self.nova, self.keypair) - self.assertEquals(self.keypair, result) + self.assertEqual(self.keypair, result) keypair = nova_utils.get_keypair_by_name(self.nova, self.keypair_name) - self.assertEquals(self.keypair, keypair) + self.assertEqual(self.keypair, keypair) def test_create_delete_keypair(self): """ @@ -116,7 +114,7 @@ class NovaUtilsKeypairTests(OSComponentTestCase): """ self.keypair = nova_utils.upload_keypair(self.nova, self.keypair_name, self.public_key) result = nova_utils.keypair_exists(self.nova, self.keypair) - self.assertEquals(self.keypair, result) + self.assertEqual(self.keypair, result) nova_utils.delete_keypair(self.nova, self.keypair) result2 = nova_utils.keypair_exists(self.nova, self.keypair) self.assertIsNone(result2) @@ -129,7 +127,7 @@ class NovaUtilsKeypairTests(OSComponentTestCase): nova_utils.save_keys_to_files(self.keys, self.pub_key_file_path, self.priv_key_file_path) self.keypair = nova_utils.upload_keypair_file(self.nova, self.keypair_name, self.pub_key_file_path) pub_key = open(os.path.expanduser(self.pub_key_file_path)).read() - self.assertEquals(self.keypair.public_key, pub_key) + self.assertEqual(self.keypair.public_key, pub_key) def test_floating_ips(self): """ @@ -141,7 +139,7 @@ class NovaUtilsKeypairTests(OSComponentTestCase): self.floating_ip = nova_utils.create_floating_ip(self.nova, self.ext_net_name) returned = nova_utils.get_floating_ip(self.nova, self.floating_ip) - self.assertEquals(self.floating_ip, returned) + self.assertEqual(self.floating_ip, returned) class NovaUtilsFlavorTests(OSComponentTestCase): @@ -192,17 +190,17 @@ class NovaUtilsFlavorTests(OSComponentTestCase): Validates the flavor_settings against the OpenStack flavor object """ self.assertIsNotNone(self.flavor) - self.assertEquals(self.flavor_settings.name, self.flavor.name) - self.assertEquals(self.flavor_settings.flavor_id, self.flavor.id) - self.assertEquals(self.flavor_settings.ram, self.flavor.ram) - self.assertEquals(self.flavor_settings.disk, self.flavor.disk) - self.assertEquals(self.flavor_settings.vcpus, self.flavor.vcpus) - self.assertEquals(self.flavor_settings.ephemeral, self.flavor.ephemeral) + self.assertEqual(self.flavor_settings.name, self.flavor.name) + self.assertEqual(self.flavor_settings.flavor_id, self.flavor.id) + self.assertEqual(self.flavor_settings.ram, self.flavor.ram) + self.assertEqual(self.flavor_settings.disk, self.flavor.disk) + self.assertEqual(self.flavor_settings.vcpus, self.flavor.vcpus) + self.assertEqual(self.flavor_settings.ephemeral, self.flavor.ephemeral) if self.flavor_settings.swap == 0: - self.assertEquals('', self.flavor.swap) + self.assertEqual('', self.flavor.swap) else: - self.assertEquals(self.flavor_settings.swap, self.flavor.swap) + self.assertEqual(self.flavor_settings.swap, self.flavor.swap) - self.assertEquals(self.flavor_settings.rxtx_factor, self.flavor.rxtx_factor) - self.assertEquals(self.flavor_settings.is_public, self.flavor.is_public) + self.assertEqual(self.flavor_settings.rxtx_factor, self.flavor.rxtx_factor) + self.assertEqual(self.flavor_settings.is_public, self.flavor.is_public) |