Merge pull request #3061 from sarthurdev/T6079_current

 dhcp-server: T6079: Disable duplicate static-mappings on migration

1 files changed, 29 insertions, 40 deletions

diff --git a/src/migration-scripts/dhcp-server/6-to-7 b/src/migration-scripts/dhcp-server/6-to-7
index ccf385a30..e6c298a60 100755
--- a/src/migration-scripts/dhcp-server/6-to-7
+++ b/src/migration-scripts/dhcp-server/6-to-7
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2023 VyOS maintainers and contributors
+# Copyright (C) 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
@@ -14,19 +14,12 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# T3316: Migrate to Kea
-#        - global-parameters will not function
-#        - shared-network-parameters will not function
-#        - subnet-parameters will not function
-#        - static-mapping-parameters will not function
-#        - host-decl-name is on by default, option removed
-#        - ping-check no longer supported
-#        - failover is default enabled on all subnets that exist on failover servers
+# T6079: Disable duplicate static mappings
 
 import sys
 from vyos.configtree import ConfigTree
 
-if (len(sys.argv) < 2):
+if len(sys.argv) < 2:
     print("Must specify file name!")
     sys.exit(1)
 
@@ -38,46 +31,42 @@ with open(file_name, 'r') as f:
 base = ['service', 'dhcp-server']
 config = ConfigTree(config_file)
 
-if not config.exists(base):
+if not config.exists(base + ['shared-network-name']):
     # Nothing to do
-    sys.exit(0)
+    exit(0)
 
-if config.exists(base + ['host-decl-name']):
-    config.delete(base + ['host-decl-name'])
+# Run this for every instance if 'shared-network-name'
+for network in config.list_nodes(base + ['shared-network-name']):
+    base_network = base + ['shared-network-name', network]
 
-if config.exists(base + ['global-parameters']):
-    config.delete(base + ['global-parameters'])
+    if not config.exists(base_network + ['subnet']):
+        continue
 
-if config.exists(base + ['shared-network-name']):
-    for network in config.list_nodes(base + ['shared-network-name']):
-        base_network = base + ['shared-network-name', network]
+    for subnet in config.list_nodes(base_network + ['subnet']):
+        base_subnet = base_network + ['subnet', subnet]
 
-        if config.exists(base_network + ['ping-check']):
-            config.delete(base_network + ['ping-check'])
+        if config.exists(base_subnet + ['static-mapping']):
+            used_mac = []
+            used_ip = []
 
-        if config.exists(base_network + ['shared-network-parameters']):
-            config.delete(base_network +['shared-network-parameters'])
+            for mapping in config.list_nodes(base_subnet + ['static-mapping']):
+                base_mapping = base_subnet + ['static-mapping', mapping]
 
-        if not config.exists(base_network + ['subnet']):
-            continue
+                if config.exists(base_mapping + ['mac-address']):
+                    mac = config.return_value(base_mapping + ['mac-address'])
 
-        # Run this for every specified 'subnet'
-        for subnet in config.list_nodes(base_network + ['subnet']):
-            base_subnet = base_network + ['subnet', subnet]
+                    if mac in used_mac:
+                        config.set(base_mapping + ['disable'])
+                    else:
+                        used_mac.append(mac)
 
-            if config.exists(base_subnet + ['enable-failover']):
-                config.delete(base_subnet + ['enable-failover'])
+                if config.exists(base_mapping + ['ip-address']):
+                    ip = config.return_value(base_mapping + ['ip-address'])
 
-            if config.exists(base_subnet + ['ping-check']):
-                config.delete(base_subnet + ['ping-check'])
-
-            if config.exists(base_subnet + ['subnet-parameters']):
-                config.delete(base_subnet + ['subnet-parameters'])
-
-            if config.exists(base_subnet + ['static-mapping']):
-                for mapping in config.list_nodes(base_subnet + ['static-mapping']):
-                    if config.exists(base_subnet + ['static-mapping', mapping, 'static-mapping-parameters']):
-                        config.delete(base_subnet + ['static-mapping', mapping, 'static-mapping-parameters'])
+                    if ip in used_ip:
+                        config.set(base_subnet + ['static-mapping', mapping, 'disable'])
+                    else:
+                        used_ip.append(ip)
 
 try:
     with open(file_name, 'w') as f: