Commit 6156399c authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'feat/325-tid-nbi-e2e-to-manage-e2e-path-computation' of... 

Merge branch 'feat/325-tid-nbi-e2e-to-manage-e2e-path-computation' of https://labs.etsi.org/rep/tfs/controller into feat/397-tid-e2e-orchestrator-with-pathcomp-for-p2mp-optical-slices
parents bfb2849f bd25e3a2

hackfest5/deploy_specs.sh

+42 −10
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
export TFS_REGISTRY_IMAGES="http://localhost:32000/tfs/"



# Set the list of components, separated by spaces, you want to build images for, and deploy.

#export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_generator"

export TFS_COMPONENTS="context device pathcomp service nbi webui"



# Uncomment to activate Monitoring (old)
@@ -66,6 +65,12 @@ export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring" 
# Uncomment to activate E2E Orchestrator

#export TFS_COMPONENTS="${TFS_COMPONENTS} e2e_orchestrator"



# Uncomment to activate VNT Manager

#export TFS_COMPONENTS="${TFS_COMPONENTS} vnt_manager"



# Uncomment to activate OSM Client

#export TFS_COMPONENTS="${TFS_COMPONENTS} osm_client"



# Uncomment to activate DLT and Interdomain

#export TFS_COMPONENTS="${TFS_COMPONENTS} interdomain dlt"

#if [[ "$TFS_COMPONENTS" == *"dlt"* ]]; then
@@ -84,6 +89,15 @@ export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring" 
#    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"

#fi



# Uncomment to activate SIMAP Connector

#export TFS_COMPONENTS="${TFS_COMPONENTS} simap_connector"



# Uncomment to activate Load Generator

#export TFS_COMPONENTS="${TFS_COMPONENTS} load_generator"



# Uncomment to activate Pluggables Component

#export TFS_COMPONENTS="${TFS_COMPONENTS} pluggables"





# Set the tag you want to use for your images.

export TFS_IMAGE_TAG="dev"
@@ -154,6 +168,22 @@ export NATS_DEPLOY_MODE="single" 
export NATS_REDEPLOY=""





# ----- Apache Kafka -----------------------------------------------------------



# Set the namespace where Apache Kafka will be deployed.

export KFK_NAMESPACE="kafka"



# Set the port Apache Kafka server will be exposed to.

export KFK_EXT_PORT_CLIENT="9092"



# Set Kafka installation mode to 'single'. This option is convenient for development and testing.

# See ./deploy/all.sh or ./deploy/kafka.sh for additional details

export KFK_DEPLOY_MODE="single"



# Disable flag for re-deploying Kafka from scratch.

export KFK_REDEPLOY=""





# ----- QuestDB ----------------------------------------------------------------



# Set the namespace where QuestDB will be deployed.
@@ -187,6 +217,14 @@ export QDB_DROP_TABLES_IF_EXIST="YES" 
export QDB_REDEPLOY=""





# ----- Time Series Storage - Prometheus / Grafana Mimir -----------------------



# Set Time Series Storage installation mode to 'single' (i.e., Prometheus only).

# This option is convenient for development and testing. See ./deploy/all.sh or

# ./deploy/monitoring.sh for additional details.

export TSDB_DEPLOY_MODE="single"





# ----- K8s Observability ------------------------------------------------------



# Set the external port Prometheus Mgmt HTTP GUI interface will be exposed to.
@@ -196,13 +234,7 @@ export PROM_EXT_PORT_HTTP="9090" 
export GRAF_EXT_PORT_HTTP="3000"





# ----- Apache Kafka -----------------------------------------------------------



# Set the namespace where Apache Kafka will be deployed.

#export KFK_NAMESPACE="kafka"



# Set the port Apache Kafka server will be exposed to.

#export KFK_SERVER_PORT="9092"

# ----- Telemetry Config ------------------------------------------------------



# Set the flag to YES for redeploying of Apache Kafka

#export KFK_REDEPLOY=""
 
# Define a Load Balancer IP for Telemetry Collector components

export LOAD_BALANCER_IP="192.168.5.250" # <-- Change this to match your network

hackfest5/redeploy-tfs.sh

+9 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ kubectl delete namespace ${NATS_NAMESPACE} --ignore-not-found 
kubectl delete namespace kafka --ignore-not-found

printf "\n"



echo "Deployting TeraFlowSDN..."

echo "Deploying TeraFlowSDN..."



# Deploy CockroachDB

./deploy/crdb.sh
@@ -32,6 +32,12 @@ echo "Deployting TeraFlowSDN..." 
# Deploy QuestDB

./deploy/qdb.sh



# Deploy Apache Kafka

./deploy/kafka.sh



#Deploy Monitoring (Prometheus Gateway, Prometheus)

# ./deploy/monitoring.sh



# Expose Dashboard

./deploy/expose_dashboard.sh
@@ -50,3 +56,5 @@ while ! kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c 
done

kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server

printf "\n"



echo "Done!"

src/nbi/service/optical_e2e_path_computation/__init__.py→hackfest5/service-ietf-create.sh

100644 → 100755
+8 −13
Original line number Diff line number Diff line 
# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#!/bin/bash

# Copyright 2022-2026 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,15 +13,9 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



from nbi.service.NbiApplication import NbiApplication

from .Resources import E2epathcomp  # solo necesitamos este



URL_PREFIX = '/restconf/e2epathcomp/v0'



def register_e2e_path_computation(nbi_app: NbiApplication):

    nbi_app.add_rest_api_resource(

        E2epathcomp,

        URL_PREFIX + '/e2e_path_computation',

        endpoint='e2e_path_computation'

    )

cd ~/tfs-ctrl/hackfest5/data

curl -X POST \

  --header "Content-Type: application/json" \

  --data @ietf-l3vpn-service.json \

  --user "admin:admin" \

  http://127.0.0.1/restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services

hackfest5/service-ietf-delete.sh

0 → 100755
+17 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2026 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.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



curl -X DELETE --user "admin:admin" \

  http://127.0.0.1/restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services/vpn-service=ietf-l3vpn-svc/

hackfest5/service-ietf-retrieve.sh

0 → 100755
+18 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2026 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.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



curl \

  --user "admin:admin" \

  http://127.0.0.1/restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services/vpn-service=ietf-l3vpn-svc/