openstack/python-neutronclient
Code Issues Proposed changes

Merge "Consume tempest CLIClient keystone v3 support"

Browse Source
This commit is contained in:
Zuul
2018-01-11 12:37:23 +00:00
committed by Gerrit Code Review
parent 17a953a899 8cc59bf688
commit 0373b9c7ea
1 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
neutronclient/tests/functional/base.py
View File

@@ -57,6 +57,8 @@ class ClientTestBase(base.ClientTestBase):
username=creds['username'], username=creds['username'],
password=creds['password'], password=creds['password'],
tenant_name=creds['project_name'], tenant_name=creds['project_name'],
project_domain_id=creds['project_domain_id'],
user_domain_id=creds['user_domain_id'],
uri=creds['auth_url'], uri=creds['auth_url'],
cli_dir=cli_dir) cli_dir=cli_dir)
@@ -64,27 +66,12 @@ class ClientTestBase(base.ClientTestBase):
return self._get_clients_from_os_cloud_config() return self._get_clients_from_os_cloud_config()
def neutron(self, *args, **kwargs): def neutron(self, *args, **kwargs):
# Workaround until tempest.lib.cli.base provdes fully return self.clients.neutron(*args, **kwargs)
# keystone v3 support. It assumes the default domain.
# TODO(amotoki): Once a new tempest with a fix for bug 1719687
# is released, this should be claen up.
kwargs['flags'] = ' '.join([kwargs.get('flags', ''),
'--os-project-domain-id default',
'--os-user-domain-id default'])
return self.clients.neutron(*args,
**kwargs)
def neutron_non_admin(self, *args, **kwargs): def neutron_non_admin(self, *args, **kwargs):
if not hasattr(self, '_non_admin_clients'): if not hasattr(self, '_non_admin_clients'):
self._non_admin_clients = self._get_clients_from_os_cloud_config( self._non_admin_clients = self._get_clients_from_os_cloud_config(
cloud='devstack') cloud='devstack')
# Workaround until tempest.lib.cli.base provdes fully
# keystone v3 support. It assumes the default domain.
# TODO(amotoki): Once a new tempest with a fix for bug 1719687
# is released, this should be claen up.
kwargs['flags'] = ' '.join([kwargs.get('flags', ''),
'--os-project-domain-id default',
'--os-user-domain-id default'])
return self._non_admin_clients.neutron(*args, **kwargs) return self._non_admin_clients.neutron(*args, **kwargs)
def is_extension_enabled(self, extension_alias): def is_extension_enabled(self, extension_alias):