diff options
| author | JeffWDH <JeffWDH@users.noreply.github.com> | 2023-09-29 04:13:17 -0400 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-10-25 09:07:48 +0000 |
| commit | 47d9109d0d49c897e2aaf66c107c0b1f9febc86d (patch) | |
| tree | 2d04755381ed3328ad1ef692dc55fc7f82c37af6 | |
| parent | cb912e98de3b17611fc5259bf755ce9eafa7ec18 (diff) | |
| download | vyos-1x-47d9109d0d49c897e2aaf66c107c0b1f9febc86d.tar.gz vyos-1x-47d9109d0d49c897e2aaf66c107c0b1f9febc86d.zip | |
T5497: Add ability to resequence rule numbers for firewall
(cherry picked from commit 5180622cd6c928812a644f427d65acae763c37cc)
| -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..4362b484a 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) |