Merge ~liaou3/checkbox-iiotg/+git/checkbox-provider-intliotg:automation_tsn-ieee802.1qbv into ~checkbox-dev/checkbox-iiotg/+git/checkbox-provider-intliotg:master

[Vincent Liao]

Modify: TSN automation for tsn-ieee802.1qbv

This MR makes the original tsn test case from manual to automated.

submission: https://certification.canonical.com/hardware/202306-31658/submission/343451/test/203645/result/37682372/

[StanleyHuang (stanley31)]

I have a couple of issues for this MR

1. the gptp config is not part of arguments for the tsn_time_sync.sh, is that config integrated into tsn_time_sync.sh scripts?
2. a minor issue found in inline comment.

review: Needs Information

[Vincent Liao (liaou3)]

> I have a couple of issues for this MR
>
> 1. the gptp config is not part of arguments for the tsn_time_sync.sh, is that
> config integrated into tsn_time_sync.sh scripts?
> 2. a minor issue found in inline comment.

1. Yes, this was implemented between line 71 to 105 in this MR [1]
2. Thanks for your reminder. Fixed

[1] https://code.launchpad.net/~liaou3/checkbox-iiotg/+git/checkbox-provider-intliotg/+merge/455020

[Rick Wu (rickwu4444)]

LGTM

review: Approve

[StanleyHuang (stanley31)]

LGTM

review: Approve

diff --git a/bin/udp_traffic_test.sh b/bin/udp_traffic_test.sh
index c0ac460..4aea97f 100755
--- a/bin/udp_traffic_test.sh
+++ b/bin/udp_traffic_test.sh
@@ -2,14 +2,13 @@
 
 eth_interface=$1
 testing_time=$2
-gptp_config_path=$3
-server_user=$4
-server_ip=$5
-server_pwd=$6
-server_eth_interface=$7
+server_user=$3
+server_ip=$4
+server_pwd=$5
+server_eth_interface=$6
 
 echo "## Starting time synchronization..."
-tsn_time_sync.sh "$testing_time" master "${gptp_config_path}" "${eth_interface}" "${server_user}" "${server_ip}" "${server_pwd}" "${server_eth_interface}" > /dev/null &
+tsn_time_sync.sh "$testing_time" master "${eth_interface}" "${server_user}" "${server_ip}" "${server_pwd}" "${server_eth_interface}" > /dev/null &
 sleep 10
 
 echo "## Setting TAPRIO qdisc..."
@@ -46,13 +45,31 @@ iperf3 -u -l 1000 -b0 -p 5102 -c ${TARGET_IP} -t $((testing_time-10)) >> /dev/nu
 echo $! > /sys/fs/cgroup/net_prio/grp3/cgroup.procs
 
 echo "## Checking results..."
-tc -s qdisc show dev "${eth_interface}"
-sleep 10
+out=$(tc -s qdisc show dev "${eth_interface}")
+echo "$out"
+sent4=$(echo "$out" | grep Sent | sed -n "2p" | awk '{print $2}')
+sent3=$(echo "$out" | grep Sent | sed -n "3p" | awk '{print $2}')
+sent2=$(echo "$out" | grep Sent | sed -n "4p" | awk '{print $2}')
+sent1=$(echo "$out" | grep Sent | sed -n "5p" | awk '{print $2}')
 echo ""
-echo "# 10 seconds after..."
-tc -s qdisc show dev "${eth_interface}"
+
 sleep 10
-echo ""
 echo "# 10 seconds after..."
-tc -s qdisc show dev "${eth_interface}"
+out=$(tc -s qdisc show dev "${eth_interface}")
+echo "$out"
+sent4_new=$(echo "$out" | grep Sent | sed -n "2p" | awk '{print $2}')
+sent3_new=$(echo "$out" | grep Sent | sed -n "3p" | awk '{print $2}')
+sent2_new=$(echo "$out" | grep Sent | sed -n "4p" | awk '{print $2}')
+sent1_new=$(echo "$out" | grep Sent | sed -n "5p" | awk '{print $2}')
+
+echo ""
+if [ "$sent4_new" -le "$sent4" ] || [ "$sent3_new" -le "$sent3" ] || [ "$sent2_new" -le "$sent2" ] || [ "$sent1_new" -le "$sent1" ]; then
+    echo "ERROR: Packet Sent is not increasing!"
+    exit_code=1
+else
+    echo "PASS: Packet Sent is increasing!"
+    exit_code=0
+fi
 sshpass -p "${server_user}" ssh -o StrictHostKeyChecking=no "${server_user}@${server_ip}" "echo ${server_pwd} | sudo -S killall iperf3"
+
+exit "$exit_code"
diff --git a/units/tsn/jobs.pxu b/units/tsn/jobs.pxu
index c7b5416..92f6082 100644
--- a/units/tsn/jobs.pxu
+++ b/units/tsn/jobs.pxu
@@ -317,7 +317,7 @@ _summary: Check if the streams packet are handled properly
 depends:
     tsn/tsn-detected
     tsn/testing-snap-install-check
-plugin: user-interact-verify
+plugin: shell
 user: root
 _purpose:
     To check if the system can transmit 4 streams of iperf udp traffic
@@ -327,9 +327,8 @@ environ:
     TSN_SERVER_USER
     TSN_SERVER_PWD
     TSN_SERVER_INTERFACE
-    GPTP_CONFIG_PATH
 command:
-    udp_traffic_test.sh {interface} 30 "${{GPTP_CONFIG_PATH:-/usr/share/gPTP.cfg}}" "$TSN_SERVER_USER" "$TSN_SERVER_IP" "$TSN_SERVER_PWD" "$TSN_SERVER_INTERFACE"
+    udp_traffic_test.sh {interface} 30 "$TSN_SERVER_USER" "$TSN_SERVER_IP" "$TSN_SERVER_PWD" "$TSN_SERVER_INTERFACE"
 _verification:
     Is the send bytes and pkt are increasing for 100:1 - 100:4?
 
diff --git a/units/tsn/test-plan.pxu b/units/tsn/test-plan.pxu
index 3978ad2..c5cc31d 100644
--- a/units/tsn/test-plan.pxu
+++ b/units/tsn/test-plan.pxu
@@ -18,7 +18,6 @@ include:
     tsn/test-env-setup-for-.*
     tsn/testing-snap-install-check
 nested_part:
-    tsn-ieee802.1qbv
 
 id: tsn-automated
 _name: Time Sensitive Networking (TSN) test (automated)
@@ -34,6 +33,7 @@ nested_part:
     tsn-ieee802.1qav
     tsn-ieee802.1qbu
     tsn-time-based-shaping
+    tsn-ieee802.1qbv
 
 id: tsn-ieee802.1as-2011
 _name: Time Sensitive Networking Test Plan for IEEE 802.1AS-2011