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

diff --git a/heat/vFW_CNF_CDS/templates/Makefile b/heat/vFW_CNF_CDS/templates/Makefile
index 38a4b389..7a8db064 100644
--- a/heat/vFW_CNF_CDS/templates/Makefile
+++ b/heat/vFW_CNF_CDS/templates/Makefile
@@ -1,30 +1,56 @@
-.PHONY: all clean helm base cba clean_all
-ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo
+.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
-	cd package/ && zip -r $(ONBOARDING_PACKAGE_NAME).zip .
-	mv package/$(ONBOARDING_PACKAGE_NAME).zip .
+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
-	mv helm/*.tgz package/
+helm: package
+	$(MAKE) -C helm
+	mv helm/helm_*.tgz package_native/
+	mv helm/*.tgz package_dummy/
 
-base: package/
-	cp 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/\*
 	cd cba/ && zip -r $(CBA_NAME).zip . -x pom.xml .idea/\* target/\*
-	mv cba/$(CBA_NAME).zip package/
+	mv cba/$(CBA_NAME).zip package_native/
+	mv cba_dummy/$(CBA_NAME).zip package_dummy/
 
-package/:
-	mkdir package/
+package:
+	mkdir package_dummy/
+	mkdir package_native/
 
 clean:
-	rm -rf package/
-	rm -f $(ONBOARDING_PACKAGE_NAME).zip
+	rm -rf package_dummy/
+	rm -rf package_native/
+	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 $@