Merge branch 'develop' into feat/scenario2-workflow3-tests

.gitignore

@@ -162,6 +162,7 @@ cython_debug/
 
 # TeraFlowSDN-generated files
 tfs_runtime_env_vars.sh
+tfs_runtime_env_vars*.sh
 tfs_bchain_runtime_env_vars.sh
 delete_local_deployment.sh
 local_docker_deployment.sh

deploy.sh

@@ -36,9 +36,13 @@ 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 neew Grafana admin password
+# 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.
+# 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:-""}
+
 ########################################################################################################################
 # Automated steps start here
 ########################################################################################################################
@@ -67,73 +71,75 @@ echo "export PYTHONPATH=${PYTHONPATH}" >> $ENV_VARS_SCRIPT
 for COMPONENT in $TFS_COMPONENTS; do
     echo "Processing '$COMPONENT' component..."
 
-    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
+    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"
 
-    if [ -n "$TFS_REGISTRY_IMAGE" ]; then
-        echo "  Pushing Docker image to '$TFS_REGISTRY_IMAGE'..."
+            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
 
-        if [ "$COMPONENT" == "pathcomp" ]; then
-            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
+        if [ -n "$TFS_REGISTRY_IMAGE" ]; then
+            echo "  Pushing Docker image to '$TFS_REGISTRY_IMAGE'..."
 
-            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"
-            docker tag "$COMPONENT-frontend:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"
+            if [ "$COMPONENT" == "pathcomp" ]; then
+                IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-frontend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
 
-            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-frontend.log"
-            docker push "$IMAGE_URL" > "$PUSH_LOG"
+                TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-frontend.log"
+                docker tag "$COMPONENT-frontend:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"
 
-            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-backend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
+                PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-frontend.log"
+                docker push "$IMAGE_URL" > "$PUSH_LOG"
 
-            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-backend.log"
-            docker tag "$COMPONENT-backend:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"
+                IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-backend:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
 
-            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-backend.log"
-            docker push "$IMAGE_URL" > "$PUSH_LOG"
-        elif [ "$COMPONENT" == "dlt" ]; then
-            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-connector:$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"
 
-            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}-backend.log"
+                docker push "$IMAGE_URL" > "$PUSH_LOG"
+            elif [ "$COMPONENT" == "dlt" ]; then
+                IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-connector:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
 
-            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-connector.log"
-            docker push "$IMAGE_URL" > "$PUSH_LOG"
+                TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-connector.log"
+                docker tag "$COMPONENT-connector:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"
 
-            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-gateway:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
+                PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-connector.log"
+                docker push "$IMAGE_URL" > "$PUSH_LOG"
 
-            TAG_LOG="$TMP_LOGS_FOLDER/tag_${COMPONENT}-gateway.log"
-            docker tag "$COMPONENT-gateway:$TFS_IMAGE_TAG" "$IMAGE_URL" > "$TAG_LOG"
+                IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT-gateway:$TFS_IMAGE_TAG" | sed 's,//,/,g' | sed 's,http:/,,g')
 
