diff --git a/orm/services/customer_manager/cms_rest/controllers/root.py b/orm/services/customer_manager/cms_rest/controllers/root.py index 3cf215b5..58862419 100755 --- a/orm/services/customer_manager/cms_rest/controllers/root.py +++ b/orm/services/customer_manager/cms_rest/controllers/root.py @@ -1,3 +1,5 @@ +import orm.base_config as config + from orm.services.customer_manager.cms_rest.controllers.v1 import root as v1 from pecan import expose @@ -20,7 +22,7 @@ class RootController(object): "id": "v1", "links": [ { - "href": "http://localhost:7080/" + "href": config.cms['base_url'] } ] } diff --git a/orm/services/flavor_manager/config.py b/orm/services/flavor_manager/config.py index ec5e9966..3f60945d 100755 --- a/orm/services/flavor_manager/config.py +++ b/orm/services/flavor_manager/config.py @@ -31,8 +31,6 @@ database = { 'connection_string': config.db_connect } -application_root = 'http://localhost:{0}'.format(server['port']) - api = { 'uuid_server': { 'base': config.uuid['base_url'], diff --git a/orm/services/flavor_manager/fms_rest/controllers/root.py b/orm/services/flavor_manager/fms_rest/controllers/root.py index 0055a8eb..86a35209 100644 --- a/orm/services/flavor_manager/fms_rest/controllers/root.py +++ b/orm/services/flavor_manager/fms_rest/controllers/root.py @@ -1,6 +1,7 @@ -from orm.services.flavor_manager.fms_rest.controllers.v1.v1 import V1Controller +import orm.base_config as config -from pecan import conf, expose +from orm.services.flavor_manager.fms_rest.controllers.v1.v1 import V1Controller +from pecan import expose from webob.exc import status_map @@ -8,12 +9,11 @@ class RootController(object): v1 = V1Controller() @expose(template='json') - def get(self): + def _default(self): """Method to handle GET / prameters: None return: dict describing flavor command version information """ - return { "versions": { "values": [ @@ -22,7 +22,7 @@ class RootController(object): "id": "v1", "links": [ { - "href": conf.application_root + "href": config.fms['base_url'] } ] } diff --git a/orm/services/id_generator/uuidgen/controllers/root.py b/orm/services/id_generator/uuidgen/controllers/root.py index c18a76dc..c0724625 100755 --- a/orm/services/id_generator/uuidgen/controllers/root.py +++ b/orm/services/id_generator/uuidgen/controllers/root.py @@ -1,5 +1,5 @@ import logging - +import orm.base_config as config import orm.services.id_generator.uuidgen.controllers.v1.root as root from pecan import expose from pecan.rest import RestController @@ -26,7 +26,7 @@ class RootController(RestController): "id": "v1", "links": [ { - "href": "http://localhost:8090/" + "href": config.uuid['base_url'] } ] } diff --git a/orm/services/image_manager/config.py b/orm/services/image_manager/config.py index 7b666d47..7ce216a5 100755 --- a/orm/services/image_manager/config.py +++ b/orm/services/image_manager/config.py @@ -30,8 +30,6 @@ database = { } -application_root = config.ims['base_url'] - api = { 'uuid_server': { 'base': config.uuid['base_url'], diff --git a/orm/services/image_manager/ims/controllers/root.py b/orm/services/image_manager/ims/controllers/root.py index 4ae2e26d..06c70a1f 100755 --- a/orm/services/image_manager/ims/controllers/root.py +++ b/orm/services/image_manager/ims/controllers/root.py @@ -1,5 +1,7 @@ +import orm.base_config as config + from orm.services.image_manager.ims.controllers.v1.v1 import V1Controller -from pecan import conf, expose +from pecan import expose from webob.exc import status_map @@ -7,7 +9,7 @@ class RootController(object): v1 = V1Controller() @expose(template='json') - def get(self): + def _default(self): """Method to handle GET / prameters: None return: dict describing image command version information @@ -21,7 +23,7 @@ class RootController(object): "id": "v1", "links": [ { - "href": conf.application_root + "href": config.ims['base_url'] } ] } diff --git a/orm/services/region_manager/rms/controllers/root.py b/orm/services/region_manager/rms/controllers/root.py index 2389742d..69950ab7 100755 --- a/orm/services/region_manager/rms/controllers/root.py +++ b/orm/services/region_manager/rms/controllers/root.py @@ -1,8 +1,10 @@ from configuration import ConfigurationController from lcp_controller import LcpController from logs import LogsController -from orm.services.region_manager.rms.controllers.v2 import root +import orm.base_config as config + +from orm.services.region_manager.rms.controllers.v2 import root from pecan import expose @@ -27,7 +29,7 @@ class RootController(object): "id": "v2", "links": [ { - "href": "http://localhost:8080/" + "href": config.rms['base_url'] } ] }