From df7c3fc0017fb27d2945ac2818ac2d5fc343ca37 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 15 Sep 2026 13:51:30 -0500 Subject: T7886: add basic cases of reverse interface dependency verification Add cases for which a config mode script calls verify_interface_exists, excluding those of dynamic_interface_pattern, to be handled separately. The dependency verification raises error, resp., gives a warning, when verify_interface_exists is called with warning_only=False, resp., True. These are the critical cases that motivated the original design, for if a removal of an interface is allowed, a subsequent reboot will raise ConfigError on config load and invalidate the config subtree for that component. --- .../constraint/dependent-error-interface-name.xml.i | 7 +++++++ .../constraint/dependent-warning-interface-name.xml.i | 7 +++++++ .../dependent-error-generic-interface-multi.xml.i | 19 +++++++++++++++++++ .../include/dependent-error-generic-interface.xml.i | 18 ++++++++++++++++++ .../include/dependent-error-source-interface.xml.i | 18 ++++++++++++++++++ ...nt-warning-generic-interface-multi-broadcast.xml.i | 19 +++++++++++++++++++ .../dependent-warning-generic-interface-multi.xml.i | 19 +++++++++++++++++++ .../include/dependent-warning-source-interface.xml.i | 18 ++++++++++++++++++ .../interface/dependent-error-inbound-interface.xml.i | 11 +++++++++++ .../include/isis/protocol-common-config.xml.i | 1 + .../include/ospf/protocol-common-config.xml.i | 4 +--- .../include/ospfv3/protocol-common-config.xml.i | 4 +--- 12 files changed, 139 insertions(+), 6 deletions(-) create mode 100644 interface-definitions/include/constraint/dependent-error-interface-name.xml.i create mode 100644 interface-definitions/include/constraint/dependent-warning-interface-name.xml.i create mode 100644 interface-definitions/include/dependent-error-generic-interface-multi.xml.i create mode 100644 interface-definitions/include/dependent-error-generic-interface.xml.i create mode 100644 interface-definitions/include/dependent-error-source-interface.xml.i create mode 100644 interface-definitions/include/dependent-warning-generic-interface-multi-broadcast.xml.i create mode 100644 interface-definitions/include/dependent-warning-generic-interface-multi.xml.i create mode 100644 interface-definitions/include/dependent-warning-source-interface.xml.i create mode 100644 interface-definitions/include/interface/dependent-error-inbound-interface.xml.i (limited to 'interface-definitions/include') diff --git a/interface-definitions/include/constraint/dependent-error-interface-name.xml.i b/interface-definitions/include/constraint/dependent-error-interface-name.xml.i new file mode 100644 index 000000000..ec4d524f4 --- /dev/null +++ b/interface-definitions/include/constraint/dependent-error-interface-name.xml.i @@ -0,0 +1,7 @@ + + + (bond|br|dum|en|ersp|eth|gnv|ifb|ipoe|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|sstpc|tun|veth|vpptap|vpptun|vti|vtun|vxlan|wg|wlan|wwan)[0-9]+(.\d+)?|pod-[-_a-zA-Z0-9]{1,11}|lo + + + + diff --git a/interface-definitions/include/constraint/dependent-warning-interface-name.xml.i b/interface-definitions/include/constraint/dependent-warning-interface-name.xml.i new file mode 100644 index 000000000..bc646c3c9 --- /dev/null +++ b/interface-definitions/include/constraint/dependent-warning-interface-name.xml.i @@ -0,0 +1,7 @@ + + + (bond|br|dum|en|ersp|eth|gnv|ifb|ipoe|lan|l2tp|l2tpeth|macsec|peth|ppp|pppoe|pptp|sstp|sstpc|tun|veth|vpptap|vpptun|vti|vtun|vxlan|wg|wlan|wwan)[0-9]+(.\d+)?|pod-[-_a-zA-Z0-9]{1,11}|lo + + + + diff --git a/interface-definitions/include/dependent-error-generic-interface-multi.xml.i b/interface-definitions/include/dependent-error-generic-interface-multi.xml.i new file mode 100644 index 000000000..c5dd26267 --- /dev/null +++ b/interface-definitions/include/dependent-error-generic-interface-multi.xml.i @@ -0,0 +1,19 @@ + + + + Interface + + + + + txt + Interface name + + + #include + + + + + + diff --git a/interface-definitions/include/dependent-error-generic-interface.xml.i b/interface-definitions/include/dependent-error-generic-interface.xml.i new file mode 100644 index 000000000..c48e728c8 --- /dev/null +++ b/interface-definitions/include/dependent-error-generic-interface.xml.i @@ -0,0 +1,18 @@ + + + + Interface + + + + + txt + Interface name + + + #include + + + + + diff --git a/interface-definitions/include/dependent-error-source-interface.xml.i b/interface-definitions/include/dependent-error-source-interface.xml.i new file mode 100644 index 000000000..b3c23f64e --- /dev/null +++ b/interface-definitions/include/dependent-error-source-interface.xml.i @@ -0,0 +1,18 @@ + + + + Interface used to establish connection + + interface + Interface name + + + + + + #include + + + + + diff --git a/interface-definitions/include/dependent-warning-generic-interface-multi-broadcast.xml.i b/interface-definitions/include/dependent-warning-generic-interface-multi-broadcast.xml.i new file mode 100644 index 000000000..22f6b6552 --- /dev/null +++ b/interface-definitions/include/dependent-warning-generic-interface-multi-broadcast.xml.i @@ -0,0 +1,19 @@ + + + + Interface + + + + + txt + Interface name + + + #include + + + + + + diff --git a/interface-definitions/include/dependent-warning-generic-interface-multi.xml.i b/interface-definitions/include/dependent-warning-generic-interface-multi.xml.i new file mode 100644 index 000000000..bd4b9ea93 --- /dev/null +++ b/interface-definitions/include/dependent-warning-generic-interface-multi.xml.i @@ -0,0 +1,19 @@ + + + + Interface + + + + + txt + Interface name + + + #include + + + + + + diff --git a/interface-definitions/include/dependent-warning-source-interface.xml.i b/interface-definitions/include/dependent-warning-source-interface.xml.i new file mode 100644 index 000000000..164135f2f --- /dev/null +++ b/interface-definitions/include/dependent-warning-source-interface.xml.i @@ -0,0 +1,18 @@ + + + + Interface used to establish connection + + interface + Interface name + + + + + + #include + + + + + diff --git a/interface-definitions/include/interface/dependent-error-inbound-interface.xml.i b/interface-definitions/include/interface/dependent-error-inbound-interface.xml.i new file mode 100644 index 000000000..e1c79feb0 --- /dev/null +++ b/interface-definitions/include/interface/dependent-error-inbound-interface.xml.i @@ -0,0 +1,11 @@ + + + + Inbound Interface + + + + + + + diff --git a/interface-definitions/include/isis/protocol-common-config.xml.i b/interface-definitions/include/isis/protocol-common-config.xml.i index 6a7388c99..d0424ea4f 100644 --- a/interface-definitions/include/isis/protocol-common-config.xml.i +++ b/interface-definitions/include/isis/protocol-common-config.xml.i @@ -719,6 +719,7 @@ + #include diff --git a/interface-definitions/include/ospf/protocol-common-config.xml.i b/interface-definitions/include/ospf/protocol-common-config.xml.i index 93d718ed4..caef8abb4 100644 --- a/interface-definitions/include/ospf/protocol-common-config.xml.i +++ b/interface-definitions/include/ospf/protocol-common-config.xml.i @@ -406,9 +406,7 @@ txt Interface name - - #include - + #include diff --git a/interface-definitions/include/ospfv3/protocol-common-config.xml.i b/interface-definitions/include/ospfv3/protocol-common-config.xml.i index 72fb86d3d..e6d3b23b8 100644 --- a/interface-definitions/include/ospfv3/protocol-common-config.xml.i +++ b/interface-definitions/include/ospfv3/protocol-common-config.xml.i @@ -132,9 +132,7 @@ txt Interface used for routing information exchange - - #include - + #include -- cgit v1.2.3 From 0b43a668ac1fdbc5149616f5065279bbce9a02c8 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Tue, 6 Oct 2026 11:50:21 -0500 Subject: T7886: add concatenation of vif entries --- .../include/interface/vif-s.xml.i | 2 + interface-definitions/include/interface/vif.xml.i | 1 + python/vyos/configmanager.py | 18 ++++++-- python/vyos/dependentverify.py | 53 ++++++++++++++++++++++ 4 files changed, 71 insertions(+), 3 deletions(-) (limited to 'interface-definitions/include') diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i index 65ca10207..e07a9bf8a 100644 --- a/interface-definitions/include/interface/vif-s.xml.i +++ b/interface-definitions/include/interface/vif-s.xml.i @@ -10,6 +10,7 @@ VLAN ID must be between 0 and 4094 + interface #include @@ -32,6 +33,7 @@ VLAN ID must be between 0 and 4094 + interface #include diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i index 87f91c5ce..e9b9385f1 100644 --- a/interface-definitions/include/interface/vif.xml.i +++ b/interface-definitions/include/interface/vif.xml.i @@ -10,6 +10,7 @@ VLAN ID must be between 0 and 4094 + interface #include diff --git a/python/vyos/configmanager.py b/python/vyos/configmanager.py index 895d43ba7..69d40e5ef 100644 --- a/python/vyos/configmanager.py +++ b/python/vyos/configmanager.py @@ -29,6 +29,7 @@ from vyos.configtree import DiffTree from vyos.referencetree import ReferenceTree from vyos.dependentverify import removed_dependency_value_paths_of_kind from vyos.dependentverify import dependent_value_paths_of_kind +from vyos.dependentverify import concatenate_vif from vyos.utils.system import load_as_module from vyos.defaults import directories @@ -163,6 +164,10 @@ class ConfigManager: 'interface', self.reference_tree, self.session_config, self.diff_tree ) + removed_dependency_value_paths, orig_value = concatenate_vif( + self.reference_tree, removed_dependency_value_paths + ) + LOG.debug(f'removed_dependency_value_paths: {removed_dependency_value_paths}') if not removed_dependency_value_paths: @@ -178,7 +183,8 @@ class ConfigManager: return for vals, path in removed_dependency_value_paths: - owner = self.reference_tree.get_owner(path) + rpath = self.reference_tree.reference_path_from_config_path(path) + owner = self.reference_tree.get_owner(rpath) if owner is None: LOG.error(f'Path {path} has no owner') continue @@ -190,16 +196,22 @@ class ConfigManager: rdep_err = component.rdep_error for dependent_vals, dependent_path in errors: for v in set(vals) & set(dependent_vals): + ov = orig_value.get(v, v) + path_str = ' '.join(path + [ov]) + dpath_str = ' '.join(dependent_path) rdep_err.append( - f'\nNode:\n {path + [v]}\nis required by:\n {dependent_path}\n' + f'\nNode:\n "{path_str}"\nis required by:\n "{dpath_str}"\n' ) warnings = dependent_value_paths.get('warning', []) rdep_warn = component.rdep_warning for dependent_vals, dependent_path in warnings: for v in set(vals) & set(dependent_vals): + ov = orig_value.get(v, v) + path_str = ' '.join(path + [ov]) + dpath_str = ' '.join(dependent_path) rdep_warn.append( - f'removed node:\n {path + [v]}\nis referenced by:\n {dependent_path}\n' + f'removed node:\n "{path_str}"\nis referenced by:\n "{dpath_str}"\n' ) def clear_rdep(self): diff --git a/python/vyos/dependentverify.py b/python/vyos/dependentverify.py index 157f99ae3..1e22b65a0 100644 --- a/python/vyos/dependentverify.py +++ b/python/vyos/dependentverify.py @@ -18,6 +18,7 @@ from vyos.configtree import ConfigTree # noqa: I001 from vyos.configtree import DiffTree from vyos.configtree import subtree_values_of_path from vyos.referencetree import ReferenceTree +from vyos.base import Warning as Warn def removed_dependency_value_paths_of_kind( @@ -60,3 +61,55 @@ def dependent_value_paths_of_kind( lst.extend(path_vals) return dependent_value_paths + + +vif_refpath = [ + ['interfaces', 'ethernet', 'vif'], + ['interfaces', 'ethernet', 'vif-s'], + ['interfaces', 'ethernet', 'vif-s', 'vif-c'], + ['interfaces', 'bonding', 'vif'], + ['interfaces', 'bonding', 'vif-s'], + ['interfaces', 'bonding', 'vif-s', 'vif-c'], + ['interfaces', 'bridge', 'vif'], + ['interfaces', 'pseudo-ethernet', 'vif'], + ['interfaces', 'pseudo-ethernet', 'vif-s'], + ['interfaces', 'pseudo-ethernet', 'vif-s', 'vif-c'], + ['interfaces', 'virtual-ethernet', 'vif'], + ['interfaces', 'virtual-ethernet', 'vif-s'], + ['interfaces', 'virtual-ethernet', 'vif-s', 'vif-c'], + ['interfaces', 'wireless', 'vif'], + ['interfaces', 'wireless', 'vif-s'], + ['interfaces', 'wireless', 'vif-s', 'vif-c'], +] + + +def check_vif_path(reference_tree: ReferenceTree): + for p in vif_refpath: + if not reference_tree.exists(p): + Warn(f'Out of date reference path: {p}') + + +def concatenate_vif(reference_tree: ReferenceTree, value_paths): + check_vif_path(reference_tree) + revised = [] + orig_value = {} + for vp in value_paths: + refpath = reference_tree.reference_path_from_config_path(vp[1]) + if refpath not in vif_refpath: + revised.append(vp) + else: + p = vp[1] + match p[-1]: + case 'vif': + rev_vals = [p[2] + '.' + v for v in vp[0]] + orig_value |= dict(zip(rev_vals, vp[0])) + revised.append((rev_vals, vp[1])) + case 'vif-s': + rev_vals = [p[2] + '.' + v for v in vp[0]] + orig_value |= dict(zip(rev_vals, vp[0])) + revised.append((rev_vals, vp[1])) + case 'vif-c': + rev_vals = [p[2] + '.' + p[4] + '.' + v for v in vp[0]] + orig_value |= dict(zip(rev_vals, vp[0])) + revised.append((rev_vals, vp[1])) + return revised, orig_value -- cgit v1.2.3