Merge "Keep py3.X compatibility for urllib"
diff --git a/neutron/tests/tempest/config.py b/neutron/tests/tempest/config.py
index 256d687..06fd541 100644
--- a/neutron/tests/tempest/config.py
+++ b/neutron/tests/tempest/config.py
@@ -59,7 +59,19 @@
"number of concurrent test processes."),
cfg.ListOpt('tempest_roles',
help="Roles to assign to all users created by tempest",
- default=[])
+ 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"),
]
identity_group = cfg.OptGroup(name='identity',
@@ -119,18 +131,6 @@
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"),
]
identity_feature_group = cfg.OptGroup(name='identity-feature-enabled',
@@ -479,6 +479,10 @@
"the extended IPv6 attributes ipv6_ra_mode "
"and ipv6_address_mode"
),
+ cfg.BoolOpt('specify_floating_ip_address_available',
+ default=True,
+ help='Allow passing an IP Address of the floating ip when '
+ 'creating the floating ip'),
]
messaging_group = cfg.OptGroup(name='messaging',
@@ -1148,6 +1152,18 @@
self.input_scenario = cfg.CONF['input-scenario']
self.cli = cfg.CONF.cli
self.negative = cfg.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
+
cfg.CONF.set_default('domain_name', self.identity.admin_domain_name,
group='identity')
cfg.CONF.set_default('alt_domain_name',