openstack/manila
Code Issues Proposed changes

Change manila_tempest_tests to use credentials_factory

Browse Source 
With the merge of 'Factor up config dependent credential classes' in tempest,
(Change-Id: I351f86f0570070105bbf24f2d904e917feea6e57)
helper methods related to credentials have been moved to
common.credentials_factory module.
manila_tempest_tests need to change accordingly.

Change-Id: I9e5c72279638e07f509a4bfe0174b5ad5ee70b45
Closes-Bug: #1519612
This commit is contained in:
Sam Wan 2015-11-25 00:22:28 -05:00
parent 6965e8ae44
commit 69a3d999c2
4 changed files with 17 additions and 10 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 # Environment variables
export MANILA_TEMPEST_COMMIT="c43c8f91" # 05 Nov, 2015 export MANILA_TEMPEST_COMMIT="d160c29b" # 01 Dec, 2015
# ---------------------------------------------- # ----------------------------------------------

11
manila_tempest_tests/clients_share.py
View File

@ -14,7 +14,7 @@
# under the License. # under the License.
from tempest import clients from tempest import clients
from tempest.common import cred_provider from tempest.common import credentials_factory as common_creds
from manila_tempest_tests.services.share.json import shares_client from manila_tempest_tests.services.share.json import shares_client
from manila_tempest_tests.services.share.v2.json import shares_client \ from manila_tempest_tests.services.share.v2.json import shares_client \
@ -22,7 +22,10 @@ from manila_tempest_tests.services.share.v2.json import shares_client \
class Manager(clients.Manager): class Manager(clients.Manager):
def __init__(self, credentials=None, service=None): def __init__(
self,
credentials=common_creds.get_configured_credentials('user'),
service=None):
super(Manager, self).__init__(credentials, service) super(Manager, self).__init__(credentials, service)
self.shares_client = shares_client.SharesClient(self.auth_provider) self.shares_client = shares_client.SharesClient(self.auth_provider)
self.shares_v2_client = shares_v2_client.SharesV2Client( self.shares_v2_client = shares_v2_client.SharesV2Client(
@ -32,11 +35,11 @@ class Manager(clients.Manager):
class AltManager(Manager): class AltManager(Manager):
def __init__(self, service=None): def __init__(self, service=None):
super(AltManager, self).__init__( super(AltManager, self).__init__(
cred_provider.get_configured_credentials('alt_user'), service) common_creds.get_configured_credentials('alt_user'), service)
class AdminManager(Manager): class AdminManager(Manager):
def __init__(self, service=None): def __init__(self, service=None):
super(AdminManager, self).__init__( super(AdminManager, self).__init__(
cred_provider.get_configured_credentials('identity_admin'), common_creds.get_configured_credentials('identity_admin'),
service) service)

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

@ -21,6 +21,7 @@ import traceback
from oslo_concurrency import lockutils from oslo_concurrency import lockutils
from oslo_log import log from oslo_log import log
import six import six
from tempest.common import credentials_factory as common_creds
from tempest.common import dynamic_creds from tempest.common import dynamic_creds
from tempest import config from tempest import config
from tempest import test from tempest import test
@ -132,7 +133,9 @@ class BaseSharesTest(test.BaseTestCase):
ic = dynamic_creds.DynamicCredentialProvider( ic = dynamic_creds.DynamicCredentialProvider(
identity_version=CONF.identity.auth_version, identity_version=CONF.identity.auth_version,
name=name, name=name,
admin_role=CONF.identity.admin_role) admin_role=CONF.identity.admin_role,
admin_creds=common_creds.get_configured_credentials(
'identity_admin'))
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:
@ -269,7 +272,8 @@ class BaseSharesTest(test.BaseTestCase):
identity_version=CONF.identity.auth_version, identity_version=CONF.identity.auth_version,
name=service_net_name, name=service_net_name,
admin_role=CONF.identity.admin_role, admin_role=CONF.identity.admin_role,
) admin_creds=common_creds.get_configured_credentials(
'identity_admin'))
net_data = ic._create_network_resources(sc.tenant_id) net_data = ic._create_network_resources(sc.tenant_id)
network, subnet, router = net_data network, subnet, router = net_data
net_id = network["id"] net_id = network["id"]

6
manila_tempest_tests/tests/scenario/test_share_basic_ops.py
View File

@ -78,13 +78,13 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
def init_ssh(self, instance, do_ping=False): def init_ssh(self, instance, do_ping=False):
# Obtain a floating IP # Obtain a floating IP
floating_ip = (self.floating_ips_client.create_floating_ip() floating_ip = (self.compute_floating_ips_client.create_floating_ip()
['floating_ip']) ['floating_ip'])
self.addCleanup(self.delete_wrapper, self.addCleanup(self.delete_wrapper,
self.floating_ips_client.delete_floating_ip, self.compute_floating_ips_client.delete_floating_ip,
floating_ip['id']) floating_ip['id'])
# Attach a floating IP # Attach a floating IP
self.floating_ips_client.associate_floating_ip_to_server( self.compute_floating_ips_client.associate_floating_ip_to_server(
floating_ip['ip'], instance['id']) floating_ip['ip'], instance['id'])
# Check ssh # Check ssh
ssh_client = self.get_remote_client( ssh_client = self.get_remote_client(