X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FIM.git;a=blobdiff_plain;f=Makefile;h=703f73c1afa10daeb79644cecc15fc4717ee8fa1;hp=8256a671088183f20ba5d9c745da3eb1f75959bd;hb=refs%2Fheads%2Fv10.0;hpb=ca7b1b08d2a99726269d72381f84cc14d0a06d6e diff --git a/Makefile b/Makefile index 8256a67..ce6e01e 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,13 @@ # Copyright 2017 Sandvine # Copyright 2017-2018 Telefonica # All Rights Reserved. -# +# # Licensed under the Apache License, Version 2.0 (the "License"); you may # not use this file except in compliance with the License. You may obtain # a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, software # distributed under the License is distributed on an "AS IS" BASIS, WITHOUT # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the @@ -17,12 +17,17 @@ # NOTE: pyang and pyangbind are required for build .PHONY: all clean package trees deps yang-ietf openapi_schemas yang2swagger -JAVA:=/usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java -PYANG:= pyang -PYBINDPLUGIN:=$(shell /usr/bin/env python3 -c \ - 'import pyangbind; import os; print("{}/plugin".format(os.path.dirname(pyangbind.__file__)))') - -YANG_DESC_MODELS := vnfd nsd nst nsi +JAVA := /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java +PYANG := pyang +ifeq ($(OS),Windows_NT) # is Windows_NT on XP, 2000, 7, Vista, 10... + PYTHON_INTERPRETER := python +else + PYTHON_INTERPRETER := python3 +endif +PYBINDPLUGIN := $(shell $(PYTHON_INTERPRETER) -c \ + 'import pyangbind; import os; print(os.path.join(f"{os.path.dirname(pyangbind.__file__)}", "plugin"))') + +YANG_DESC_MODELS := vnfd nsd nst nsi etsi-nfv-vnfd etsi-nfv-nsd YANG_RECORD_MODELS := vnfr nsr PYTHON_MODELS := $(addsuffix .py, $(YANG_DESC_MODELS)) YANG_DESC_TREES := $(addsuffix .tree.txt, $(YANG_DESC_MODELS)) @@ -34,78 +39,94 @@ OPENAPI_SCHEMAS := osm.yaml OUT_DIR := osm_im TREES_DIR := osm_im_trees MODEL_DIR := models/yang +SOL006_MODEL_DIR := sol006_model/src/yang +SOL006_AUGMENTS_DIR := models/augments/* + Q?=@ PYANG_OPTIONS := -Werror -all: $(PYTHON_MODELS) trees openapi_schemas +all: models trees openapi_schemas $(MAKE) package +models: sol006_deps $(PYTHON_MODELS) rename_etsi_nfv_py + trees: $(YANG_DESC_TREES) $(YANG_DESC_JSTREES) $(YANG_RECORD_TREES) $(YANG_RECORD_JSTREES) openapi_schemas: $(OPENAPI_SCHEMAS) -$(OUT_DIR): - $(Q)mkdir -p $(OUT_DIR) - $(Q)touch $(OUT_DIR)/__init__.py - $(TREES_DIR): $(Q)mkdir -p $(TREES_DIR) -%.py: $(OUT_DIR) yang-ietf +%.py: yang-ietf $(Q)echo generating $@ from $*.yang - $(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) --plugindir $(PYBINDPLUGIN) -f pybind -o $(OUT_DIR)/$@ $(MODEL_DIR)/$*.yang + $(if $(findstring etsi,$@), $(eval DIR=$(SOL006_MODEL_DIR)),$(eval DIR=$(MODEL_DIR))) + $(if $(findstring etsi,$@), $(eval AUGMENTS_DIR=$(SOL006_AUGMENTS_DIR)),$(eval AUGMENTS_DIR=)) + $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) --plugindir "$(PYBINDPLUGIN)" -f pybind -o $(OUT_DIR)/$@ $(AUGMENTS_DIR) $(DIR)/$*.yang %.tree.txt: $(TREES_DIR) yang-ietf $(Q)echo generating $@ from $*.yang - $(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f tree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang + $(if $(findstring etsi,$@), $(eval DIR=$(SOL006_MODEL_DIR)),$(eval DIR = $(MODEL_DIR))) + $(if $(findstring etsi,$@), $(eval AUGMENTS_DIR=$(SOL006_AUGMENTS_DIR)),$(eval AUGMENTS_DIR=)) + $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) -f tree -o $(TREES_DIR)/$@ $(DIR)/$*.yang $(AUGMENTS_DIR) %.html: $(TREES_DIR) yang-ietf $(Q)echo generating $@ from $*.yang - $(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f jstree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang + $(if $(findstring etsi,$@), $(eval DIR=$(SOL006_MODEL_DIR)),$(eval DIR = $(MODEL_DIR))) + $(if $(findstring etsi,$@), $(eval AUGMENTS_DIR=$(SOL006_AUGMENTS_DIR)),$(eval AUGMENTS_DIR=)) + $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) -f jstree -o $(TREES_DIR)/$@ $(DIR)/$*.yang $(AUGMENTS_DIR) $(Q)sed -r -i 's|data\:image/gif\;base64,R0lGODlhS.*RCAA7|https://osm.etsi.org/images/OSM-logo.png\" width=\"175\" height=\"60|g' $(TREES_DIR)/$@ $(Q)sed -r -i 's|||g' $(TREES_DIR)/$@ %.rec.tree.txt: $(TREES_DIR) yang-ietf $(Q)echo generating $@ from $*.yang - $(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f tree -o $(TREES_DIR)/$@ $(MODEL_DIR)/$*.yang + $(if $(findstring etsi,$@), $(eval DIR=$(SOL006_MODEL_DIR)),$(eval DIR=$(MODEL_DIR))) + $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) -f tree -o $(TREES_DIR)/$@ $(DIR)/$*.yang $(Q)mv $(TREES_DIR)/$@ $(TREES_DIR)/$*.tree.txt %.rec.html: $(TREES_DIR) yang-ietf $(Q)echo generating $@ from $*.yang - $(Q)pyang $(PYANG_OPTIONS) --path $(MODEL_DIR) -f jstree -o $(TREES_DIR)/$@ $(MODEL_DIR)/osm-project.yang $(MODEL_DIR)/$*.yang + $(if $(findstring etsi,$@), $(eval DIR=$(SOL006_MODEL_DIR)),$(eval DIR=$(MODEL_DIR))) + $(Q)pyang $(PYANG_OPTIONS) --path $(DIR) -f jstree -o $(TREES_DIR)/$@ $(DIR)/osm-project.yang $(DIR)/$*.yang $(Q)sed -r -i 's|data\:image/gif\;base64,R0lGODlhS.*RCAA7|https://osm.etsi.org/images/OSM-logo.png\" width=\"175\" height=\"60|g' $(TREES_DIR)/$@ $(Q)sed -r -i 's|||g' $(TREES_DIR)/$@ $(Q)mv $(TREES_DIR)/$@ $(TREES_DIR)/$*.html -osm.yaml: $(OUT_DIR) yang-ietf yang2swagger +osm.yaml: yang-ietf yang2swagger $(Q)echo generating $@ - $(Q)$(JAVA) -jar ${HOME}/.m2/repository/com/mrv/yangtools/swagger-generator-cli/1.1.11/swagger-generator-cli-1.1.11-executable.jar -yang-dir $(MODEL_DIR) -output $(OUT_DIR)/$@ + $(Q)$(JAVA) -jar ${HOME}/.m2/repository/com/mrv/yangtools/swagger-generator-cli/1.1.14/swagger-generator-cli-1.1.14-executable.jar -yang-dir $(MODEL_DIR) -output $(OUT_DIR)/$@ yang-ietf: - $(Q)wget -q https://raw.githubusercontent.com/YangModels/yang/master/standard/ietf/RFC/ietf-yang-types%402013-07-15.yang -O models/yang/ietf-yang-types.yang - $(Q)wget -q https://raw.githubusercontent.com/YangModels/yang/master/standard/ietf/RFC/ietf-inet-types%402013-07-15.yang -O models/yang/ietf-inet-types.yang + $(Q)wget -q https://raw.githubusercontent.com/YangModels/yang/master/standard/ietf/RFC/ietf-yang-types%402013-07-15.yang -O $(MODEL_DIR)/ietf-yang-types.yang + $(Q)wget -q https://raw.githubusercontent.com/YangModels/yang/master/standard/ietf/RFC/ietf-inet-types%402013-07-15.yang -O $(MODEL_DIR)/ietf-inet-types.yang + $(Q)cp $(MODEL_DIR)/ietf-yang-types.yang $(SOL006_MODEL_DIR)/ietf-yang-types.yang + $(Q)cp $(MODEL_DIR)/ietf-inet-types.yang $(SOL006_MODEL_DIR)/ietf-inet-types.yang yang2swagger: $(Q)mkdir -p ${HOME}/.m2 $(Q)wget -q -O ${HOME}/.m2/settings.xml https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml git clone https://github.com/bartoszm/yang2swagger.git - git -C yang2swagger checkout tags/1.1.11 + git -C yang2swagger checkout tags/1.1.14 mvn -f yang2swagger/pom.xml clean install package: - tox -e build - tox -e build3 ./build-docs.sh deps: - $(Q)sudo apt-get -y install git make wget python python-pip debhelper dh-make tox python3 python3-pip maven - $(Q)sudo -H python3 -m pip install -U pip - $(Q)sudo -H python2 -m pip install -U pip - $(Q)sudo -H python3 -m pip install -U pyang pyangbind stdeb - $(Q)sudo -H python2 -m pip install -U pyang pyangbind stdeb - $(Q)mkdir -p ~/.m2 - $(Q)cp -n ~/.m2/settings.xml{,.orig} ; wget -q -O - https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml > ~/.m2/settings.xml + $(Q)mkdir -p ${HOME}/.m2 + $(Q)cp -n ${HOME}/.m2/settings.xml ${HOME}/.m2/settings.xml.orig ; wget -q -O - https://raw.githubusercontent.com/opendaylight/odlparent/master/settings.xml > ${HOME}/.m2/settings.xml + +sol006_deps: + $(Q)git clone --single-branch --branch v2.6.1 https://forge.etsi.org/rep/nfv/SOL006.git sol006_model + $(Q)patch -p2 < patch/deref_warnings.patch + $(Q)patch -p2 < patch/nested_workaround.patch + +rename_etsi_nfv_py: + mv osm_im/etsi-nfv-nsd.py osm_im/etsi_nfv_nsd.py + mv osm_im/etsi-nfv-vnfd.py osm_im/etsi_nfv_vnfd.py clean: - $(Q)rm -rf dist osm_im.egg-info deb deb_dist *.gz osm-imdocs* yang2swagger $(OUT_DIR) $(TREES_DIR) + $(Q)rm -rf dist sol006_model osm_im.egg-info deb deb_dist *.gz osm-imdocs* yang2swagger $(TREES_DIR) + $(Q)rm -rf debian/osm-imdocs.install + $(Q)rm -rf osm_im/etsi_nfv_nsd.py osm_im/etsi_nfv_vnfd.py + $(Q)rm -rf osm_im/nsd.py osm_im/nsi.py osm_im/nst.py osm_im/osm.yaml osm_im/vnfd.py