Merge pull request #11 from opennetworkinglab/test-fix

Minor fixes to PTF tests

Author: ccascone

Makefile

@@ -72,9 +72,11 @@ netcfg:
 reset: stop
 	-rm -rf ./tmp
 
-clean: reset
+clean:
 	-rm -rf p4src/build
 	-rm -rf app/target
+
+deep-clean: clean
 	-docker container rm ${app_build_container_name}
 
 p4-build:
@@ -85,6 +87,9 @@ p4-build:
 		--p4runtime-files p4src/build/p4info.txt --Wdisable=unsupported \
 		p4src/main.p4
 
+p4-test:
+	@cd ptf && ./run_tests
+
 _create_mvn_container:
 	@if ! docker container ls -a --format '{{.Names}}' | grep -q ${app_build_container_name} ; then \
 		docker create -v ${curr_dir}/app:/mvn-src -w /mvn-src --name ${app_build_container_name} ${MAVEN_IMG} mvn clean package; \

README.md

@@ -113,8 +113,9 @@ the exercises, here's a quick reference:
 | Make command        | Description                                            |
 |---------------------|------------------------------------------------------- |
 | `make pull-deps`    | Pull all required dependencies                         |
-| `make p4-build `    | Build the P4 program                                   |
-| `make app-build `   | Build ONOS app                                         |
+| `make p4-build`     | Build P4 program                                       |
+| `make p4-test`      | Run the PTF tests                                      |
+| `make app-build`    | Build ONOS app                                         |
 | `make start`        | Start containers (`mininet` and `onos`)                |
 | `make stop`         | Stop and remove all containers                         |
 | `make onos-cli`     | Access the ONOS CLI (password: `rocks`, Ctrl+D to exit)|

ptf/lib/base_test.py

@@ -19,6 +19,10 @@
 # Carmelo Cascone ([email protected])
 #
 
+import logging
+# https://stackoverflow.com/questions/24812604/hide-scapy-warning-message-ipv6
+logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
+
 import itertools
 import Queue
 import sys

ptf/run_tests

@@ -10,8 +10,8 @@ DOCKER_IMG=onosproject/fabric-p4test
 runName=ptf-${RANDOM}
 
 function stop() {
-        echo "Stopping ${runName}..."
-        docker stop -t0 "${runName}"
+        echo "Stopping container ${runName}..."
+        docker stop -t0 "${runName}" > /dev/null
 }
 trap stop INT
 
@@ -37,3 +37,5 @@ docker exec "${runName}" ./lib/runner.py \
     --ptf-dir ./tests \
     --cpu-port 255 \
     --port-map /ptf/lib/port_map.json "${@}"
+
+stop