summaryrefslogtreecommitdiff
path: root/src/migration-scripts/pptp/2-to-3
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-01-10 19:59:20 +0100
committerGitHub <noreply@github.com>2024-01-10 19:59:20 +0100
commitaebb458262072457c6a3840d1b17031fbd780eca (patch)
treeb89f9b47d85bc00c758bd2388574270d20858079 /src/migration-scripts/pptp/2-to-3
parente890527d730053ed73227180c77d9dbbb9393ce0 (diff)
parent4ffec67d04670192d9b722353cbaef04cb0ba129 (diff)
downloadvyos-1x-aebb458262072457c6a3840d1b17031fbd780eca.tar.gz
vyos-1x-aebb458262072457c6a3840d1b17031fbd780eca.zip
Merge pull request #2777 from aapostoliuk/T5688-multirange
T5688: Changed 'range' to multi in 'client-ip-pool' for accell-ppp
Diffstat (limited to 'src/migration-scripts/pptp/2-to-3')
-rwxr-xr-xsrc/migration-scripts/pptp/2-to-319
1 files changed, 15 insertions, 4 deletions
diff --git a/src/migration-scripts/pptp/2-to-3 b/src/migration-scripts/pptp/2-to-3
index 98dc5c2a6..091cb68ec 100755
--- a/src/migration-scripts/pptp/2-to-3
+++ b/src/migration-scripts/pptp/2-to-3
@@ -23,7 +23,7 @@ import os
from sys import argv
from sys import exit
from vyos.configtree import ConfigTree
-
+from vyos.base import Warning
if len(argv) < 2:
print("Must specify file name!")
@@ -46,13 +46,24 @@ if not config.exists(pool_base):
range_pool_name = 'default-range-pool'
if config.exists(pool_base + ['start']) and config.exists(pool_base + ['stop']):
+ def is_legalrange(ip1: str, ip2: str, mask: str):
+ from ipaddress import IPv4Interface
+ interface1 = IPv4Interface(f'{ip1}/{mask}')
+ interface2 = IPv4Interface(f'{ip2}/{mask}')
+ return interface1.network.network_address == interface2.network.network_address and interface2.ip > interface1.ip
+
start_ip = config.return_value(pool_base + ['start'])
stop_ip = config.return_value(pool_base + ['stop'])
- ip_range = f'{start_ip}-{stop_ip}'
+ if is_legalrange(start_ip, stop_ip, '24'):
+ ip_range = f'{start_ip}-{stop_ip}'
+ config.set(pool_base + [range_pool_name, 'range'], value=ip_range, replace=False)
+ config.set(base + ['default-pool'], value=range_pool_name)
+ else:
+ Warning(
+ f'PPTP client-ip-pool range start-ip:{start_ip} and stop-ip:{stop_ip} can not be migrated.')
+
config.delete(pool_base + ['start'])
config.delete(pool_base + ['stop'])
- config.set(pool_base + [range_pool_name, 'range'], value=ip_range)
- config.set(base + ['default-pool'], value=range_pool_name)
# format as tag node
config.set_tag(pool_base)