Commit 81e549bc authored by Pablo Armingol's avatar Pablo Armingol
Browse files

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

parents 8e987266 3d2441a8

deploy/expose_dashboard.sh

+12 −5
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"} 
# Automated steps start here

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



MONITORING_NAMESPACE="monitoring"



function expose_dashboard() {

    echo "Prometheus Port Mapping"

    echo ">>> Expose Prometheus HTTP Mgmt GUI port (9090->${PROM_EXT_PORT_HTTP})"

    PROM_PORT_HTTP=$(kubectl --namespace monitoring get service prometheus-k8s -o 'jsonpath={.spec.ports[?(@.name=="web")].port}')

    PATCH='{"data": {"'${PROM_EXT_PORT_HTTP}'": "monitoring/prometheus-k8s:'${PROM_PORT_HTTP}'"}}'

    PROM_PORT_HTTP=$(kubectl --namespace ${MONITORING_NAMESPACE} get service prometheus-k8s -o 'jsonpath={.spec.ports[?(@.name=="web")].port}')

    PATCH='{"data": {"'${PROM_EXT_PORT_HTTP}'": "'${MONITORING_NAMESPACE}'/prometheus-k8s:'${PROM_PORT_HTTP}'"}}'

    kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"



    PORT_MAP='{"containerPort": '${PROM_EXT_PORT_HTTP}', "hostPort": '${PROM_EXT_PORT_HTTP}'}'
@@ -44,8 +46,8 @@ function expose_dashboard() { 


    echo "Grafana Port Mapping"

    echo ">>> Expose Grafana HTTP Mgmt GUI port (3000->${GRAF_EXT_PORT_HTTP})"

    GRAF_PORT_HTTP=$(kubectl --namespace monitoring get service grafana -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

    PATCH='{"data": {"'${GRAF_EXT_PORT_HTTP}'": "monitoring/grafana:'${GRAF_PORT_HTTP}'"}}'

    GRAF_PORT_HTTP=$(kubectl --namespace ${MONITORING_NAMESPACE} get service grafana -o 'jsonpath={.spec.ports[?(@.name=="http")].port}')

    PATCH='{"data": {"'${GRAF_EXT_PORT_HTTP}'": "'${MONITORING_NAMESPACE}'/grafana:'${GRAF_PORT_HTTP}'"}}'

    kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"



    PORT_MAP='{"containerPort": '${GRAF_EXT_PORT_HTTP}', "hostPort": '${GRAF_EXT_PORT_HTTP}'}'
@@ -55,4 +57,9 @@ function expose_dashboard() { 
    echo

}



if kubectl get namespace ${MONITORING_NAMESPACE} &> /dev/null; then

    echo ">>> Namespace ${MONITORING_NAMESPACE} is present, exposing dashboard..."

    expose_dashboard

else

    echo ">>> Namespace ${MONITORING_NAMESPACE} is NOT present, skipping expose dashboard..."

fi

deploy/mock_blockchain.sh

+9 −8
Original line number Diff line number Diff line
@@ -38,20 +38,21 @@ 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"

TMP_MANIFESTS_FOLDER="${TMP_FOLDER}/${K8S_NAMESPACE}/manifests"

mkdir -p $TMP_MANIFESTS_FOLDER

TMP_LOGS_FOLDER="$TMP_FOLDER/logs"

TMP_LOGS_FOLDER="${TMP_FOLDER}/${K8S_NAMESPACE}/logs"

mkdir -p $TMP_LOGS_FOLDER



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

kubectl delete namespace $K8S_NAMESPACE

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

kubectl create namespace $K8S_NAMESPACE

printf "\n"



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

ENV_VARS_SCRIPT=tfs_bchain_runtime_env_vars.sh

echo "# Environment variables for TeraFlow Mock-Blockchain deployment" > $ENV_VARS_SCRIPT

echo "# Environment variables for TeraFlowSDN Mock-Blockchain deployment" > $ENV_VARS_SCRIPT

PYTHONPATH=$(pwd)/src

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



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

IMAGE_NAME="$COMPONENT:$IMAGE_TAG"
@@ -77,12 +78,12 @@ cp ./manifests/"${COMPONENT}".yaml "$MANIFEST" 


if [ -n "$REGISTRY_IMAGE" ]; then

    # Registry is set

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

    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"

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

else

    # Registry is not set

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

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

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

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

fi
@@ -91,8 +92,8 @@ echo " Deploying '$COMPONENT' component to Kubernetes..." 
DEPLOY_LOG="$TMP_LOGS_FOLDER/deploy_${COMPONENT}.log"

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

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

kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=0 ${COMPONENT_OBJNAME} >> "$DEPLOY_LOG"

kubectl --namespace $K8S_NAMESPACE scale deployment --replicas=1 ${COMPONENT_OBJNAME} >> "$DEPLOY_LOG"

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

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



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

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

deploy/tfs.sh

+7 −2
Original line number Diff line number Diff line
@@ -327,7 +327,12 @@ echo "Deploying extra manifests..." 
for EXTRA_MANIFEST in $TFS_EXTRA_MANIFESTS; do

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

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

        if kubectl get namespace monitoring &> /dev/null; then

            echo ">>> Namespace monitoring is present, applying service monitors..."

            kubectl apply -f $EXTRA_MANIFEST

        else

            echo ">>> Namespace monitoring is NOT present, skipping service monitors..."

        fi

    else

        kubectl --namespace $TFS_K8S_NAMESPACE apply -f $EXTRA_MANIFEST

    fi
@@ -343,7 +348,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
    printf "\n"

done



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

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

    echo "Configuring WebUI DataStores and Dashboards..."

    sleep 5

hackfest/containerlab/commands.txt

+10 −8
Original line number Diff line number Diff line
@@ -60,22 +60,24 @@ docker exec -it clab-tfs-scenario-client2 bash 
$ sudo bash -c "$(curl -sL https://get-gnmic.kmrd.dev)"



## gNMI Capabilities request

$ gnmic -a clab-srlinux-srl1 -u admin -p NokiaSrl1! --skip-verify capabilities

$ gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify capabilities



## gNMI Get request

$ gnmic -a clab-srlinux-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path /system/name/host-name

$ gnmic -a clab-srlinux-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path /interface[name=mgmt0]

$ gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path /system/config/hostname

$ gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path /interfaces/interface[name=mgmt0]





## gNMI Set request

$ gnmic -a clab-srlinux-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --update-path /system/name/host-name --update-value slr11

$ gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf set --update-path /system/config/hostname --update-value srl11



(we check the changed value)

$ gnmic -a clab-srlinux-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path /system/name/host-name 

$ gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf get --path /system/config/hostname



## Subscribe request

$ gnmic -a clab-srlinux-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf subscribe --path /interface[name=mgmt0]/statistics

$ gnmic -a clab-tfs-scenario-srl1 -u admin -p NokiaSrl1! --skip-verify -e json_ietf subscribe --path /interfaces/interface[name=mgmt0]/state/



(In another terminal, you can generate traffic) 

$ssh admin@clab-srlinux-srl1

$ssh admin@clab-tfs-scenario-srl1

manifests/deviceservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ spec: 
          exec:

            command: ["/bin/grpc_health_probe", "-addr=:2020"]

          failureThreshold: 30

          periodSeconds: 10

          periodSeconds: 1

        readinessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:2020"]