fix: input is now rfc 7951 compliant

Change-Id: I8ef1c7a7da382cfa51d24aff27065fd4a38d5a3a

Author: RenatoParker

gnpyapi/core/__init__.py

@@ -4,7 +4,7 @@
 """
 from flask import Flask
 
-API_VERSION = "/api/v0.1"
+API_VERSION = "/api/v0.2"
 
 app = Flask(__name__)
 

gnpyapi/core/route/path_request_route.py

@@ -1,27 +1,42 @@
 # coding: utf-8
+import json
 
 from flask import request
 
 from gnpyapi.core import app
 from gnpyapi.core.exception.equipment_error import EquipmentError
 from gnpyapi.core.exception.topology_error import TopologyError
 from gnpyapi.core.service.path_request_service import PathRequestService
+from gnpy.tools.convert_legacy_yang import yang_to_legacy
 from gnpyapi.core import API_VERSION
 
 PATH_REQUEST_BASE_PATH = '/path-request'
 
 
 @app.route(API_VERSION + PATH_REQUEST_BASE_PATH, methods=['POST'])
 def path_request(path_request_service: PathRequestService):
-    data = request.json
-    service = data['gnpy-api:service']
-    if 'gnpy-api:topology' in data:
-        topology = data['gnpy-api:topology']
+    is_legacy = 'gnpy-api:api' not in request.json
+    if not is_legacy:
+        data = json.loads(request.json)['gnpy-api:api']
+        service = yang_to_legacy(data['gnpy-path-computation:services'])
+        if 'gnpy-network-topology:topology' in data:
+            topology = yang_to_legacy(data['gnpy-network-topology:topology'])
+        else:
+            raise TopologyError('No topology found in request')
+        if 'gnpy-eqpt-config:equipment' in data:
+            equipment = yang_to_legacy(data['gnpy-eqpt-config:equipment'])
+        else:
+            raise EquipmentError('No equipment found in request')
     else:
-        raise TopologyError('No topology found in request')
-    if 'gnpy-api:equipment' in data:
-        equipment = data['gnpy-api:equipment']
-    else:
-        raise EquipmentError('No equipment found in request')
+        data = request.json
+        service = data['gnpy-api:service']
+        if 'gnpy-api:topology' in data:
+            topology = data['gnpy-api:topology']
+        else:
+            raise TopologyError('No topology found in request')
+        if 'gnpy-api:equipment' in data:
+            equipment = data['gnpy-api:equipment']
+        else:
+            raise EquipmentError('No equipment found in request')
 
     return path_request_service.path_request(topology, equipment, service), 201

gnpyapi/core/route/status_route.py

@@ -5,4 +5,4 @@
 
 @app.route(API_VERSION + '/status', methods=['GET'])
 def api_status():
-    return {"version": "v0.1", "status": "ok"}, 200
+    return {"version": "v0.2", "status": "ok"}, 200

gnpyapi/core/service/path_request_service.py

@@ -6,7 +6,6 @@
 from gnpy.tools.json_io import results_to_json, load_eqpt_topo_from_json
 from gnpy.tools.worker_utils import designed_network, planning
 from gnpyapi.core.exception.topology_error import TopologyError
-
 from gnpyapi.core.exception.equipment_error import EquipmentError
 
 _logger = logging.getLogger(__name__)