changes in OSDF and optimizer for CCVPN get link requirement.

Changed the model file location as suggested in comments.

Issue-ID: OPTFRA-420

Signed-off-by: Isaac Manuel Raj <isaac.manuelraj@huawei.com>
Change-Id: I1f4b9a01865a91da1518a250ded48f1b077bed4e

diff --git a/apps/route/optimizers/route_opt.mzn b/apps/route/optimizers/route_opt.mzn
new file mode 100644 (file)
index 0000000..7aa73cb
--- /dev/null
+++ b/apps/route/optimizers/route_opt.mzn
@@ -0,0 +1,53 @@
+
+% Number of nodes
+int: N;
+    % Start node
+0..N-1: Start;
+    % End node
+0..N-1: End;
+    % Number of edges (directed arcs)
+int: M;
+    %  The actual edges
+set of int: Edges = 1..M;
+    % Edge lengths
+array[Edges] of int: L;
+    % Edge start node
+array[Edges] of 0..N-1: Edge_Start;
+array[Edges] of 0..N-1: Edge_End;
+
+    % Variable indicating if edge is used
+array[Edges] of var 0..1: x;
+
+constraint
+    forall( i in 0..N-1 ) (
+        if i = Start then
+                % outgoing flow
+            sum(e in Edges where Edge_Start[e] = i)(x[e]) -
+                % incoming flow
+            sum(e in Edges where Edge_End[e] = i)(x[e])
+            = 1
+        elseif i = End then
+            sum(e in Edges where Edge_Start[e] = i)(x[e]) -
+            sum(e in Edges where Edge_End[e] = i)(x[e])
+            = -1
+        else
+            sum(e in Edges where Edge_Start[e] = i)(x[e]) -
+            sum(e in Edges where Edge_End[e] = i)(x[e])
+            = 0
+        endif
+    );
+
+
+solve minimize sum(e in Edges)( L[e] * x[e] );
+%solve satisfy;
+
+output ["Length: ", show(sum(e in Edges)(L[e] * x[e])), "\n"] ++
+       ["Start : ", show(Start), "\n"] ++
+       ["End   : ", show(End), "\n\n"] ++
+       ["Edges in shortest path:\n"] ++
+       [ if   fix(x[e]) = 1
+         then show(Edge_Start[e]) ++ " -> " ++ show(Edge_End[e]) ++ "\n"
+         else ""
+         endif | e in Edges
+       ];
+

diff --git a/apps/route/optimizers/simple_route_opt.py b/apps/route/optimizers/simple_route_opt.py
index b00180d..27c1141 100644 (file)
--- a/apps/route/optimizers/simple_route_opt.py
+++ b/apps/route/optimizers/simple_route_opt.py
@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------
-#   Copyright (c) 2018 Huawei Intellectual Property
+#   Copyright (c) 2020 Huawei Intellectual Property
 #
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
@@ -20,7 +20,12 @@ import requests
 from requests.auth import HTTPBasicAuth
 
 from osdf.utils.mdc_utils import mdc_from_json
+from osdf.logging.osdf_logging import MH, audit_log, error_log, debug_log
+import pymzn
+from sklearn import preprocessing
 
+import os
+BASE_DIR = os.path.dirname(__file__)
 
 class RouteOpt:
 
@@ -31,6 +36,8 @@ class RouteOpt:
     # DNS server and standard port of AAI.. 
     # TODO: read the port from the configuration and add to DNS
     aai_host = "https://aai.api.simpledemo.onap.org:8443"
