Disabling policy retrieval for pci opt

[optf/osdf.git] / osdfapp.py

diff --git a/osdfapp.py b/osdfapp.py
index 09a89b0..b1819ee 100755 (executable)
--- a/osdfapp.py
+++ b/osdfapp.py
@@ -45,7 +45,11 @@ from requests import RequestException
 from schematics.exceptions import DataError
 from osdf.logging.osdf_logging import MH, audit_log, error_log, debug_log
 from osdf.models.api.placementRequest import PlacementAPI
+from osdf.models.api.pciOptimizationRequest import PCIOptimizationAPI
 from osdf.operation.responses import osdf_response_for_request_accept as req_accept
+from osdf.optimizers.routeopt.simple_route_opt import RouteOpt
+from osdf.optimizers.pciopt.pci_opt_processor import process_pci_optimation
+from osdf.utils import api_data_utils
 
 ERROR_TEMPLATE = osdf.ERROR_TEMPLATE
 
@@ -97,12 +101,23 @@ def handle_data_error(e):
 @app.route("/api/oof/v1/healthcheck", methods=["GET"])
 def do_osdf_health_check():
     """Simple health check"""
+    audit_log.info("A health check request is processed!")
     return "OK"
 
 
 @app.route("/api/oof/v1/placement", methods=["POST"])
 @auth_basic.login_required
 def do_placement_opt():
+    return placement_rest_api()
+
+
+@app.route("/api/oof/placement/v1", methods=["POST"])
+@auth_basic.login_required
+def do_placement_opt_common_versioning():
+    return placement_rest_api()
+
+
+def placement_rest_api():
     """Perform placement optimization after validating the request and fetching policies
     Make a call to the call-back URL with the output of the placement request.
     Note: Call to Conductor for placement optimization may have redirects, so account for them
@@ -111,16 +126,71 @@ def do_placement_opt():
     req_id = request_json['requestInfo']['requestId']
     g.request_id = req_id
     audit_log.info(MH.received_request(request.url, request.remote_addr, json.dumps(request_json)))
+    api_version_info = api_data_utils.retrieve_version_info(request, req_id)
     PlacementAPI(request_json).validate()
     policies = get_policies(request_json, "placement")
     audit_log.info(MH.new_worker_thread(req_id, "[for placement]"))
     t = Thread(target=process_placement_opt, args=(request_json, policies, osdf_config))
     t.start()
     audit_log.info(MH.accepted_valid_request(req_id, request))
+    return req_accept(request_id=req_id,
+                      transaction_id=request_json['requestInfo']['transactionId'],
+                      version_info=api_version_info, request_status="accepted", status_message="")
+
+
+@app.route("/api/oof/v1/route", methods=["POST"])
+def do_route_calc():
+    """
+    Perform the basic route calculations and returnn the vpn-bindings
+    """
+    request_json = request.get_json()
+    audit_log.info("Calculate Route request received!")
+    src_access_node_id = ""
+    dst_access_node_id = ""
+    try:
+        src_access_node_id = request_json["srcPort"]["src-access-node-id"]
+        audit_log.info( src_access_node_id )
+        dst_access_node_id = request_json["dstPort"]["dst-access-node-id"]
+    except Exception as ex:
+        error_log.error("Exception while retriving the src and dst node info")
+    # for the case of request_json for same domain, return the same node with destination update
+    if src_access_node_id == dst_access_node_id:
+        audit_log.info("src and dst are same")
+        data = '{'\
+                '"vpns":['\
+                    '{'\
+                        '"access-topology-id": "' + request_json["srcPort"]["src-access-topology-id"] + '",'\
+                        '"access-client-id": "' + request_json["srcPort"]["src-access-client-id"] + '",'\
+                        '"access-provider-id": "' + request_json["srcPort"]["src-access-provider-id"]+ '",'\
+                        '"access-node-id": "' + request_json["srcPort"]["src-access-node-id"]+ '",'\
+                        '"src-access-ltp-id": "' + request_json["srcPort"]["src-access-ltp-id"]+ '",'\
+                        '"dst-access-ltp-id": "' + request_json["dstPort"]["dst-access-ltp-id"]  +'"'\
+                    '}'\
+                ']'\
+            '}'
+        return data
+    else:
+        return RouteOpt.getRoute(request_json)
+
+@app.route("/api/oof/v1/pci", methods=["POST"])
+@auth_basic.login_required
+def do_pci_optimization():
+    request_json = request.get_json()
+    req_id = request_json['requestInfo']['requestId']
+    g.request_id = req_id
+    audit_log.info(MH.received_request(request.url, request.remote_addr, json.dumps(request_json)))
+    PCIOptimizationAPI(request_json).validate()
+    #disable policy retrieval
+    # policies = get_policies(request_json, "pciopt")
+    audit_log.info(MH.new_worker_thread(req_id, "[for pciopt]"))
+    t = Thread(target=process_pci_optimation, args=(request_json, osdf_config, None))
+    t.start()
+    audit_log.info(MH.accepted_valid_request(req_id, request))
     return req_accept(request_id=req_id,
                       transaction_id=request_json['requestInfo']['transactionId'],
                       request_status="accepted", status_message="")
 
+
 @app.errorhandler(500)
 def internal_failure(error):
     """Returned when unexpected coding errors occur during initial synchronous processing"""