Commit 549327c7 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/62-tid-add-support-to-nbi-to-export-the-device-inventory-items-2
parents 32492d84 5892ca30

quick_deploy.sh

deleted100755 → 0
+0 −438
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (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.





########################################################################################################################

# Read deployment settings

########################################################################################################################





# ----- TeraFlowSDN ------------------------------------------------------------



# If not already set, set the URL of the Docker registry where the images will be uploaded to.

# By default, assume internal MicroK8s registry is used.

export TFS_REGISTRY_IMAGES=${TFS_REGISTRY_IMAGES:-"http://localhost:32000/tfs/"}



# If not already set, set the list of components, separated by spaces, you want to build images for, and deploy.

# By default, only basic components are deployed

export TFS_COMPONENTS=${TFS_COMPONENTS:-"context device pathcomp service slice nbi webui load_generator"}



# If not already set, set the tag you want to use for your images.

export TFS_IMAGE_TAG=${TFS_IMAGE_TAG:-"dev"}



# If not already set, set the name of the Kubernetes namespace to deploy TFS to.

export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}



# If not already set, set additional manifest files to be applied after the deployment

export TFS_EXTRA_MANIFESTS=${TFS_EXTRA_MANIFESTS:-""}



# If not already set, set the new Grafana admin password

export TFS_GRAFANA_PASSWORD=${TFS_GRAFANA_PASSWORD:-"admin123+"}



# If not already set, disable skip-build flag to rebuild the Docker images.

# If TFS_SKIP_BUILD is "YES", the containers are not rebuilt-retagged-repushed and existing ones are used.

export TFS_SKIP_BUILD=${TFS_SKIP_BUILD:-"YES"}



# If TFS_SKIP_BUILD is "YES", select the containers to be build

# Any other container will use previous docker images

export TFS_QUICK_COMPONENTS="slice"



# ----- CockroachDB ------------------------------------------------------------



# If not already set, set the namespace where CockroackDB will be deployed.

export CRDB_NAMESPACE=${CRDB_NAMESPACE:-"crdb"}



# If not already set, set the database username to be used by Context.

export CRDB_USERNAME=${CRDB_USERNAME:-"tfs"}



# If not already set, set the database user's password to be used by Context.

export CRDB_PASSWORD=${CRDB_PASSWORD:-"tfs123"}



# If not already set, set the database name to be used by Context.

export CRDB_DATABASE=${CRDB_DATABASE:-"tfs"}





# ----- NATS -------------------------------------------------------------------



# If not already set, set the namespace where NATS will be deployed.

export NATS_NAMESPACE=${NATS_NAMESPACE:-"nats"}





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



# If not already set, set the namespace where QuestDB will be deployed.

export QDB_NAMESPACE=${QDB_NAMESPACE:-"qdb"}



# If not already set, set the database username to be used for QuestDB.

export QDB_USERNAME=${QDB_USERNAME:-"admin"}



# If not already set, set the database user's password to be used for QuestDB.

export QDB_PASSWORD=${QDB_PASSWORD:-"quest"}



# If not already set, set the table name to be used by Monitoring for KPIs.

export QDB_TABLE_MONITORING_KPIS=${QDB_TABLE_MONITORING_KPIS:-"tfs_monitoring_kpis"}



# If not already set, set the table name to be used by Slice for plotting groups.

export QDB_TABLE_SLICE_GROUPS=${QDB_TABLE_SLICE_GROUPS:-"tfs_slice_groups"}





########################################################################################################################

# Automated steps start here

########################################################################################################################



# Constants

GITLAB_REPO_URL="labs.etsi.org:5050/tfs/controller"

TMP_FOLDER="./tmp"



# Create a tmp folder for files modified during the deployment

TMP_MANIFESTS_FOLDER="$TMP_FOLDER/manifests"

mkdir -p $TMP_MANIFESTS_FOLDER

TMP_LOGS_FOLDER="$TMP_FOLDER/logs"

mkdir -p $TMP_LOGS_FOLDER



echo "Deleting and Creating a new namespace..."

kubectl delete namespace $TFS_K8S_NAMESPACE --ignore-not-found

kubectl create namespace $TFS_K8S_NAMESPACE

printf "\n"



echo "Create secret with CockroachDB data"

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

kubectl create secret generic crdb-data --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} \

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

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

    --from-literal=CRDB_SSLMODE=require

