x
/
ranger
Code Issues Proposed changes

Merge "Changed made for the multiple endpoints of Ranger services"

This commit is contained in:
Zuul 2019-03-15 17:16:03 +00:00 committed by Gerrit Code Review
parent 4520efebe2 aaba65c2bd
commit f270bcac2f
7 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ranger-tempest-plugin/ranger_tempest_plugin/clients.py
View File

@ -32,16 +32,16 @@ class OrmClientManager(clients.Manager):
self.cms_client = CmsClient(base_client.RangerAuthProvider(credentials),
CONF.identity.catalog_type,
CONF.identity.region,
CONF.ranger.uri)
CONF.ranger.RANGER_CMS_BASE_URL)
self.fms_client = FmsClient(base_client.RangerAuthProvider(credentials),
CONF.identity.catalog_type,
CONF.identity.region,
CONF.ranger.uri)
CONF.ranger.RANGER_FMS_BASE_URL)
self.rms_client = RmsClient(base_client.RangerAuthProvider(credentials),
CONF.identity.catalog_type,
CONF.identity.region,
CONF.ranger.uri)
CONF.ranger.RANGER_RMS_BASE_URL)
self.ims_client = ImsClient(base_client.RangerAuthProvider(credentials),
CONF.identity.catalog_type,
CONF.identity.region,
CONF.ranger.uri)
CONF.ranger.RANGER_IMS_BASE_URL)

8
ranger-tempest-plugin/ranger_tempest_plugin/config.py
View File

@ -52,6 +52,14 @@ OrmGroup = [
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",
help="Ranger Project Service URL"),
cfg.StrOpt("RANGER_FMS_BASE_URL",
help="Ranger Flavor Service URL"),
cfg.StrOpt("RANGER_IMS_BASE_URL",
help="Ranger Image Service URL"),
cfg.StrOpt("RANGER_RMS_BASE_URL",
help="Ranger Region Service URL"),
cfg.ListOpt("flavor_series",
default=['xx'],
help="Supported flavor series")

2
ranger-tempest-plugin/ranger_tempest_plugin/services/cms_client.py
View File

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

2
ranger-tempest-plugin/ranger_tempest_plugin/services/fms_client.py
View File

@ -26,7 +26,7 @@ CONF = config.CONF
class FmsClient(base_client.RangerClientBase):
fms_url = '%s:%s' % (CONF.ranger.uri, CONF.ranger.fms_port)
fms_url = CONF.ranger.RANGER_FMS_BASE_URL
version = "v1"
def get_extra_headers(self):

2
ranger-tempest-plugin/ranger_tempest_plugin/services/ims_client.py
View File

@ -24,7 +24,7 @@ CONF = config.CONF
class ImsClient(base_client.RangerClientBase):
ims_url = '%s:%s' % (CONF.ranger.uri, CONF.ranger.ims_port)
ims_url = CONF.ranger.RANGER_IMS_BASE_URL
version = "v1"
def get_headers(self):

2
ranger-tempest-plugin/ranger_tempest_plugin/services/rms_client.py
View File

@ -27,7 +27,7 @@ CONF = config.CONF
class RmsClient(base_client.RangerClientBase):
rms_url = '%s:%s' % (CONF.ranger.uri, CONF.ranger.region_port)
rms_url = CONF.ranger.RANGER_RMS_BASE_URL
version = "v2"
def create_region(self, region_id, **kwargs):

5
ranger-tempest-plugin/tempest_setup/tempest.conf
View File

@ -111,7 +111,10 @@ multi_backend = false
[ranger]
# change uri IP address as needed
uri = http://127.0.0.1
# RANGER_RMS_BASE_URL='https://<ranger-rms-endpoint>:443'
# RANGER_CMS_BASE_URL='https://<ranger-cms-endpoint>:443'
# RANGER_FMS_BASE_URL='https://<ranger-fms-endpoint>:443'
# RANGER_IMS_BASE_URL='https://<ranger-ims-endpoint>:443'
catalog_type = ranger
# uncomment flavor_series and set it accordingly
# flavor_series =