openstack/neutron-lbaas
Code Issues Proposed changes

Fix API tests

Browse Source 
Patch https://review.openstack.org/256164 broke the Neutron API job by
unsetting Tempest configuration values that were unused by Tempest,
but used by Neutron's fork of Tempest. This patch copies credentials
from the 'auth' section to the 'identity' section.

This patch is a clone of https://review.openstack.org/263400 for the
LBaaS API test job.

Change-Id: Ie2ca9f9e1628b90e7ffc51c82049eeb161d32ff3
Co-Authored-By: Assaf Muller <amuller@redhat.com>
This commit is contained in:
Henry Gessau 2016-01-04 22:40:35 -05:00 committed by Henry Gessau
parent a17cf32886
commit ed35918607
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
neutron_lbaas/tests/tempest/lib/config.py
View File

@ -62,6 +62,18 @@ AuthGroup = [
cfg.ListOpt('tempest_roles',
help="Roles to assign to all users created by tempest",
default=[]),
cfg.StrOpt('admin_username',
help="Administrative Username to use for "
"Keystone API requests."),
cfg.StrOpt('admin_tenant_name',
help="Administrative Tenant name to use for Keystone API "
"requests."),
cfg.StrOpt('admin_password',
help="API key to use when authenticating as admin.",
secret=True),
cfg.StrOpt('admin_domain_name',
help="Admin domain name for authentication (Keystone V3)."
"The same domain applies to user and project"),
cfg.StrOpt('tenant_isolation_domain_name',
help="Only applicable when identity.auth_version is v3."
"Domain within which isolated credentials are provisioned."
@ -126,18 +138,6 @@ IdentityGroup = [
cfg.StrOpt('alt_domain_name',
help="Alternate domain name for authentication (Keystone V3)."
"The same domain applies to user and project"),
cfg.StrOpt('admin_username',
help="Administrative Username to use for "
"Keystone API requests."),
cfg.StrOpt('admin_tenant_name',
help="Administrative Tenant name to use for Keystone API "
"requests."),
cfg.StrOpt('admin_password',
help="API key to use when authenticating as admin.",
secret=True),
cfg.StrOpt('admin_domain_name',
help="Admin domain name for authentication (Keystone V3)."
"The same domain applies to user and project"),
cfg.StrOpt('default_domain_id',
default='default',
help="ID of the default domain"),
@ -1208,6 +1208,18 @@ class TempestConfigPrivate(object):
self.baremetal = _CONF.baremetal
self.input_scenario = _CONF['input-scenario']
self.negative = _CONF.negative
self.identity.admin_username = self.auth.admin_username
self.identity.admin_password = self.auth.admin_password
self.identity.admin_tenant_name = self.auth.admin_tenant_name
self.identity.admin_domain_name = self.auth.admin_domain_name
self.identity.password = self.auth.admin_password
self.identity.tenant_name = 'demo'
self.identity.username = 'demo'
self.identity.alt_username = 'alt_demo'
self.identity.alt_tenant_name = 'alt_demo'
self.identity.alt_password = self.auth.admin_password
_CONF.set_default('domain_name', self.identity.admin_domain_name,
group='identity')
_CONF.set_default('alt_domain_name', self.identity.admin_domain_name,