Merge ~liaou3/checkbox-iiotg/+git/checkbox-provider-intliotg:fix_typo_tsn into ~checkbox-dev/checkbox-iiotg/+git/checkbox-provider-intliotg:master

[Vincent Liao]

Fix the job `tsn/ieee802.1qav/check-credit-based-shaper-{{ interface }}`
 - Fix typo from `1000000` to `100000`
 - Make the command field into shell script
 - Replace `tc` command from the snap `iproute2-rt`

[Patrick Liu (patliu)]

+1

review: Approve

[Vincent Liao (liaou3)]

@Stanley Please review the updated MR.
Submission: https://certification.canonical.com/hardware/202306-31658/submission/340437/test-results/pass/

[Rick Wu (rickwu4444)]

@Vincent, Please see my inline comment.

review: Needs Information

[StanleyHuang (stanley31)]

LGTM

review: Approve

[Vincent Liao (liaou3)]

@Rick
This is an unused variable. Thank you for the reminder. I have removed it.

[Rick Wu (rickwu4444)]

LGTM

review: Approve

diff --git a/bin/tsn_credit_based_shaper.sh b/bin/tsn_credit_based_shaper.sh
new file mode 100755
index 0000000..f023b3b
--- /dev/null
+++ b/bin/tsn_credit_based_shaper.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+set -e
+
+eth_interface=$1
+server_user=$2
+server_ip=$3
+server_pwd=$4
+server_eth_interface=$5
+
+echo "## Clearing previous queue discipline configuration..."
+echo "## You will get errors if there's no previous configuration, but you could ignore it."
+sshpass -p "$server_pwd" ssh -o StrictHostKeyChecking=no "$server_user"@"$server_ip" "echo ${server_pwd} | sudo -S iproute2-rt.tc qdisc del dev $server_eth_interface root" || true
+iproute2-rt.tc qdisc del dev "$eth_interface" root || true
+echo ""
+
+echo "## Setting 4 traffic classes mapping..."
+iproute2-rt.tc qdisc replace dev "$eth_interface" handle 100: parent root mqprio num_tc 4 map 0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 queues 1@0 1@1 1@2 1@3 hw 0
+iproute2-rt.tc -g class show dev "$eth_interface"
+echo ""
+
+echo "## Setting Traffic Class 1 (Queue 1) to 10% bandwidth of 1 Gbps..."
+iproute2-rt.tc qdisc replace dev "$eth_interface" parent 100:1 cbs locredit -1350 hicredit 150 sendslope -900000 idleslope 100000 offload 1
+iproute2-rt.tc qdisc show dev "$eth_interface"
+echo ""
+
+echo "## Start sending UDP packets of 1500 bytes using socket priority 1 with tsn-talker..."
+stdbuf -oL timeout 60 tsn-talker -d 01:AA:AA:AA:AA:AA -i "$eth_interface" -p 0 -s 1500 &
+sleep 5
+echo ""
+
+echo "## Start listening on TSN server..."
+output=$(mktemp)
+(sshpass -p "$server_pwd" ssh -o StrictHostKeyChecking=no "$server_user"@"$server_ip" "echo $server_pwd | sudo -S stdbuf -oL timeout 55 ./tsn-listener -d 01:AA:AA:AA:AA:AA -i $server_eth_interface -s 1500") | tee "$output"
+lines=$(tail -n 50 "$output")
+while read -r line
+do
+    speed=$(echo "$line" | awk 'match($0, /: [0-9]* kbps/) {print substr($0, RSTART+2, RLENGTH-7)}')
+    if [ "$speed" -gt 100000 ]; then
+        echo "FAIL: Data rate over 100000 kbps!"
+        exit 1
+    fi
+    if [ "$speed" -lt 90000 ]; then
+        echo "FAIL: Data rate cannot reach 90% of 100000 kbps!"
+        exit 1
+    fi
+done <<< "$lines"
+echo ""
+echo "Pass: Data rate within -10% of 100000 kbps"
diff --git a/units/tsn/jobs.pxu b/units/tsn/jobs.pxu
index e975c30..b422172 100644
--- a/units/tsn/jobs.pxu
+++ b/units/tsn/jobs.pxu
@@ -276,45 +276,8 @@ environ:
     TSN_SERVER_USER
     TSN_SERVER_PWD
     TSN_SERVER_INTERFACE
-    GPTP_CONFIG_PATH
 command:
-    echo "## Clearing previous queue discipline configuration..."
-    echo "## You will get error if there's no previous configuration, but you could ignore it."
-    echo ""
-    sshpass -p "$TSN_SERVER_PWD" ssh -o StrictHostKeyChecking=no "$TSN_SERVER_USER"@"$TSN_SERVER_IP" "echo $TSN_SERVER_PWD | sudo -S tc qdisc del dev $TSN_SERVER_INTERFACE root"
-    tc qdisc del dev {{ interface }} root
-    echo ""
-    echo "## Setting 4 traffic classes mapping..."
-    tc qdisc replace dev {{ interface }} handle 100: parent root mqprio num_tc 4 map 0 1 2 3 3 3 3 3 3 3 3 3 3 3 3 3 queues 1@0 1@1 1@2 1@3 hw 0
-    tc -g class show dev {{ interface }}
-    echo ""
-    echo "## Setting Traffic Class 1 (Queue 1) to 10% bandwidth of 1 Gbps..."
-    tc qdisc replace dev {{ interface }} parent 100:1 cbs locredit -1350 hicredit 150 sendslope -900000 idleslope 100000 offload 1
-    tc qdisc show dev {{ interface }}
-    echo ""
-    echo "## Start sending UDP packets of 1500 bytes using socket priority 1 with tsn-talker..."
-    stdbuf -oL timeout 60 tsn-talker -d 01:AA:AA:AA:AA:AA -i {{ interface }} -p 0 -s 1500 &
-    sleep 5
-    echo ""
-    echo "## Start listening on TSN server..."
-    output=$(mktemp)
-    (sshpass -p "$TSN_SERVER_PWD" ssh -o StrictHostKeyChecking=no "$TSN_SERVER_USER"@"$TSN_SERVER_IP" "echo $TSN_SERVER_PWD | sudo -S stdbuf -oL timeout 55 ./tsn-listener -d 01:AA:AA:AA:AA:AA -i $TSN_SERVER_INTERFACE -s 1500") | tee $output
-    lines=$(cat $output | tail -n 50)
-    while read -r line
-    do
-        speed=$(echo "$line" | awk 'match($0, /: [0-9]* kbps/) {print substr($0, RSTART+2, RLENGTH-7)}')
-        if [ $speed -gt 100000 ]; then
-            echo "FAIL: Data rate over 1000000 kbps!"
-            exit 1
-        fi
-        if [ $speed -lt 90000 ]; then
-            echo "FAIL: Data rate cannot reach 90% of 1000000 kbps!"
-            exit 1
-        fi
-    done <<< $lines
-    echo ""
-    echo "Pass: Data rate within -10% of 1000000kbps"
-    exit 0
+    tsn_credit_based_shaper.sh {{ interface }} "$TSN_SERVER_USER" "$TSN_SERVER_IP" "$TSN_SERVER_PWD" "$TSN_SERVER_INTERFACE"
 
 unit: template
 template-resource: tsn/tsn-devices