openstack/manila
Code Issues Proposed changes

Sync tempest plugin with latest Tempest

Browse Source 
Tempest has been changed and our plugin no more compatible with it.
Update files that are broken and bump Tempest commit that is used as HEAD.

Change-Id: I5b13d060b552154345ecfc5c1c6679496f3f3ea6
This commit is contained in:
vponomaryov 2015-01-09 13:08:01 +02:00 committed by Valeriy Ponomaryov
parent 5f84b5869e
commit d36a343608
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/ci/pre_test_hook.sh
View File

@ -38,7 +38,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="128bbed7" # 23 Dec, 2014 TEMPEST_COMMIT="b5fa11db" # 8 Jan, 2015
cd $BASE/new/tempest cd $BASE/new/tempest
git checkout $TEMPEST_COMMIT git checkout $TEMPEST_COMMIT

6
contrib/tempest/tempest/config_share.py
View File

@ -31,6 +31,12 @@ ServiceAvailableGroup = [
share_group = cfg.OptGroup(name="share", title="Share Service Options") share_group = cfg.OptGroup(name="share", title="Share Service Options")
ShareGroup = [ ShareGroup = [
cfg.StrOpt("region",
default="",
help="The share region name to use. If empty, the value "
"of identity.region is used instead. If no such region "
"is found in the service catalog, the first found one is "
"used."),
cfg.StrOpt("catalog_type", cfg.StrOpt("catalog_type",
default="share", default="share",
help="Catalog type of the Share service."), help="Catalog type of the Share service."),

11
contrib/tempest/tempest/services/share/json/shares_client.py
View File

@ -35,8 +35,11 @@ class SharesClient(rest_client.RestClient):
""" """
def __init__(self, auth_provider): def __init__(self, auth_provider):
super(SharesClient, self).__init__(auth_provider) super(SharesClient, self).__init__(
self.service = CONF.share.catalog_type auth_provider,
CONF.share.catalog_type,
CONF.share.region or CONF.identity.region,
endpoint_type=CONF.share.endpoint_type)
self.share_protocol = None self.share_protocol = None
if CONF.share.enable_protocols: if CONF.share.enable_protocols:
self.share_protocol = CONF.share.enable_protocols[0] self.share_protocol = CONF.share.enable_protocols[0]
@ -45,10 +48,6 @@ class SharesClient(rest_client.RestClient):
self.build_timeout = CONF.share.build_timeout self.build_timeout = CONF.share.build_timeout
self.auth_params = auth_provider._auth_params() self.auth_params = auth_provider._auth_params()
def _get_endpoint_type(self, service):
# This is workaround for rest_client, that uses main config
return CONF.share.endpoint_type
def create_share(self, share_protocol=None, size=1, def create_share(self, share_protocol=None, size=1,
name=None, snapshot_id=None, description=None, name=None, snapshot_id=None, description=None,
metadata={}, share_network_id=None, metadata={}, share_network_id=None,