From 55d13ed3b3c05893672829a07351db839e642187 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 20 Nov 2023 19:03:29 +0000
Subject: [PATCH] NBI component:

- Moved prefix "/restconf" to appropriate plugins
---
 manifests/nginx_ingress_http.yaml                  | 14 ++++++++++++++
 src/common/Constants.py                            |  2 +-
 .../rest_server/nbi_plugins/ietf_l2vpn/__init__.py |  2 +-
 .../nbi_plugins/ietf_network_slice/__init__.py     |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/manifests/nginx_ingress_http.yaml b/manifests/nginx_ingress_http.yaml
index b77356b13..e8e8a80e4 100644
--- a/manifests/nginx_ingress_http.yaml
+++ b/manifests/nginx_ingress_http.yaml
@@ -43,3 +43,17 @@ spec:
               name: nbiservice
               port:
                 number: 8080
+        - path: /()(debug-api/.*)
+          pathType: Prefix
+          backend:
+            service:
+              name: nbiservice
+              port:
+                number: 8080
+        - path: /()(bmw/.*)
+          pathType: Prefix
+          backend:
+            service:
+              name: nbiservice
+              port:
+                number: 8080
diff --git a/src/common/Constants.py b/src/common/Constants.py
index 0cf76c088..79d5bb3b5 100644
--- a/src/common/Constants.py
+++ b/src/common/Constants.py
@@ -99,6 +99,6 @@ DEFAULT_SERVICE_HTTP_PORTS = {
 
 # Default HTTP/REST-API service base URLs
 DEFAULT_SERVICE_HTTP_BASEURLS = {
-    ServiceNameEnum.NBI       .value : '/restconf',
+    ServiceNameEnum.NBI       .value : None,
     ServiceNameEnum.WEBUI     .value : None,
 }
diff --git a/src/nbi/service/rest_server/nbi_plugins/ietf_l2vpn/__init__.py b/src/nbi/service/rest_server/nbi_plugins/ietf_l2vpn/__init__.py
index 7cdc31ec8..11a554313 100644
--- a/src/nbi/service/rest_server/nbi_plugins/ietf_l2vpn/__init__.py
+++ b/src/nbi/service/rest_server/nbi_plugins/ietf_l2vpn/__init__.py
@@ -21,7 +21,7 @@ from .L2VPN_Services import L2VPN_Services
 from .L2VPN_Service import L2VPN_Service
 from .L2VPN_SiteNetworkAccesses import L2VPN_SiteNetworkAccesses
 
-URL_PREFIX = '/data/ietf-l2vpn-svc:l2vpn-svc'
+URL_PREFIX = '/restconf/data/ietf-l2vpn-svc:l2vpn-svc'
 
 def _add_resource(rest_server : RestServer, resource : Resource, *urls, **kwargs):
     urls = [(URL_PREFIX + url) for url in urls]
diff --git a/src/nbi/service/rest_server/nbi_plugins/ietf_network_slice/__init__.py b/src/nbi/service/rest_server/nbi_plugins/ietf_network_slice/__init__.py
index ccd64d2b5..fdd2ac64a 100644
--- a/src/nbi/service/rest_server/nbi_plugins/ietf_network_slice/__init__.py
+++ b/src/nbi/service/rest_server/nbi_plugins/ietf_network_slice/__init__.py
@@ -20,7 +20,7 @@ from nbi.service.rest_server.RestServer import RestServer
 from .NSS_Services import NSS_Services
 from .NSS_Service import NSS_Service
 
-URL_PREFIX = '/data/ietf-network-slice-service:ietf-nss'
+URL_PREFIX = '/restconf/data/ietf-network-slice-service:ietf-nss'
 
 def _add_resource(rest_server : RestServer, resource : Resource, *urls, **kwargs):
     urls = [(URL_PREFIX + url) for url in urls]
-- 
GitLab