printf "\n"



echo "Create secret with NATS data"

NATS_CLIENT_PORT=$(kubectl --namespace ${NATS_NAMESPACE} get service nats -o 'jsonpath={.spec.ports[?(@.name=="client")].port}')

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

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

    --from-literal=NATS_CLIENT_PORT=${NATS_CLIENT_PORT}

printf "\n"



echo "Create secret with QuestDB data"

QDB_HTTP_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

QDB_ILP_PORT=$(kubectl --namespace ${QDB_NAMESPACE} get service questdb-public -o 'jsonpath={.spec.ports[?(@.name=="ilp")].port}')

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

METRICSDB_HOSTNAME="questdb-public.${QDB_NAMESPACE}.svc.cluster.local"

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

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

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

    --from-literal=METRICSDB_REST_PORT=${QDB_HTTP_PORT} \

    --from-literal=METRICSDB_ILP_PORT=${QDB_ILP_PORT} \

    --from-literal=METRICSDB_SQL_PORT=${QDB_SQL_PORT} \

    --from-literal=METRICSDB_TABLE_MONITORING_KPIS=${QDB_TABLE_MONITORING_KPIS} \

    --from-literal=METRICSDB_TABLE_SLICE_GROUPS=${QDB_TABLE_SLICE_GROUPS} \

    --from-literal=METRICSDB_USERNAME=${QDB_USERNAME} \

    --from-literal=METRICSDB_PASSWORD=${QDB_PASSWORD}

printf "\n"



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

ENV_VARS_SCRIPT=tfs_runtime_env_vars.sh

echo "# Environment variables for TeraFlowSDN deployment" > $ENV_VARS_SCRIPT

PYTHONPATH=$(pwd)/src

echo "export PYTHONPATH=${PYTHONPATH}" >> $ENV_VARS_SCRIPT



