Merge pull request #4578 from dmbaturin/T7578-enforce-op-mode-path-uniqueness

build: T7578: fail the package build if there are non-unique op mode nodes

Author: dmbaturin

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

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')