VOL-2042 Unify tests for BBSim and physical pod
Change-Id: Ia5aed704281c20742e3a9a78894da3d739aabf57
diff --git a/Makefile b/Makefile
index 60d61a5..58ec0d8 100644
--- a/Makefile
+++ b/Makefile
@@ -15,20 +15,12 @@
# use bash for pushd/popd, and to fail quickly. virtualenv's activate
# has undefined variables, so no -u
SHELL = bash -e -o pipefail
+ROOT_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
# Variables
LINT_ARGS ?= --verbose --configure LineTooLong:120 --configure TooManyTestSteps:15
VERSION ?= $(shell cat ./VERSION)
-ROBOT_OLT_SN =
-ROBOT_ONU_SN =
-
-ifneq ($(BBSIM_OLT_SN),)
-ROBOT_OLT_SN=-v BBSIM_OLT_SN:$(BBSIM_OLT_SN)
-endif
-
-ifneq ($(BBSIM_ONU_SN),)
-ROBOT_ONU_SN=-v BBSIM_ONU_SN:$(BBSIM_ONU_SN)
-endif
+ROBOT_VAR_FILE ?= $(ROOT_DIR)/tests/data/bbsim-kind.yaml
.PHONY: gendocs
@@ -41,11 +33,13 @@
LIB_BASENAME := $(basename $(LIB_SOURCE))
LIB_DIRS := $(dir $(LIB_SOURCE))
+ROBOT_MISC_ARGS ?=
-sanity-kind: ROBOT_PORT_ARGS ?= -v ONOS_REST_PORT:8181 -v ONOS_SSH_PORT:8101
-sanity-kind: ROBOT_TEST_ARGS ?= --exclude notready --critical sanity
-sanity-kind: ROBOT_MISC_ARGS ?= -v num_onus:1
-sanity-kind: sanity
+sanity-kind: ROBOT_MISC_ARGS += -i sanity
+sanity-kind: bbsim-kind
+
+bbsim-kind: ROBOT_MISC_ARGS += -v num_onus:1 -X
+bbsim-kind: voltha-podtest
# virtualenv for the robot tools
vst_venv:
@@ -67,12 +61,11 @@
set -u ;\
find . -name *.robot -exec python -m robot.tidy --inplace {} \;
-sanity: vst_venv
+voltha-podtest: vst_venv
source ./vst_venv/bin/activate ;\
set -u ;\
- cd tests/sanity ;\
- robot $(ROBOT_PORT_ARGS) $(ROBOT_TEST_ARGS) $(ROBOT_MISC_ARGS) $(ROBOT_OLT_SN) $(ROBOT_ONU_SN) sanity.robot
-
+ cd tests/functional ;\
+ robot -V $(ROBOT_VAR_FILE) $(ROBOT_MISC_ARGS) Voltha_PODTests.robot
gendocs: vst_venv
source ./vst_venv/bin/activate ;\