+    audit_log.info("base directory")
+    audit_log.info(BASE_DIR)
     aai_headers = {
         "X-TransactionId": "9999",
         "X-FromAppId": "OOF",
@@ -50,89 +57,184 @@ class RouteOpt:
                 return True
         return False
 
+    def getLinksName(self, routes,initial_start_edge,initial_end_edge, mappingTable):
+        routes=list(routes)
+        arr=routes[0]['x']
+        listOfLinks=[]
+        for i in range(0, len(routes[0]['x'])):
+            if arr[i] == 1 :
+                # listOfLinks.append(self.fetchLogicalLinks(initial_start_edge[i], initial_end_edge[i], mappingTable))
+                listOfLinks.append(mappingTable[initial_start_edge[i] + ":" + initial_end_edge[i]])
+
+        return listOfLinks
+
+    # def search(self, ip1, ip2, dic):
+    #     if ip1 == "" or ip2 == "":
+    #         return ""
+    #     else:
+    #         string = ip1 + ":" + ip2
+    #         return dic[string]
+    #
+    # def fetchLogicalLinks(self, initial_start_edge, initial_end_edge, mappingTable):
+    #     link_name=self.search(initial_start_edge, initial_end_edge, mappingTable)
+    #     return link_name
+
+
+    # def fetchLogicalLinks(self, initial_start_edge, initial_end_edge, mappingTable):
+    #     return mappingTable[initial_start_edge + ":" + initial_end_edge]
+
+    def solve(self, mzn_model, dzn_data):
+        return pymzn.minizinc(mzn=mzn_model, data=dzn_data)
+
+    def getLinks(self, mzn_model, dzn_data, initial_start_edge,initial_end_edge, mappingTable):
+        routes = self.solve(mzn_model, dzn_data)
+        audit_log.info("mocked minizinc solution====>")
+        audit_log.info(routes)
+
+        converted_links=self.getLinksName(routes, initial_start_edge,initial_end_edge, mappingTable)
+        audit_log.info("converted links===>")
+        audit_log.info(converted_links)
+        return converted_links
+
+    def addition(self, data):
+        relationship = data["relationship-list"]["relationship"]
+        res = ""
+        for index, eachItem in enumerate(relationship):
+            if index == len(relationship) - 1:
+                res += eachItem["accessNodeId"]
+            else:
+                res += eachItem["accessNodeId"] + ":"
+
+        return data["link-name"], res
+
+    def createMapTable(self, logical_links):
+        result = map(self.addition, logical_links)
+
+        parseTemplate = {}
+
+        for eachItem in result:
+            parseTemplate[eachItem[1]] = eachItem[0]
+        audit_log.info("mapping table")
+        audit_log.info(parseTemplate)
+        return parseTemplate
+
+    def build_dzn_data(self, src_access_node_id, dst_access_node_id):
+        Edge_Start = []
+        Edge_End = []
+        logical_links = self.get_logical_links()
+        audit_log.info("mocked response of AAI received (logical links) successful===>")
+        audit_log.info(logical_links)
+        # prepare map table
+        mappingTable = self.createMapTable(logical_links)
+        # take the logical link where both the p-interface in same onap
+        if logical_links is not None:
+            for logical_link in logical_links:
+                if not self.isCrossONAPLink(logical_link):
+                    # link is in local ONAP
+                    relationship = logical_link["relationship-list"]["relationship"]
+
+                    relationshipStartNode = relationship[0]
+                    relationshipStartNodeID = relationshipStartNode["related-link"].split("/")[-1]
+                    start_accessNodeId = relationshipStartNodeID.split("-")[-3]
+                    Edge_Start.append(start_accessNodeId)
+
+                    relationshipEndtNode = relationship[1]
+                    relationshipEndNodeID = relationshipEndtNode["related-link"].split("/")[-1]
+                    end_accessNodeId = relationshipEndNodeID.split("-")[-3]
+                    Edge_End.append(end_accessNodeId)
+
+        audit_log.info("edge start and end array of i/p address are===>")
+        audit_log.info(Edge_Start)
+        audit_log.info(Edge_End)
+        # labeling ip to number for mapping
+        le = preprocessing.LabelEncoder()
+        le.fit(Edge_Start + Edge_End)
+        # print(le.classes_)
+        dzn_start_edge = le.transform(Edge_Start)
+
+        final_dzn_start_arr = []
+        for i in range(0, len(dzn_start_edge)):
+            final_dzn_start_arr.append(dzn_start_edge[i])
+
+        final_dzn_end_arr = []
+        dzn_end_edge = le.transform(Edge_End)
+        for j in range(0, len(dzn_end_edge)):
+            final_dzn_end_arr.append(dzn_end_edge[j])
+
+        audit_log.info("start and end array that passed in dzn_data===>")
+        audit_log.info(final_dzn_start_arr)
+        audit_log.info(final_dzn_end_arr)
+
+        link_cost  = []
+        for k in range(0, len(final_dzn_start_arr)):
+            link_cost.append(1)
+
+        audit_log.info("src_access_node_id")
+        audit_log.info(src_access_node_id)
+        source= le.transform([src_access_node_id])
+        audit_log.info("vallue of source===>")
+        audit_log.info(source)
+        if source in final_dzn_start_arr :
+            start = source[0]
+            audit_log.info("source node")
+            audit_log.info(start)
+
+        audit_log.info("dst_access_node_id")
+        audit_log.info(dst_access_node_id)
+        destination= le.transform([dst_access_node_id])
+        if destination in final_dzn_end_arr :
+            end = destination[0]
+            audit_log.info("destination node")
+            audit_log.info(end)
+        # data to be prepared in the below format:
+        dzn_data = {
+            'N': self.total_node(final_dzn_start_arr + final_dzn_end_arr),
+            'M': len(final_dzn_start_arr),
+            'Edge_Start': final_dzn_start_arr,
+            'Edge_End': final_dzn_end_arr,
+            'L': link_cost,
+            'Start': start,
+            'End': end,
+        }
+        # can not do reverse mapping outside of this scope, so doing here
+        audit_log.info("reverse mapping after prepared dzn_data")
+        initial_start_edge=le.inverse_transform(final_dzn_start_arr)
+        initial_end_edge=le.inverse_transform(final_dzn_end_arr)
+        audit_log.info(initial_start_edge)
+        audit_log.info(initial_end_edge)
+        return dzn_data, initial_start_edge,initial_end_edge, mappingTable
+
+    def total_node(self, node):
+        nodeSet = set()
+        for i in range(0, len(node)):
+            nodeSet.add(node[i])
+        total_node = len(nodeSet)
+        return total_node
+
     def getRoute(self, request):
         """
-        This method checks 
+        This method checks
         :param logical_link:
         :return:
         """
-        mdc_from_json(request)
-
-        src_access_node_id = request["srcPort"]["src-access-node-id"]
-        dst_access_node_id = request["dstPort"]["dst-access-node-id"]
-        
-
-        ingress_p_interface = None
-        egress_p_interface = None
-
-        # 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:
-            data = '{'\
-                '"vpns":['\
-                    '{'\
-                        '"access-topology-id": "' + request["srcPort"]["src-access-topology-id"] + '",'\
-                        '"access-client-id": "' + request["srcPort"]["src-access-client-id"] + '",'\
-                        '"access-provider-id": "' + request["srcPort"]["src-access-provider-id"]+ '",'\
-                        '"access-node-id": "' + request["srcPort"]["src-access-node-id"]+ '",'\
-                        '"src-access-ltp-id": "' + request["srcPort"]["src-access-ltp-id"]+ '",'\
-                        '"dst-access-ltp-id": "' + request["dstPort"]["dst-access-ltp-id"]  +'"'\
-                    '}'\
-                ']'\
-            '}'
-            return data
-        else:
-            logical_links = self.get_logical_links()
-
-            # take the logical link where both the p-interface in same onap
-            if logical_links != None:
-                for logical_link in logical_links.get("logical-link"):
-                    if not self.isCrossONAPLink(logical_link):
-                        # link is in local ONAP
-                        for relationship in logical_link["relationship-list"]["relationship"]:
-                            if relationship["related-to"] == "p-interface":
-                                if src_access_node_id in relationship["related-link"]:
-                                    i_interface = relationship["related-link"].split("/")[-1]
-                                    ingress_p_interface = i_interface.split("-")[-1]
-                                if dst_access_node_id in relationship["related-link"]:
-                                    e_interface = relationship["related-link"].split("/")[-1]
-                                    egress_p_interface = e_interface.split("-")[-1]
-                        data = '{'\
-                                '"vpns":['\
-                                        '{'\
-                                        '"access-topology-id": "' + request["srcPort"]["src-access-topology-id"] + '",'\
-                                        '"access-client-id": "' + request["srcPort"]["src-access-client-id"] + '",'\
-                                        '"access-provider-id": "' + request["srcPort"]["src-access-provider-id"]+ '",'\
-                                        '"access-node-id": "' + request["srcPort"]["src-access-node-id"]+ '",'\
-                                        '"src-access-ltp-id": "' + request["srcPort"]["src-access-ltp-id"]+ '",'\
-                                        '"dst-access-ltp-id": "' + ingress_p_interface +'"'\
-                                '},'\
-                                '{' \
-                                        '"access-topology-id": "' + request["dstPort"]["dst-access-topology-id"] + '",' \
-                                        '"access-topology-id": "' + request["dstPort"]["dst-access-topology-id"]+ '",' \
-                                        '"access-provider-id": "' + request["dstPort"]["dst-access-provider-id"]+ '",' \
-                                        '"access-node-id": "' + request["dstPort"]["dst-access-node-id"]+ '",' \
-                                        '"src-access-ltp-id": "' + egress_p_interface + '",' \
-                                        '"dst-access-ltp-id": "' + request["dstPort"]["dst-access-ltp-id"] + '"' \
-                                '}'\
-                            ']'\
-                        '}'
-                        return data
-
-
-    def get_pinterface(self, url):
-        """
-        This method returns details for p interface
-        :return: details of p interface
-        """
-        aai_req_url = self.aai_host + url
-        response = requests.get(aai_req_url,
-                                headers=self.aai_headers,
-                                auth=HTTPBasicAuth("AAI", "AAI"),
-                                verify=False)
+        routeInfo = request["routeInfo"]["routeRequests"]
+        routeRequest = routeInfo[0]
+        src_access_node_id = routeRequest["srcPort"]["accessNodeId"]
+        dst_access_node_id = routeRequest["dstPort"]["accessNodeId"]
 
-        if response.status_code == 200:
-            return response.json()
+        dzn_data, initial_start_edge, initial_end_edge, mappingTable = self.build_dzn_data(src_access_node_id, dst_access_node_id )
+        #mzn_model = "/home/root1/Videos/projects/osdf/test/functest/simulators/osdf/optimizers/routeopt/route_opt.mzn"
+        mzn_model = os.path.join(BASE_DIR, 'route_opt.mzn')
 
+        routeSolutions = self.getLinks(mzn_model, dzn_data, initial_start_edge,initial_end_edge, mappingTable)
+
+        return {
+            "requestId": request["requestInfo"]["requestId"],
+            "transactionId": request["requestInfo"]["transactionId"],
+            "statusMessage": " ",
+            "requestStatus": "accepted",
+            "solutions": routeSolutions
+        }
 
     def get_logical_links(self):
         """
@@ -142,12 +244,6 @@ class RouteOpt:
         """
         logical_link_url = "/aai/v13/network/logical-links?operational-status=up"
         aai_req_url = self.aai_host + logical_link_url
-
-        response = requests.get(aai_req_url,
-                     headers=self.aai_headers,
-                     auth=HTTPBasicAuth("AAI", "AAI"),
-                     verify=False)
-
-        logical_links =  None
+        response = requests.get(aai_req_url,headers=self.aai_headers,auth=HTTPBasicAuth("AAI", "AAI"),verify=False)
         if response.status_code == 200:
             return response.json()
\ No newline at end of file

diff --git a/osdfapp.py b/osdfapp.py
index 71106fd..775beaf 100755 (executable)
--- a/osdfapp.py
+++ b/osdfapp.py
@@ -21,6 +21,11 @@ OSDF Manager Main Flask Application
 """
 
 import json
+import ssl
+import sys
+import time
+import traceback
+from optparse import OptionParser
 from threading import Thread  # for scaling up, may need celery with RabbitMQ or redis
 
 from flask import request, g
@@ -89,14 +94,15 @@ def placement_rest_api():
                       version_info=api_version_info, request_status="accepted", status_message="")
 
 
-@app.route("/api/oof/v1/route", methods=["POST"])
+@app.route("/api/oof/route/v1", 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!")
-    return RouteOpt().getRoute(request_json)
+    response = RouteOpt().getRoute(request_json)
+    return response
 
 
 @app.route("/api/oof/v1/pci", methods=["POST"])
@@ -104,7 +110,13 @@ def do_route_calc():
 @auth_basic.login_required
 def do_pci_optimization():
     request_json = request.get_json()
+    audit_log.info('request json obtained==>')
+    audit_log.info(request_json)
+
     req_id = request_json['requestInfo']['requestId']
+    audit_log.info('requestID obtained==>')
+    audit_log.info(req_id)
+    
     g.request_id = req_id
     audit_log.info(MH.received_request(request.url, request.remote_addr, json.dumps(request_json)))
     PCIOptimizationAPI(request_json).validate()
@@ -114,6 +126,7 @@ def do_pci_optimization():
     t = Thread(target=process_pci_optimation, args=(request_json, osdf_config, None))
     t.start()
     audit_log.info(MH.accepted_valid_request(req_id, request))
+    audit_log.info('reached upto return')
     return req_accept(request_id=req_id,
                       transaction_id=request_json['requestInfo']['transactionId'],
                       request_status="accepted", status_message="")