getOptions renamed in osdfapp.py and tests

[optf/osdf.git] / osdfapp.py

diff --git a/osdfapp.py b/osdfapp.py
index f854dca..a2af0bf 100755 (executable)
--- a/osdfapp.py
+++ b/osdfapp.py
@@ -31,14 +31,11 @@ import json
 import osdf.adapters.policy.interface
 import osdf.config.credentials
 import osdf.config.loader
-import osdf.datasources.aai.aai_local_cached_data
 import osdf.operation.error_handling
 import osdf.operation.responses
 import traceback
 from osdf.adapters.policy.interface import get_policies
-from osdf.adapters.response_parsing.aots_ueb_cm_data import aots_ds_ueb_listener
-from osdf.config.base import osdf_config, DOCKER_CM_OPTIMIZER, AOTS_CM_MESSAGE_BUS
-from osdf.optimizers.cmopt.rcscheduler.local_opt_processor import process_local_cm_scheduler_opt
+from osdf.config.base import osdf_config
 from osdf.optimizers.placementopt.conductor.remote_opt_processor import process_placement_opt
 from osdf.webapp.appcontroller import auth_basic
 from optparse import OptionParser
@@ -47,8 +44,7 @@ from osdf.operation.error_handling import request_exception_to_json_body, intern
 from requests import RequestException
 from schematics.exceptions import DataError
 from osdf.logging.osdf_logging import MH, audit_log, error_log
-from osdf.models.placementRequest import PlacementAPI
-from osdf.models.schedulerRequest import SchedulerAPI
+from osdf.models.api.placementRequest import PlacementAPI
 
 ERROR_TEMPLATE = osdf.ERROR_TEMPLATE
 
@@ -125,26 +121,25 @@ def do_placement_opt():
 
 # Returned when unexpected coding errors occur during initial synchronous processing
 @app.errorhandler(500)
-def interal_failure(error):
+def internal_failure(error):
     error_log.error("Synchronous error for request id {} {}".format(g.request_id, traceback.format_exc()))
     response = Response(internal_error_message, content_type='application/json; charset=utf-8')
     response.status_code = 500
     return response
 
 
-def getOptions(argv):
+def get_options(argv):
     program_version_string = '%%prog %s' % ("v1.0")
-    #program_usage = '''usage: spam two eggs''' # optional - will be autogenerated by optparse
     program_longdesc = ""
     program_license = ""
 
-    # setup option parser
     parser = OptionParser(version=program_version_string, epilog=program_longdesc, description=program_license)
     parser.add_option("-l", "--local", dest="local", help="run locally", action="store_true", default=False)
     parser.add_option("-t", "--devtest", dest="devtest", help="run in dev/test environment", action="store_true", default=False)
     parser.add_option("-d", "--debughost", dest="debughost", help="IP Address of host running debug server", default='')
     parser.add_option("-p", "--debugport", dest="debugport", help="Port number of debug server", type=int, default=5678)
     (opts, args) = parser.parse_args(argv)
+
     if (opts.debughost != ''):
         print('pydevd.settrace(%s, port=%s)' % (opts.debughost, opts.debugport))
         pydevd.settrace(opts.debughost, port=opts.debugport)
@@ -157,12 +152,13 @@ if __name__ == "__main__":
     ports = sys_conf['osdf_ports']
     internal_port, external_port = ports['internal'], ports['external']
     ssl_context = tuple(sys_conf['ssl_context'])
+    local_host = "0.0.0.0"  # NOSONAR
 
-    common_app_opts = dict(host='0.0.0.0', threaded=True, use_reloader=False)
+    common_app_opts = dict(host=local_host, threaded=True, use_reloader=False)
 
-    opts = getOptions(sys.argv)
-    if (opts.local == False and opts.devtest == False):  # normal deployment
+    opts = get_options(sys.argv)
+    if (not opts.local and not opts.devtest):  # normal deployment
         app.run(port=internal_port, ssl_context=ssl_context, debug=False, **common_app_opts)
     else:
-        port = internal_port if opts.local == True else external_port
+        port = internal_port if opts.local else external_port
         app.run(port=port, debug=True, **common_app_opts)