for COMPONENT in $TFS_COMPONENTS; do

    echo "Processing '$COMPONENT' component..."



    if [ "$TFS_SKIP_BUILD" != "YES" ]; then

        echo "  Building Docker image..."

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



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

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

        elif [ "$COMPONENT" == "pathcomp" ]; 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"



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

            docker build -t "$COMPONENT-backend:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/backend/Dockerfile . > "$BUILD_LOG"

            # next command is redundant, but helpful to keep cache updated between rebuilds

            IMAGE_NAME="$COMPONENT-backend:$TFS_IMAGE_TAG-builder"

            docker build -t "$IMAGE_NAME" --target builder -f ./src/"$COMPONENT"/backend/Dockerfile . >> "$BUILD_LOG"

        elif [ "$COMPONENT" == "dlt" ]; then

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

            docker build -t "$COMPONENT-connector:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/connector/Dockerfile . > "$BUILD_LOG"



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

            docker build -t "$COMPONENT-gateway:$TFS_IMAGE_TAG" -f ./src/"$COMPONENT"/gateway/Dockerfile . > "$BUILD_LOG"

        else

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

        fi



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



        if [ "$COMPONENT" == "pathcomp" ]; 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"

            docker tag "$COMPONENT-frontend:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"



            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-frontend.log"

            docker push "$IMAGE_URL" > "$PUSH_LOG"



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



            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-backend.log"

            docker tag "$COMPONENT-backend:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"



            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-backend.log"

            docker push "$IMAGE_URL" > "$PUSH_LOG"

        elif [ "$COMPONENT" == "dlt" ]; then

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



            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-connector.log"

            docker tag "$COMPONENT-connector:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"



            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-connector.log"

            docker push "$IMAGE_URL" > "$PUSH_LOG"



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



            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-gateway.log"

            docker tag "$COMPONENT-gateway:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"



            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-gateway.log"

            docker push "$IMAGE_URL" > "$PUSH_LOG"

        else

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



            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}.log"

            docker tag "$COMPONENT:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"



            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log"

            docker push "$IMAGE_URL" > "$PUSH_LOG"

        fi

    else 

        for QUICK_COMPONENT in $TFS_QUICK_COMPONENTS; do

            if [ "$COMPONENT" == "$QUICK_COMPONENT" ]; then

                

                echo "  Building Docker image..."

                BUILD_LOG="$TMP_LOGS_FOLDER/build_${QUICK_COMPONENT}.log"



                docker build -t "$QUICK_COMPONENT:$TFS_IMAGE_TAG" -f ./src/"$QUICK_COMPONENT"/Dockerfile . > "$BUILD_LOG"

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



                



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



                TAG_LOG="$TMP_LOGS_FOLDER/tag_${QUICK_COMPONENT}.log"

                docker tag "$QUICK_COMPONENT:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"



                PUSH_LOG="$TMP_LOGS_FOLDER/push_${QUICK_COMPONENT}.log"

                docker push "$IMAGE_URL" > "$PUSH_LOG"

            fi

        done

    fi



    echo "  Adapting '$COMPONENT' manifest file..."

    MANIFEST="$TMP_MANIFESTS_FOLDER/${COMPONENT}service.yaml"

    cp ./manifests/"${COMPONENT}"service.yaml "$MANIFEST"



    if [ "$COMPONENT" == "pathcomp" ]; 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"



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

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

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

    elif [ "$COMPONENT" == "dlt" ]; then

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

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

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



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

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

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

    else

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

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

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

    fi



    sed -E -i "s#imagePullPolicy: .*#imagePullPolicy: Always#g" "$MANIFEST"



    # TODO: harmonize names of the monitoring component



    echo "  Deploying '$COMPONENT' component to Kubernetes..."

    DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"

    kubectl --namespace $TFS_K8S_NAMESPACE apply -f "$MANIFEST" > "$DEPLOY_LOG"

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

    #kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"

    #kubectl --namespace $TFS_K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT_OBJNAME}service >> "$DEPLOY_LOG"



    echo "  Collecting env-vars for '$COMPONENT' component..."



    SERVICE_DATA=$(kubectl get service ${COMPONENT_OBJNAME}service --namespace $TFS_K8S_NAMESPACE -o json)

    if [ -z "${SERVICE_DATA}" ]; then continue; fi



    # Env vars for service's host address

    SERVICE_HOST=$(echo ${SERVICE_DATA} | jq -r '.spec.clusterIP')

    if [ -z "${SERVICE_HOST}" ]; then continue; fi

    ENVVAR_HOST=$(echo "${COMPONENT}service_SERVICE_HOST" | tr '[:lower:]' '[:upper:]')

    echo "export ${ENVVAR_HOST}=${SERVICE_HOST}" >> $ENV_VARS_SCRIPT



    # Env vars for service's 'grpc' port (if any)

    SERVICE_PORT_GRPC=$(echo ${SERVICE_DATA} | jq -r '.spec.ports[] | select(.name=="grpc") | .port')

    if [ -n "${SERVICE_PORT_GRPC}" ]; then

        ENVVAR_PORT_GRPC=$(echo "${COMPONENT}service_SERVICE_PORT_GRPC" | tr '[:lower:]' '[:upper:]')

        echo "export ${ENVVAR_PORT_GRPC}=${SERVICE_PORT_GRPC}" >> $ENV_VARS_SCRIPT

    fi



    # Env vars for service's 'http' port (if any)

    SERVICE_PORT_HTTP=$(echo ${SERVICE_DATA} | jq -r '.spec.ports[] | select(.name=="http") | .port')

    if [ -n "${SERVICE_PORT_HTTP}" ]; then

        ENVVAR_PORT_HTTP=$(echo "${COMPONENT}service_SERVICE_PORT_HTTP" | tr '[:lower:]' '[:upper:]')

        echo "export ${ENVVAR_PORT_HTTP}=${SERVICE_PORT_HTTP}" >> $ENV_VARS_SCRIPT

    fi



    printf "\n"

done



echo "Deploying extra manifests..."

for EXTRA_MANIFEST in $TFS_EXTRA_MANIFESTS; do

    echo "Processing manifest '$EXTRA_MANIFEST'..."

    if [[ "$EXTRA_MANIFEST" == *"servicemonitor"* ]]; then

        kubectl apply -f $EXTRA_MANIFEST

    else

        kubectl --namespace $TFS_K8S_NAMESPACE apply -f $EXTRA_MANIFEST

    fi

    printf "\n"

done

printf "\n"



for COMPONENT in $TFS_COMPONENTS; do

    echo "Waiting for '$COMPONENT' component..."

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

    kubectl wait --namespace $TFS_K8S_NAMESPACE \

        --for='condition=available' --timeout=300s deployment/${COMPONENT_OBJNAME}service

    printf "\n"

