diff options
| author | Daniil Baturin <daniil@vyos.io> | 2023-10-25 13:39:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 13:39:46 +0100 |
| commit | 35cde6f533eb3b7f44804e323e29d69c3b19be92 (patch) | |
| tree | 68be644346e400fcb26ab399614ac5c4f5f9524d | |
| parent | cb912e98de3b17611fc5259bf755ce9eafa7ec18 (diff) | |
| parent | 438eb7ad6a9edcf2ced3ac08595dace20d861909 (diff) | |
| download | vyos-1x-35cde6f533eb3b7f44804e323e29d69c3b19be92.tar.gz vyos-1x-35cde6f533eb3b7f44804e323e29d69c3b19be92.zip | |
Merge pull request #2404 from vyos/mergify/bp/sagitta/pr-2323
T5497: Add ability to resequence rule numbers for firewall (backport #2323)
| -rwxr-xr-x | src/op_mode/generate_firewall_rule-resequence.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/op_mode/generate_firewall_rule-resequence.py b/src/op_mode/generate_firewall_rule-resequence.py index b5b625a80..eb82a1a0a 100755 --- a/src/op_mode/generate_firewall_rule-resequence.py +++ b/src/op_mode/generate_firewall_rule-resequence.py @@ -116,9 +116,18 @@ if __name__ == "__main__": print('Firewall is not configured') exit(1) - #config_dict = config.get_config_dict('firewall') config_dict = config.get_config_dict('firewall') + # Remove global-options, group and flowtable as they don't need sequencing + if 'global-options' in config_dict['firewall']: + del config_dict['firewall']['global-options'] + + if 'group' in config_dict['firewall']: + del config_dict['firewall']['group'] + + if 'flowtable' in config_dict['firewall']: + del config_dict['firewall']['flowtable'] + # Convert rule keys to integers, rule "10" -> rule 10 # This is necessary for sorting the rules config_dict = convert_rule_keys_to_int(config_dict) |