summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViacheslav Hletenko <v.gletenko@vyos.io>2024-05-16 12:08:34 +0000
committerViacheslav Hletenko <v.gletenko@vyos.io>2024-05-16 12:08:34 +0000
commite337030f31a9162738748d246dae83ad46125439 (patch)
tree290c3e111477e2bc0976a39f77c168fe38d10fd3
parent2a07aaed70f6c9dda0e95d2b01d3ba922c572716 (diff)
downloadvyos-1x-e337030f31a9162738748d246dae83ad46125439.tar.gz
vyos-1x-e337030f31a9162738748d246dae83ad46125439.zip
T6347: CGNAT fix error if pool contain dashes in the name
-rwxr-xr-xsrc/conf_mode/nat_cgnat.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/conf_mode/nat_cgnat.py b/src/conf_mode/nat_cgnat.py
index f41d66c66..8292f23a4 100755
--- a/src/conf_mode/nat_cgnat.py
+++ b/src/conf_mode/nat_cgnat.py
@@ -219,8 +219,8 @@ def generate(config):
# first external pool as we allow only one as PoC
ext_pool_name = jmespath.search("rule.*.translation | [0]", config).get('pool')
int_pool_name = jmespath.search("rule.*.source | [0]", config).get('pool')
- ext_query = f"pool.external.{ext_pool_name}.range | keys(@)"
- int_query = f"pool.internal.{int_pool_name}.range"
+ ext_query = f'pool.external."{ext_pool_name}".range | keys(@)'
+ int_query = f'pool.internal."{int_pool_name}".range'
external_ranges = jmespath.search(ext_query, config)
internal_ranges = [jmespath.search(int_query, config)]
@@ -246,10 +246,10 @@ def generate(config):
external_host_count = sum(external_list_count)
internal_host_count = sum(internal_list_count)
ports_per_user = int(
- jmespath.search(f'pool.external.{ext_pool_name}.per_user_limit.port', config)
+ jmespath.search(f'pool.external."{ext_pool_name}".per_user_limit.port', config)
)
external_port_range: str = jmespath.search(
- f'pool.external.{ext_pool_name}.external_port_range', config
+ f'pool.external."{ext_pool_name}".external_port_range', config
)
proto_maps, other_maps = generate_port_rules(