diff options
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/nat_cgnat.py | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/src/conf_mode/nat_cgnat.py b/src/conf_mode/nat_cgnat.py index f41d66c66..9a20a3c54 100755 --- a/src/conf_mode/nat_cgnat.py +++ b/src/conf_mode/nat_cgnat.py @@ -203,6 +203,11 @@ def verify(config): f'Range for "{pool} pool {pool_name}" must be defined!' ) + external_pools_query = "keys(pool.external)" + external_pools: list = jmespath.search(external_pools_query, config) + internal_pools_query = "keys(pool.internal)" + internal_pools: list = jmespath.search(internal_pools_query, config) + for rule, rule_config in config['rule'].items(): if 'source' not in rule_config: raise ConfigError(f'Rule "{rule}" source pool must be defined!') @@ -212,6 +217,14 @@ def verify(config): if 'translation' not in rule_config: raise ConfigError(f'Rule "{rule}" translation pool must be defined!') + internal_pool = rule_config['source']['pool'] + if internal_pool not in internal_pools: + raise ConfigError(f'Internal pool "{internal_pool}" does not exist!') + + external_pool = rule_config['translation']['pool'] + if external_pool not in external_pools: + raise ConfigError(f'External pool "{external_pool}" does not exist!') + def generate(config): if not config: @@ -219,8 +232,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 +259,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( |