From 1a650c3076c03324bfdfe6754a125f0e1fa8a145 Mon Sep 17 00:00:00 2001
From: rahhal <mrahhal@cttc.com>
Date: Thu, 26 Jun 2025 09:45:52 +0000
Subject: [PATCH 1/3] Challanege 1 - Use NBI instead of uploading templates to
 webui

---
 src/Constants.py                |   1 +
 src/helpers.py                  |  20 ++-
 src/network_slice_controller.py | 207 +++++++++++++++++++++-----------
 3 files changed, 142 insertions(+), 86 deletions(-)

diff --git a/src/Constants.py b/src/Constants.py
index f699aed..8916cb3 100644
--- a/src/Constants.py
+++ b/src/Constants.py
@@ -31,5 +31,6 @@ TEMPLATES_PATH = os.path.join(SRC_PATH, "templates")
 TFS_UPLOAD = False
 # Teraflow IP
 TFS_IP = "192.168.165.10"
+path = "restconf/data/ietf-l2vpn-svc:l2vpn-svc/vpn-services"
 # Flag to determine if additional L2VPN configuration support is required for deploying L2VPNs with path selection
 TFS_L2VPN_SUPPORT = False
\ No newline at end of file
diff --git a/src/helpers.py b/src/helpers.py
index abbac02..700adba 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -28,20 +28,14 @@ class tfs_connector():
         user="admin"
         password="admin"
         token=""
-        session = requests.Session()
-        session.auth = (user, password)
-        url=f'http://{tfs_ip}/webui'
-        response=session.get(url=url)
-        for item in response.iter_lines():
-            if("csrf_token" in str(item)):
-                string=str(item).split('<input id="csrf_token" name="csrf_token" type="hidden" value=')[1]
-                token=string.split(">")[0].strip('"')
-        logging.debug("csrf token %s",token)
-
-        files = {'descriptors': ("data.json", json.dumps(service).encode("utf-8"), "application/json")}
+        url = f'http://{tfs_ip}/{path}'
+        logging.info(service)
+        headers = {'Content-Type': 'application/json'}
+        json_data = json.dumps(service)
+        json_decoded = json_data
         token={'csrf_token':token}
-        response = session.post(url,files=files,data=token,timeout=60)
-        logging.debug("Http response: %s",response.text)
+        response = requests.post(url,headers=headers,data=json_decoded,timeout=60)
+        logging.info(response.text)
         return response
 
 #CISCO
diff --git a/src/network_slice_controller.py b/src/network_slice_controller.py
index 871e5d1..8a4de08 100644
--- a/src/network_slice_controller.py
+++ b/src/network_slice_controller.py
@@ -15,7 +15,7 @@
 import json, time, os, logging, uuid
 from datetime import datetime
 from src.helpers import tfs_connector, cisco_connector
