Commit 6dc65f13 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into... 

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into cnit_related_activity_openroadm
parents d3705438 20095d7f

src/tests/p4-fwd-l1/run_test_01_bootstrap.sh

+1 −2
Original line number Diff line number Diff line
@@ -18,5 +18,4 @@ 
# - tfs_runtime_env_vars.sh



source tfs_runtime_env_vars.sh

python -m pytest --verbose src/tests/p4/tests/test_functional_bootstrap.py

python -m pytest --verbose src/tests/p4-fwd-l1/tests/test_functional_bootstrap.py

src/tests/p4-fwd-l1/run_test_02_create_service.sh

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
# limitations under the License.



source tfs_runtime_env_vars.sh

python -m pytest --verbose src/tests/p4/tests/test_functional_create_service.py
 
python -m pytest --verbose src/tests/p4-fwd-l1/tests/test_functional_create_service.py

src/tests/p4-fwd-l1/run_test_03_delete_service.sh

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
# limitations under the License.



source tfs_runtime_env_vars.sh

python -m pytest --verbose src/tests/p4/tests/test_functional_delete_service.py
 
python -m pytest --verbose src/tests/p4-fwd-l1/tests/test_functional_delete_service.py

src/tests/p4-fwd-l1/run_test_04_cleanup.sh

+1 −1
Original line number Diff line number Diff line
@@ -14,4 +14,4 @@ 
# limitations under the License.



source tfs_runtime_env_vars.sh

python -m pytest --verbose src/tests/p4/tests/test_functional_cleanup.py
 
python -m pytest --verbose src/tests/p4-fwd-l1/tests/test_functional_cleanup.py

src/tests/p4-fwd-l1/setup.sh

+2 −2
Original line number Diff line number Diff line
@@ -18,5 +18,5 @@ export POD_NAME=$(kubectl get pods -n=tfs | grep device | awk '{print $1}') 


kubectl exec ${POD_NAME} -n=tfs -c=server -- mkdir /root/p4



kubectl cp src/tests/p4/p4/p4info.txt tfs/${POD_NAME}:/root/p4 -c=server

kubectl cp src/tests/p4/p4/bmv2.json tfs/${POD_NAME}:/root/p4 -c=server
 
kubectl cp src/tests/p4-fwd-l1/p4/p4info.txt tfs/${POD_NAME}:/root/p4 -c=server

kubectl cp src/tests/p4-fwd-l1/p4/bmv2.json tfs/${POD_NAME}:/root/p4 -c=server

src/tests/p4-fwd-l1/mininet/4switch2path.py

+4 −4

File changed.

Contains only whitespace changes.

src/tests/p4-fwd-l1/mininet/6switch2path.py

+4 −4

File changed.

Contains only whitespace changes.

src/tests/p4-fwd-l1/mininet/2switch1path.py

+2 −2

File changed.

Contains only whitespace changes.

src/tests/p4-fwd-l1/mininet/8switch3path.py

+4 −4

File changed.

Contains only whitespace changes.

src/tests/p4-fwd-l1/tests/Objects.py

+1 −1

File changed.

Contains only whitespace changes.