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

1 files changed, 0 insertions, 68 deletions

diff --git a/smoketest/scripts/cli/test_service_bcast-relay.py b/smoketest/scripts/cli/test_service_bcast-relay.py
deleted file mode 100755
index 87901869e..000000000
--- a/smoketest/scripts/cli/test_service_bcast-relay.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 2019-2020 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 <http://www.gnu.org/licenses/>.
-
-import unittest
-
-from base_vyostest_shim import VyOSUnitTestSHIM
-
-from psutil import process_iter
-from vyos.configsession import ConfigSessionError
-
-base_path = ['service', 'broadcast-relay']
-
-class TestServiceBroadcastRelay(VyOSUnitTestSHIM.TestCase):
-    _address1 = '192.0.2.1/24'
-    _address2 = '192.0.2.1/24'
-
-    def setUp(self):
-        self.cli_set(['interfaces', 'dummy', 'dum1001', 'address', self._address1])
-        self.cli_set(['interfaces', 'dummy', 'dum1002', 'address', self._address2])
-
-    def tearDown(self):
-        self.cli_delete(['interfaces', 'dummy', 'dum1001'])
-        self.cli_delete(['interfaces', 'dummy', 'dum1002'])
-        self.cli_delete(base_path)
-        self.cli_commit()
-
-    def test_broadcast_relay_service(self):
-        ids = range(1, 5)
-        for id in ids:
-            base = base_path + ['id', str(id)]
-            self.cli_set(base + ['description', 'vyos'])
-            self.cli_set(base + ['port', str(10000 + id)])
-
-            # check validate() - two interfaces must be present
-            with self.assertRaises(ConfigSessionError):
-                self.cli_commit()
-
-            self.cli_set(base + ['interface', 'dum1001'])
-            self.cli_set(base + ['interface', 'dum1002'])
-            self.cli_set(base + ['address', self._address1.split('/')[0]])
-
-        self.cli_commit()
-
-        for id in ids:
-            # check if process is running
-            running = False
-            for p in process_iter():
-                if "udp-broadcast-relay" in p.name():
-                    if p.cmdline()[3] == str(id):
-                        running = True
-                        break
-            self.assertTrue(running)
-
-if __name__ == '__main__':
-    unittest.main(verbosity=2)