-from src.Constants import DEFAULT_LOGGING_LEVEL, TFS_UPLOAD, TFS_IP, TFS_L2VPN_SUPPORT, SRC_PATH, TEMPLATES_PATH
+from src.Constants import DEFAULT_LOGGING_LEVEL, TFS_UPLOAD, TFS_IP, TFS_L2VPN_SUPPORT, SRC_PATH, TEMPLATES_PATH, path, path_l3
 
 # Configure logging to provide clear and informative log messages
 logging.basicConfig(
@@ -38,7 +38,7 @@ class NSController:
     - Slice Realization: Convert intents to specific network configurations (L2VPN, L3VPN)
     """
 
-    def __init__(self, upload_to_tfs = TFS_UPLOAD, tfs_ip=TFS_IP, need_l2vpn_support=TFS_L2VPN_SUPPORT):
+    def __init__(self, upload_to_tfs = TFS_UPLOAD, tfs_ip=TFS_IP,path=path, need_l2vpn_support=TFS_L2VPN_SUPPORT):
         """
         Initialize the Network Slice Controller.
 
@@ -58,6 +58,9 @@ class NSController:
         """
         self.upload_to_tfs = upload_to_tfs
         self.tfs_ip = tfs_ip
+        self.path = path
+        self.path_l3 = path_l3
+        #self.json_file = json_file
         self.answer = {}
         self.cool_answer = {}
         self.start_time = 0
@@ -257,7 +260,8 @@ class NSController:
 
             # Reset requests and load IETF template
             self.__load_template(1, os.path.join(TEMPLATES_PATH, "ietf_template_empty.json"))  
-            tfs_requests = {"services":[]}
+            #tfs_requests = {"services":[]}
+            tfs_requests = {}
             
             # Process intent (translate if 3GPP)
             ietf_intents = self.__nbi_processor(intent_json)
@@ -271,23 +275,24 @@ class NSController:
                     self.__mapper(intent)
                     # Realizer
                     tfs_request = self.__realizer(intent)
-                    tfs_requests["services"].append(tfs_request)
+                    #tfs_requests.append(tfs_request)
+                    tfs_requests = tfs_request
             else:
                 return self.__send_response(False, code=404, message="No intents found")
 
             # Generated service
-            logging.debug(json.dumps(tfs_requests, indent=2))
+            #logging.debug(json.dumps(tfs_requests, indent=2))
             
             # Optional: Upload template to Teraflow
             if self.upload_to_tfs == True:
-                response = tfs_connector().simple_post(self.tfs_ip, tfs_requests)
+                response = tfs_connector().simple_post(self.tfs_ip, tfs_requests, self.path)
 
-                if not response.ok:
-                    return self.__send_response(False, code=response.status_code, message=f"Teraflow upload failed. Response: {response.text}")
+                # if not response.ok:
+                #     return self.__send_response(False, code=response.status_code, message=f"Teraflow upload failed. Response: {response.text}")
                 
                 # For deploying an L2VPN with path selection (not supported by Teraflow)
-                if self.need_l2vpn_support:
-                    self.__tfs_l2vpn_support(tfs_requests["services"])
+                # if self.need_l2vpn_support:
+                #     self.__tfs_l2vpn_support(tfs_requests["services"])
 
                 logging.info("Request sent to Teraflow")
 
@@ -405,7 +410,7 @@ class NSController:
             self.__nrp(order, nrp)
         else:
             # Select slice service method
-            return self.__select_way("L2VPN", ietf_intent)
+            return self.__select_way("L3VPN", ietf_intent)
 
     ### Generic functionalities
     def __load_template(self, which, dir_t):
@@ -461,6 +466,7 @@ class NSController:
                 "setup_time": self.setup_time
             }
             # Add slice details to the response
+            logging.info(self.answer)
             for subnet in self.answer:
                 slice_info = {
                     "id": subnet,
@@ -847,76 +853,131 @@ class NSController:
         elif way == "L3VPN":
             realizing_request = self.__tfs_l3vpn(ietf_intent)
         return realizing_request
-    
     def __tfs_l2vpn(self, ietf_intent):
-        """
-        Translate slice intent into a TeraFlow service request.
+       """
+       Translate slice intent into a TeraFlow service request.
 
-        This method prepares a L2VPN service request by:
-        1. Defining endpoint routers
-        2. Loading a service template
-        3. Generating a unique service UUID
-        4. Configuring service endpoints
-        5. Adding QoS constraints
-        6. Preparing configuration rules for network interfaces
+       This method prepares a L2VPN service request by:
+       1. Defining endpoint routers
+       2. Loading a service template
+       3. Generating a unique service UUID
+       4. Configuring service endpoints
+       5. Adding QoS constraints
+       6. Preparing configuration rules for network interfaces
 
-        Args:
-            ietf_intent (dict): IETF-formatted network slice intent.
+       Args:
+           ietf_intent (dict): IETF-formatted network slice intent.
 
-        Returns:
-            dict: A TeraFlow service request for L2VPN configuration.
+       Returns:
+           dict: A TeraFlow service request for L2VPN configuration.
 
         """
         # Hardcoded router endpoints
         # TODO (should be dynamically determined)
         origin_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
-        origin_router_if = '0/0/0-GigabitEthernet0/0/0/0'
+        origin_router_if = 'eth2'
         destination_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
-        destination_router_if = '0/0/3-GigabitEthernet0/0/0/3'
-
-        # Extract QoS Profile from intent
-        QoSProfile = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["id"]
-
-        vlan_value = 0
-        
-        # Load L2VPN service template
-        self.__load_template(2, os.path.join(TEMPLATES_PATH, "L2-VPN_template_empty.json"))
-        tfs_request = json.loads(str(self.__teraflow_template))["services"][0]
-
-        # Generate unique service UUID
-        tfs_request["service_id"]["service_uuid"]["uuid"] += "-" + str(int(datetime.now().timestamp() * 1e7))
-
-        # Configure service endpoints
-        for endpoint in tfs_request["service_endpoint_ids"]:
-            endpoint["device_id"]["device_uuid"]["uuid"] = origin_router_id if endpoint is tfs_request["service_endpoint_ids"][0] else destination_router_id
-            endpoint["endpoint_uuid"]["uuid"] = origin_router_if if endpoint is tfs_request["service_endpoint_ids"][0] else destination_router_if
-
-        self.answer[self.subnet]["QoS Requirements"] = []
-        # Add service constraints
-        for i, constraint in enumerate(tfs_request["service_constraints"]):
-            bound = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["bound"]
-            self.answer[self.subnet]["QoS Requirements"].append(bound)
-            constraint["custom"]["constraint_value"] = str(bound)
-
-        # Add configuration rules
-        for i, config_rule in enumerate(tfs_request["service_config"]["config_rules"][1:], start=1):
-            router_id = origin_router_id if i == 1 else destination_router_id
-            router_if = origin_router_if if i == 1 else destination_router_if
-            resource_value = config_rule["custom"]["resource_value"]
-
-            sdp_index = i - 1
-            vlan_value = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][sdp_index]["service-match-criteria"]["match-criterion"][0]["value"]
-            resource_value["vlan_id"] = int(vlan_value)
-            resource_value["circuit_id"] = vlan_value
-            resource_value["remote_router"] = destination_router_id if i == 1 else origin_router_id
-            resource_value["ni_name"] = 'ELAN{:s}'.format(str(vlan_value))
-            config_rule["custom"]["resource_key"] = f"/device[{router_id}]/endpoint[{router_if}]/settings"
-
-        # Log and store VLAN information
-        logging.info(f"Intent with VLAN {vlan_value} realized\n")
-        self.answer[self.subnet]["VLAN"] = vlan_value
-        return tfs_request
-    
+        destination_router_if = 'eth2'
+
+       # Extract QoS Profile from intent
+       QoSProfile = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["id"]
+       vlan_value = 0
+       self.__load_template(2, os.path.join(TEMPLATES_PATH, "ietfL2VPN_template.json"))
+       tfs_request = json.loads(str(self.__teraflow_template))
+       full_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["id"]
+       uuid_only = full_id.split("slice-service-")[-1]
+       tfs_request["ietf-l2vpn-svc:vpn-service"][0]["vpn-id"] = uuid_only
+       for site in tfs_request["ietf-l2vpn-svc:vpn-service"][0]["site"]:
+           if site is tfs_request["ietf-l2vpn-svc:vpn-service"][0]["site"][0]:
+               site["site-id"] = origin_router_id
+               site["site-location"] = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["node-id"]
+               site["site-network-access"]["interface"]["ip-address"] = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["sdp-ip-address"]
+           else:
+               site["site-id"] = destination_router_id
+               site["site-location"] = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["node-id"]
+               site["site-network-access"]["interface"]["ip-address"] = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["sdp-ip-address"]
+
+       self.answer[self.subnet]["QoS Requirements"] = []
+       for i in range(len(ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"])):
+            logging.info(self.answer[self.subnet])
+            self.answer[self.subnet]["QoS Requirements"].append(ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["bound"])
+
+       logging.info(f"Intent with VLAN {vlan_value} realized\n")
+       self.answer[self.subnet]["VLAN"] = vlan_value
+       logging.info(tfs_request)
+       with open(os.path.join(TEMPLATES_PATH, "l2vpn_request.json"), "w") as archivo:
+           archivo.write(json.dumps(tfs_request,indent=2))
+       return tfs_request
+ 
+#    def __tfs_l2vpn(self, ietf_intent):
+#        """
+#        Translate slice intent into a TeraFlow service request.
+#
+#        This method prepares a L2VPN service request by:
+#        1. Defining endpoint routers
+#        2. Loading a service template
+#        3. Generating a unique service UUID
+#        4. Configuring service endpoints
+#        5. Adding QoS constraints
+#        6. Preparing configuration rules for network interfaces
+#
+#        Args:
+#            ietf_intent (dict): IETF-formatted network slice intent.
+#
+#        Returns:
+#            dict: A TeraFlow service request for L2VPN configuration.
+#
+#        """
+#        # Hardcoded router endpoints
+#        # TODO (should be dynamically determined)
+#        origin_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
+#        origin_router_if = 'eth2'
+#        destination_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
+#        destination_router_if = 'eth2'
+#
+#        # Extract QoS Profile from intent
+#        QoSProfile = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["id"]
+#
+#        vlan_value = 0
+#        
+#        # Load L2VPN service template
+#        self.__load_template(2, os.path.join(TEMPLATES_PATH, "ietfL2VPN_template"))
+#        tfs_request = json.loads(str(self.__teraflow_template))["services"][0]
+#
+#        # Generate unique service UUID
+#        tfs_request["service_id"]["service_uuid"]["uuid"] += "-" + str(int(datetime.now().timestamp() * 1e7))
+#
+#        # Configure service endpoints
+#        for endpoint in tfs_request["service_endpoint_ids"]:
+#            endpoint["device_id"]["device_uuid"]["uuid"] = origin_router_id if endpoint is tfs_request["service_endpoint_ids"][0] else destination_router_id
+#            endpoint["endpoint_uuid"]["uuid"] = origin_router_if if endpoint is tfs_request["service_endpoint_ids"][0] else destination_router_if
+#
+#        self.answer[self.subnet]["QoS Requirements"] = []
+#        # Add service constraints
+#        for i, constraint in enumerate(tfs_request["service_constraints"]):
+#            bound = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["bound"]
+#            self.answer[self.subnet]["QoS Requirements"].append(bound)
+#            constraint["custom"]["constraint_value"] = str(bound)
+#
+#        # Add configuration rules
+#        for i, config_rule in enumerate(tfs_request["service_config"]["config_rules"][1:], start=1):
+#            router_id = origin_router_id if i == 1 else destination_router_id
+#            router_if = origin_router_if if i == 1 else destination_router_if
+#            resource_value = config_rule["custom"]["resource_value"]
+#
+#            sdp_index = i - 1
+#            vlan_value = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][sdp_index]["service-match-criteria"]["match-criterion"][0]["value"]
+#            resource_value["vlan_id"] = int(vlan_value)
+#            resource_value["circuit_id"] = vlan_value
+#            resource_value["remote_router"] = destination_router_id if i == 1 else origin_router_id
+#            resource_value["ni_name"] = 'ELAN{:s}'.format(str(vlan_value))
+#            config_rule["custom"]["resource_key"] = f"/device[{router_id}]/endpoint[{router_if}]/settings"
+#
+#        # Log and store VLAN information
+#        logging.info(f"Intent with VLAN {vlan_value} realized\n")
+#        self.answer[self.subnet]["VLAN"] = vlan_value
+#        return tfs_request
+#    
     def __tfs_l2vpn_support(self, requests):
         """
         Configuration support for L2VPN with path selection based on MPLS traffic-engineering tunnels
@@ -1006,11 +1067,11 @@ class NSController:
             dict: A TeraFlow service request for L3VPN configuration.
         """
         # Hardcoded router endpoints
-        # TODO should be dynamically determined
+        # TODO (should be dynamically determined)
         origin_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
         origin_router_if = '0/0/0-GigabitEthernet0/0/0/0'
         destination_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
-        destination_router_if = '0/0/3-GigabitEthernet0/0/0/3'
+        destination_router_if = 'eth2'
         
         # Load L3VPN service template
         self.__load_template(2, os.path.join(TEMPLATES_PATH, "L3-VPN_template_empty.json"))
-- 
GitLab


From 4b4ae60160daa6c1e12ab2ad325e130ac62f557f Mon Sep 17 00:00:00 2001
From: rahhal <mrahhal@cttc.com>
Date: Thu, 26 Jun 2025 09:45:52 +0000
Subject: [PATCH 2/3] Challanege 1 - Use NBI instead of uploading templates to
 webui

---
 src/Constants.py                |  1 +
 src/helpers.py                  | 22 ++++++++--------------
 src/network_slice_controller.py |  8 +++++---
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/Constants.py b/src/Constants.py
index 62ec457..7fd1dae 100644
--- a/src/Constants.py
+++ b/src/Constants.py
@@ -50,6 +50,7 @@ PCE_EXTERNAL = False
 DUMMY_MODE = True
 # Teraflow IP
 TFS_IP = ips.get('TFS_IP')
+path = "restconf/data/ietf-l2vpn-svc:l2vpn-svc/vpn-services"
 # Flag to determine if additional L2VPN configuration support is required for deploying L2VPNs with path selection
 TFS_L2VPN_SUPPORT = False
 # IXIA NEII IP
diff --git a/src/helpers.py b/src/helpers.py
index 080238e..df4a30f 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -26,24 +26,18 @@ logging.basicConfig(
 #Teraflow
 class tfs_connector():
     
-    def simple_post(self, tfs_ip, service):
+    def simple_post(self, tfs_ip, service, path):
         user="admin"
         password="admin"
         token=""
-        session = requests.Session()
-        session.auth = (user, password)
-        url=f'http://{tfs_ip}/webui'
-        response=session.get(url=url)
-        for item in response.iter_lines():
-            if("csrf_token" in str(item)):
-                string=str(item).split('<input id="csrf_token" name="csrf_token" type="hidden" value=')[1]
-                token=string.split(">")[0].strip('"')
-        logging.debug("csrf token %s",token)
-
-        files = {'descriptors': ("data.json", json.dumps(service).encode("utf-8"), "application/json")}
+        url = f'http://{tfs_ip}/{path}'
+        logging.info(service)
+        headers = {'Content-Type': 'application/json'}
+        json_data = json.dumps(service)
+        json_decoded = json_data
         token={'csrf_token':token}
-        response = session.post(url,files=files,data=token,timeout=60)
-        logging.debug("Http response: %s",response.text)
+        response = requests.post(url,headers=headers,data=json_decoded,timeout=60)
+        logging.info(response.text)
         return response
 
 #CISCO
diff --git a/src/network_slice_controller.py b/src/network_slice_controller.py
index fd7dfcc..05e4517 100644
--- a/src/network_slice_controller.py
+++ b/src/network_slice_controller.py
@@ -17,7 +17,7 @@
 import json, time, os, logging, uuid, traceback, sys
 from datetime import datetime
 from src.helpers import tfs_connector, cisco_connector
-from src.Constants import DEFAULT_LOGGING_LEVEL, TFS_IP, TFS_L2VPN_SUPPORT, IXIA_IP, SRC_PATH, TEMPLATES_PATH, DUMMY_MODE, DUMP_TEMPLATES, PLANNER_ENABLED, NRP_ENABLED
+from src.Constants import DEFAULT_LOGGING_LEVEL, TFS_IP, TFS_L2VPN_SUPPORT, IXIA_IP, SRC_PATH, TEMPLATES_PATH, DUMMY_MODE, DUMP_TEMPLATES, PLANNER_ENABLED, NRP_ENABLED, path, path_l3
 from src.realizers.ixia.NEII_V4 import NEII_controller
 from src.planner.planner import Planner
 
@@ -42,7 +42,7 @@ class NSController:
     - Slice Realization: Convert intents to specific network configurations (L2VPN, L3VPN)
     """
 
-    def __init__(self, controller_type = "TFS", tfs_ip=TFS_IP, ixia_ip =IXIA_IP, need_l2vpn_support=TFS_L2VPN_SUPPORT):
+    def __init__(self, controller_type = "TFS", tfs_ip=TFS_IP, ixia_ip =IXIA_IP, need_l2vpn_support=TFS_L2VPN_SUPPORT, path=path):
         """
         Initialize the Network Slice Controller.
 
@@ -61,6 +61,8 @@ class NSController:
         """
         self.controller_type = controller_type
         self.tfs_ip = tfs_ip
+        self.path = path
+        self.path_l3 = path_l3
         self.answer = {}
         self.cool_answer = {}
         self.start_time = 0
@@ -298,7 +300,7 @@ class NSController:
             # Optional: Upload template to Teraflow
             if not DUMMY_MODE:
                 if self.controller_type == "TFS":
-                    response = tfs_connector().simple_post(self.tfs_ip, requests)
+                    response = tfs_connector().simple_post(self.tfs_ip, requests, self.path)
 
                     if not response.ok:
                         return self.__send_response(False, code=response.status_code, message=f"Teraflow upload failed. Response: {response.text}")
-- 
GitLab


From e01a219d20f0a4e2a6fb4747565f072e89dbe3ee Mon Sep 17 00:00:00 2001
From: jvelazquezm <j.velazquezm@alumnos.upm.es>
Date: Mon, 25 Aug 2025 14:50:10 +0200
Subject: [PATCH 3/3] Modify code to support both webui and nbi TFS uploads

---
 src/Constants.py                      |  7 +--
 src/helpers.py                        | 34 +++++++++---
 src/network_slice_controller.py       | 75 ++++++++++++++-------------
 src/templates/ietfL2VPN_template.json | 66 +++++++++++------------
 4 files changed, 101 insertions(+), 81 deletions(-)

diff --git a/src/Constants.py b/src/Constants.py
index 7fd1dae..fee596b 100644
--- a/src/Constants.py
+++ b/src/Constants.py
@@ -17,7 +17,7 @@
 import logging, os, json
 
 # Default logging level
-DEFAULT_LOGGING_LEVEL = logging.DEBUG
+DEFAULT_LOGGING_LEVEL = logging.INFO
 
 # Default port for NSC deployment
 NSC_PORT = 8081
@@ -47,10 +47,11 @@ PCE_EXTERNAL = False
 
 # Controller Flags
 # If True, config is not sent to controllers
-DUMMY_MODE = True
+DUMMY_MODE = False
 # Teraflow IP
 TFS_IP = ips.get('TFS_IP')
-path = "restconf/data/ietf-l2vpn-svc:l2vpn-svc/vpn-services"
+UPLOAD_TYPE = "NBI"  # "WEBUI" or "NBI"
+NBI_L2_PATH = "restconf/data/ietf-l2vpn-svc:l2vpn-svc/vpn-services"
 # Flag to determine if additional L2VPN configuration support is required for deploying L2VPNs with path selection
 TFS_L2VPN_SUPPORT = False
 # IXIA NEII IP
diff --git a/src/helpers.py b/src/helpers.py
index df4a30f..0e15079 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -26,18 +26,40 @@ logging.basicConfig(
 #Teraflow
 class tfs_connector():
     
-    def simple_post(self, tfs_ip, service, path):
+    def webui_post(self, tfs_ip, service):
         user="admin"
         password="admin"
         token=""
+        session = requests.Session()
+        session.auth = (user, password)
+        url=f'http://{tfs_ip}/webui'
+        response=session.get(url=url)
+        for item in response.iter_lines():
+            if("csrf_token" in str(item)):
+                string=str(item).split('<input id="csrf_token" name="csrf_token" type="hidden" value=')[1]
+                token=string.split(">")[0].strip('"')
+        logging.debug("csrf token %s",token)
+
+        files = {'descriptors': ("data.json", json.dumps(service).encode("utf-8"), "application/json")}
+        token={'csrf_token':token}
+        response = session.post(url,files=files,data=token,timeout=60)
+        logging.debug("Http response: %s",response.text)
+        return response
+
+    def nbi_post(self, tfs_ip, service, path):
+        token=""
+        user="admin"
+        password="admin"
+        token=""
+        session = requests.Session()
+        session.auth = (user, password)
         url = f'http://{tfs_ip}/{path}'
-        logging.info(service)
         headers = {'Content-Type': 'application/json'}
-        json_data = json.dumps(service)
-        json_decoded = json_data
+        data = json.dumps(service)
+        logging.debug("Posting to TFS NBI: %s",data)
         token={'csrf_token':token}
-        response = requests.post(url,headers=headers,data=json_decoded,timeout=60)
-        logging.info(response.text)
+        response = session.post(url,headers=headers,data=data,timeout=60)
+        logging.debug("Http response: %s",response.text)
         return response
 
 #CISCO
diff --git a/src/network_slice_controller.py b/src/network_slice_controller.py
index f8a9bce..55a3389 100644
--- a/src/network_slice_controller.py
+++ b/src/network_slice_controller.py
@@ -17,7 +17,7 @@
 import json, time, os, logging, uuid, traceback, sys
 from datetime import datetime
 from src.helpers import tfs_connector, cisco_connector
-from src.Constants import DEFAULT_LOGGING_LEVEL, TFS_IP, TFS_L2VPN_SUPPORT, IXIA_IP, SRC_PATH, TEMPLATES_PATH, DUMMY_MODE, DUMP_TEMPLATES, PLANNER_ENABLED, NRP_ENABLED, path, path_l3
+from src.Constants import DEFAULT_LOGGING_LEVEL, TFS_IP, TFS_L2VPN_SUPPORT, IXIA_IP, SRC_PATH, TEMPLATES_PATH, DUMMY_MODE, DUMP_TEMPLATES, PLANNER_ENABLED, NRP_ENABLED, UPLOAD_TYPE, NBI_L2_PATH
 from src.realizers.ixia.NEII_V4 import NEII_controller
 from src.planner.planner import Planner
 
@@ -42,7 +42,7 @@ class NSController:
     - Slice Realization: Convert intents to specific network configurations (L2VPN, L3VPN)
     """
 
-    def __init__(self, controller_type = "TFS", tfs_ip=TFS_IP, ixia_ip =IXIA_IP, need_l2vpn_support=TFS_L2VPN_SUPPORT, path=path):
+    def __init__(self, controller_type = "TFS", tfs_ip=TFS_IP, ixia_ip =IXIA_IP, need_l2vpn_support=TFS_L2VPN_SUPPORT, path=NBI_L2_PATH):
         """
         Initialize the Network Slice Controller.
 
@@ -62,7 +62,6 @@ class NSController:
         self.controller_type = controller_type
         self.tfs_ip = tfs_ip
         self.path = path
-        self.path_l3 = path_l3
         self.answer = {}
         self.cool_answer = {}
         self.start_time = 0
@@ -300,7 +299,10 @@ class NSController:
             # Optional: Upload template to Teraflow
             if not DUMMY_MODE:
                 if self.controller_type == "TFS":
-                    response = tfs_connector().simple_post(self.tfs_ip, requests, self.path)
+                    if UPLOAD_TYPE == "WEBUI":
+                        response = tfs_connector().webui_post(self.tfs_ip, requests)
+                    elif UPLOAD_TYPE == "NBI":
+                        response = tfs_connector().nbi_post(self.tfs_ip, requests, self.path)
 
                     if not response.ok:
                         return self.__send_response(False, code=response.status_code, message=f"Teraflow upload failed. Response: {response.text}")
@@ -494,7 +496,6 @@ class NSController:
                 "setup_time": self.setup_time
             }
             # Add slice details to the response
-            logging.info(self.answer)
             for subnet in self.answer:
                 slice_info = {
                     "id": subnet,
@@ -825,49 +826,49 @@ class NSController:
             logging.warning(f"Unsupported controller: {controller}. Defaulting to TFS L2VPN realization.")
             realizing_request = self.__tfs_l2vpn(ietf_intent)
         return realizing_request
+    
     def __tfs_l2vpn(self, ietf_intent):
-       """
-       Translate slice intent into a TeraFlow service request.
+        """
+        Translate slice intent into a TeraFlow service request.
 
-       This method prepares a L2VPN service request by:
-       1. Defining endpoint routers
-       2. Loading a service template
-       3. Generating a unique service UUID
-       4. Configuring service endpoints
-       5. Adding QoS constraints
-       6. Preparing configuration rules for network interfaces
+        This method prepares a L2VPN service request by:
+        1. Defining endpoint routers
+        2. Loading a service template
+        3. Generating a unique service UUID
+        4. Configuring service endpoints
+        5. Adding QoS constraints
+        6. Preparing configuration rules for network interfaces
 
-       Args:
-           ietf_intent (dict): IETF-formatted network slice intent.
+        Args:
+            ietf_intent (dict): IETF-formatted network slice intent.
 
-       Returns:
-           dict: A TeraFlow service request for L2VPN configuration.
+        Returns:
+            dict: A TeraFlow service request for L2VPN configuration.
 
         """
         # Hardcoded router endpoints
         # TODO (should be dynamically determined)
         origin_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
-        origin_router_if = 'eth2'
+        origin_router_if = '0/0/0-GigabitEthernet0/0/0/0'
         destination_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
         destination_router_if = '0/0/0-GigabitEthernet0/0/0/0'
 
-       # Extract QoS Profile from intent
-       QoSProfile = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["id"]
-       vlan_value = 0
-       self.__load_template(2, os.path.join(TEMPLATES_PATH, "ietfL2VPN_template.json"))
-       tfs_request = json.loads(str(self.__teraflow_template))
-       full_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["id"]
-       uuid_only = full_id.split("slice-service-")[-1]
-       tfs_request["ietf-l2vpn-svc:vpn-service"][0]["vpn-id"] = uuid_only
-       for site in tfs_request["ietf-l2vpn-svc:vpn-service"][0]["site"]:
-           if site is tfs_request["ietf-l2vpn-svc:vpn-service"][0]["site"][0]:
-               site["site-id"] = origin_router_id
-               site["site-location"] = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["node-id"]
-               site["site-network-access"]["interface"]["ip-address"] = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["sdp-ip-address"]
-           else:
-               site["site-id"] = destination_router_id
-               site["site-location"] = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["node-id"]
-               site["site-network-access"]["interface"]["ip-address"] = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["sdp-ip-address"]
+        # Extract QoS Profile from intent
+        QoSProfile = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["id"]
+
+        vlan_value = 0
+        
+        # Load L2VPN service template
+        self.__load_template(2, os.path.join(TEMPLATES_PATH, "L2-VPN_template_empty.json"))
+        tfs_request = json.loads(str(self.__teraflow_template))["services"][0]
+
+        # Generate unique service UUID
+        tfs_request["service_id"]["service_uuid"]["uuid"] += "-" + str(int(datetime.now().timestamp() * 1e7))
+
+        # Configure service endpoints
+        for endpoint in tfs_request["service_endpoint_ids"]:
+            endpoint["device_id"]["device_uuid"]["uuid"] = origin_router_id if endpoint is tfs_request["service_endpoint_ids"][0] else destination_router_id
+            endpoint["endpoint_uuid"]["uuid"] = origin_router_if if endpoint is tfs_request["service_endpoint_ids"][0] else destination_router_if
 
         self.answer[self.subnet]["QoS Requirements"] = []
         # Add service constraints
@@ -993,7 +994,7 @@ class NSController:
             dict: A TeraFlow service request for L3VPN configuration.
         """
         # Hardcoded router endpoints
-        # TODO (should be dynamically determined)
+        # TODO should be dynamically determined
         origin_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
         origin_router_if = '0/0/0-GigabitEthernet0/0/0/0'
         destination_router_id = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][1]["attachment-circuits"]["attachment-circuit"][0]["sdp-peering"]["peer-sap-id"]
diff --git a/src/templates/ietfL2VPN_template.json b/src/templates/ietfL2VPN_template.json
index 79037c2..6430e40 100644
--- a/src/templates/ietfL2VPN_template.json
+++ b/src/templates/ietfL2VPN_template.json
@@ -1,38 +1,34 @@
 {
-    "l2vpn": {
-      "vpn-services": {
-        "vpn-service": [
-          {
-            "vpn-id": 100,
-            "name": "VPN_L2_Example",
-            "vpn-type": "point-to-point",
-            "site": [
-              {
-                "site-id": 1,
-                "site-role": "hub",
-                "site-location": "R4",
-                "site-network-access": {
-                  "interface": {
-                    "ip-address": "4.4.4.4",
-                    "encapsulation": "ethernet"
-                  }
-                }
-              },
-              {
-                "site-id": 2,
-                "site-role": "spoke",
-                "site-location": "R5",
-                "site-network-access": {
-                  "interface": {
-                    "ip-address": "5.5.5.5",
-                    "encapsulation": "ethernet"
-                  }
-                }
-              }
-            ]
+  "ietf-l2vpn-svc:vpn-service": [
+    {
+      "vpn-id": "11327140-7361-41b3-aa45-e84a7fb40be9",
+      "customer-name": "osm",
+      "vpn-svc-type": "vpws",
+      "svc-topo": "any-to-any",
+      "site": [
+        {
+          "site-id": "1.1.1.1",
+          "site-role": "hub",
+          "site-location": "CU-N2",
+          "site-network-access": {
+            "interface": {
+              "ip-address": "10.60.11.3",
+              "encapsulation": "ethernet"
+            }
           }
-        ]
-      }
+        },
+        {
+          "site-id": "3.3.3.3",
+          "site-role": "spoke",
+          "site-location": "AMF-N2",
+          "site-network-access": {
+            "interface": {
+              "ip-address": "10.60.60.105",
+              "encapsulation": "ethernet"
+            }
+          }
+        }
+      ]
     }
-  }
-  
\ No newline at end of file
+  ]
+}
-- 
GitLab