From c9eaafd9f808aba8d29be73054e11d37577e539a Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sat, 30 Dec 2023 23:25:20 +0100 Subject: T5474: establish common file name pattern for XML conf mode commands We will use _ as CLI level divider. The XML definition filename and also the Python helper should match the CLI node. Example: set interfaces ethernet -> interfaces_ethernet.xml.in set interfaces bond -> interfaces_bond.xml.in set service dhcp-server -> service_dhcp-server-xml.in (cherry picked from commit 4ef110fd2c501b718344c72d495ad7e16d2bd465) --- src/conf_mode/interfaces-input.py | 70 --------------------------------------- 1 file changed, 70 deletions(-) delete mode 100755 src/conf_mode/interfaces-input.py (limited to 'src/conf_mode/interfaces-input.py') diff --git a/src/conf_mode/interfaces-input.py b/src/conf_mode/interfaces-input.py deleted file mode 100755 index ad248843d..000000000 --- a/src/conf_mode/interfaces-input.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2023 VyOS maintainers and contributors -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 or later as -# published by the Free Software Foundation. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -from sys import exit - -from vyos.config import Config -from vyos.configdict import get_interface_dict -from vyos.configverify import verify_mirror_redirect -from vyos.ifconfig import InputIf -from vyos import ConfigError -from vyos import airbag -airbag.enable() - -def get_config(config=None): - """ - Retrive CLI config as dictionary. Dictionary can never be empty, as at - least the interface name will be added or a deleted flag - """ - if config: - conf = config - else: - conf = Config() - base = ['interfaces', 'input'] - _, ifb = get_interface_dict(conf, base) - - return ifb - -def verify(ifb): - if 'deleted' in ifb: - return None - - verify_mirror_redirect(ifb) - return None - -def generate(ifb): - return None - -def apply(ifb): - d = InputIf(ifb['ifname']) - - # Remove input interface - if 'deleted' in ifb: - d.remove() - else: - d.update(ifb) - - return None - -if __name__ == '__main__': - try: - c = get_config() - verify(c) - generate(c) - apply(c) - except ConfigError as e: - print(e) - exit(1) -- cgit v1.2.3