From 334b6139a4e88b4e97b62b757b3fd2e0f15c0d72 Mon Sep 17 00:00:00 2001 From: Martin Kopec Date: Fri, 18 Dec 2020 13:19:10 +0000 Subject: [PATCH] Use tempest's ServiceClients rather than Manager tempest.Manager has been deprecated for more than 4 years already and will be removed by [1]. Tempest plugins are expected to consume tempest.lib.services.clients.ServiceClients directly. [1] https://review.opendev.org/c/openstack/tempest/+/767628 Change-Id: I84afb611cb994ce0ef5eaa94fd14612d00327182 --- zun_tempest_plugin/tests/tempest/api/clients.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/zun_tempest_plugin/tests/tempest/api/clients.py b/zun_tempest_plugin/tests/tempest/api/clients.py index 0941b8b..8b35408 100644 --- a/zun_tempest_plugin/tests/tempest/api/clients.py +++ b/zun_tempest_plugin/tests/tempest/api/clients.py @@ -12,10 +12,12 @@ import contextlib import docker +from tempest import clients as tempest_clients from tempest.common import credentials_factory as common_creds from tempest import config from tempest.lib.common import api_version_utils from tempest.lib.common import rest_client +from tempest.lib.services import clients from tempest.lib.services.image.v2 import images_client from tempest.lib.services.network import floating_ips_client from tempest.lib.services.network import networks_client @@ -26,7 +28,6 @@ from tempest.lib.services.network import security_groups_client from tempest.lib.services.network import subnetpools_client from tempest.lib.services.network import subnets_client from tempest.lib.services.volume.v3 import volumes_client -from tempest import manager from urllib import parse from zun_tempest_plugin.tests.tempest.api.models import capsule_model @@ -59,7 +60,7 @@ def reset_container_service_api_microversion(): CONTAINER_SERVICE_MICROVERSION = None -class Manager(manager.Manager): +class Manager(clients.ServiceClients): def __init__(self, credentials=None): """Initialization of Manager class. @@ -72,7 +73,15 @@ class Manager(manager.Manager): if ADMIN_CREDS is None: ADMIN_CREDS = common_creds.get_configured_admin_credentials() credentials = ADMIN_CREDS - super(Manager, self).__init__(credentials=credentials) + dscv = CONF.identity.disable_ssl_certificate_validation + _, uri = tempest_clients.get_auth_provider_class(credentials) + super(Manager, self).__init__( + credentials=credentials, + identity_uri=uri, + scope='project', + disable_ssl_certificate_validation=dscv, + ca_certs=CONF.identity.ca_certificates_file, + trace_requests=CONF.debug.trace_requests) self.images_client = images_client.ImagesClient( self.auth_provider, 'image', CONF.identity.region,