Merge pull request #2340 from vyos/mergify/bp/sagitta/pr-2338

T4320: remove references to obsoleted legacy version files (backport #2338)

3 files changed, 0 insertions, 76 deletions

diff --git a/python/vyos/component_version.py b/python/vyos/component_version.py
index 84e0ae51a..9662ebfcf 100644
--- a/python/vyos/component_version.py
+++ b/python/vyos/component_version.py
@@ -90,31 +90,6 @@ def from_system():
     """
     return component_version()
 
-def legacy_from_system():
-    """
-    Get system component version dict from legacy location.
-    This is for a transitional sanity check; the directory will eventually
-    be removed.
-    """
-    system_versions = {}
-    legacy_dir = directories['current']
-
-    # To be removed:
-    if not os.path.isdir(legacy_dir):
-        return system_versions
-
-    try:
-        version_info = os.listdir(legacy_dir)
-    except OSError as err:
-        sys.exit(repr(err))
-
-    for info in version_info:
-        if re.match(r'[\w,-]+@\d+', info):
-            pair = info.split('@')
-            system_versions[pair[0]] = int(pair[1])
-
-    return system_versions
-
 def format_string(ver: dict) -> str:
     """
     Version dict to string.
diff --git a/python/vyos/defaults.py b/python/vyos/defaults.py
index a5314790d..a229533bd 100644
--- a/python/vyos/defaults.py
+++ b/python/vyos/defaults.py
@@ -24,7 +24,6 @@ directories = {
   'op_mode' : f'{base_dir}/op_mode',
   'services' : f'{base_dir}/services',
   'config' : '/opt/vyatta/etc/config',
-  'current' : '/opt/vyatta/etc/config-migrate/current',
   'migrate' : '/opt/vyatta/etc/config-migrate/migrate',
   'log' : '/var/log/vyatta',
   'templates' : '/usr/share/vyos/templates/',
diff --git a/smoketest/scripts/cli/test_component_version.py b/smoketest/scripts/cli/test_component_version.py
deleted file mode 100755
index 7b1b12c53..000000000
--- a/smoketest/scripts/cli/test_component_version.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (C) 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 <http://www.gnu.org/licenses/>.
-
-import unittest
-
-import vyos.component_version as component_version
-
-# After T3474, component versions should be updated in the files in
-# vyos-1x/interface-definitions/include/version/
-# This test verifies that the legacy version in curver_DATA does not exceed
-# that in the xml cache.
-class TestComponentVersion(unittest.TestCase):
-    def setUp(self):
-        self.legacy_d = component_version.legacy_from_system()
-        self.xml_d = component_version.from_system()
-        self.set_legacy_d = set(self.legacy_d)
-        self.set_xml_d = set(self.xml_d)
-
-    def test_component_version(self):
-        bool_issubset = (self.set_legacy_d.issubset(self.set_xml_d))
-        if not bool_issubset:
-            missing = self.set_legacy_d.difference(self.set_xml_d)
-            print(f'\n\ncomponents in legacy but not in XML: {missing}')
-            print('new components must be listed in xml-component-version.xml.in')
-        self.assertTrue(bool_issubset)
-
-        bad_component_version = False
-        for k, v in self.legacy_d.items():
-            bool_inequality = (v <= self.xml_d[k])
-            if not bool_inequality:
-                print(f'\n\n{k} has not been updated in XML component versions:')
-                print(f'legacy version {v}; XML version {self.xml_d[k]}')
-                bad_component_version = True
-        self.assertFalse(bad_component_version)
-
-if __name__ == '__main__':
-    unittest.main(verbosity=2)