openstack/deb-manila
Code Issues Proposed changes

Merge "Sync contrib/tempest to newer state"

Browse Source
This commit is contained in:
Jenkins 2015-04-24 15:15:20 +00:00 committed by Gerrit Code Review
commit 2f884924b9
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/pre_test_hook.sh
View File

@ -47,7 +47,7 @@ fi
# Go to Tempest dir and checkout stable commit to avoid possible # Go to Tempest dir and checkout stable commit to avoid possible
# incompatibilities for plugin stored in Manila repo. # incompatibilities for plugin stored in Manila repo.
TEMPEST_COMMIT="d8f38aba" # 21 Mar, 2015 TEMPEST_COMMIT="628c965d" # 23 Apr, 2015
cd $BASE/new/tempest cd $BASE/new/tempest
git checkout $TEMPEST_COMMIT git checkout $TEMPEST_COMMIT

13
contrib/tempest/tempest/api/share/base.py
View File

@ -116,7 +116,7 @@ class BaseSharesTest(test.BaseTestCase):
name = name[0:32] name = name[0:32]
# Choose type of isolated creds # Choose type of isolated creds
ic = isolated_creds.IsolatedCreds(name) ic = isolated_creds.IsolatedCreds(name=name)
if "admin" in type_of_creds: if "admin" in type_of_creds:
creds = ic.get_admin_creds() creds = ic.get_admin_creds()
elif "alt" in type_of_creds: elif "alt" in type_of_creds:
@ -253,7 +253,7 @@ class BaseSharesTest(test.BaseTestCase):
# Create suitable network # Create suitable network
if (net_id is None or subnet_id is None): if (net_id is None or subnet_id is None):
ic = isolated_creds.IsolatedCreds(service_net_name) ic = isolated_creds.IsolatedCreds(name=service_net_name)
identity_client = cls._get_identity_admin_client() identity_client = cls._get_identity_admin_client()
tenant = identity_client.\ tenant = identity_client.\
get_tenant_by_name(sc.auth_params["tenant"]) get_tenant_by_name(sc.auth_params["tenant"])
@ -273,11 +273,10 @@ class BaseSharesTest(test.BaseTestCase):
else: else:
sn_name = "autogenerated_by_tempest_for_isolated_creds" sn_name = "autogenerated_by_tempest_for_isolated_creds"
# Use precreated network and subnet from isolated creds # Use precreated network and subnet from isolated creds
net_resources = ( net_id = isolated_creds_client.get_credentials(
isolated_creds_client.isolated_net_resources[ isolated_creds_client.type_of_creds).network['id']
isolated_creds_client.type_of_creds]) subnet_id = isolated_creds_client.get_credentials(
net_id = net_resources[0]["id"] isolated_creds_client.type_of_creds).subnet['id']
subnet_id = net_resources[1]["id"]
# Create suitable share-network # Create suitable share-network
if share_network_id is None: if share_network_id is None: