From 8f2eac38f1b7bb132bf7782596899315745a713a Mon Sep 17 00:00:00 2001 From: Daniil Baturin Date: Wed, 25 Jun 2025 18:15:29 +0100 Subject: build: T7578: fail the package build if there are non-unique op mode nodes to ensure that the JSON cache is usable for command lookup --- Makefile | 2 +- python/vyos/xml_ref/generate_op_cache.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d3248c8d2..e85ccd7f4 100644 --- a/Makefile +++ b/Makefile @@ -69,7 +69,7 @@ op_mode_definitions: $(op_xml_obj) find $(BUILD_DIR)/op-mode-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-op-templates {} $(CURDIR)/schema/op-mode-definition.rng $(OP_TMPL_DIR) || exit 1 - $(CURDIR)/python/vyos/xml_ref/generate_op_cache.py --xml-dir $(BUILD_DIR)/op-mode-definitions || exit 1 + $(CURDIR)/python/vyos/xml_ref/generate_op_cache.py --check-path-ambiguity --xml-dir $(BUILD_DIR)/op-mode-definitions || exit 1 # XXX: tcpdump, ping, traceroute and mtr must be able to recursivly call themselves as the # options are provided from the scripts themselves diff --git a/python/vyos/xml_ref/generate_op_cache.py b/python/vyos/xml_ref/generate_op_cache.py index 117b080b4..29697dc58 100755 --- a/python/vyos/xml_ref/generate_op_cache.py +++ b/python/vyos/xml_ref/generate_op_cache.py @@ -280,6 +280,7 @@ def main(): else: print('Found the following duplicate paths:\n') print(out) + sys.exit(1) with open(op_ref_cache, 'w') as f: f.write('from vyos.xml_ref.op_definition import NodeData\n') -- cgit v1.2.3