Merge branch 'netx22-p4' into 'develop'

fix: Change directory structure to match hackfest

See merge request !12

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