X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=fcb28f7e9740f4e59edb6f20c8b8638941111476;hb=a28f9de209c34ff053b92513e2cb546943c83813;hp=3a875ca4e128de49fa5b57a216125bdbdd02905c;hpb=15ef8c87177cf951066f5925d51675b8eb42aef2;p=icn.git

diff --git a/Makefile b/Makefile
index 3a875ca..fcb28f7 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ METAL3DIR:=$(CURDIR)/deploy/metal3/scripts
 METAL3VMDIR:=$(CURDIR)/deploy/metal3-vm
 BPA_OPERATOR:=$(CURDIR)/cmd/bpa-operator/
 KUD_PATH:=$(CURDIR)/deploy/kud
-BPA_E2E_SETUP:=https://raw.githubusercontent.com/onap/multicloud-k8s/master/kud/hosting_providers/vagrant/setup.sh
+SDWAN_VERIFIER_PATH:=$(CURDIR)/sdwan/test
+BPA_REST_API:=$(CURDIR)/cmd/bpa-restapi-agent
+
 
 help:
 	@echo "  Targets:"
@@ -37,24 +39,39 @@ metal3_prerequisite:
 metal3_vm:
 	pushd $(METAL3VMDIR) && make bmh && popd
 
+sdwan_verifier:
+	pushd $(SDWAN_VERIFIER_PATH) && bash sdwan_verifier.sh && popd
+
 bpa_op_install:
 	pushd $(BPA_OPERATOR) && make docker && make deploy && popd
 
 bpa_op_delete:
 	pushd $(BPA_OPERATOR) && make delete && popd
 
-bpa_op_e2e_preinstall:
-	wget $(BPA_E2E_SETUP) && bash setup.sh -p libvirt
-
 bpa_op_e2e:
 	pushd $(BPA_OPERATOR) && make e2etest && popd
 
-bpa_op_verifier: bpa_op_install bpa_op_e2e	
+bpa_op_unit:
+	pushd $(BPA_OPERATOR) && make unit_test && popd
+
+bpa_op_verifier: bpa_op_install bpa_op_e2e
 
 bpa_op_all: bm_all bpa_op_install
 
+bpa_rest_api_install:
+	pushd $(BPA_REST_API) && make deploy && popd
+
+bpa_rest_api_uninstall:
+	pushd $(BPA_REST_API) && make clean && popd
+
+bpa_rest_api_verifier:
+	pushd $(BPA_REST_API) && make e2e_test && popd
+
+bpa_rest_api_unit:
+	pushd $(BPA_REST_API) && make unit_test && popd
+
 bashate:
-	bashate -i E006 `find . -name *.sh`
+	bashate -i E006,E003,E002,E010,E011,E042,E043 `find . -type f -not -path './cmd/bpa-operator/vendor/*' -not -path './ci/jjb/shell/*' -name *.sh`
 
 prerequisite:
 	pushd $(ENV) && ./cd_package_installer.sh && popd
@@ -62,11 +79,14 @@ prerequisite:
 verify_all: prerequisite \
 	metal3_prerequisite \
 	kud_bm_deploy_mini \
-	metal3_vm
+	metal3_vm \
+	bpa_op_verifier \
+	bpa_rest_api_verifier
 
 verifier: verify_all
 
 verify_nestedk8s: prerequisite \
-	kud_bm_deploy
+	kud_bm_deploy \
+	sdwan_verifier
 
 .PHONY: all bm_preinstall bm_install bashate