dhcp ip: DSCP settings for transmitted DHCP packets

[vpp.git] / Makefile

diff --git a/Makefile b/Makefile
index 90ed59f..0c8b173 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -67,7 +67,7 @@ DEB_DEPENDS += lcov chrpath autoconf indent clang-format libnuma-dev
 DEB_DEPENDS += python-all python3-all python3-setuptools python-dev
 DEB_DEPENDS += python-virtualenv python-pip libffi6 check
 DEB_DEPENDS += libboost-all-dev libffi-dev python3-ply libmbedtls-dev
-DEB_DEPENDS += cmake ninja-build uuid-dev
+DEB_DEPENDS += cmake ninja-build uuid-dev python3-jsonschema
 ifeq ($(OS_VERSION_ID),14.04)
        DEB_DEPENDS += libssl-dev
 else ifeq ($(OS_ID)-$(OS_VERSION_ID),debian-8)
@@ -94,7 +94,7 @@ ifeq ($(OS_ID),fedora)
        RPM_DEPENDS += subunit subunit-devel
        RPM_DEPENDS += compat-openssl10-devel
        RPM_DEPENDS += python3-devel python3-ply
-       RPM_DEPENDS += python3-virtualenv
+       RPM_DEPENDS += python3-virtualenv python3-jsonschema
        RPM_DEPENDS += cmake
        RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
 else
@@ -102,7 +102,7 @@ else
        RPM_DEPENDS += openssl-devel
        RPM_DEPENDS += python-devel python36-ply
        RPM_DEPENDS += python36-devel python36-pip
-       RPM_DEPENDS += python-virtualenv
+       RPM_DEPENDS += python-virtualenv python36-jsonschema
        RPM_DEPENDS += devtoolset-7
        RPM_DEPENDS += cmake3
        RPM_DEPENDS_GROUPS = 'Development Tools'
@@ -216,6 +216,10 @@ help:
        @echo " doxygen             - (re)generate documentation"
        @echo " bootstrap-doxygen   - setup Doxygen dependencies"
        @echo " wipe-doxygen        - wipe all generated documentation"
+       @echo " checkfeaturelist    - check FEATURE.yaml according to schema"
+       @echo " featurelist         - dump feature list in markdown"
+       @echo " json-api-files      - (re)-generate json api files"
+       @echo " json-api-files-debug - (re)-generate json api files for debug target"
        @echo " docs                 - Build the Sphinx documentation"
        @echo " docs-venv         - Build the virtual environment for the Sphinx docs"
        @echo " docs-clean        - Remove the generated files from the Sphinx docs"
@@ -224,6 +228,7 @@ help:
        @echo " test-cov            - generate code coverage report for test framework"
        @echo " test-wipe-cov       - wipe code coverage report for test framework"
        @echo " test-checkstyle     - check PEP8 compliance for test framework"
+       @echo " test-refresh-deps   - refresh the Python dependencies for the tests"
        @echo ""
        @echo "Make Arguments:"
        @echo " V=[0|1]                  - set build verbosity level"
@@ -443,7 +448,7 @@ test-wipe-doc:
        @make -C test wipe-doc
 
 test-cov:
-       @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install japi-install
+       @make -C $(BR) PLATFORM=vpp TAG=vpp_gcov vom-install
        $(eval EXTENDED_TESTS=yes)
        $(call test,vpp,vpp_gcov,cov)
 
@@ -453,6 +458,9 @@ test-wipe-cov:
 test-checkstyle:
        @make -C test checkstyle
 
+test-refresh-deps:
+       @make -C test refresh-deps
+
 retest:
        $(call test,vpp,vpp,retest)
 
@@ -528,6 +536,12 @@ dpdk-install-dev:
 install-ext-deps:
        make -C build/external install-$(PKG)
 
+json-api-files:
+       $(WS_ROOT)/src/tools/vppapigen/generate_json.py
+
+json-api-files-debug:
+       $(WS_ROOT)/src/tools/vppapigen/generate_json.py --debug-target
+
 ctags: ctags.files
        @ctags --totals --tag-relative -L $<
        @rm $<
@@ -544,6 +558,12 @@ checkstyle:
 fixstyle:
        @build-root/scripts/checkstyle.sh --fix
 
+featurelist:
+       @build-root/scripts/fts.py --all --markdown
+
+checkfeaturelist:
+       @build-root/scripts/fts.py --validate --git-status
+
 #
 # Build the documentation
 #
@@ -582,7 +602,7 @@ docs: $(DOCS_DIR)
 docs-clean:
        @($(SPHINX_SCRIPTS_DIR)/sphinx-make.sh clean)
 
-verify: install-dep $(BR)/.deps.ok install-ext-deps
+pkg-verify: install-dep $(BR)/.deps.ok install-ext-deps
        $(call banner,"Building for PLATFORM=vpp using gcc")
        @make -C build-root PLATFORM=vpp TAG=vpp wipe-all install-packages
        $(call banner,"Building sample-plugin")
@@ -593,6 +613,12 @@ verify: install-dep $(BR)/.deps.ok install-ext-deps
        @make -C build-root PLATFORM=vpp TAG=vpp vom-install
        $(call banner,"Building $(PKG) packages")
        @make pkg-$(PKG)
+ifeq ($(OS_ID),ubuntu)
+       $(call banner,"Building VOM $(PKG) package")
+       @make vom-pkg-deb
+endif
+
+verify: pkg-verify
 ifeq ($(OS_ID)-$(OS_VERSION_ID),ubuntu-18.04)
        $(call banner,"Running tests")
        @make COMPRESS_FAILED_TEST_LOGS=yes RETRIES=3 test