Refactor: use p4runtime_lib instead of external dependency, self-contained veth setup, add make test target to the Makerfile, updated the README.md to reflect changes

Signed-off-by: aqn96 <aqnguyen96@gmail.com>
Signed-off-by: An <aqnguyen96@gmail.com>

Author: aqn96

exercises/basic/Makefile

@@ -3,3 +3,6 @@ BMV2_SWITCH_EXE = simple_switch_grpc
 TOPO = pod-topo/topology.json
 
 include ../../utils/Makefile
+
+test:
+	./runptf.sh

exercises/basic/README.md

@@ -198,12 +198,11 @@ forwarding, and multi-entry LPM routing.
 
 To run the tests:
 ```bash
-./runptf.sh
+make test
 ```
 
-Note: The `veth` interfaces must be set up before running. If you see
-a "No such device" error, run the `veth_setup.sh` script from
-[p4-guide](https://github.com/jafingerhut/p4-guide/blob/master/bin/veth_setup.sh).
+This handles veth interface creation, P4 compilation, switch startup,
+test execution, and cleanup automatically.
 
 ## Relevant Documentation
 

exercises/basic/ptf/basic_fwd.py

@@ -15,12 +15,20 @@
 # limitations under the License.
 
 import logging
+import os
+import sys
 
 import ptf
 import ptf.testutils as tu
 from ptf.base_tests import BaseTest
-import p4runtime_sh.shell as sh
-import p4runtime_shell_utils as shu
+
+# Import p4runtime_lib from the tutorials repo utils directory
+sys.path.append(
+    os.path.join(os.path.dirname(os.path.abspath(__file__)),
+                 '../../../utils/'))
+import p4runtime_lib.bmv2
+import p4runtime_lib.helper
+from p4runtime_lib.switch import ShutdownAllSwitchConnections
 
 
 # Configure logging
@@ -38,32 +46,53 @@ def setUp(self):
         self.dataplane.flush()
 
         logging.debug("BasicFwdTest.setUp()")
+
+        # Get test parameters
         grpc_addr = tu.test_param_get("grpcaddr")
         if grpc_addr is None:
             grpc_addr = 'localhost:9559'
         p4info_txt_fname = tu.test_param_get("p4info")
         p4prog_binary_fname = tu.test_param_get("config")
-        sh.setup(device_id=0,
-                 grpc_addr=grpc_addr,
-                 election_id=(0, 1),
-                 config=sh.FwdPipeConfig(p4info_txt_fname, p4prog_binary_fname),
-                 verbose=False)
+
+        # Create P4Info helper for building table entries
+        self.p4info_helper = p4runtime_lib.helper.P4InfoHelper(p4info_txt_fname)
+
+        # Connect to the switch via gRPC
+        self.sw = p4runtime_lib.bmv2.Bmv2SwitchConnection(
+            name='s1',
+            address=grpc_addr,
+            device_id=0,
+            proto_dump_file='logs/s1-p4runtime-requests.txt')
+
+        # Establish as master controller
+        self.sw.MasterArbitrationUpdate()
+
+        # Load the P4 program onto the switch
+        self.sw.SetForwardingPipelineConfig(
+            p4info=self.p4info_helper.p4info,
+            bmv2_json_file_path=p4prog_binary_fname)
 
     def tearDown(self):
         logging.debug("BasicFwdTest.tearDown()")
-        sh.teardown()
+        ShutdownAllSwitchConnections()
 
 
 ######################################################################
 # Helper function to add entries to ipv4_lpm table
 ######################################################################
 
-def add_ipv4_lpm_entry(ipv4_addr_str, prefix_len, dst_mac_str, port):
-    te = sh.TableEntry('MyIngress.ipv4_lpm')(action='MyIngress.ipv4_forward')
-    te.match['hdr.ipv4.dstAddr'] = '%s/%d' % (ipv4_addr_str, prefix_len)
-    te.action['dstAddr'] = dst_mac_str
-    te.action['port'] = '%d' % port
-    te.insert()
+    def add_ipv4_lpm_entry(self, ipv4_addr_str, prefix_len, dst_mac_str, port):
+        table_entry = self.p4info_helper.buildTableEntry(
+            table_name='MyIngress.ipv4_lpm',
+            match_fields={
+                'hdr.ipv4.dstAddr': (ipv4_addr_str, prefix_len)
+            },
+            action_name='MyIngress.ipv4_forward',
+            action_params={
+                'dstAddr': dst_mac_str,
+                'port': port
+            })
+        self.sw.WriteTableEntry(table_entry)
 
 
 class DropTest(BasicFwdTest):
@@ -92,7 +121,7 @@ def runTest(self):
         out_dmac = '08:00:00:00:02:22'
 
         # Add a forwarding entry
-        add_ipv4_lpm_entry(ip_dst, 32, out_dmac, eg_port)
+        self.add_ipv4_lpm_entry(ip_dst, 32, out_dmac, eg_port)
 
         # Send packet
         pkt = tu.simple_tcp_packet(eth_src=in_smac, eth_dst=in_dmac,
@@ -131,8 +160,8 @@ def runTest(self):
 
         # Add all entries
         for e in entries:
-            add_ipv4_lpm_entry(e['ip_dst'], e['prefix_len'],
-                               e['out_dmac'], e['eg_port'])
+            self.add_ipv4_lpm_entry(e['ip_dst'], e['prefix_len'],
+                                    e['out_dmac'], e['eg_port'])
 
         # Test each entry
         ttl_in = 64

exercises/basic/runptf.sh

@@ -2,18 +2,25 @@
 # Run PTF tests for the basic forwarding exercise.
 # Tests run against the solution P4 program.
 
-# Path to p4runtime_shell_utils and testlib
-T="`realpath ~/p4-guide/testlib`"
-if [ x"${PYTHONPATH}" == "x" ]
-then
-    P="${T}"
-else
-    P="${T}:${PYTHONPATH}"
-fi
+set -e
+
+# ---- veth setup ----
+echo "Creating veth interfaces..."
+for i in 0 1 2 3 4 5 6 7; do
+    intf0="veth$(( i * 2 ))"
+    intf1="veth$(( i * 2 + 1 ))"
+    if ! ip link show $intf0 &>/dev/null; then
+        sudo ip link add name $intf0 type veth peer name $intf1
+        sudo ip link set dev $intf0 up
+        sudo ip link set dev $intf1 up
+        sudo sysctl -q net.ipv6.conf.$intf0.disable_ipv6=1
+        sudo sysctl -q net.ipv6.conf.$intf1.disable_ipv6=1
+    fi
+done
 
 set -x
 
-# Compile the solution P4 program into build directory
+# ---- compile ----
 mkdir -p build
 p4c --target bmv2 \
     --arch v1model \
@@ -23,7 +30,7 @@ p4c --target bmv2 \
 
 /bin/rm -f ss-log.txt
 
-# Start simple_switch_grpc with no P4 program loaded (loaded via P4Runtime)
+# ---- start switch ----
 sudo simple_switch_grpc \
      --log-file ss-log \
      --log-flush \
@@ -39,12 +46,11 @@ sudo simple_switch_grpc \
      --no-p4 &
 
 echo ""
-echo "Started simple_switch_grpc.  Waiting 2 seconds before starting PTF test ..."
+echo "Started simple_switch_grpc. Waiting 2 seconds before starting PTF test..."
 sleep 2
 
-# Run PTF tests
+# ---- run tests ----
 sudo ${P4_EXTRA_SUDO_OPTS} `which ptf` \
-    --pypath "$P" \
     -i 0@veth1 \
     -i 1@veth3 \
     -i 2@veth5 \
@@ -57,10 +63,22 @@ sudo ${P4_EXTRA_SUDO_OPTS} `which ptf` \
     --test-dir ptf
 
 echo ""
-echo "PTF test finished.  Waiting 2 seconds before killing simple_switch_grpc ..."
+echo "PTF test finished. Waiting 2 seconds before killing simple_switch_grpc..."
 sleep 2
+
+# ---- cleanup ----
 sudo pkill --signal 9 --list-name simple_switch
+
 echo ""
-echo "Verifying that there are no simple_switch_grpc processes running any longer in 4 seconds ..."
-sleep 4
+echo "Cleaning up veth interfaces..."
+for i in 0 1 2 3 4 5 6 7; do
+    intf0="veth$(( i * 2 ))"
+    if ip link show $intf0 &>/dev/null; then
+        sudo ip link del $intf0
+    fi
+done
+
+echo ""
+echo "Verifying no simple_switch_grpc processes remain..."
+sleep 2
 ps axguwww | grep simple_switch