diff options
| author | aapostoliuk <a.apostoliuk@vyos.io> | 2023-12-27 12:36:22 +0200 |
|---|---|---|
| committer | Christian Breunig <christian@breunig.cc> | 2023-12-28 16:35:12 +0100 |
| commit | e0c7d8a8305925c26073098474ed230da05fae11 (patch) | |
| tree | d30e1a47c74949b15eae342b83f19853aa969c35 /data | |
| parent | 428d3121de49e608a6e03a5456dd63b8b48bebe9 (diff) | |
| download | vyos-1x-e0c7d8a8305925c26073098474ed230da05fae11.tar.gz vyos-1x-e0c7d8a8305925c26073098474ed230da05fae11.zip | |
T5859: Fixed format of pool range in the accel-ppp config
Fixed format of ipv4 pool range from 'x.x.x.x-x.x.x.y'
to 'x.x.x.x-y'
(cherry picked from commit 714a6b1dd5e4de6c85911fa64f4b5f37b44979cf)
Diffstat (limited to 'data')
| -rw-r--r-- | data/templates/accel-ppp/config_ip_pool.j2 | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/data/templates/accel-ppp/config_ip_pool.j2 b/data/templates/accel-ppp/config_ip_pool.j2 index c567236a4..6ac04e1a1 100644 --- a/data/templates/accel-ppp/config_ip_pool.j2 +++ b/data/templates/accel-ppp/config_ip_pool.j2 @@ -12,10 +12,16 @@ gw-ip-address={{ gateway_address }} {% endif %} {% for pool in ordered_named_pools %} {% for pool_name, pool_config in pool.items() %} +{% set iprange_str = pool_config.range %} +{% set iprange_list = pool_config.range.split('-') %} +{% if iprange_list | length == 2 %} +{% set last_ip_oct = iprange_list[1].split('.') %} +{% set iprange_str = iprange_list[0] + '-' + last_ip_oct[last_ip_oct | length - 1] %} +{% endif %} {% if pool_config.next_pool is vyos_defined %} -{{ pool_config.range }},name={{ pool_name }},next={{ pool_config.next_pool }} +{{ iprange_str }},name={{ pool_name }},next={{ pool_config.next_pool }} {% else %} -{{ pool_config.range }},name={{ pool_name }} +{{ iprange_str }},name={{ pool_name }} {% endif %} {% endfor %} {% endfor %} |