X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2FMakefile;h=7a8db06456aeda985d258fb529e09a9dcff29c4d;hb=21757af846776cf5005e06d8c4a9c9dfd4eb6b6e;hp=7ca4ac04d75508cbdea0ef1327e93e8c489c72fe;hpb=522c69de81b355646789a340f061313e3598f5b9;p=demo.git

diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile
index 7ca4ac04..7a8db064 100644
--- a/heat/vFW_CNF_CDS/templates/Makefile
+++ b/heat/vFW_CNF_CDS/templates/Makefile
@@ -1,29 +1,33 @@
-.PHONY: all clean helm base cba clean_all
+.PHONY: all clean helm base clean_all package cba jsonlint_cba
 DUMMY_ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo
 NATIVE_ONBOARDING_PACKAGE_NAME ?= native_vfw_k8s_demo
 CBA_NAME ?= CBA
+_type_files = $(wildcard cba/Definitions/*_types.json)
+
 
 clean_all:
 	$(MAKE) clean
 	$(MAKE) all
 
 #Can't use .csar extension or SDC will panic
-all: package/ helm base cba
+all: package helm base cba
 	cd package_dummy/ && zip -r $(DUMMY_ONBOARDING_PACKAGE_NAME).zip .
 	cd package_native/ && zip -r $(NATIVE_ONBOARDING_PACKAGE_NAME).zip .
 	mv package_dummy/$(DUMMY_ONBOARDING_PACKAGE_NAME).zip .
 	mv package_native/$(NATIVE_ONBOARDING_PACKAGE_NAME).zip .
+	cp $(DUMMY_ONBOARDING_PACKAGE_NAME).zip ../automation/vsp/
+	cp $(NATIVE_ONBOARDING_PACKAGE_NAME).zip  ../automation/vsp/
 
-helm: package/
-	make -C helm
+helm: package
+	$(MAKE) -C helm
 	mv helm/helm_*.tgz package_native/
 	mv helm/*.tgz package_dummy/
 
-base: package/
+base: package
 	cp base_dummy/* package_dummy/
 	cp base_native/* package_native/
 
-cba: package/
+cba: package
 	cp -r cba cba_dummy
 	sed -i 's/"helm_/"/g' cba_dummy/Definitions/vFW_CNF_CDS.json
 	cd cba_dummy/ && zip -r $(CBA_NAME).zip . -x pom.xml .idea/\* target/\*
@@ -31,7 +35,7 @@ cba: package/
 	mv cba/$(CBA_NAME).zip package_native/
 	mv cba_dummy/$(CBA_NAME).zip package_dummy/
 
-package/:
+package:
 	mkdir package_dummy/
 	mkdir package_native/
 
@@ -41,3 +45,12 @@ clean:
 	rm -rf cba_dummy
 	rm -f $(DUMMY_ONBOARDING_PACKAGE_NAME).zip
 	rm -f $(NATIVE_ONBOARDING_PACKAGE_NAME).zip
+
+jsonlint_cba: $(_type_files)
+	@:
+
+#This shouldn't be PHONY, but it's easier now to define this way
+.PHONY: $(_type_files)
+$(_type_files):
+	@which jq expand unexpand sponge >/dev/null
+	jq -S . <$@ | unexpand -t 2 | expand -t 4 | sponge $@