done



if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring"* ]]; then

    echo "Configuring WebUI DataStores and Dashboards..."

    sleep 5



    # Exposed through the ingress controller "tfs-ingress"

    GRAFANA_URL="127.0.0.1:80/grafana"



    # Default Grafana credentials

    GRAFANA_USERNAME="admin"

    GRAFANA_PASSWORD="admin"



    # Configure Grafana Admin Password

    # Ref: https://grafana.com/docs/grafana/latest/http_api/user/#change-password

    GRAFANA_URL_DEFAULT="http://${GRAFANA_USERNAME}:${GRAFANA_PASSWORD}@${GRAFANA_URL}"



    echo ">> Updating Grafana 'admin' password..."

    curl -X PUT -H "Content-Type: application/json" -d '{

        "oldPassword": "'${GRAFANA_PASSWORD}'",

        "newPassword": "'${TFS_GRAFANA_PASSWORD}'",

        "confirmNew" : "'${TFS_GRAFANA_PASSWORD}'"

    }' ${GRAFANA_URL_DEFAULT}/api/user/password

    echo

    echo



    # Updated Grafana API URL

    GRAFANA_URL_UPDATED="http://${GRAFANA_USERNAME}:${TFS_GRAFANA_PASSWORD}@${GRAFANA_URL}"

    echo "export GRAFANA_URL_UPDATED=${GRAFANA_URL_UPDATED}" >> $ENV_VARS_SCRIPT



    echo ">> Installing Scatter Plot plugin..."

    curl -X POST -H "Content-Type: application/json" -H "Content-Length: 0" \

        ${GRAFANA_URL_UPDATED}/api/plugins/michaeldmoore-scatter-panel/install

    echo



    # Ref: https://grafana.com/docs/grafana/latest/http_api/data_source/

    QDB_HOST_PORT="${METRICSDB_HOSTNAME}:${QDB_SQL_PORT}"

    echo ">> Creating datasources..."

    curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{

        "access"   : "proxy",

        "type"     : "postgres",

        "name"     : "questdb-mon-kpi",

        "url"      : "'${QDB_HOST_PORT}'",

        "database" : "'${QDB_TABLE_MONITORING_KPIS}'",

        "user"     : "'${QDB_USERNAME}'",

        "basicAuth": false,

        "isDefault": true,

        "jsonData" : {

            "sslmode"               : "disable",

            "postgresVersion"       : 1100,

            "maxOpenConns"          : 0,

            "maxIdleConns"          : 2,

            "connMaxLifetime"       : 14400,

            "tlsAuth"               : false,

            "tlsAuthWithCACert"     : false,

            "timescaledb"           : false,

            "tlsConfigurationMethod": "file-path",

            "tlsSkipVerify"         : true

        },

        "secureJsonData": {"password": "'${QDB_PASSWORD}'"}

    }' ${GRAFANA_URL_UPDATED}/api/datasources

    echo



    curl -X POST -H "Content-Type: application/json" -H "Accept: application/json" -d '{

        "access"   : "proxy",

        "type"     : "postgres",

        "name"     : "questdb-slc-grp",

        "url"      : "'${QDB_HOST_PORT}'",

        "database" : "'${QDB_TABLE_SLICE_GROUPS}'",

        "user"     : "'${QDB_USERNAME}'",

        "basicAuth": false,

        "isDefault": false,

        "jsonData" : {

            "sslmode"               : "disable",

            "postgresVersion"       : 1100,

            "maxOpenConns"          : 0,

            "maxIdleConns"          : 2,

            "connMaxLifetime"       : 14400,

            "tlsAuth"               : false,

            "tlsAuthWithCACert"     : false,

            "timescaledb"           : false,

            "tlsConfigurationMethod": "file-path",

            "tlsSkipVerify"         : true

        },

        "secureJsonData": {"password": "'${QDB_PASSWORD}'"}

    }' ${GRAFANA_URL_UPDATED}/api/datasources

    printf "\n\n"



    echo ">> Creating dashboards..."

    # Ref: https://grafana.com/docs/grafana/latest/http_api/dashboard/

    curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_db_mon_kpis_psql.json' \

        ${GRAFANA_URL_UPDATED}/api/dashboards/db

    echo



    curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_db_slc_grps_psql.json' \

        ${GRAFANA_URL_UPDATED}/api/dashboards/db

    printf "\n\n"



    echo ">> Staring dashboards..."

    DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-l3-monit"

    DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" | jq '.dashboard.id')

    curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}

    echo



    DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-slice-grps"

    DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" | jq '.dashboard.id')

    curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID}

    echo



    printf "\n\n"

