diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-17 06:56:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-17 06:56:45 +0200 |
| commit | 4af8d98e8f4038ed680557e3b96be6b455be84f8 (patch) | |
| tree | 26de830b6ffa7aeafa48e668ebdb0491086dd06a | |
| parent | 3606418d8f473646a1f39d052badccf224c9c7fa (diff) | |
| parent | e337030f31a9162738748d246dae83ad46125439 (diff) | |
| download | vyos-1x-4af8d98e8f4038ed680557e3b96be6b455be84f8.tar.gz vyos-1x-4af8d98e8f4038ed680557e3b96be6b455be84f8.zip | |
Merge pull request #3463 from sever-sever/T6347
T6347: CGNAT fix error if pool contain dashes in the name
| -rwxr-xr-x | src/conf_mode/nat_cgnat.py | 8 |
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( |