Merge pull request #509 from byllyfish/examples

Re-compile example P4 programs; rename p4info.txt to p4info.txtpb

Author: byllyfish

docs/packets.md

@@ -15,7 +15,7 @@ Here's the initial setup.
 ```pycon
 >>> from finsy import P4PacketOut, P4PacketIn, P4Schema
 >>> from pathlib import Path
->>> p4info = P4Schema(Path('examples/ngsdn/ngsdn/p4/main.p4info.txt'))
+>>> p4info = P4Schema(Path('examples/ngsdn/ngsdn/p4/main.p4info.txtpb'))
 
 ```
 

docs/replication_entry.md

@@ -19,7 +19,7 @@ Here's the initial setup.
 ```pycon
 >>> from finsy import P4MulticastGroupEntry, P4CloneSessionEntry, P4Schema
 >>> from pathlib import Path
->>> p4info = P4Schema(Path('examples/ngsdn/ngsdn/p4/main.p4info.txt'))
+>>> p4info = P4Schema(Path('examples/ngsdn/ngsdn/p4/main.p4info.txtpb'))
 
 ```
 

docs/table_entry.md

@@ -18,7 +18,7 @@ Here's the initial setup:
 ```pycon
 >>> from finsy import P4Schema, P4TableEntry, Match, Action, IndirectAction
 >>> from pathlib import Path
->>> p4info = P4Schema(Path('examples/ngsdn/ngsdn/p4/main.p4info.txt'))
+>>> p4info = P4Schema(Path('examples/ngsdn/ngsdn/p4/main.p4info.txtpb'))
 
 ``` 
 

examples/README.md

@@ -13,8 +13,9 @@ podman or docker to run the demonstration network in a container.
 
 ### Requirements
 
-- Python 3.10 (or later) virtual environment with `finsy` installed.
-- [podman](https://podman.io/) or [docker](https://docker.com)
+- Python 3.10 (or later) virtual environment.
+- [podman](https://podman.io/) or [docker](https://docker.com) installed on the host and available in PATH.
+- Finsy with the demonet extra installed:  `pip install finsy[demonet]`
 
 ## gnmi
 
@@ -59,6 +60,10 @@ To run the integration tests, enter the examples directory and type
 `pytest`. Each test module will create a Mininet instance, run its tests in order, 
 then stop Mininet.
 
+To use pytest, you will need to install the Finsy `dev` dependencies in your virtualenv:
+
+- `pip install -r ./ci/requirements-dev.txt`
+
 ## References
 
 Most of the Finsy example programs use P4 programs from other open source projects. These

examples/basic/demo.py

@@ -59,7 +59,7 @@ def ipv4_lpm_drop_default():
 async def main():
     "Main program."
     opts = fy.SwitchOptions(
-        p4info=_P4SRC / "basic.p4info.txt",
+        p4info=_P4SRC / "basic.p4info.txtpb",
         p4blob=_P4SRC / "basic.json",
         p4force=True,  # Always reload P4 program upon connection.
     )

examples/basic/p4/basic.p4info.txt examples/basic/p4/basic.p4info.txtpbexamples/basic/p4/basic.p4info.txt renamed to examples/basic/p4/basic.p4info.txtpb

@@ -12,7 +12,7 @@ This demo program reads an existing P4Info file and prints out a description of
 contents.
 
 ```
-$ python demo0.py p4/hello.p4info.txt
+$ python demo0.py p4/hello.p4info.txtpb
 ```
 
 You should see output like:

examples/hello/README.md

@@ -46,7 +46,7 @@ async def ready_handler(sw: fy.Switch):
 async def main():
     "Main program."
     options = fy.SwitchOptions(
-        p4info=P4SRC / "hello.p4info.txt",
+        p4info=P4SRC / "hello.p4info.txtpb",
         p4blob=P4SRC / "hello.json",
         ready_handler=ready_handler,
     )

examples/hello/demo1.py

@@ -26,7 +26,7 @@ class DemoApp:
     "Hello World, demo app."
 
     CONTROLLER_PORT = 255
-    P4INFO = P4SRC / "hello.p4info.txt"
+    P4INFO = P4SRC / "hello.p4info.txtpb"
     P4BLOB = P4SRC / "hello.json"
 
     def __init__(self):

examples/hello/demo2.py

@@ -28,7 +28,7 @@ class DemoRoleApp:
     "Hello World, demo app (with role support)."
 
     CONTROLLER_PORT = 255
-    P4INFO = P4SRC / "hello.p4info.txt"
+    P4INFO = P4SRC / "hello.p4info.txtpb"
     P4BLOB = P4SRC / "hello.json"
 
     def __init__(self):