From f1c92528c528626052bf4d73dbf09e2bc9de5ad9 Mon Sep 17 00:00:00 2001 From: Stamatis Katsaounis Date: Fri, 14 Sep 2018 14:07:02 +0300 Subject: Replace glance client calls with openstack sdk JIRA: SDNVPN-220 This patch replaces all calls of glance client with openstack sdk. Change-Id: I8bf9913e3be9615c462791a20267e4dc71ffd727 Signed-off-by: Stamatis Katsaounis --- sdnvpn/test/functest/testcase_1.py | 6 +++--- sdnvpn/test/functest/testcase_10.py | 6 +++--- sdnvpn/test/functest/testcase_11.py | 6 +++--- sdnvpn/test/functest/testcase_12.py | 6 +++--- sdnvpn/test/functest/testcase_13.py | 8 ++++---- sdnvpn/test/functest/testcase_2.py | 6 +++--- sdnvpn/test/functest/testcase_3.py | 8 ++++---- sdnvpn/test/functest/testcase_4.py | 6 +++--- sdnvpn/test/functest/testcase_7.py | 6 +++--- sdnvpn/test/functest/testcase_8.py | 6 +++--- 10 files changed, 32 insertions(+), 32 deletions(-) (limited to 'sdnvpn/test/functest') diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index 35e32b2..7c0cb43 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -33,14 +33,14 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) try: image_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_id) @@ -245,7 +245,7 @@ def main(): raise finally: test_utils.cleanup_nova(nova_client, instance_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py index aebc146..78d5684 100644 --- a/sdnvpn/test/functest/testcase_10.py +++ b/sdnvpn/test/functest/testcase_10.py @@ -72,11 +72,11 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) - image_id = os_utils.create_glance_image(glance_client, + image_id = os_utils.create_glance_image(conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, @@ -260,7 +260,7 @@ def main(): thread.join() test_utils.cleanup_nova(nova_client, instance_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_11.py b/sdnvpn/test/functest/testcase_11.py index c597c4d..85dea19 100644 --- a/sdnvpn/test/functest/testcase_11.py +++ b/sdnvpn/test/functest/testcase_11.py @@ -32,7 +32,7 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() openstack_nodes = test_utils.get_nodes() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, @@ -40,7 +40,7 @@ def main(): try: image_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_id) @@ -129,7 +129,7 @@ def main(): finally: # Cleanup topology test_utils.cleanup_nova(nova_client, instance_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_12.py b/sdnvpn/test/functest/testcase_12.py index 3e13d69..be32d1d 100644 --- a/sdnvpn/test/functest/testcase_12.py +++ b/sdnvpn/test/functest/testcase_12.py @@ -32,7 +32,7 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() openstack_nodes = test_utils.get_nodes() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, @@ -40,7 +40,7 @@ def main(): try: image_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_id) @@ -186,7 +186,7 @@ def main(): finally: # Cleanup topology test_utils.cleanup_nova(nova_client, instance_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_13.py b/sdnvpn/test/functest/testcase_13.py index 8beb1db..2d79b45 100644 --- a/sdnvpn/test/functest/testcase_13.py +++ b/sdnvpn/test/functest/testcase_13.py @@ -45,14 +45,14 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, subnet_ids, interfaces, bgpvpn_ids, flavor_ids) = ([] for i in range(9)) try: image_id = os_utils.create_glance_image( - glance_client, + conn, COMMON_CONFIG.ubuntu_image_name, COMMON_CONFIG.ubuntu_image_path, disk="qcow2", @@ -133,7 +133,7 @@ def main(): test_utils.async_Wait_for_instances([vm_1, vm_2]) image_2_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_2_id) @@ -209,7 +209,7 @@ def main(): finally: test_utils.update_router_no_extra_route(neutron_client, router_ids) test_utils.cleanup_nova(nova_client, instance_ids, flavor_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py index ee74d8d..4955f7e 100644 --- a/sdnvpn/test/functest/testcase_2.py +++ b/sdnvpn/test/functest/testcase_2.py @@ -33,7 +33,7 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) @@ -47,7 +47,7 @@ def main(): files = {"/home/cirros/id_rsa": key} image_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_id) @@ -268,7 +268,7 @@ def main(): raise finally: test_utils.cleanup_nova(nova_client, instance_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index b06915a..c942f0b 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -168,7 +168,7 @@ def main(): else: logger.info("Using old image") - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() @@ -190,7 +190,7 @@ def main(): test_utils.open_bgp_port(neutron_client, sg_id) image_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_id) @@ -225,7 +225,7 @@ def main(): logger.error("Incompatible installer type") ubuntu_image_id = os_utils.create_glance_image( - glance_client, + conn, COMMON_CONFIG.ubuntu_image_name, COMMON_CONFIG.ubuntu_image_path, disk, @@ -399,7 +399,7 @@ def main(): if quagga_vm is not None: test_utils.detach_instance_from_ext_br(quagga_vm, compute) test_utils.cleanup_nova(nova_client, instance_ids, flavor_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py index 9b11cc3..a29dc12 100644 --- a/sdnvpn/test/functest/testcase_4.py +++ b/sdnvpn/test/functest/testcase_4.py @@ -34,14 +34,14 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) try: image_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_id) @@ -259,7 +259,7 @@ def main(): raise finally: test_utils.cleanup_nova(nova_client, instance_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py index 1ad0538..381b98b 100644 --- a/sdnvpn/test/functest/testcase_7.py +++ b/sdnvpn/test/functest/testcase_7.py @@ -43,14 +43,14 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) try: image_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_id) @@ -169,7 +169,7 @@ def main(): raise finally: test_utils.cleanup_nova(nova_client, instance_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py index 6336f46..cfdb950 100644 --- a/sdnvpn/test/functest/testcase_8.py +++ b/sdnvpn/test/functest/testcase_8.py @@ -41,14 +41,14 @@ def main(): nova_client = os_utils.get_nova_client() neutron_client = os_utils.get_neutron_client() - glance_client = os_utils.get_glance_client() + conn = os_utils.get_os_connection() (floatingip_ids, instance_ids, router_ids, network_ids, image_ids, subnet_ids, interfaces, bgpvpn_ids) = ([] for i in range(8)) try: image_id = os_utils.create_glance_image( - glance_client, TESTCASE_CONFIG.image_name, + conn, TESTCASE_CONFIG.image_name, COMMON_CONFIG.image_path, disk=COMMON_CONFIG.image_format, container="bare", public='public') image_ids.append(image_id) @@ -177,7 +177,7 @@ def main(): raise finally: test_utils.cleanup_nova(nova_client, instance_ids) - test_utils.cleanup_glance(glance_client, image_ids) + test_utils.cleanup_glance(conn, image_ids) test_utils.cleanup_neutron(neutron_client, floatingip_ids, bgpvpn_ids, interfaces, subnet_ids, router_ids, network_ids) -- cgit 1.2.3-korg