Merge pull request #3260 from c-po/spring-cleaning-3

T6199: remove unused Python imports from migration scripts

Makefile

@@ -7,7 +7,7 @@ LIBS := -lzmq
 CFLAGS :=
 BUILD_ARCH := $(shell dpkg-architecture -q DEB_BUILD_ARCH)
 J2LINT := $(shell command -v j2lint 2> /dev/null)
-PYLINT_FILES := $(shell git ls-files *.py)
+PYLINT_FILES := $(shell git ls-files *.py src/migration-scripts)
 
 config_xml_src = $(wildcard interface-definitions/*.xml.in)
 config_xml_obj = $(config_xml_src:.xml.in=.xml)

src/migration-scripts/conntrack/2-to-3

@@ -6,7 +6,6 @@
 import sys
 
 from vyos.configtree import ConfigTree
-from vyos.version import get_version
 
 if len(sys.argv) < 2:
     print('Must specify file name!')

src/migration-scripts/dhcp-server/9-to-10

@@ -19,7 +19,6 @@
 # - Add subnet IDs to existing subnets
 
 import sys
-import re
 from vyos.configtree import ConfigTree
 
 if len(sys.argv) < 2:
@@ -57,7 +56,7 @@ for network in config.list_nodes(base):
     if config.exists(base + [network, 'subnet']):
         for subnet in config.list_nodes(base + [network, 'subnet']):
             base_subnet = base + [network, 'subnet', subnet]
-            
+
             for option in option_nodes:
                 if config.exists(base_subnet + [option]):
                     config.set(base_subnet + ['option'])

src/migration-scripts/dhcpv6-server/3-to-4

@@ -20,7 +20,6 @@
 # - Migrate address-range to range tagNode
 
 import sys
-import re
 from vyos.configtree import ConfigTree
 
 if len(sys.argv) < 2:

src/migration-scripts/firewall/10-to-11

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 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
@@ -16,12 +16,12 @@
 
 # T5160: Firewall re-writing
 
-#  cli changes from:       
+#  cli changes from:
 #  set firewall name <name> ...
 #  set firewall ipv6-name <name> ...
 #  To
-#  set firewall ipv4 name <name> 
-#  set firewall ipv6 name <name> 
+#  set firewall ipv4 name <name>
+#  set firewall ipv6 name <name>
 
 ## Also from 'firewall interface' removed.
 ## in and out:
@@ -37,13 +37,10 @@
     # set firewall [ipv4 | ipv6] input filter rule <5,10,15,...> action jump
     # set firewall [ipv4 | ipv6] input filter rule <5,10,15,...> jump-target <name>
 
-import re
-
 from sys import argv
 from sys import exit
 
 from vyos.configtree import ConfigTree
-from vyos.ifconfig import Section
 
 if len(argv) < 2:
     print("Must specify file name!")
@@ -207,4 +204,4 @@ try:
         f.write(config.to_string())
 except OSError as e:
     print("Failed to save the modified config: {}".format(e))
-    exit(1)
+    exit(1)

src/migration-scripts/firewall/11-to-12

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 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
@@ -22,13 +22,10 @@
     # set firewall ... rule <rule> [inbound-interface | outboubd-interface] name <iface>
     # set firewall ... rule <rule> [inbound-interface | outboubd-interface] group <iface_group>
 
-import re
-
 from sys import argv
 from sys import exit
 
 from vyos.configtree import ConfigTree
-from vyos.ifconfig import Section
 
 if len(argv) < 2:
     print("Must specify file name!")
@@ -71,4 +68,4 @@ try:
         f.write(config.to_string())
 except OSError as e:
     print("Failed to save the modified config: {}".format(e))
-    exit(1)
+    exit(1)

src/migration-scripts/firewall/12-to-13

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 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
@@ -25,13 +25,10 @@
     # set firewall ... rule <rule> state <state>
     # Remove command if log=disable or <state>=disable
 
-import re
-
 from sys import argv
 from sys import exit
 
 from vyos.configtree import ConfigTree
-from vyos.ifconfig import Section
 
 if len(argv) < 2:
     print("Must specify file name!")
@@ -89,4 +86,4 @@ try:
         f.write(config.to_string())
 except OSError as e:
     print("Failed to save the modified config: {}".format(e))
-    exit(1)
+    exit(1)

src/migration-scripts/firewall/7-to-8

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2022 VyOS maintainers and contributors
+# Copyright (C) 2022-2024 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
@@ -17,13 +17,10 @@
 # T2199: Migrate interface firewall nodes to firewall interfaces <ifname> <direction> name/ipv6-name <name>
 # T2199: Migrate zone-policy to firewall node
 
-import re
-
 from sys import argv
 from sys import exit
 
 from vyos.configtree import ConfigTree
-from vyos.ifconfig import Section
 
 if len(argv) < 2:
     print("Must specify file name!")

src/migration-scripts/firewall/8-to-9

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2022 VyOS maintainers and contributors
+# Copyright (C) 2022-2024 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
@@ -15,18 +15,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # T4780: Add firewall interface group
-#  cli changes from:       
+#  cli changes from:
 #  set firewall [name | ipv6-name] <name> rule <number> [inbound-interface | outbound-interface] <interface_name>
 #  To
 #  set firewall [name | ipv6-name] <name> rule <number> [inbound-interface | outbound-interface]  [interface-name | interface-group] <interface_name | interface_group>
 
-import re
-
 from sys import argv
 from sys import exit
 
 from vyos.configtree import ConfigTree
-from vyos.ifconfig import Section
 
 if len(argv) < 2:
     print("Must specify file name!")
@@ -88,4 +85,4 @@ try:
         f.write(config.to_string())
 except OSError as e:
     print("Failed to save the modified config: {}".format(e))
-    exit(1)
+    exit(1)

src/migration-scripts/firewall/9-to-10

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 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
@@ -15,18 +15,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # T5050: Log options
-#  cli changes from:       
+#  cli changes from:
 #  set firewall [name | ipv6-name] <name> rule <number> log-level <log_level>
 #  To
 #  set firewall [name | ipv6-name] <name> rule <number> log-options level <log_level>
 
-import re
-
 from sys import argv
 from sys import exit
 
 from vyos.configtree import ConfigTree
-from vyos.ifconfig import Section
 
 if len(argv) < 2:
     print("Must specify file name!")
@@ -50,7 +47,7 @@ if config.exists(base + ['name']):
             continue
 
         for rule in config.list_nodes(base + ['name', name, 'rule']):
-            log_options_base = base + ['name', name, 'rule', rule, 'log-options'] 
+            log_options_base = base + ['name', name, 'rule', rule, 'log-options']
             rule_log_level = base + ['name', name, 'rule', rule, 'log-level']
 
             if config.exists(rule_log_level):
@@ -64,7 +61,7 @@ if config.exists(base + ['ipv6-name']):
             continue
 
         for rule in config.list_nodes(base + ['ipv6-name', name, 'rule']):
-            log_options_base = base + ['ipv6-name', name, 'rule', rule, 'log-options'] 
+            log_options_base = base + ['ipv6-name', name, 'rule', rule, 'log-options']
             rule_log_level = base + ['ipv6-name', name, 'rule', rule, 'log-level']
 
             if config.exists(rule_log_level):
@@ -77,4 +74,4 @@ try:
         f.write(config.to_string())
 except OSError as e:
     print("Failed to save the modified config: {}".format(e))
-    exit(1)
+    exit(1)

src/migration-scripts/interfaces/26-to-27

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2022 VyOS maintainers and contributors
+# Copyright (C) 2022-2024 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
@@ -18,8 +18,6 @@
 #        present for DHCP
 
 from sys import argv
-
-from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
 if len(argv) < 2:

src/migration-scripts/interfaces/27-to-28

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 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
@@ -19,7 +19,6 @@
 
 from sys import argv
 
-from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
 if len(argv) < 2:

src/migration-scripts/interfaces/28-to-29

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 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
@@ -18,8 +18,6 @@
 #        valueless node.
 
 from sys import argv
-
-from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
 if len(argv) < 2:

src/migration-scripts/interfaces/29-to-30

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 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
@@ -17,8 +17,6 @@
 # T5286: remove XDP support in favour of VPP
 
 from sys import argv
-
-from vyos.ethtool import Ethtool
 from vyos.configtree import ConfigTree
 
 if len(argv) < 2:

src/migration-scripts/ipoe-server/1-to-2

@@ -23,8 +23,6 @@
 #       1. The first pool that contains next-poll.
 #       2. Else, the first pool in the list
 
-import os
-
 from sys import argv
 from sys import exit
 from vyos.configtree import ConfigTree

src/migration-scripts/ipoe-server/2-to-3

@@ -16,13 +16,10 @@
 
 # Migrating to named ipv6 pools
 
-import os
-
 from sys import argv
 from sys import exit
 from vyos.configtree import ConfigTree
 
-
 if len(argv) < 2:
     print("Must specify file name!")
     exit(1)

src/migration-scripts/ipsec/11-to-12

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 2023-2024 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
@@ -16,8 +16,6 @@
 
 # Remove legacy ipsec.conf and ipsec.secrets - Not supported with swanctl
 
-import re
-
 from sys import argv
 from sys import exit
 

src/migration-scripts/ipsec/12-to-13

@@ -17,8 +17,6 @@
 # Changed value of dead-peer-detection.action from hold to trap
 # Changed value of close-action from hold to trap and from restart to start
 
-import re
-
 from sys import argv
 from sys import exit
 

src/migration-scripts/ipsec/7-to-8

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2021 VyOS maintainers and contributors
+# Copyright (C) 2021-2024 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
@@ -26,7 +26,6 @@ from sys import argv
 from sys import exit
 
 from vyos.configtree import ConfigTree
-from vyos.pki import load_public_key
 from vyos.pki import load_private_key
 from vyos.pki import encode_public_key
 from vyos.pki import encode_private_key