diff options
| author |   Nikos Karandreas <nick@intracom-telecom.com> | 2018-10-08 08:30:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-10-08 08:30:09 +0000 |
| commit | ae9dc4895258d200b6f7a90b389a5710ac271b33 (patch) | |
| tree | f6ceca583c407f24684fa5b1d3992e1a87107b5e /sdnvpn/test/functest/testcase_3.py | |
| parent | b80455110aaaadafcd416b6a8e39467071cb6a62 (diff) | |
| parent | f1c92528c528626052bf4d73dbf09e2bc9de5ad9 (diff) | |
Merge "Replace glance client calls with openstack sdk"
Diffstat (limited to 'sdnvpn/test/functest/testcase_3.py')
| -rw-r--r-- | sdnvpn/test/functest/testcase_3.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 258652f..3d202c5 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -179,7 +179,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() @@ -201,7 +201,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) @@ -236,7 +236,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, @@ -410,7 +410,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) |