Commit 9aca4539 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge cleanup

parent 9838a806

my_deploy.sh

+5 −5
Original line number Diff line number Diff line
@@ -80,11 +80,11 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui" 
#   To manage QKD Apps, "service" requires "qkd_app" to be deployed

#   before "service", thus we "hack" the TFS_COMPONENTS environment variable prepending the

#   "qkd_app" only if "service" is already in TFS_COMPONENTS, and re-export it.

if [[ "$TFS_COMPONENTS" == *"service"* ]]; then

    BEFORE="${TFS_COMPONENTS% service*}"

    AFTER="${TFS_COMPONENTS#* service}"

    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"

fi

#if [[ "$TFS_COMPONENTS" == *"service"* ]]; then

#    BEFORE="${TFS_COMPONENTS% service*}"

#    AFTER="${TFS_COMPONENTS#* service}"

#    export TFS_COMPONENTS="${BEFORE} qkd_app service ${AFTER}"

#fi



# Uncomment to activate Load Generator

#export TFS_COMPONENTS="${TFS_COMPONENTS} load_generator"

src/tests/qkd_end2end/deploy_specs.sh

+12 −12
Original line number Diff line number Diff line
@@ -159,6 +159,18 @@ 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_SERVER_PORT="9092"



# Set the flag to YES for redeploying of Apache Kafka

export KFK_REDEPLOY=""





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



# Set the namespace where QuestDB will be deployed.
@@ -199,15 +211,3 @@ export PROM_EXT_PORT_HTTP="9090" 


# Set the external port Grafana HTTP Dashboards will be exposed to.

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"



# Set the flag to YES for redeploying of Apache Kafka

export KFK_REDEPLOY=""

src/tests/qkd_end2end/redeploy-all.sh

+2 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash

#!/bin/bash

# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.





# Cleanup

docker rm --force qkd-node-01 qkd-node-02 qkd-node-03

docker network rm --force qkd-node-br

src/tests/qkd_end2end/redeploy-qkd-nodes.sh

+2 −1
Original line number Diff line number Diff line 
#!/usr/bin/env bash

#!/bin/bash

# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.





# Cleanup

docker rm --force qkd-node-01 qkd-node-02 qkd-node-03

docker network rm --force qkd-node-br

src/tests/qkd_end2end/redeploy-tfs.sh

+1 −0
Original line number Diff line number Diff line
@@ -13,5 +13,6 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.





source ~/tfs-ctrl/src/tests/qkd_end2end/deploy_specs.sh

./deploy/all.sh