-            PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}-gateway.log"
-            docker push "$IMAGE_URL" > "$PUSH_LOG"
-        else
-            IMAGE_URL=$(echo "$TFS_REGISTRY_IMAGE/$COMPONENT:$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_IMAGE/$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"
+                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"
+                PUSH_LOG="$TMP_LOGS_FOLDER/push_${COMPONENT}.log"
+                docker push "$IMAGE_URL" > "$PUSH_LOG"
+            fi
         fi
     fi
 

src/tests/netx22-p4/README.md → hackfest/p4/README.md

@@ -4,12 +4,12 @@ This functional test shows the P4 driver with a basic connectivity test between
 
 ## Functional test folder
 
-This functional test can be found in folder `src/tests/netx22-p4/`. 
+This functional test can be found in folder `hackfest/p4`
 
 ## P4 source and Mininet topology
 
-This test is designed to operate with a mininet deployment that contains 2 hosts and a BMv2 switch, such a topology can be found in the 'src/tests/netx22-p4/mininet' folder.
-Additionally the P4 source code, along with its compiled artifacts are present in the 'src/tests/netx22-p4/mininet' folder.
+This test is designed to operate with a mininet deployment that contains 2 hosts and a BMv2 switch, such a topology can be found in the 'hackfest/p4/mininet' folder.
+Additionally the P4 source code, along with its compiled artifacts are present in the 'hackfest/p4/p4' folder.
 
 ## Deployment and Dependencies
 
@@ -50,7 +50,7 @@ start-simple: NGSDN_TOPO_PY := topo-simple.py
 start-simple: _start
 ```
 
-And copy the topology file from ~/tfs-ctrl/src/tests/netx22-p4/mininet/topo-simple.py to the ~/ngsdn-tutorial/mininet/ directory.
+And copy the topology file from ~/tfs-ctrl/hackfest/p4/mininet/topo-simple.py to the ~/ngsdn-tutorial/mininet/ directory.
 
 ## Test Execution
 
@@ -70,28 +70,28 @@ client ping server
 
 In another terminal cd to the teraflow directory and run the following
 ```
-src/tests/netx22-p4/setup.sh
+hackfest/p4/setup.sh
 ```
 This will copy the p4 artifacts to the device pod.
 
 Then you can bootstrap the device to the Teraflow Controller
 ```
-src/tests/netx22-p4/run_test_01_bootstrap.sh
+hackfest/p4/run_test_01_bootstrap.sh
 ```
 
 Install the required rules to the p4 switch
 ```
-src/tests/netx22-p4/run_test_02_create_service.sh
+hackfest/p4/run_test_02_create_service.sh
 ```
 You should now check the mininet terminal. The two hosts should be pinging each other as intended.
 
 You can remove the rules from the p4 switch
 ```
-src/tests/netx22-p4/run_test_03_delete_service.sh
+hackfest/p4/run_test_03_delete_service.sh
 ```
 The two hosts on the mininet terminal, should stop pinging.
 
 And remove the device from the Teraflow Controller
 ```
-src/tests/netx22-p4/run_test_04_cleanup.sh
+hackfest/p4/run_test_04_cleanup.sh
 ```

src/tests/netx22-p4/run_test_01_bootstrap.sh → hackfest/p4/run_test_01_bootstrap.sh

@@ -18,4 +18,5 @@
 # - tfs_runtime_env_vars.sh
 
 source tfs_runtime_env_vars.sh
-python -m pytest --verbose src/tests/netx22-p4/tests/test_functional_bootstrap.py
+python -m pytest --verbose hackfest/p4/tests/test_functional_bootstrap.py
+

src/tests/netx22-p4/run_test_02_create_service.sh → hackfest/p4/run_test_02_create_service.sh

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 source tfs_runtime_env_vars.sh
-python -m pytest --verbose src/tests/netx22-p4/tests/test_functional_create_service.py
+python -m pytest --verbose hackfest/p4/tests/test_functional_create_service.py

src/tests/netx22-p4/run_test_03_delete_service.sh → hackfest/p4/run_test_03_delete_service.sh

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 source tfs_runtime_env_vars.sh
-python -m pytest --verbose src/tests/netx22-p4/tests/test_functional_delete_service.py
+python -m pytest --verbose hackfest/p4/tests/test_functional_delete_service.py

src/tests/netx22-p4/run_test_04_cleanup.sh → hackfest/p4/run_test_04_cleanup.sh

@@ -14,4 +14,4 @@
 # limitations under the License.
 
 source tfs_runtime_env_vars.sh
-python -m pytest --verbose src/tests/netx22-p4/tests/test_functional_cleanup.py
+python -m pytest --verbose hackfest/p4/tests/test_functional_cleanup.py

src/tests/netx22-p4/setup.sh → hackfest/p4/setup.sh

@@ -4,5 +4,5 @@ export POD_NAME=$(kubectl get pods -n=tfs | grep device | awk '{print $1}')
 
 kubectl exec ${POD_NAME} -n=tfs -- mkdir /root/p4
 
-kubectl cp src/tests/netx22-p4/p4/p4info.txt tfs/${POD_NAME}:/root/p4
-kubectl cp src/tests/netx22-p4/p4/bmv2.json tfs/${POD_NAME}:/root/p4
+kubectl cp hackfest/p4/p4/p4info.txt tfs/${POD_NAME}:/root/p4
+kubectl cp hackfest/p4/p4/bmv2.json tfs/${POD_NAME}:/root/p4

src/tests/netx22-p4/tests/Objects.py → hackfest/p4/tests/Objects.py

 # Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
+#
 # 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
@@ -42,6 +43,8 @@ PACKET_PORT_SAMPLE_TYPES = [
     KpiSampleType.KPISAMPLETYPE_BYTES_RECEIVED,
 ]
 
+# ----- Device Credentials and Settings --------------------------------------------------------------------------------
+
 
 # ----- Devices --------------------------------------------------------------------------------------------------------
 
@@ -54,7 +57,7 @@ DEVICE_SW1                  = json_device_p4_disabled(DEVICE_SW1_UUID)
 
 DEVICE_SW1_DPID             = 1
 DEVICE_SW1_NAME             = DEVICE_SW1_UUID
-DEVICE_SW1_IP_ADDR          = '10.0.2.10'
+DEVICE_SW1_IP_ADDR          = 'localhost'
 DEVICE_SW1_PORT             = '50001'
 DEVICE_SW1_VENDOR           = 'Open Networking Foundation'
 DEVICE_SW1_HW_VER           = 'BMv2 simple_switch'
@@ -78,9 +81,38 @@ DEVICE_SW1_CONNECT_RULES    = json_device_connect_rules(
     }
 )
 
+DEVICE_SW2_UUID             = 'SW2'
+DEVICE_SW2_TIMEOUT          = 60
+DEVICE_SW2_ID               = json_device_id(DEVICE_SW2_UUID)
+DEVICE_SW2                  = json_device_p4_disabled(DEVICE_SW2_UUID)
 
-################################## TABLE ENTRIES ##################################
+DEVICE_SW2_DPID             = 1
+DEVICE_SW2_NAME             = DEVICE_SW2_UUID
+DEVICE_SW2_IP_ADDR          = 'localhost'
+DEVICE_SW2_PORT             = '50002'
+DEVICE_SW2_VENDOR           = 'Open Networking Foundation'
+DEVICE_SW2_HW_VER           = 'BMv2 simple_switch'
+DEVICE_SW2_SW_VER           = 'Stratum'
 
+DEVICE_SW2_BIN_PATH         = '/root/p4/bmv2.json'
+DEVICE_SW2_INFO_PATH        = '/root/p4/p4info.txt'
+
+DEVICE_SW2_CONNECT_RULES    = json_device_connect_rules(
+    DEVICE_SW2_IP_ADDR,
+    DEVICE_SW2_PORT,
+    {
+        'id':       DEVICE_SW2_DPID,
+        'name':     DEVICE_SW2_NAME,
+        'vendor':   DEVICE_SW2_VENDOR,
+        'hw_ver':   DEVICE_SW2_HW_VER,
+        'sw_ver':   DEVICE_SW2_SW_VER,
+        'timeout':  DEVICE_SW2_TIMEOUT,
+        'p4bin':    DEVICE_SW2_BIN_PATH,
+        'p4info':   DEVICE_SW2_INFO_PATH
+    }
+)
+
+################################## TABLE ENTRIES ##################################
 
 DEVICE_SW1_CONFIG_TABLE_ENTRIES = [
     json_config_rule_set(
@@ -123,6 +155,8 @@ DEVICE_SW1_CONFIG_TABLE_ENTRIES = [
     )
 ]
 
+DEVICE_SW2_CONFIG_TABLE_ENTRIES = DEVICE_SW1_CONFIG_TABLE_ENTRIES 
+
 
 """
 DEVICE_SW1_CONFIG_TABLE_ENTRIES = [
@@ -171,7 +205,6 @@ DEVICE_SW1_CONFIG_TABLE_ENTRIES = [
 
 ################################## TABLE DECONF ##################################
 
-
 DEVICE_SW1_DECONF_TABLE_ENTRIES = [
     json_config_rule_delete(
         'table',
@@ -213,6 +246,7 @@ DEVICE_SW1_DECONF_TABLE_ENTRIES = [
     )
 ]
 
+DEVICE_SW2_DECONF_TABLE_ENTRIES = DEVICE_SW1_DECONF_TABLE_ENTRIES 
 
 
 """
@@ -271,6 +305,7 @@ TOPOLOGIES = [TOPOLOGY]
 
 DEVICES = [
     (DEVICE_SW1, DEVICE_SW1_CONNECT_RULES, DEVICE_SW1_CONFIG_TABLE_ENTRIES, DEVICE_SW1_DECONF_TABLE_ENTRIES),
+    (DEVICE_SW2, DEVICE_SW2_CONNECT_RULES, DEVICE_SW2_CONFIG_TABLE_ENTRIES, DEVICE_SW2_DECONF_TABLE_ENTRIES),
 ]
 
 LINKS = []