openstack
/
manila
Code Issues Proposed changes

[Fix CI] Bump Tempest version 

We are forced to bump version of Tempest because of regular
introduced incompatibility.
Also, add compatibility fixes to Manila plugin for
latest Tempest version.

Change-Id: I13c838c39d99c008d53e544f54dadee01f36fdf2
Closes-Bug: #1568785
This commit is contained in:
Valeriy Ponomaryov 2016-04-11 14:02:29 +03:00
parent b959b98ced
commit 6d2efea25f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/common.sh
View File

@ -1,6 +1,6 @@
# Environment variables
export MANILA_TEMPEST_COMMIT="4aaa5493" # 2 Mar, 2016
export MANILA_TEMPEST_COMMIT="a16bf19e" # 11 Apr, 2016
# ----------------------------------------------

14
manila_tempest_tests/tests/api/base.py
View File

@ -201,8 +201,8 @@ class BaseSharesTest(test.BaseTestCase):
if not hasattr(cls, "os"):
cls.username = CONF.identity.username
cls.password = CONF.identity.password
cls.tenant_name = CONF.identity.tenant_name
cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
cls.project_name = CONF.identity.project_name
cls.verify_nonempty(cls.username, cls.password, cls.project_name)
cls.os = clients.Manager()
if CONF.share.multitenancy_enabled:
if not CONF.service_available.neutron:
@ -807,8 +807,8 @@ class BaseSharesAltTest(BaseSharesTest):
def resource_setup(cls):
cls.username = CONF.identity.alt_username
cls.password = CONF.identity.alt_password
cls.tenant_name = CONF.identity.alt_tenant_name
cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
cls.project_name = CONF.identity.alt_project_name
cls.verify_nonempty(cls.username, cls.password, cls.project_name)
cls.os = clients.AltManager()
alt_share_network_id = CONF.share.alt_share_network_id
cls.os.shares_client.share_network_id = alt_share_network_id
@ -824,12 +824,12 @@ class BaseSharesAdminTest(BaseSharesTest):
if hasattr(CONF.identity, 'admin_username'):
cls.username = CONF.identity.admin_username
cls.password = CONF.identity.admin_password
cls.tenant_name = CONF.identity.admin_tenant_name
cls.project_name = CONF.identity.admin_project_name
else:
cls.username = CONF.auth.admin_username
cls.password = CONF.auth.admin_password
cls.tenant_name = CONF.auth.admin_tenant_name
cls.verify_nonempty(cls.username, cls.password, cls.tenant_name)
cls.project_name = CONF.auth.admin_project_name
cls.verify_nonempty(cls.username, cls.password, cls.project_name)
cls.os = clients.AdminManager()
admin_share_network_id = CONF.share.admin_share_network_id
cls.os.shares_client.share_network_id = admin_share_network_id

2
manila_tempest_tests/tests/scenario/manager_share.py
View File

@ -152,7 +152,7 @@ class ShareScenarioTest(manager.NetworkScenarioTest):
:param tenant_id
"""
if not client:
client = self.network_client
client = self.routers_client
if not tenant_id:
tenant_id = client.tenant_id
if not router_id: