openstack
/
congress
Code Issues Proposed changes

Fixes Tempest error caused by tempest's changes 

CONF.network.tenant_networks_reachable and CONF.auth.admin_tenant_name
doesn't exist now. It causes Jenkins failure in gerrit.

This patch fixes the failure by changing some deprecated config name.

Change-Id: I61b0c159cda78cfd9a4fe8513383631cb6de77e6
This commit is contained in:
Masahito Muroi 2016-04-08 11:21:34 +09:00
parent dba26a5d62
commit 8c65d2bac2
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py
View File

@ -31,9 +31,9 @@ class TestCinderDriver(manager_congress.ScenarioPolicyBase):
@classmethod
def skip_checks(cls):
super(TestCinderDriver, cls).skip_checks()
if not (CONF.network.tenant_networks_reachable or
if not (CONF.network.project_networks_reachable or
CONF.network.public_network_id):
msg = ('Either tenant_networks_reachable must be "true", or'
msg = ('Either project_networks_reachable must be "true", or'
'public_network_id must be defined.')
cls.enabled = False
raise cls.skipException(msg)

4
congress_tempest_tests/tests/scenario/congress_datasources/test_glancev2.py
View File

@ -30,9 +30,9 @@ class TestGlanceV2Driver(manager_congress.ScenarioPolicyBase):
@classmethod
def skip_checks(cls):
super(TestGlanceV2Driver, cls).skip_checks()
if not (CONF.network.tenant_networks_reachable
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
msg = ('Either tenant_networks_reachable must be "true", or '
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
cls.enabled = False
raise cls.skipException(msg)

4
congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py
View File

@ -30,9 +30,9 @@ class TestKeystoneV2Driver(manager_congress.ScenarioPolicyBase):
@classmethod
def skip_checks(cls):
super(TestKeystoneV2Driver, cls).skip_checks()
if not (CONF.network.tenant_networks_reachable or
if not (CONF.network.project_networks_reachable or
CONF.network.public_network_id):
msg = ('Either tenant_networks_reachable must be "true", or'
msg = ('Either project_networks_reachable must be "true", or'
'public_network_id must be defined.')
cls.enabled = False
raise cls.skipException(msg)

6
congress_tempest_tests/tests/scenario/congress_datasources/test_murano.py
View File

@ -34,9 +34,9 @@ class TestMuranoDriver(manager_congress.ScenarioPolicyBase):
cls.__class__.__name__)
raise cls.skipException(msg)
if not (CONF.network.tenant_networks_reachable
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
msg = ('Either tenant_networks_reachable must be "true", or '
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
cls.enabled = False
raise cls.skipException(msg)
@ -68,7 +68,7 @@ class TestMuranoDriver(manager_congress.ScenarioPolicyBase):
def _create_datasource():
body = {"config": {"username": CONF.auth.admin_username,
"tenant_name": CONF.auth.admin_tenant_name,
"tenant_name": CONF.auth.admin_project_name,
"password": CONF.auth.admin_password,
"auth_url": CONF.identity.uri},
"driver": "murano",

4
congress_tempest_tests/tests/scenario/congress_datasources/test_neutronv2.py
View File

@ -32,9 +32,9 @@ class TestNeutronV2Driver(manager_congress.ScenarioPolicyBase):
@classmethod
def skip_checks(cls):
super(TestNeutronV2Driver, cls).skip_checks()
if not (CONF.network.tenant_networks_reachable
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
msg = ('Either tenant_networks_reachable must be "true", or '
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
cls.enabled = False
raise cls.skipException(msg)

4
congress_tempest_tests/tests/scenario/congress_datasources/test_nova.py
View File

@ -34,9 +34,9 @@ class TestNovaDriver(manager_congress.ScenarioPolicyBase):
skip_msg = ("%s skipped as nova is not available" % cls.__name__)
raise cls.skipException(skip_msg)
if not (CONF.network.tenant_networks_reachable
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
msg = ('Either tenant_networks_reachable must be "true", or '
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
cls.enabled = False
raise cls.skipException(msg)

8
congress_tempest_tests/tests/scenario/test_congress_basic_ops.py
View File

@ -35,9 +35,9 @@ class TestPolicyBasicOps(manager_congress.ScenarioPolicyBase):
@classmethod
def skip_checks(cls):
super(TestPolicyBasicOps, cls).skip_checks()
if not (CONF.network.tenant_networks_reachable
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
msg = ('Either tenant_networks_reachable must be "true", or '
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
cls.enabled = False
raise cls.skipException(msg)
@ -185,9 +185,9 @@ class TestCongressDataSources(manager_congress.ScenarioPolicyBase):
@classmethod
def skip_checks(cls):
super(TestCongressDataSources, cls).skip_checks()
if not (CONF.network.tenant_networks_reachable
if not (CONF.network.project_networks_reachable
or CONF.network.public_network_id):
msg = ('Either tenant_networks_reachable must be "true", or '
msg = ('Either project_networks_reachable must be "true", or '
'public_network_id must be defined.')
cls.enabled = False
raise cls.skipException(msg)