From 1357cd2cbcfb99f5f47bb9543b5a48b465b9af00 Mon Sep 17 00:00:00 2001
From: Nicholas <nj762h@att.com>
Date: Thu, 10 May 2018 09:58:30 -0500
Subject: [PATCH] Fix broken app.py files

Change-Id: I46f0157bc9dd775b8011380f61ca6aa5cfde9f8e
---
 .../audit_trail_manager/audit_server/app.py   | 10 ++++++++++
 orm/services/flavor_manager/fms_rest/app.py   | 11 +++++-----
 orm/services/id_generator/uuidgen/app.py      | 20 +++++++++++++++----
 orm/services/image_manager/ims/app.py         | 10 ++++++----
 orm/services/resource_distributor/rds/app.py  |  6 +++++-
 5 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/orm/services/audit_trail_manager/audit_server/app.py b/orm/services/audit_trail_manager/audit_server/app.py
index 83295b08..82f9e692 100644
--- a/orm/services/audit_trail_manager/audit_server/app.py
+++ b/orm/services/audit_trail_manager/audit_server/app.py
@@ -1,9 +1,11 @@
 """app module."""
 import logging
+import os
 
 from orm.services.audit_trail_manager.audit_server import model
 from orm.services.audit_trail_manager.audit_server.storage import factory
 
+from pecan.commands import CommandRunner
 from pecan import make_app
 
 logger = logging.getLogger(__name__)
@@ -24,3 +26,11 @@ def setup_app(config):
 
     logger.info('Starting Audit...')
     return app
+
+
+def main():
+    dir_name = os.path.dirname(__file__)
+    drive, path_and_file = os.path.splitdrive(dir_name)
+    path, filename = os.path.split(path_and_file)
+    runner = CommandRunner()
+    runner.run(['serve', path + '/config.py'])
diff --git a/orm/services/flavor_manager/fms_rest/app.py b/orm/services/flavor_manager/fms_rest/app.py
index 03e6dadc..799285fb 100644
--- a/orm/services/flavor_manager/fms_rest/app.py
+++ b/orm/services/flavor_manager/fms_rest/app.py
@@ -1,10 +1,11 @@
+import os
+
 from orm.common.orm_common.policy import policy
 from orm.services.flavor_manager.fms_rest.data import wsme
 from orm.services.flavor_manager.fms_rest.logger import get_logger
 from orm.services.flavor_manager.fms_rest.utils import authentication
 
 from pecan.commands import CommandRunner
-
 from pecan import make_app
 
 logger = get_logger(__name__)
@@ -26,8 +27,8 @@ def setup_app(config):
 
 
 def main():
+    dir_name = os.path.dirname(__file__)
+    drive, path_and_file = os.path.splitdrive(dir_name)
+    path, filename = os.path.split(path_and_file)
     runner = CommandRunner()
-    runner.run(['serve', '../config.py'])
-
-if __name__ == "__main__":
-    main()
+    runner.run(['serve', path + '/config.py'])
diff --git a/orm/services/id_generator/uuidgen/app.py b/orm/services/id_generator/uuidgen/app.py
index c3ec1d4a..2bde154d 100755
--- a/orm/services/id_generator/uuidgen/app.py
+++ b/orm/services/id_generator/uuidgen/app.py
@@ -1,14 +1,26 @@
-import logging
+import os
+
+from oslo_log import log as logging
+
+from pecan.commands import CommandRunner
 from pecan import make_app
 
-logger = logging.getLogger(__name__)
+LOG = logging.getLogger(__name__)
 
 
 def setup_app(config):
     app_conf = dict(config.app)
-
     app = make_app(app_conf.pop('root'),
                    logging=getattr(config, 'logging', {}),
                    **app_conf)
-    logger.info('Starting uuidgen...')
+    LOG.info('Starting uuidgen...')
+
     return app
+
+
+def main():
+    dir_name = os.path.dirname(__file__)
+    drive, path_and_file = os.path.splitdrive(dir_name)
+    path, filename = os.path.split(path_and_file)
+    runner = CommandRunner()
+    runner.run(['serve', path + '/config.py'])
diff --git a/orm/services/image_manager/ims/app.py b/orm/services/image_manager/ims/app.py
index f3aa3cbd..2b13ffbe 100755
--- a/orm/services/image_manager/ims/app.py
+++ b/orm/services/image_manager/ims/app.py
@@ -1,3 +1,5 @@
+import os
+
 from orm.common.orm_common.policy import policy
 from orm.common.orm_common.utils.utils import set_utils_conf
 from orm.services.image_manager.ims.logger import get_logger
@@ -27,8 +29,8 @@ def setup_app(config):
 
 
 def main():
+    dir_name = os.path.dirname(__file__)
+    drive, path_and_file = os.path.splitdrive(dir_name)
+    path, filename = os.path.split(path_and_file)
     runner = CommandRunner()
-    runner.run(['serve', '../config.py'])
-
-if __name__ == "__main__":
-    main()
+    runner.run(['serve', path + '/config.py'])
diff --git a/orm/services/resource_distributor/rds/app.py b/orm/services/resource_distributor/rds/app.py
index 845762a9..3294ac6c 100755
--- a/orm/services/resource_distributor/rds/app.py
+++ b/orm/services/resource_distributor/rds/app.py
@@ -1,4 +1,5 @@
 import logging
+import os
 
 from orm.common.client.audit.audit_client.api import audit
 from pecan import conf, make_app
@@ -62,8 +63,11 @@ def validate_sot():
 
 
 def main():
+    dir_name = os.path.dirname(__file__)
+    drive, path_and_file = os.path.splitdrive(dir_name)
+    path, filename = os.path.split(path_and_file)
     runner = CommandRunner()
-    runner.run(['serve', '../config.py'])
+    runner.run(['serve', path + '/config.py'])
 
 if __name__ == "__main__":
     main()