From 4ef110fd2c501b718344c72d495ad7e16d2bd465 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 --- .../scripts/cli/test_interfaces_pseudo_ethernet.py | 46 ---------------------- 1 file changed, 46 deletions(-) delete mode 100755 smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py (limited to 'smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py') diff --git a/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py b/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py deleted file mode 100755 index 0d6f5bc1f..000000000 --- a/smoketest/scripts/cli/test_interfaces_pseudo_ethernet.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env python3 -# -# Copyright (C) 2020-2022 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 . - -import os -import unittest - -from vyos.ifconfig import Section -from base_interfaces_test import BasicInterfaceTest - -class PEthInterfaceTest(BasicInterfaceTest.TestCase): - @classmethod - def setUpClass(cls): - cls._base_path = ['interfaces', 'pseudo-ethernet'] - - cls._options = {} - # we need to filter out VLAN interfaces identified by a dot (.) - # in their name - just in case! - if 'TEST_ETH' in os.environ: - for tmp in os.environ['TEST_ETH'].split(): - cls._options.update({f'p{tmp}' : [f'source-interface {tmp}']}) - - else: - for tmp in Section.interfaces('ethernet'): - if '.' in tmp: - continue - cls._options.update({f'p{tmp}' : [f'source-interface {tmp}']}) - - cls._interfaces = list(cls._options) - # call base-classes classmethod - super(PEthInterfaceTest, cls).setUpClass() - -if __name__ == '__main__': - unittest.main(verbosity=2) -- cgit v1.2.3