diff --git a/src/tests/netx22-p4/README.md b/hackfest/p4/README.md similarity index 84% rename from src/tests/netx22-p4/README.md rename to hackfest/p4/README.md index ddc759f43477fa69cdfd94cf979f9e3a803e77de..344b88c0826a4d44ded9c8369a5009e73ed211b4 100644 --- a/src/tests/netx22-p4/README.md +++ b/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 ``` diff --git a/src/tests/netx22-p4/__init__.py b/hackfest/p4/__init__.py similarity index 100% rename from src/tests/netx22-p4/__init__.py rename to hackfest/p4/__init__.py diff --git a/src/tests/netx22-p4/deploy_specs.sh b/hackfest/p4/deploy_specs.sh similarity index 100% rename from src/tests/netx22-p4/deploy_specs.sh rename to hackfest/p4/deploy_specs.sh diff --git a/src/tests/netx22-p4/mininet/topo-simple.py b/hackfest/p4/mininet/topo-simple.py similarity index 100% rename from src/tests/netx22-p4/mininet/topo-simple.py rename to hackfest/p4/mininet/topo-simple.py diff --git a/src/tests/netx22-p4/p4/bmv2.json b/hackfest/p4/p4/bmv2.json similarity index 100% rename from src/tests/netx22-p4/p4/bmv2.json rename to hackfest/p4/p4/bmv2.json diff --git a/src/tests/netx22-p4/p4/main.p4 b/hackfest/p4/p4/main.p4 similarity index 100% rename from src/tests/netx22-p4/p4/main.p4 rename to hackfest/p4/p4/main.p4 diff --git a/src/tests/netx22-p4/p4/p4info.txt b/hackfest/p4/p4/p4info.txt similarity index 100% rename from src/tests/netx22-p4/p4/p4info.txt rename to hackfest/p4/p4/p4info.txt diff --git a/src/tests/netx22-p4/run_test_01_bootstrap.sh b/hackfest/p4/run_test_01_bootstrap.sh similarity index 90% rename from src/tests/netx22-p4/run_test_01_bootstrap.sh rename to hackfest/p4/run_test_01_bootstrap.sh index a3aeaa2b624bf28a06d379247e97211915522746..42e647be17b0e1731a8c69fb68c2cb414fdb542c 100755 --- a/src/tests/netx22-p4/run_test_01_bootstrap.sh +++ b/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 + diff --git a/src/tests/netx22-p4/run_test_02_create_service.sh b/hackfest/p4/run_test_02_create_service.sh similarity index 88% rename from src/tests/netx22-p4/run_test_02_create_service.sh rename to hackfest/p4/run_test_02_create_service.sh index eb2b2d1ab2861bbcfc1d1fcd091ffc784945ceae..c6307deb79dc296266c2dc9ebae112121b599035 100755 --- a/src/tests/netx22-p4/run_test_02_create_service.sh +++ b/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_bootstrap.py diff --git a/src/tests/netx22-p4/run_test_03_delete_service.sh b/hackfest/p4/run_test_03_delete_service.sh similarity index 88% rename from src/tests/netx22-p4/run_test_03_delete_service.sh rename to hackfest/p4/run_test_03_delete_service.sh index 918073c84ab0a1b42c832fb2bf048eabb0aeabc2..c6307deb79dc296266c2dc9ebae112121b599035 100755 --- a/src/tests/netx22-p4/run_test_03_delete_service.sh +++ b/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_bootstrap.py diff --git a/src/tests/netx22-p4/run_test_04_cleanup.sh b/hackfest/p4/run_test_04_cleanup.sh similarity index 89% rename from src/tests/netx22-p4/run_test_04_cleanup.sh rename to hackfest/p4/run_test_04_cleanup.sh index 9e70d02ad09fcdd5c3f7a77b3f0361f366c7f989..c6307deb79dc296266c2dc9ebae112121b599035 100755 --- a/src/tests/netx22-p4/run_test_04_cleanup.sh +++ b/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_bootstrap.py diff --git a/src/tests/netx22-p4/setup.sh b/hackfest/p4/setup.sh similarity index 100% rename from src/tests/netx22-p4/setup.sh rename to hackfest/p4/setup.sh diff --git a/src/tests/netx22-p4/tests/.gitignore b/hackfest/p4/tests/.gitignore similarity index 100% rename from src/tests/netx22-p4/tests/.gitignore rename to hackfest/p4/tests/.gitignore diff --git a/src/tests/netx22-p4/tests/BuildDescriptors.py b/hackfest/p4/tests/BuildDescriptors.py similarity index 100% rename from src/tests/netx22-p4/tests/BuildDescriptors.py rename to hackfest/p4/tests/BuildDescriptors.py diff --git a/src/tests/netx22-p4/tests/LoadDescriptors.py b/hackfest/p4/tests/LoadDescriptors.py similarity index 100% rename from src/tests/netx22-p4/tests/LoadDescriptors.py rename to hackfest/p4/tests/LoadDescriptors.py diff --git a/src/tests/netx22-p4/tests/Objects.py b/hackfest/p4/tests/Objects.py similarity index 100% rename from src/tests/netx22-p4/tests/Objects.py rename to hackfest/p4/tests/Objects.py diff --git a/src/tests/netx22-p4/tests/__init__.py b/hackfest/p4/tests/__init__.py similarity index 100% rename from src/tests/netx22-p4/tests/__init__.py rename to hackfest/p4/tests/__init__.py diff --git a/src/tests/netx22-p4/tests/test_functional_bootstrap.py b/hackfest/p4/tests/test_functional_bootstrap.py similarity index 100% rename from src/tests/netx22-p4/tests/test_functional_bootstrap.py rename to hackfest/p4/tests/test_functional_bootstrap.py diff --git a/src/tests/netx22-p4/tests/test_functional_cleanup.py b/hackfest/p4/tests/test_functional_cleanup.py similarity index 100% rename from src/tests/netx22-p4/tests/test_functional_cleanup.py rename to hackfest/p4/tests/test_functional_cleanup.py diff --git a/src/tests/netx22-p4/tests/test_functional_create_service.py b/hackfest/p4/tests/test_functional_create_service.py similarity index 100% rename from src/tests/netx22-p4/tests/test_functional_create_service.py rename to hackfest/p4/tests/test_functional_create_service.py diff --git a/src/tests/netx22-p4/tests/test_functional_delete_service.py b/hackfest/p4/tests/test_functional_delete_service.py similarity index 100% rename from src/tests/netx22-p4/tests/test_functional_delete_service.py rename to hackfest/p4/tests/test_functional_delete_service.py