From: garciadeblas Date: Sun, 28 Oct 2018 14:51:42 +0000 (+0100) Subject: Removed jsonschema generation from YANG (non-working) X-Git-Tag: v5.0.0~9 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=commitdiff_plain;h=1dbd25781e9ab9ecd6d024067be200d9faee0ffd Removed jsonschema generation from YANG (non-working) Change-Id: I069c3684d113a287c892a9e657b88eb4d4e5d49a Signed-off-by: garciadeblas --- diff --git a/Makefile b/Makefile index 22df56d..b543314 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,6 @@ PYBINDPLUGIN:=$(shell /usr/bin/env python3 -c \ YANG_DESC_MODELS := vnfd nsd YANG_RECORD_MODELS := vnfr nsr PYTHON_MODELS := $(addsuffix .py, $(YANG_DESC_MODELS)) -PYTHON_JSONSCHEMAS := $(addsuffix .jsonschema, $(YANG_DESC_MODELS)) YANG_DESC_TREES := $(addsuffix .tree.txt, $(YANG_DESC_MODELS)) YANG_DESC_JSTREES := $(addsuffix .html, $(YANG_DESC_MODELS)) YANG_RECORD_TREES := $(addsuffix .rec.tree.txt, $(YANG_RECORD_MODELS)) @@ -53,10 +52,6 @@ $(TREES_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 - %.tree.txt: $(TREES_DIR) $(Q)echo generating $@ from $*.yang $(Q)pyang $(PYANG_OPTIONS) --path build/yang --path $(MODEL_DIR) -f tree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang @@ -88,8 +83,5 @@ package: tox -e build3 ./build-docs.sh -pyang-json-schema-plugin: - git clone https://github.com/cmoberg/pyang-json-schema-plugin - clean: - $(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz pyang-json-schema-plugin $(OUT_DIR) $(TREES_DIR) + $(Q)rm -rf build dist osm_im.egg-info deb deb_dist *.gz $(OUT_DIR) $(TREES_DIR)