diff --git a/ranger-tempest-plugin/ranger_tempest_plugin/clients.py b/ranger-tempest-plugin/ranger_tempest_plugin/clients.py index a2798ae0..084c44e4 100755 --- a/ranger-tempest-plugin/ranger_tempest_plugin/clients.py +++ b/ranger-tempest-plugin/ranger_tempest_plugin/clients.py @@ -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) diff --git a/ranger-tempest-plugin/ranger_tempest_plugin/config.py b/ranger-tempest-plugin/ranger_tempest_plugin/config.py index bc3babc9..cc005340 100755 --- a/ranger-tempest-plugin/ranger_tempest_plugin/config.py +++ b/ranger-tempest-plugin/ranger_tempest_plugin/config.py @@ -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") diff --git a/ranger-tempest-plugin/ranger_tempest_plugin/services/cms_client.py b/ranger-tempest-plugin/ranger_tempest_plugin/services/cms_client.py index 67fad4c9..0fafc02f 100755 --- a/ranger-tempest-plugin/ranger_tempest_plugin/services/cms_client.py +++ b/ranger-tempest-plugin/ranger_tempest_plugin/services/cms_client.py @@ -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 diff --git a/ranger-tempest-plugin/ranger_tempest_plugin/services/fms_client.py b/ranger-tempest-plugin/ranger_tempest_plugin/services/fms_client.py index e7c654f2..3b78f1c9 100755 --- a/ranger-tempest-plugin/ranger_tempest_plugin/services/fms_client.py +++ b/ranger-tempest-plugin/ranger_tempest_plugin/services/fms_client.py @@ -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): diff --git a/ranger-tempest-plugin/ranger_tempest_plugin/services/ims_client.py b/ranger-tempest-plugin/ranger_tempest_plugin/services/ims_client.py index 4aba519a..0b2b5fc7 100755 --- a/ranger-tempest-plugin/ranger_tempest_plugin/services/ims_client.py +++ b/ranger-tempest-plugin/ranger_tempest_plugin/services/ims_client.py @@ -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): diff --git a/ranger-tempest-plugin/ranger_tempest_plugin/services/rms_client.py b/ranger-tempest-plugin/ranger_tempest_plugin/services/rms_client.py index 0d0f1a71..827454e9 100755 --- a/ranger-tempest-plugin/ranger_tempest_plugin/services/rms_client.py +++ b/ranger-tempest-plugin/ranger_tempest_plugin/services/rms_client.py @@ -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): diff --git a/ranger-tempest-plugin/tempest_setup/tempest.conf b/ranger-tempest-plugin/tempest_setup/tempest.conf index 38eba813..8a980340 100644 --- a/ranger-tempest-plugin/tempest_setup/tempest.conf +++ b/ranger-tempest-plugin/tempest_setup/tempest.conf @@ -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://:443' +# RANGER_CMS_BASE_URL='https://:443' +# RANGER_FMS_BASE_URL='https://:443' +# RANGER_IMS_BASE_URL='https://:443' catalog_type = ranger # uncomment flavor_series and set it accordingly # flavor_series =