X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=osdfapp.py;h=b45529243d4ffe6d3c56acb9936fbfba7fce361b;hb=6e8e8fef1cf7dda685cbe6f1f67d759847e62782;hp=c0a554e1e8ab06a6d3891284992da6cf1a5fcb66;hpb=6f3312c6576eefdbac120214b1adc0f150b72d98;p=optf%2Fosdf.git

diff --git a/osdfapp.py b/osdfapp.py
index c0a554e..b455292 100755
--- a/osdfapp.py
+++ b/osdfapp.py
@@ -33,7 +33,10 @@ from apps.nst.optimizers.nst_select_processor import process_nst_selection
 from apps.pci.optimizers.pci_opt_processor import process_pci_optimation
 from apps.placement.models.api.placementRequest import PlacementAPI
 from apps.placement.optimizers.conductor.remote_opt_processor import process_placement_opt
+from apps.route.optimizers.inter_domain_route_opt import InterDomainRouteOpt
 from apps.route.optimizers.simple_route_opt import RouteOpt
+from apps.slice_selection.models.api.nsi_selection_request import NSISelectionAPI
+from apps.slice_selection.optimizers.conductor.remote_opt_processor import process_nsi_selection_opt
 from osdf.adapters.policy.interface import get_policies
 from osdf.adapters.policy.interface import upload_policy_models
 from osdf.config.base import osdf_config
@@ -99,7 +102,17 @@ def do_route_calc():
     """
     request_json = request.get_json()
     audit_log.info("Calculate Route request received!")
-    response = RouteOpt().getRoute(request_json)
+    response = RouteOpt().get_route(request_json, osdf_config)
+    return response
+
+@app.route("/api/oof/mdons/route/v1", methods=["POST"])
+def do_mdons_route_calc():
+    """
+    Perform the inter domain route calculation
+    """
+    request_json = request.get_json()
+    audit_log.info("Inter Domain Calculation  Route request received!")
+    response = InterDomainRouteOpt().get_route(request_json, osdf_config)
     return response
 
 @app.route("/api/oof/v1/selection/nst", methods=["POST"])
@@ -137,5 +150,15 @@ def do_pci_optimization():
                       request_status="accepted", status_message="")
 
 
+@app.route("/api/oof/selection/nsi/v1", methods=["POST"])
+def do_nsi_selection():
+    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)))
+    NSISelectionAPI(request_json).validate()
+    return process_nsi_selection_opt(request_json, osdf_config)
+
+
 if __name__ == "__main__":
     run_app()