X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=Makefile;h=706bab445414b3a066422f94e42c560bd371f946;hp=c72183e74dbb4e39cabf740a49fe325b90a8691c;hb=55fa4301b2dacaf96b84f2df260fa53efbc6f326;hpb=94b645e0104e813616289a24c2f53b32c6931b0c

diff --git a/Makefile b/Makefile
index c72183e..706bab4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,13 +21,14 @@ PYBINDPLUGIN:=$(shell /usr/bin/env python -c \
 
 YANG_MODELS := vnfd nsd
 PYTHON_MODELS := $(addsuffix .py, $(YANG_MODELS))
+PYTHON_JSONSCHEMAS := $(addsuffix .jsonschema, $(YANG_MODELS))
 
 OUT_DIR := osm_im
 MODEL_DIR := models/yang
 RW_PB_EXT := build/yang/rw-pb-ext.yang
 Q?=@
 
-PYANG_OPTIONS := -Wnone
+PYANG_OPTIONS := -Werror
 
 all: $(PYTHON_MODELS) pyangbind
 	$(MAKE) package
@@ -40,6 +41,10 @@ $(OUT_DIR):
 	$(Q)echo generating $@ from $*.yang
 	$(Q)pyang $(PYANG_OPTIONS) --path build/yang --path $(MODEL_DIR) --plugindir $(PYBINDPLUGIN) -f pybind -o $(OUT_DIR)/$@ $(MODEL_DIR)/$*.yang
 
+%.jsonschema: $(OUT_DIR) $(RW_PB_EXT) pyang-json-schema-plugin
+	$(Q)echo generating $@ from $*.yang
+	$(Q)pyang $(PYANG_OPTIONS) --path build/yang --path $(MODEL_DIR) --plugindir pyang-json-schema-plugin -f json-schema -o $(OUT_DIR)/$@ $(MODEL_DIR)/$*.yang
+
 $(RW_PB_EXT):
 	$(Q)mkdir -p $$(dirname $@)
 	$(Q)wget -q https://raw.githubusercontent.com/RIFTIO/RIFT.ware/RIFT.ware-4.4.1/modules/core/util/yangtools/yang/rw-pb-ext.yang -O $@
@@ -47,9 +52,20 @@ $(RW_PB_EXT):
 package:
 	tox -e build
 
-pyangbind:
+pyangbind: pyang
 	git clone https://github.com/robshakir/pyangbind
 	cd pyangbind; python setup.py --command-packages=stdeb.command bdist_deb; cd ..
+	mkdir -p deb_dist
+	cp pyangbind/deb_dist/*.deb deb_dist
+
+pyang:
+	git clone https://github.com/mbj4668/pyang
+	cd pyang; python setup.py --command-packages=stdeb.command bdist_deb; cd ..
+	mkdir -p deb_dist
+	cp pyang/deb_dist/*.deb deb_dist
+
+pyang-json-schema-plugin:
+	git clone https://github.com/cmoberg/pyang-json-schema-plugin
 
 clean:
-	$(Q)rm -rf build deb deb_dist *.gz pyangbind $(OUT_DIR)
+	$(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz pyang pyangbind pyang-json-schema-plugin $(OUT_DIR)