From 5d0335faaa76549133f181eaadc0fc6477db42da Mon Sep 17 00:00:00 2001
From: hosingh000 <hosingh000@gmail.com>
Date: Sat, 4 Apr 2020 23:10:30 -0500
Subject: [PATCH] Pass service url through configuration

Change-Id: I77334e2604481540954ea751ff2e46f46aa91aae
---
 orm/base_config.py | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/orm/base_config.py b/orm/base_config.py
index 70ecd750..053087aa 100644
--- a/orm/base_config.py
+++ b/orm/base_config.py
@@ -124,8 +124,11 @@ orm_uuid_group = cfg.OptGroup(name='uuid', title='Orm UUID Options')
 
 OrmUuidGroup = [
     cfg.PortOpt('port',
-                default=8090,
+                default=7001,
                 help='UUID port.'),
+    cfg.StrOpt('url',
+               default='http://127.0.0.1:7001/',
+               help='UUID url.'),
     cfg.StrOpt('log',
                default='uuidgen.log',
                help='UUID log name.')
@@ -142,6 +145,9 @@ OrmCmsGroup = [
     cfg.PortOpt('port',
                 default=7080,
                 help='Cms port.'),
+    cfg.StrOpt('url',
+               default='http://127.0.0.1:7080/',
+               help='Cms url.'),
     cfg.StrOpt('log',
                default='cms.log',
                help='Cms log name.')
@@ -168,6 +174,9 @@ OrmFmsGroup = [
     cfg.PortOpt('port',
                 default=8082,
                 help='Fms port.'),
+    cfg.StrOpt('url',
+               default='http://127.0.0.1:8082/',
+               help='Fms url.'),
     cfg.StrOpt('log',
                default='fms.log',
                help='Fms log name.'),
@@ -232,8 +241,11 @@ orm_audit_group = cfg.OptGroup(name='audit', title='Orm Audit Options')
 
 OrmAuditGroup = [
     cfg.PortOpt('port',
-                default=8776,
+                default=7008,
                 help='Audit port.'),
+    cfg.StrOpt('url',
+               default='http://127.0.0.1:7008/',
+               help='Audit url.'),
     cfg.StrOpt('log',
                default='audit_server.log',
                help='Audit log name.')
@@ -250,6 +262,9 @@ OrmImsGroup = [
     cfg.PortOpt('port',
                 default=8084,
                 help='Ims port.'),
+    cfg.StrOpt('url',
+               default='http://127.0.0.1:8084/',
+               help='Ims url.'),
     cfg.StrOpt('log',
                default='ims.log',
                help='Ims log name.')
@@ -265,8 +280,11 @@ orm_rms_group = cfg.OptGroup(name='rms', title='Orm Rms Options')
 
 OrmRmsGroup = [
     cfg.PortOpt('port',
-                default=8080,
+                default=7003,
                 help='Rms port.'),
+    cfg.StrOpt('url',
+               default='http://127.0.0.1:7003/',
+               help='Rms url.'),
     cfg.StrOpt('log',
                default='rms.log',
                help='Rms log name.')
@@ -283,6 +301,9 @@ OrmRdsGroup = [
     cfg.PortOpt('port',
                 default=8777,
                 help='Rds port.'),
+    cfg.StrOpt('url',
+               default='http://127.0.0.1:8777/',
+               help='Rds url.'),
     cfg.StrOpt('customer_domain',
                default='default',
                help='Keystone project domain'),
@@ -335,36 +356,34 @@ cert_path = CONF.ranger_agent_client_cert_path
 https_enabled = CONF.ranger_agent_https_enabled
 
 uuid = {'port': CONF.uuid.port,
-        'base_url': '{}://{}:{}/'.
-                    format(protocol, orm_host, CONF.uuid.port),
+        'base_url': CONF.uuid.url,
         'log': '{}/{}'.format(CONF.log_location, CONF.uuid.log)}
 
 cms = {'port': CONF.cms.port,
-       'base_url': '{}://{}:{}/'.format(protocol, orm_host, CONF.cms.port),
+       'base_url': CONF.cms.url,
        'log': '{}/{}'.format(CONF.log_location, CONF.cms.log)}
 
 fms = {'port': CONF.fms.port,
-       'base_url': '{}://{}:{}/'.format(protocol, orm_host, CONF.fms.port),
+       'base_url': CONF.fms.url,
        'log': '{}/{}'.format(CONF.log_location, CONF.fms.log)}
 
 audit_server = {'port': CONF.audit.port,
-                'base_url': '{}://{}:{}/'
-                            .format(protocol, orm_host, CONF.audit.port),
+                'base_url': CONF.audit.url,
                 'log': '{}/{}'.format(CONF.log_location, CONF.audit.log)}
 
 ims = {'port': CONF.ims.port,
-       'base_url': '{}://{}:{}/'.format(protocol, orm_host, CONF.ims.port),
+       'base_url': CONF.ims.url,
        'log': '{}/{}'.format(CONF.log_location, CONF.ims.log)}
 
 # Had to remove trailing slash from port number in base_url so rms would work.
 rms = {'port': CONF.rms.port,
-       'base_url': '{}://{}:{}'.format(protocol, orm_host, CONF.rms.port),
+       'base_url': CONF.rms.url,
        'log': '{}/{}'.format(CONF.log_location, CONF.rms.log)}
 
 rds = {'port': CONF.rds.port,
        'token_version': CONF.keystone_authtoken.auth_version,
        'customer_domain': CONF.rds.customer_domain,
-       'base_url': '{}://{}:{}/'.format(protocol, orm_host, CONF.rds.port),
+       'base_url': CONF.rds.url,
        'log': '{}/{}'.format(CONF.log_location, CONF.rds.log)}
 
 cli = {'base_region': CONF.cli.base_region}