Merge "Remove Manager class"

This commit is contained in:
Zuul 2019-08-06 17:31:43 +00:00 committed by Gerrit Code Review
commit a226433e77
2 changed files with 0 additions and 11 deletions

View File

@ -12,20 +12,11 @@
# License for the specific language governing permissions and limitations under # License for the specific language governing permissions and limitations under
# the License. # the License.
from tempest import clients
from tempest.common import credentials_factory as common_creds
from tempest import config from tempest import config
from tempest.lib.services import clients as cli from tempest.lib.services import clients as cli
CONF = config.CONF CONF = config.CONF
ADMIN_CREDS = common_creds.get_configured_admin_credentials()
class Manager(clients.Manager):
def __init__(self, credentials=ADMIN_CREDS):
super(Manager, self).__init__(credentials)
class Clients(cli.ServiceClients): class Clients(cli.ServiceClients):
"""Tempest stable service clients and loaded plugins service clients""" """Tempest stable service clients and loaded plugins service clients"""

View File

@ -30,7 +30,6 @@ from cryptography.x509.oid import NameOID
from oslo_log import log as logging from oslo_log import log as logging
from tempest import config from tempest import config
from barbican_tempest_plugin import clients
from barbican_tempest_plugin.tests.scenario import manager as mgr from barbican_tempest_plugin.tests.scenario import manager as mgr
CONF = config.CONF CONF = config.CONF
@ -40,7 +39,6 @@ LOG = logging.getLogger(__name__)
class BarbicanScenarioTest(mgr.ScenarioTest): class BarbicanScenarioTest(mgr.ScenarioTest):
credentials = ('primary', 'admin') credentials = ('primary', 'admin')
manager = clients.Manager()
def setUp(self): def setUp(self):
super(BarbicanScenarioTest, self).setUp() super(BarbicanScenarioTest, self).setUp()