fi

src/device/service/drivers/openconfig/templates/Acl.py

+33 −31

File changed.

Preview size limit exceeded, changes collapsed.

src/device/service/drivers/openconfig/templates/Inventory.py

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
        if not component_location is None:

            add_value_from_tag(inventory['attributes'], 'location', component_location)



       

        component_id = xml_component.find('ocp:state/ocp:id', namespaces=NAMESPACES)

        if not component_id is None:

            add_value_from_tag(inventory['attributes'], 'id', component_id)

src/device/service/drivers/openconfig/templates/NetworkInstances.py

+17 −0
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ XPATH_NETWORK_INSTANCES = "//ocni:network-instances/ocni:network-instance" 
XPATH_NI_PROTOCOLS      = ".//ocni:protocols/ocni:protocol"

XPATH_NI_TABLE_CONNECTS = ".//ocni:table-connections/ocni:table-connection"



XPATH_NI_INTERFACE      = ".//ocni:interfaces/ocni:interface"



XPATH_NI_IIP_AP         = ".//ocni:inter-instance-policies/ocni:apply-policy"

XPATH_NI_IIP_AP_IMPORT  = ".//ocni:config/ocni:import-policy"

XPATH_NI_IIP_AP_EXPORT  = ".//ocni:config/ocni:export-policy"
@@ -136,6 +138,21 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
                table_connection['address_family'])

            response.append((resource_key, table_connection))



        for xml_interface in xml_network_instance.xpath(XPATH_NI_INTERFACE, namespaces=NAMESPACES):

            LOGGER.info('xml_interfaces = {:s}'.format(str(ET.tostring(xml_interface))))



            interface = {}

            name_iface = xml_interface.find('ocni:config/ocni:interface', namespaces=NAMESPACES)

            if name_iface is None or name_iface.text is None: continue

            add_value_from_tag(interface, 'name_iface', name_iface)

            

            name_subiface = xml_interface.find('ocni:config/ocni:subinterface', namespaces=NAMESPACES)

            add_value_from_tag(interface, 'name_subiface', name_subiface)

            

            resource_key = '/network_instance[{:s}]/interface[{:s}]'.format(

                network_instance['name'], interface['name_iface'])

            response.append((resource_key, interface))



        for xml_iip_ap in xml_network_instance.xpath(XPATH_NI_IIP_AP, namespaces=NAMESPACES):

            #LOGGER.info('xml_iip_ap = {:s}'.format(str(ET.tostring(xml_iip_ap))))

src/nbi/service/__main__.py

+2 −2
Original line number Diff line number Diff line
@@ -22,12 +22,12 @@ from common.Settings import ( 
from .NbiService import NbiService

from .rest_server.RestServer import RestServer

from .rest_server.nbi_plugins.etsi_bwm import register_etsi_bwm_api

from .rest_server.nbi_plugins.ietf_hardware import register_ietf_hardware

from .rest_server.nbi_plugins.ietf_l2vpn import register_ietf_l2vpn

from .rest_server.nbi_plugins.ietf_l3vpn import register_ietf_l3vpn

from .rest_server.nbi_plugins.ietf_network import register_ietf_network

from .rest_server.nbi_plugins.ietf_network_slice import register_ietf_nss

from .rest_server.nbi_plugins.tfs_api import register_tfs_api

from .rest_server.nbi_plugins.ietf_hardware import register_ietf_hardware



terminate = threading.Event()

LOGGER = None
@@ -65,12 +65,12 @@ def main(): 


    rest_server = RestServer()

    register_etsi_bwm_api(rest_server)

    register_ietf_hardware(rest_server)

    register_ietf_l2vpn(rest_server)  # Registering L2VPN entrypoint

    register_ietf_l3vpn(rest_server)  # Registering L3VPN entrypoint

    register_ietf_network(rest_server)

    register_ietf_nss(rest_server)  # Registering NSS entrypoint

    register_tfs_api(rest_server)

    register_ietf_hardware(rest_server)

    rest_server.start()



    # Wait for Ctrl+C or termination signal