X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=Makefile;h=dbf043932977a08b54b1b3122d7f81d475916a38;hb=826c67cd90a0ab7c0282f63d7de63ab785295b83;hp=80e8cea475ab40b805d247c593b8096d016495cf;hpb=066bb8cf144cc33ddc7d2743d2437881db19b28d;p=icn.git

diff --git a/Makefile b/Makefile
index 80e8cea..dbf0439 100644
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,12 @@ SHELL:=/bin/bash
 ENV:=$(CURDIR)/env
 BMDIR:=$(CURDIR)/env/metal3
 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:"
@@ -24,8 +27,20 @@ bm_install:
 
 bm_all: bm_preinstall bm_install
 
+kud_bm_deploy_mini:
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh minimal && popd
+
 kud_bm_deploy:
-	pushd $(KUD_PATH) && ./kud_bm_launch.sh && popd
+	pushd $(KUD_PATH) && ./kud_bm_launch.sh all && popd
+
+metal3_prerequisite:
+	pushd $(METAL3VMDIR) && make bmh_install && popd
+
+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
@@ -33,25 +48,42 @@ bpa_op_install:
 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_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/*' -name *.sh`
 
 prerequisite:
 	pushd $(ENV) && ./cd_package_installer.sh && popd
 
 verify_all: prerequisite \
-	kud_bm_deploy 
+	metal3_prerequisite \
+	kud_bm_deploy_mini \
+	metal3_vm \
+	bpa_op_verifier \
+	bpa_rest_api_verifier
 
 verifier: verify_all
 
+verify_nestedk8s: prerequisite \
+	kud_bm_deploy \
+	sdwan_verifier
+
 .PHONY: all bm_preinstall bm_install bashate