777fd3993a
This code fixes importing configured admin credentials, adds a help message to 'catalog_type' config parameter and removes unused custom tempest.conf Change-Id: I60ba1852d3686141132ae11362f51bf65ddfc618 Closes-bug: #1718669
41 lines
1.3 KiB
Python
41 lines
1.3 KiB
Python
# Copyright (c) 2015 Mirantis, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
|
|
from tempest import clients
|
|
from tempest.common import credentials_factory as common_creds
|
|
from tempest import config
|
|
|
|
|
|
from glare_tempest_plugin.services.artifacts import artifacts_client
|
|
|
|
CONF = config.CONF
|
|
|
|
ADMIN_CREDS = None
|
|
|
|
|
|
class Manager(clients.Manager):
|
|
|
|
def __init__(self, credentials=None):
|
|
if credentials is None:
|
|
global ADMIN_CREDS
|
|
if ADMIN_CREDS is None:
|
|
ADMIN_CREDS = common_creds.get_configured_admin_credentials()
|
|
credentials = ADMIN_CREDS
|
|
super(Manager, self).__init__(credentials)
|
|
|
|
self.artifacts_client = artifacts_client.ArtifactsClient(
|
|
self.auth_provider)
|