From fc16b40610986249153e18fc9650469671b46b95 Mon Sep 17 00:00:00 2001
From: rahhal <mrahhal@cttc.com>
Date: Thu, 26 Jun 2025 10:05:08 +0000
Subject: [PATCH 1/3] =?UTF-8?q?Challenge=20#3=20=E2=80=93=20L2VPN=20Suppor?=
 =?UTF-8?q?t=20-=20Change=20L2VPN=20realizer=20to=20use=20IETF=20L2NM=20YA?=
 =?UTF-8?q?NG=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 our-temp/ietf-l3vpn-service.json |  83 ++++++++++++
 src/Constants.py                 |   9 +-
 src/helpers.py                   |  47 ++++---
 src/network_slice_controller.py  | 209 ++++++++++++++++++++-----------
 src/templates/l2vpn_request.json |  34 +++++
 5 files changed, 289 insertions(+), 93 deletions(-)
 create mode 100644 our-temp/ietf-l3vpn-service.json
 create mode 100644 src/templates/l2vpn_request.json

diff --git a/our-temp/ietf-l3vpn-service.json b/our-temp/ietf-l3vpn-service.json
new file mode 100644
index 0000000..9eb70db
--- /dev/null
+++ b/our-temp/ietf-l3vpn-service.json
@@ -0,0 +1,83 @@
+{
+    "ietf-l3vpn-svc:l3vpn-svc": {
+        "vpn-services": {"vpn-service": [{"vpn-id": "ietf-l3vpn-svc"}]},
+        "sites": {
+            "site": [
+                {
+                    "site-id": "site_DC1",
+                    "management": {"type": "ietf-l3vpn-svc:provider-managed"},
+                    "locations": {"location": [{"location-id": "DC1"}]},
+                    "devices": {"device": [{"device-id": "dc1", "location": "DC1"}]},
+                    "site-network-accesses": {
+                        "site-network-access": [
+                            {
+                                "site-network-access-id": "eth1",
+                                "site-network-access-type": "ietf-l3vpn-svc:multipoint",
+                                "device-reference": "dc1",
+                                "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:spoke-role"},
+                                "ip-connection": {
+                                    "ipv4": {
+                                        "address-allocation-type": "ietf-l3vpn-svc:static-address",
+                                        "addresses": {
+                                            "provider-address": "192.168.1.1",
+                                            "customer-address": "192.168.1.10",
+                                            "prefix-length": 24
+                                        }
+                                    }
+                                },
+                                "service": {
+                                    "svc-mtu": 1500,
+                                    "svc-input-bandwidth": 1000000000,
+                                    "svc-output-bandwidth": 1000000000,
+                                    "qos": {"qos-profile": {"classes": {"class": [{
+                                        "class-id": "qos-realtime",
+                                        "direction": "ietf-l3vpn-svc:both",
+                                        "latency": {"latency-boundary": 10},
+                                        "bandwidth": {"guaranteed-bw-percent": 100}
+                                    }]}}}
+                                }
+                            }
+                        ]
+                    }
+                },
+                {
+                    "site-id": "site_DC2",
+                    "management": {"type": "ietf-l3vpn-svc:provider-managed"},
+                    "locations": {"location": [{"location-id": "DC2"}]},
+                    "devices": {"device": [{"device-id": "dc2", "location": "DC2"}]},
+                    "site-network-accesses": {
+                        "site-network-access": [
+                            {
+                                "site-network-access-id": "eth1",
+                                "site-network-access-type": "ietf-l3vpn-svc:multipoint",
+                                "device-reference": "dc2",
+                                "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:hub-role"},
+                                "ip-connection": {
+                                    "ipv4": {
+                                        "address-allocation-type": "ietf-l3vpn-svc:static-address",
+                                        "addresses": {
+                                            "provider-address": "192.168.2.1",
+                                            "customer-address": "192.168.2.10",
+                                            "prefix-length": 24
+                                        }
+                                    }
+                                },
+                                "service": {
+                                    "svc-mtu": 1500,
+                                    "svc-input-bandwidth": 1000000000,
+                                    "svc-output-bandwidth": 1000000000,
+                                    "qos": {"qos-profile": {"classes": {"class": [{
+                                        "class-id": "qos-realtime",
+                                        "direction": "ietf-l3vpn-svc:both",
+                                        "latency": {"latency-boundary": 10},
+                                        "bandwidth": {"guaranteed-bw-percent": 100}
+                                    }]}}}
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/src/Constants.py b/src/Constants.py
index 337be88..d5e54f7 100644
--- a/src/Constants.py
+++ b/src/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
+# Copyright 2025 Telefonica Innovación Digital S.L.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is an original contribution from Telefonica Innovación Digital S.L.
-
 import logging, os
 # Default logging level
 DEFAULT_LOGGING_LEVEL = logging.INFO
@@ -33,5 +31,10 @@ 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"
+#path_l3 = "restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services"
+
+#json_file = "/home/tfs/nsc-hackfest7/src/hackfest7/slice_request.json"
+#/home/tfs/nsc-hackfest7/src/hackfest7/slice_request.json
 # 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 47adc16..4fcf2bb 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
+# Copyright 2025 Telefonica Innovación Digital S.L.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 import logging, requests, json
 from netmiko import ConnectHandler
 from src.Constants import DEFAULT_LOGGING_LEVEL
+from requests.auth import HTTPBasicAuth
 
 # Configure logging to provide clear and informative log messages
 logging.basicConfig(
@@ -23,25 +24,39 @@ logging.basicConfig(
 
 #Teraflow
 class tfs_connector():
-    
-    def simple_post(self, tfs_ip, service):
+    #curl -X POST -H "Content-Type: application/json" --user "admin:admin" --data @ietf-l3vpn-service.json http://10.1.7.197/restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services
+
+    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")}
+        #session = requests.Session()
+        #session.auth = (user, password)
+        #url = f'http://{tfs_ip}/{path}'
+        url_l2 = f'http://{user}:{password}@{tfs_ip}/{path}'
+        #url_l3 = f'http://{user}:{password}@{tfs_ip}/{path_l3}'
+        logging.info(service)
+        #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")}
+        headers = {'Content-Type': 'application/json'}
+        json_data = json.dumps(service)
+        #json_url="/home/tfs/nsc-hackfest7/our-temp/ietf-l3vpn-service.json"
+        #with open(json_url, 'r', encoding="UTF-8") as file:
+        #    json_data = json.load(file)
+        #    logging.debug("this is the JSON data that we have")
+        #    logging.debug(json_data)
+        #    json_decoded = json.dumps(json_data)
+        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_l2, headers=headers, data=json_decoded, timeout=60)
+        logging.info(response.text)
+        #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 7d14114..8a4de08 100644
--- a/src/network_slice_controller.py
+++ b/src/network_slice_controller.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
+# Copyright 2025 Telefonica Innovación Digital S.L.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -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"))
diff --git a/src/templates/l2vpn_request.json b/src/templates/l2vpn_request.json
new file mode 100644
index 0000000..ec935e8
--- /dev/null
+++ b/src/templates/l2vpn_request.json
@@ -0,0 +1,34 @@
+{
+  "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


From c9ae55eb708854fd67b73410a4f8715e64b3aa57 Mon Sep 17 00:00:00 2001
From: rahhal <mrahhal@cttc.com>
Date: Thu, 26 Jun 2025 10:05:08 +0000
Subject: [PATCH 2/3] =?UTF-8?q?Challenge=20#3=20=E2=80=93=20L2VPN=20Suppor?=
 =?UTF-8?q?t=20-=20Change=20L2VPN=20realizer=20to=20use=20IETF=20L2NM=20YA?=
 =?UTF-8?q?NG=20model?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 our-temp/ietf-l3vpn-service.json |  83 +++++++++++++++++++++++++
 src/Constants.py                 |   4 +-
 src/helpers.py                   |  42 ++++++++-----
 src/network_slice_controller.py  | 103 ++++++++++++++++---------------
 src/templates/l2vpn_request.json |  34 ++++++++++
 5 files changed, 199 insertions(+), 67 deletions(-)
 create mode 100644 our-temp/ietf-l3vpn-service.json
 create mode 100644 src/templates/l2vpn_request.json

diff --git a/our-temp/ietf-l3vpn-service.json b/our-temp/ietf-l3vpn-service.json
new file mode 100644
index 0000000..9eb70db
--- /dev/null
+++ b/our-temp/ietf-l3vpn-service.json
@@ -0,0 +1,83 @@
+{
+    "ietf-l3vpn-svc:l3vpn-svc": {
+        "vpn-services": {"vpn-service": [{"vpn-id": "ietf-l3vpn-svc"}]},
+        "sites": {
+            "site": [
+                {
+                    "site-id": "site_DC1",
+                    "management": {"type": "ietf-l3vpn-svc:provider-managed"},
+                    "locations": {"location": [{"location-id": "DC1"}]},
+                    "devices": {"device": [{"device-id": "dc1", "location": "DC1"}]},
+                    "site-network-accesses": {
+                        "site-network-access": [
+                            {
+                                "site-network-access-id": "eth1",
+                                "site-network-access-type": "ietf-l3vpn-svc:multipoint",
+                                "device-reference": "dc1",
+                                "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:spoke-role"},
+                                "ip-connection": {
+                                    "ipv4": {
+                                        "address-allocation-type": "ietf-l3vpn-svc:static-address",
+                                        "addresses": {
+                                            "provider-address": "192.168.1.1",
+                                            "customer-address": "192.168.1.10",
+                                            "prefix-length": 24
+                                        }
+                                    }
+                                },
+                                "service": {
+                                    "svc-mtu": 1500,
+                                    "svc-input-bandwidth": 1000000000,
+                                    "svc-output-bandwidth": 1000000000,
+                                    "qos": {"qos-profile": {"classes": {"class": [{
+                                        "class-id": "qos-realtime",
+                                        "direction": "ietf-l3vpn-svc:both",
+                                        "latency": {"latency-boundary": 10},
+                                        "bandwidth": {"guaranteed-bw-percent": 100}
+                                    }]}}}
+                                }
+                            }
+                        ]
+                    }
+                },
+                {
+                    "site-id": "site_DC2",
+                    "management": {"type": "ietf-l3vpn-svc:provider-managed"},
+                    "locations": {"location": [{"location-id": "DC2"}]},
+                    "devices": {"device": [{"device-id": "dc2", "location": "DC2"}]},
+                    "site-network-accesses": {
+                        "site-network-access": [
+                            {
+                                "site-network-access-id": "eth1",
+                                "site-network-access-type": "ietf-l3vpn-svc:multipoint",
+                                "device-reference": "dc2",
+                                "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:hub-role"},
+                                "ip-connection": {
+                                    "ipv4": {
+                                        "address-allocation-type": "ietf-l3vpn-svc:static-address",
+                                        "addresses": {
+                                            "provider-address": "192.168.2.1",
+                                            "customer-address": "192.168.2.10",
+                                            "prefix-length": 24
+                                        }
+                                    }
+                                },
+                                "service": {
+                                    "svc-mtu": 1500,
+                                    "svc-input-bandwidth": 1000000000,
+                                    "svc-output-bandwidth": 1000000000,
+                                    "qos": {"qos-profile": {"classes": {"class": [{
+                                        "class-id": "qos-realtime",
+                                        "direction": "ietf-l3vpn-svc:both",
+                                        "latency": {"latency-boundary": 10},
+                                        "bandwidth": {"guaranteed-bw-percent": 100}
+                                    }]}}}
+                                }
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    }
+}
diff --git a/src/Constants.py b/src/Constants.py
index fee596b..e038b5b 100644
--- a/src/Constants.py
+++ b/src/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
+# Copyright 2025 Telefonica Innovación Digital S.L.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# This file is an original contribution from Telefonica Innovación Digital S.L.
+# This file includes original contributions from Telefonica Innovación Digital S.L.
 
 import logging, os, json
 
diff --git a/src/helpers.py b/src/helpers.py
index 0e15079..928a6b5 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
+# Copyright 2025 Telefonica Innovación Digital S.L.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 import logging, requests, json
 from netmiko import ConnectHandler
 from src.Constants import DEFAULT_LOGGING_LEVEL
+from requests.auth import HTTPBasicAuth
 
 # Configure logging to provide clear and informative log messages
 logging.basicConfig(
@@ -30,20 +31,33 @@ 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")}
+        #session = requests.Session()
+        #session.auth = (user, password)
+        #url = f'http://{tfs_ip}/{path}'
+        url_l2 = f'http://{user}:{password}@{tfs_ip}/{path}'
+        #url_l3 = f'http://{user}:{password}@{tfs_ip}/{path_l3}'
+        logging.info(service)
+        #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")}
+        headers = {'Content-Type': 'application/json'}
+        json_data = json.dumps(service)
+        #json_url="/home/tfs/nsc-hackfest7/our-temp/ietf-l3vpn-service.json"
+        #with open(json_url, 'r', encoding="UTF-8") as file:
+        #    json_data = json.load(file)
+        #    logging.debug("this is the JSON data that we have")
+        #    logging.debug(json_data)
+        #    json_decoded = json.dumps(json_data)
+        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_l2, headers=headers, data=json_decoded, timeout=60)
+        logging.info(response.text)
+        #logging.debug("Http response: %s",response.text)
         return response
 
     def nbi_post(self, tfs_ip, service, path):
diff --git a/src/network_slice_controller.py b/src/network_slice_controller.py
index 55a3389..3b1727d 100644
--- a/src/network_slice_controller.py
+++ b/src/network_slice_controller.py
@@ -1,4 +1,4 @@
-# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
+# Copyright 2025 Telefonica Innovación Digital S.L.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -496,6 +496,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,
@@ -826,7 +827,6 @@ 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.
@@ -849,61 +849,62 @@ class NSController:
         # 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/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
-        
-        # 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(ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"]):
-            bound = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["bound"]
-            metric_type = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["metric-type"]
-            metric_unit = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["metric-unit"]
-            service_constraint ={
-                "custom": {
-                    "constraint_type": f"{metric_type}[{metric_unit}]",
-                    "constraint_value": f"{bound}"
+        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"] = []
+            # Add service constraints
+            for i, constraint in enumerate(ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"]):
+                bound = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["bound"]
+                metric_type = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["metric-type"]
+                metric_unit = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["metric-unit"]
+                service_constraint ={
+                    "custom": {
+                        "constraint_type": f"{metric_type}[{metric_unit}]",
+                        "constraint_value": f"{bound}"
+                    }
                 }
-            }
-            self.answer[self.subnet]["QoS Requirements"].append(service_constraint["custom"])
-            tfs_request["service_constraints"].append(service_constraint)
-
-        # 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"]
-            if vlan_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"L2VPN Intent realized\n")
-        self.answer[self.subnet]["VLAN"] = vlan_value
-        return tfs_request
+                self.answer[self.subnet]["QoS Requirements"].append(service_constraint["custom"])
+                tfs_request["service_constraints"].append(service_constraint)
+
+            # 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"]
+                if vlan_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"L2VPN Intent realized\n")
+            self.answer[self.subnet]["VLAN"] = vlan_value
+            return tfs_request
     
     def __tfs_l2vpn_support(self, requests):
         """
@@ -994,7 +995,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/l2vpn_request.json b/src/templates/l2vpn_request.json
new file mode 100644
index 0000000..ec935e8
--- /dev/null
+++ b/src/templates/l2vpn_request.json
@@ -0,0 +1,34 @@
+{
+  "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


From d545ab9b4098ec8c1818861356b9fe334552af1a Mon Sep 17 00:00:00 2001
From: velazquez <j.velamar@telefonica.com>
Date: Tue, 26 Aug 2025 12:28:14 +0200
Subject: [PATCH 3/3] Modify code to realize l2vpn slices depending on the flag
 (webUI or NBI)

---
 our-temp/ietf-l3vpn-service.json              |  83 --------
 src/Constants.py                              |  12 +-
 src/helpers.py                                |  42 ++--
 src/network_slice_controller.py               | 128 ++++++------
 ...ate.json => ietfL2VPN_template_empty.json} |  16 +-
 src/templates/ietfL3VPN_template.json         | 184 ------------------
 src/templates/l2vpn_request.json              |  34 ----
 7 files changed, 100 insertions(+), 399 deletions(-)
 delete mode 100644 our-temp/ietf-l3vpn-service.json
 rename src/templates/{ietfL2VPN_template.json => ietfL2VPN_template_empty.json} (58%)
 delete mode 100644 src/templates/ietfL3VPN_template.json
 delete mode 100644 src/templates/l2vpn_request.json

diff --git a/our-temp/ietf-l3vpn-service.json b/our-temp/ietf-l3vpn-service.json
deleted file mode 100644
index 9eb70db..0000000
--- a/our-temp/ietf-l3vpn-service.json
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-    "ietf-l3vpn-svc:l3vpn-svc": {
-        "vpn-services": {"vpn-service": [{"vpn-id": "ietf-l3vpn-svc"}]},
-        "sites": {
-            "site": [
-                {
-                    "site-id": "site_DC1",
-                    "management": {"type": "ietf-l3vpn-svc:provider-managed"},
-                    "locations": {"location": [{"location-id": "DC1"}]},
-                    "devices": {"device": [{"device-id": "dc1", "location": "DC1"}]},
-                    "site-network-accesses": {
-                        "site-network-access": [
-                            {
-                                "site-network-access-id": "eth1",
-                                "site-network-access-type": "ietf-l3vpn-svc:multipoint",
-                                "device-reference": "dc1",
-                                "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:spoke-role"},
-                                "ip-connection": {
-                                    "ipv4": {
-                                        "address-allocation-type": "ietf-l3vpn-svc:static-address",
-                                        "addresses": {
-                                            "provider-address": "192.168.1.1",
-                                            "customer-address": "192.168.1.10",
-                                            "prefix-length": 24
-                                        }
-                                    }
-                                },
-                                "service": {
-                                    "svc-mtu": 1500,
-                                    "svc-input-bandwidth": 1000000000,
-                                    "svc-output-bandwidth": 1000000000,
-                                    "qos": {"qos-profile": {"classes": {"class": [{
-                                        "class-id": "qos-realtime",
-                                        "direction": "ietf-l3vpn-svc:both",
-                                        "latency": {"latency-boundary": 10},
-                                        "bandwidth": {"guaranteed-bw-percent": 100}
-                                    }]}}}
-                                }
-                            }
-                        ]
-                    }
-                },
-                {
-                    "site-id": "site_DC2",
-                    "management": {"type": "ietf-l3vpn-svc:provider-managed"},
-                    "locations": {"location": [{"location-id": "DC2"}]},
-                    "devices": {"device": [{"device-id": "dc2", "location": "DC2"}]},
-                    "site-network-accesses": {
-                        "site-network-access": [
-                            {
-                                "site-network-access-id": "eth1",
-                                "site-network-access-type": "ietf-l3vpn-svc:multipoint",
-                                "device-reference": "dc2",
-                                "vpn-attachment": {"vpn-id": "ietf-l3vpn-svc", "site-role": "ietf-l3vpn-svc:hub-role"},
-                                "ip-connection": {
-                                    "ipv4": {
-                                        "address-allocation-type": "ietf-l3vpn-svc:static-address",
-                                        "addresses": {
-                                            "provider-address": "192.168.2.1",
-                                            "customer-address": "192.168.2.10",
-                                            "prefix-length": 24
-                                        }
-                                    }
-                                },
-                                "service": {
-                                    "svc-mtu": 1500,
-                                    "svc-input-bandwidth": 1000000000,
-                                    "svc-output-bandwidth": 1000000000,
-                                    "qos": {"qos-profile": {"classes": {"class": [{
-                                        "class-id": "qos-realtime",
-                                        "direction": "ietf-l3vpn-svc:both",
-                                        "latency": {"latency-boundary": 10},
-                                        "bandwidth": {"guaranteed-bw-percent": 100}
-                                    }]}}}
-                                }
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-    }
-}
diff --git a/src/Constants.py b/src/Constants.py
index 39a51bd..b05deea 100644
--- a/src/Constants.py
+++ b/src/Constants.py
@@ -1,4 +1,4 @@
-# Copyright 2025 Telefonica Innovación Digital S.L.
+# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -12,6 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# This file includes original contributions from Telefonica Innovación Digital S.L.
+
+import logging, os, json
+
 # Default logging level
 DEFAULT_LOGGING_LEVEL = logging.INFO
 
@@ -44,12 +48,16 @@ PCE_EXTERNAL = False
 # Controller Flags
 # If True, config is not sent to controllers
 DUMMY_MODE = False
+
+#####TERAFLOW#####
 # Teraflow IP
 TFS_IP = ips.get('TFS_IP')
-UPLOAD_TYPE = "NBI"  # "WEBUI" or "NBI"
+UPLOAD_TYPE = "WEBUI"  # "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#####
 # IXIA NEII IP
 IXIA_IP = ips.get('IXIA_IP')
 
diff --git a/src/helpers.py b/src/helpers.py
index 928a6b5..0e15079 100644
--- a/src/helpers.py
+++ b/src/helpers.py
@@ -1,4 +1,4 @@
-# Copyright 2025 Telefonica Innovación Digital S.L.
+# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 import logging, requests, json
 from netmiko import ConnectHandler
 from src.Constants import DEFAULT_LOGGING_LEVEL
-from requests.auth import HTTPBasicAuth
 
 # Configure logging to provide clear and informative log messages
 logging.basicConfig(
@@ -31,33 +30,20 @@ class tfs_connector():
         user="admin"
         password="admin"
         token=""
-        #session = requests.Session()
-        #session.auth = (user, password)
-        #url = f'http://{tfs_ip}/{path}'
-        url_l2 = f'http://{user}:{password}@{tfs_ip}/{path}'
-        #url_l3 = f'http://{user}:{password}@{tfs_ip}/{path_l3}'
-        logging.info(service)
-        #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")}
-        headers = {'Content-Type': 'application/json'}
-        json_data = json.dumps(service)
-        #json_url="/home/tfs/nsc-hackfest7/our-temp/ietf-l3vpn-service.json"
-        #with open(json_url, 'r', encoding="UTF-8") as file:
-        #    json_data = json.load(file)
-        #    logging.debug("this is the JSON data that we have")
-        #    logging.debug(json_data)
-        #    json_decoded = json.dumps(json_data)
-        json_decoded = json_data
+        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 = requests.post(url_l2, headers=headers, data=json_decoded, timeout=60)
-        logging.info(response.text)
-        #logging.debug("Http response: %s",response.text)
+        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):
diff --git a/src/network_slice_controller.py b/src/network_slice_controller.py
index 2a280e6..34697b3 100644
--- a/src/network_slice_controller.py
+++ b/src/network_slice_controller.py
@@ -1,4 +1,4 @@
-# Copyright 2025 Telefonica Innovación Digital S.L.
+# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -302,10 +302,12 @@ class NSController:
                     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)
+                        for intent in requests["services"]:
+                            # Send each separate NBI request
+                            response = tfs_connector().nbi_post(self.tfs_ip, intent, 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:
@@ -496,7 +498,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,
@@ -827,6 +828,7 @@ 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.
@@ -849,36 +851,76 @@ class NSController:
         # 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 = '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
-            self.__load_template(2, os.path.join(TEMPLATES_PATH, "ietfL2VPN_template.json"))
+
+        self.answer[self.subnet]["QoS Requirements"] = []
+        
+        # Populate response with QoS requirements and VLAN from intent
+        for i, constraint in enumerate(ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"]):
+            bound = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["bound"]
+            metric_type = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["metric-type"]
+            metric_unit = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["metric-unit"]
+            service_constraint ={
+                "custom": {
+                    "constraint_type": f"{metric_type}[{metric_unit}]",
+                    "constraint_value": f"{bound}"
+                }
+            }
+            self.answer[self.subnet]["QoS Requirements"].append(service_constraint["custom"])
+        
+        vlan_value = ietf_intent["ietf-network-slice-service:network-slice-services"]["slice-service"][0]["sdps"]["sdp"][0]["service-match-criteria"]["match-criterion"][0]["value"]
+        self.answer[self.subnet]["VLAN"] = vlan_value
+
+        if UPLOAD_TYPE == "WEBUI":
+            # 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
+
+            # Add service constraints
+            for constraint in self.answer[self.subnet]["QoS Requirements"]:
+                tfs_request["service_constraints"].append({"custom": constraint})
+
+            # 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"]
+                if vlan_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"
+
+        elif UPLOAD_TYPE == "NBI":
+
+            # Load IETF L2VPN service template
+            self.__load_template(2, os.path.join(TEMPLATES_PATH, "ietfL2VPN_template_empty.json"))
             tfs_request = json.loads(str(self.__teraflow_template))
+
+            # Generate service UUID
             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
+
+            # Configure service endpoints
             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
@@ -889,40 +931,8 @@ class NSController:
                     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"] = []
-                # Add service constraints
-                for i, constraint in enumerate(ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"]):
-                    bound = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["bound"]
-                    metric_type = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["metric-type"]
-                    metric_unit = ietf_intent["ietf-network-slice-service:network-slice-services"]["slo-sle-templates"]["slo-sle-template"][0]["slo-policy"]["metric-bound"][i]["metric-unit"]
-                    service_constraint ={
-                        "custom": {
-                            "constraint_type": f"{metric_type}[{metric_unit}]",
-                            "constraint_value": f"{bound}"
-                        }
-                    }
-                    self.answer[self.subnet]["QoS Requirements"].append(service_constraint["custom"])
-                    tfs_request["service_constraints"].append(service_constraint)
-
-                # 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"]
-                    if vlan_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"L2VPN Intent realized\n")
-                self.answer[self.subnet]["VLAN"] = vlan_value
-                return tfs_request
+        logging.info(f"L2VPN Intent realized\n")
+        return tfs_request
     
     def __tfs_l2vpn_support(self, requests):
         """
diff --git a/src/templates/ietfL2VPN_template.json b/src/templates/ietfL2VPN_template_empty.json
similarity index 58%
rename from src/templates/ietfL2VPN_template.json
rename to src/templates/ietfL2VPN_template_empty.json
index 6430e40..d7d6be0 100644
--- a/src/templates/ietfL2VPN_template.json
+++ b/src/templates/ietfL2VPN_template_empty.json
@@ -1,29 +1,27 @@
 {
   "ietf-l2vpn-svc:vpn-service": [
     {
-      "vpn-id": "11327140-7361-41b3-aa45-e84a7fb40be9",
+      "vpn-id": "",
       "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-id": "",
+          "site-location": "",
           "site-network-access": {
             "interface": {
-              "ip-address": "10.60.11.3",
+              "ip-address": "",
               "encapsulation": "ethernet"
             }
           }
         },
         {
-          "site-id": "3.3.3.3",
-          "site-role": "spoke",
-          "site-location": "AMF-N2",
+          "site-id": "",
+          "site-location": "",
           "site-network-access": {
             "interface": {
-              "ip-address": "10.60.60.105",
+              "ip-address": "",
               "encapsulation": "ethernet"
             }
           }
diff --git a/src/templates/ietfL3VPN_template.json b/src/templates/ietfL3VPN_template.json
deleted file mode 100644
index 07ffbe9..0000000
--- a/src/templates/ietfL3VPN_template.json
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-    "ietf-l3vpn-svc:l3vpn-svc": {
-      "sites": {
-        "site": [
-          {
-            "devices": {
-              "device": [
-                {
-                  "device-id": "4.4.4.4",
-                  "location": "router4"
-                }
-              ]
-            },
-            "locations": {
-              "location": [
-                {
-                  "location-id": "router4"
-                }
-              ]
-            },
-            "management": {
-              "type": "ietf-l3vpn-svc:provider-managed"
-            },
-            "routing-protocols": {
-              "routing-protocol": [
-                {
-                  "static": {
-                    "cascaded-lan-prefixes": {
-                      "ipv4-lan-prefixes": [
-                        {
-                          "lan": "4.4.4.4/24",
-                          "lan-tag": "100",
-                          "next-hop": "2.2.2.2"
-                        }
-                      ]
-                    }
-                  },
-                  "type": "ietf-l3vpn-svc:static"
-                }
-              ]
-            },
-            "site-id": "site_router4",
-            "site-network-accesses": {
-              "site-network-access": [
-                {
-                  "device-reference": "4.4.4.4",
-                  "ip-connection": {
-                    "ipv4": {
-                      "address-allocation-type": "ietf-l3vpn-svc:static-address",
-                      "addresses": {
-                        "customer-address": "2.2.2.2",
-                        "prefix-length": "24",
-                        "provider-address": "4.4.4.4"
-                      }
-                    }
-                  },
-                  "service": {
-                    "qos": {
-                      "qos-profile": {
-                        "classes": {
-                          "class": [
-                            {
-                              "bandwidth": {
-                                "guaranteed-bw-percent": 100
-                              },
-                              "class-id": "qos-realtime",
-                              "direction": "ietf-l3vpn-svc:both",
-                              "latency": {
-                                "latency-boundary": 20
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    },
-                    "svc-input-bandwidth": 5000000000,
-                    "svc-mtu": 1500,
-                    "svc-output-bandwidth": 1000000000
-                  },
-                  "site-network-access-type": "ietf-l3vpn-svc:multipoint",
-                  "vpn-attachment": {
-                    "site-role": "ietf-l3vpn-svc:hub-role",
-                    "vpn-id": "vpn-example"
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "devices": {
-              "device": [
-                {
-                  "device-id": "5.5.5.5",
-                  "location": "router5"
-                }
-              ]
-            },
-            "locations": {
-              "location": [
-                {
-                  "location-id": "router5"
-                }
-              ]
-            },
-            "management": {
-              "type": "ietf-l3vpn-svc:provider-managed"
-            },
-            "routing-protocols": {
-              "routing-protocol": [
-                {
-                  "static": {
-                    "cascaded-lan-prefixes": {
-                      "ipv4-lan-prefixes": [
-                        {
-                          "lan": "5.5.5.5/24",
-                          "lan-tag": "200",
-                          "next-hop": "2.2.2.2"
-                        }
-                      ]
-                    }
-                  },
-                  "type": "ietf-l3vpn-svc:static"
-                }
-              ]
-            },
-            "site-id": "site_router5",
-            "site-network-accesses": {
-              "site-network-access": [
-                {
-                  "device-reference": "5.5.5.5",
-                  "ip-connection": {
-                    "ipv4": {
-                      "address-allocation-type": "ietf-l3vpn-svc:static-address",
-                      "addresses": {
-                        "customer-address": "2.2.2.2",
-                        "prefix-length": "24",
-                        "provider-address": "5.5.5.5"
-                      }
-                    }
-                  },
-                  "service": {
-                    "qos": {
-                      "qos-profile": {
-                        "classes": {
-                          "class": [
-                            {
-                              "bandwidth": {
-                                "guaranteed-bw-percent": 100
-                              },
-                              "class-id": "qos-realtime",
-                              "direction": "ietf-l3vpn-svc:both",
-                              "latency": {
-                                "latency-boundary": 10
-                              }
-                            }
-                          ]
-                        }
-                      }
-                    },
-                    "svc-input-bandwidth": 1000000000,
-                    "svc-mtu": 1500,
-                    "svc-output-bandwidth": 5000000000
-                  },
-                  "site-network-access-type": "ietf-l3vpn-svc:multipoint",
-                  "vpn-attachment": {
-                    "site-role": "ietf-l3vpn-svc:spoke-role",
-                    "vpn-id": "vpn-example"
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      },
-      "vpn-services": {
-        "vpn-service": [
-          {
-            "vpn-id": "vpn-example"
-          }
-        ]
-      }
-    }
-  }
-  
\ No newline at end of file
diff --git a/src/templates/l2vpn_request.json b/src/templates/l2vpn_request.json
deleted file mode 100644
index ec935e8..0000000
--- a/src/templates/l2vpn_request.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "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