Commit 44619421 authored by Shayan Hajipour's avatar Shayan Hajipour
Browse files

Merge branch 'feat/190-cttc-generalize-service-database-management' into... 

Merge branch 'feat/190-cttc-generalize-service-database-management' into feat/183-create-qosprofile-component
parents d6a68975 6c2d2c40

.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -176,3 +176,6 @@ libyang/ 


# Other logs

**/logs/*.log.*



# PySpark checkpoints

src/analytics/.spark/*

deploy/all.sh

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice n 
#export TFS_COMPONENTS="${TFS_COMPONENTS} monitoring"



# Uncomment to activate Monitoring Framework (new)

#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api"

#export TFS_COMPONENTS="${TFS_COMPONENTS} kpi_manager kpi_value_writer kpi_value_api telemetry analytics"



# Uncomment to activate BGP-LS Speaker

#export TFS_COMPONENTS="${TFS_COMPONENTS} bgpls_speaker"

deploy/tfs.sh

+31 −4
Original line number Diff line number Diff line
@@ -182,7 +182,19 @@ kubectl create secret generic crdb-telemetry --namespace ${TFS_K8S_NAMESPACE} -- 
    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with Apache Kafka data for KPI and Telemetry microservices"

echo "Create secret with CockroachDB data for Analytics microservices"

CRDB_SQL_PORT=$(kubectl --namespace ${CRDB_NAMESPACE} get service cockroachdb-public -o 'jsonpath={.spec.ports[?(@.name=="sql")].port}')

CRDB_DATABASE_ANALYTICS="tfs_analytics"  # TODO: change by specific configurable environment variable

kubectl create secret generic crdb-analytics --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=CRDB_NAMESPACE=${CRDB_NAMESPACE} \

    --from-literal=CRDB_SQL_PORT=${CRDB_SQL_PORT} \

    --from-literal=CRDB_DATABASE=${CRDB_DATABASE_ANALYTICS} \

    --from-literal=CRDB_USERNAME=${CRDB_USERNAME} \

    --from-literal=CRDB_PASSWORD=${CRDB_PASSWORD} \

    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with Apache Kafka data for KPI, Telemetry and Analytics microservices"

KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')

kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \
@@ -228,6 +240,21 @@ kubectl create secret generic qdb-data --namespace ${TFS_K8S_NAMESPACE} --type=' 
    --from-literal=METRICSDB_PASSWORD=${QDB_PASSWORD}

printf "\n"



# Check if "dlt" is in the list of components

if [[ " ${TFS_COMPONENTS[@]} " =~ " dlt " ]]; then

  echo "Create secret for HLF keystore"

  kubectl create secret generic dlt-keystone --namespace ${TFS_K8S_NAMESPACE} --from-file=keystore=${KEY_DIRECTORY_PATH}

  printf "\n"



  echo "Create secret for HLF signcerts"

  kubectl create secret generic dlt-signcerts --namespace ${TFS_K8S_NAMESPACE} --from-file=signcerts.pem=${CERT_DIRECTORY_PATH}

  printf "\n"



  echo "Create secret for HLF ca.crt"

  kubectl create secret generic dlt-ca-crt --namespace ${TFS_K8S_NAMESPACE} --from-file=ca.crt=${TLS_CERT_PATH}

  printf "\n"

fi



echo "Deploying components and collecting environment variables..."

ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh

echo "# Environment variables for TeraFlowSDN deployment" > $ENV_VARS_SCRIPT
@@ -275,7 +302,7 @@ for COMPONENT in $TFS_COMPONENTS; do 


        if [ "$COMPONENT" == "ztp" ] || [ "$COMPONENT" == "policy" ]; then

            $DOCKER_BUILD -t "$COMPONENT:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/Dockerfile ./src/"$COMPONENT"/ > "$BUILD_LOG"

        elif [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ]; then

        elif [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ]; then

            BUILD_LOG="$TMP_LOGS_FOLDER/build_${COMPONENT}-frontend.log"

            $DOCKER_BUILD -t "$COMPONENT-frontend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/frontend/Dockerfile . > "$BUILD_LOG"
@@ -298,7 +325,7 @@ for COMPONENT in $TFS_COMPONENTS; do 


        echo "  Pushing Docker image to '$TFS_REGISTRY_IMAGES'..."



        if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ]; then

        if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ] ; then

            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')



            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"
@@ -349,7 +376,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
        cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"

    fi



    if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ]; then

    if [ "$COMPONENT" == "pathcomp" ] || [ "$COMPONENT" == "telemetry" ] || [ "$COMPONENT" == "analytics" ]; then

        IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGES/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')

        VERSION=$(grep -i "${GITLAB_REPO_URL}/${COMPONENT}-frontend:" "$MANIFEST" | cut -d ":" -f4)

        sed -E -i "s#image: $GITLAB_REPO_URL/$COMPONENT-frontend:${VERSION}#image: $IMAGE_URL#g" "$MANIFEST"

hackfest/containerlab/README.md

0 → 100644
+35 −0
Original line number Diff line number Diff line 
# ContainerLab



The setup consists of a management network for configuring and managing nodes.

srl1 and srl2 are interconnected.

client1 is connected to srl1 and client2 to srl2.

Routing between client1 and client2 is set up via the Nokia SR Linux nodes.



## Management Network

Name: mgmt-net

Subnet: 172.100.100.0/24



## Node Kinds

Nokia SR Linux: Image ghcr.io/nokia/srlinux:23.10.3

Linux: Image ghcr.io/hellt/network-multitool



## Nodes



### Nokia SR Linux

- Type: ixr6

- CPU: 0.5

- Memory: 2GB

- Management IP: 172.100.100.101



The provided SR Linux CLI commands in the _srl.cli_ enables system management and configures the GNMI server with OpenConfig models.



### Linux



Assigns IP 172.16.1.10/24 to eth1 and adds route to 172.16.2.0/24 via 172.16.1.1



In this topology file, the clients are pre-configured with the respectivly IP addresses in their interfaces and routes in their IP tables.



### Links

- Connect srl1:e1-1 to srl2:e1-1

- Connect client1:eth1 to srl1:e1-2

- Connect client2:eth1 to srl2:e1-2
 
 No newline at end of file

hackfest/containerlab/commands.txt

+10 −10
Original line number Diff line number Diff line
@@ -83,19 +83,19 @@ $ssh admin@clab-tfs-scenario-srl1 




# Check configurations done:

gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/network-instances' > srl1-nis.json

gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/interfaces' > srl1-ifs.json

gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/network-instances' > srl2-nis.json

gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/interfaces' > srl2-ifs.json

gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/network-instances' > srl1-nis.json

gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/interfaces' > srl1-ifs.json

gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/network-instances' > srl2-nis.json

gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path '/interfaces' > srl2-ifs.json





# Delete elements:

gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/network-instances/network-instance[name=b19229e8]'

gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/1]/subinterfaces/subinterface[index=0]'

gnmic -a 172.100.100.101 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/2]/subinterfaces/subinterface[index=0]'

gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/network-instances/network-instance[name=b19229e8]'

gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/1]/subinterfaces/subinterface[index=0]'

gnmic -a 172.100.100.102 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/2]/subinterfaces/subinterface[index=0]'

gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/network-instances/network-instance[name=b19229e8]'

gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/1]/subinterfaces/subinterface[index=0]'

gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/2]/subinterfaces/subinterface[index=0]'

gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/network-instances/network-instance[name=b19229e8]'

gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/1]/subinterfaces/subinterface[index=0]'

gnmic -a clab-tfs-scenario-srl2 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --delete '/interfaces/interface[name=ethernet-1/2]/subinterfaces/subinterface[index=0]'



# Run gNMI Driver in standalone mode (advanced)

PYTHONPATH=./src python -m src.device.tests.test_gnmi