x/ranger-tempest-plugin
Code Issues Proposed changes

Merge "Change ranger-tempest-plugin config"

Browse Source
This commit is contained in:
Zuul 2019-09-10 17:12:09 +00:00 committed by Gerrit Code Review
commit c01b840ac6
8 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ranger_tempest_plugin/clients.py
View File

@ -33,19 +33,19 @@ class OrmClientManager(clients.Manager):
base_client.RangerAuthProvider(credentials),
CONF.identity.catalog_type,
CONF.identity.region,
CONF.ranger.RANGER_CMS_BASE_URL)
CONF.ranger.ranger_cms_base_url)
self.fms_client = FmsClient(
base_client.RangerAuthProvider(credentials),
CONF.identity.catalog_type,
CONF.identity.region,
CONF.ranger.RANGER_FMS_BASE_URL)
CONF.ranger.ranger_fms_base_url)
self.rms_client = RmsClient(
base_client.RangerAuthProvider(credentials),
CONF.identity.catalog_type,
CONF.identity.region,
CONF.ranger.RANGER_RMS_BASE_URL)
CONF.ranger.ranger_rms_base_url)
self.ims_client = ImsClient(
base_client.RangerAuthProvider(credentials),
CONF.identity.catalog_type,
CONF.identity.region,
CONF.ranger.RANGER_IMS_BASE_URL)
CONF.ranger.ranger_ims_base_url)

29
ranger_tempest_plugin/config.py
View File

@ -32,33 +32,15 @@ ORM_GROUP = cfg.OptGroup(
)
ORM_GROUP_OPTIONS = [
cfg.StrOpt("uri",
default="orm",
help="Uri of the orm service."),
cfg.StrOpt("cms_port",
default='7080',
help="cms port of the orm url."),
cfg.StrOpt("fms_port",
default='8082',
help="fms port of the orm url."),
cfg.StrOpt("region_port",
default='8080',
help="region port of the orm url."),
cfg.BoolOpt("alt_region_available",
default=None,
help="alt_region_available of the orm alternate region."),
cfg.StrOpt("ims_port",
default='8084',
help="ims port of the orm url."),
cfg.StrOpt("image_url",
help="swift container url where image is located"),
cfg.StrOpt("RANGER_CMS_BASE_URL",
cfg.StrOpt("ranger_cms_base_url",
help="Ranger Project Service URL"),
cfg.StrOpt("RANGER_FMS_BASE_URL",
cfg.StrOpt("ranger_fms_base_url",
help="Ranger Flavor Service URL"),
cfg.StrOpt("RANGER_IMS_BASE_URL",
cfg.StrOpt("ranger_ims_base_url",
help="Ranger Image Service URL"),
cfg.StrOpt("RANGER_RMS_BASE_URL",
cfg.StrOpt("ranger_rms_base_url",
help="Ranger Region Service URL"),
cfg.BoolOpt('verify',
default=False,
@ -69,6 +51,9 @@ ORM_GROUP_OPTIONS = [
cfg.ListOpt("flavor_series",
default=['xx'],
help="Supported flavor series"),
cfg.StrOpt("catalog_type",
default='ranger',
help="ranger catalog type"),
cfg.StrOpt("domain",
default='Default',
help="Domain used for Ranger tempest testing"),

2
ranger_tempest_plugin/services/base_client.py
View File

@ -34,7 +34,7 @@ class ConnectionError(Exception):
class RangerClientBase(rest_client.RestClient):
rms_url = CONF.ranger.RANGER_RMS_BASE_URL
rms_url = CONF.ranger.ranger_rms_base_url
auth_region = CONF.identity.region
timeout = 10

2
ranger_tempest_plugin/services/cms_client.py
View File

@ -26,7 +26,7 @@ CONF = config.CONF
class CmsClient(base_client.RangerClientBase):
cms_url = CONF.ranger.RANGER_CMS_BASE_URL
cms_url = CONF.ranger.ranger_cms_base_url
version = 'v1'
# POST

2
ranger_tempest_plugin/services/fms_client.py
View File

@ -26,7 +26,7 @@ CONF = config.CONF
class FmsClient(base_client.RangerClientBase):
fms_url = CONF.ranger.RANGER_FMS_BASE_URL
fms_url = CONF.ranger.ranger_fms_base_url
version = "v1"
def create_flavor(self, **kwargs):

2
ranger_tempest_plugin/services/grp_client.py
View File

@ -29,7 +29,7 @@ CONF = config.CONF
class GrpClient(base_client.RangerClientBase):
cms_url = CONF.ranger.RANGER_CMS_BASE_URL
cms_url = CONF.ranger.ranger_cms_base_url
version = 'v1'
def create_group(self, **kwargs):

2
ranger_tempest_plugin/services/ims_client.py
View File

@ -24,7 +24,7 @@ CONF = config.CONF
class ImsClient(base_client.RangerClientBase):
ims_url = CONF.ranger.RANGER_IMS_BASE_URL
ims_url = CONF.ranger.ranger_ims_base_url
version = "v1"
def create_image(self, **kwargs):

2
ranger_tempest_plugin/services/rms_client.py
View File

@ -27,7 +27,7 @@ CONF = config.CONF
class RmsClient(base_client.RangerClientBase):
rms_url = CONF.ranger.RANGER_RMS_BASE_URL
rms_url = CONF.ranger.ranger_rms_base_url
identity_url = CONF.identity.uri_v3 or ""
identity_url = identity_url.strip('/v3')
version = "v2"