Merge "Fix broken app.py files"

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'])

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'])

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'])

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'])

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()