diff options
| author | John Estabrook <jestabro@vyos.io> | 2026-09-15 13:37:55 -0500 |
|---|---|---|
| committer | John Estabrook <jestabro@vyos.io> | 2026-10-08 07:41:04 -0500 |
| commit | ec64edcb5b014125dfd5574f40704423b0c0831b (patch) | |
| tree | 5aac1745de8d89dcf89f59f364df1ca72ff9c8df /python | |
| parent | 0d3e730c9e71748f866573a72951e142b4108a7b (diff) | |
| download | vyos-1x-ec64edcb5b014125dfd5574f40704423b0c0831b.tar.gz vyos-1x-ec64edcb5b014125dfd5574f40704423b0c0831b.zip | |
T7886: add verification of reverse dependencies
Suggested-by: l0crian1 <ryan.claridge13@gmail.com>
Diffstat (limited to 'python')
| -rw-r--r-- | python/vyos/configmanager.py | 116 |
1 files changed, 114 insertions, 2 deletions
diff --git a/python/vyos/configmanager.py b/python/vyos/configmanager.py index 46bff08b0..895d43ba7 100644 --- a/python/vyos/configmanager.py +++ b/python/vyos/configmanager.py @@ -13,7 +13,9 @@ # You should have received a copy of the GNU Lesser General Public # License along with this library. If not, see <http://www.gnu.org/licenses/>. -import json + +import json # noqa: I001 +import logging from types import ModuleType from dataclasses import dataclass @@ -23,9 +25,25 @@ from pathlib import Path from vyos.config import Config from vyos.config import ConfigDict from vyos.configtree import ConfigTree +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.utils.system import load_as_module from vyos.defaults import directories +from vyos.base import Warning as Warn +from vyos import ConfigError + +LOG = logging.getLogger(Path(__file__).stem) +handler = logging.StreamHandler() +formatter = logging.Formatter('(%(name)s): %(message)s') +handler.setFormatter(formatter) +LOG.addHandler(handler) + +debug = False + +_ = LOG.setLevel(logging.DEBUG) if debug else LOG.setLevel(logging.INFO) @dataclass @@ -38,6 +56,8 @@ class ConfigDictCache: class Component: module: ModuleType name: str + rdep_error: list = field(default_factory=list) + rdep_warning: list = field(default_factory=list) cache: ConfigDictCache = None @@ -54,6 +74,7 @@ class ConfigManager: self.config: Config = None self.running_config: ConfigTree = None self.session_config: ConfigTree = None + self.diff_tree: DiffTree = None self.components = self.init_components() @@ -92,14 +113,100 @@ class ConfigManager: if config is None: self.running_config = None self.session_config = None + self.diff_tree = None else: self.running_config = config.get_config_tree(effective=True) self.session_config = config.get_config_tree() - setattr(config, 'manager', self) + self.diff_tree = DiffTree(self.running_config, self.session_config) if self.cache_config: self.clear_cache() + self.clear_rdep() + + if config is None: + return + + self.init_rdep() + + def init_rdep(self): + # pylint: disable=too-many-locals,too-many-branches + """ + Schema definition for reverse dependency alert: + alertAttr = attribute alert + { + "error" | "warning" + } + + We are currently only considering reverse dependencies for type + (kind) 'interface'. Extension for other kinds may be added here. + + The reference tree utils return data of the form outlined below. In + all cases, the input path is a reference tree path, and consequently + may define a subtree of the config (due to intermediary tag node); + thus the return values are lists of (tuples including) actual config + paths. + + removed_dependency_value_paths: list[tuple[list(values), path]] + are the values for each path defined by the XML paths of kind + 'interface', which are to be removed in the current commit session. + + dependent_value_paths: dict[alert: list[tuple[list(values), path]]] + are the (values, path) defined by all XML dependency annotations + existing in the session tree, indexed by alert type. + + The dependent_value_paths are cross-referenced with the interface + values scheduled for deletion in removed_dependency_value_paths, and + the corresponding alert raised in the configmanager verify stage. + """ + removed_dependency_value_paths = removed_dependency_value_paths_of_kind( + 'interface', self.reference_tree, self.session_config, self.diff_tree + ) + + LOG.debug(f'removed_dependency_value_paths: {removed_dependency_value_paths}') + + if not removed_dependency_value_paths: + return + + dependent_value_paths = dependent_value_paths_of_kind( + 'interface', self.reference_tree, self.session_config + ) + + LOG.debug(f'dependent_value_paths: {dependent_value_paths}') + + if not dependent_value_paths: + return + + for vals, path in removed_dependency_value_paths: + owner = self.reference_tree.get_owner(path) + if owner is None: + LOG.error(f'Path {path} has no owner') + continue + component_name = Path(owner).stem + component = self.components.get(component_name) + LOG.debug(f'owner: {component_name}') + + errors = dependent_value_paths.get('error', []) + rdep_err = component.rdep_error + for dependent_vals, dependent_path in errors: + for v in set(vals) & set(dependent_vals): + rdep_err.append( + f'\nNode:\n {path + [v]}\nis required by:\n {dependent_path}\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): + rdep_warn.append( + f'removed node:\n {path + [v]}\nis referenced by:\n {dependent_path}\n' + ) + + def clear_rdep(self): + for component in self.components.values(): + component.rdep_error = [] + component.rdep_warning = [] + def clear_cache(self): for component in self.components.values(): component.cache = None @@ -121,6 +228,11 @@ class ConfigManager: component = self.components[script_name] mod = component.module + if errors := component.rdep_error: + raise ConfigError('\n'.join(errors)) + if warnings := component.rdep_warning: + Warn('\n'.join(warnings)) + mod.verify(config_dict) def generate(self, script_name: str, config_dict: ConfigDict) -> None: |
