Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

T6313: Add "NAT" to "generate" command for rule resequence #3715

Merged
merged 1 commit into from
Jun 27, 2024
Merged

T6313: Add "NAT" to "generate" command for rule resequence #3715

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions op-mode-definitions/generate_firewall_rule-resequence.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,34 +7,7 @@
<help>Firewall</help>
</properties>
<children>
<node name="rule-resequence">
<properties>
<help>Resequence the firewall rules</help>
</properties>
<command>${vyos_op_scripts_dir}/generate_firewall_rule-resequence.py</command>
<children>
<tagNode name="start">
<properties>
<help>Set the first sequence number</help>
<completionHelp>
<list>1-1000</list>
</completionHelp>
</properties>
<command>${vyos_op_scripts_dir}/generate_firewall_rule-resequence.py --start $5</command>
<children>
<tagNode name="step">
<properties>
<help>Step between rules</help>
<completionHelp>
<list>1-1000</list>
</completionHelp>
</properties>
<command>${vyos_op_scripts_dir}/generate_firewall_rule-resequence.py --start $5 --step $7</command>
</tagNode>
</children>
</tagNode>
</children>
</node>
#include <include/rule-resequence.xml.i>
</children>
</node>
</children>
Expand Down
15 changes: 15 additions & 0 deletions op-mode-definitions/generate_nat64_rule-resequence.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="generate">
<children>
<node name="nat64">
<properties>
<help>Network Address Translation (NAT64)</help>
</properties>
<children>
#include <include/rule-resequence.xml.i>
</children>
</node>
</children>
</node>
</interfaceDefinition>
15 changes: 15 additions & 0 deletions op-mode-definitions/generate_nat66_rule-resequence.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="generate">
<children>
<node name="nat66">
<properties>
<help>Network Prefix Translation (NAT66/NPTv6)</help>
</properties>
<children>
#include <include/rule-resequence.xml.i>
</children>
</node>
</children>
</node>
</interfaceDefinition>
15 changes: 15 additions & 0 deletions op-mode-definitions/generate_nat_rule-resequence.xml.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<interfaceDefinition>
<node name="generate">
<children>
<node name="nat">
<properties>
<help>Network Address Translation (NAT)</help>
</properties>
<children>
#include <include/rule-resequence.xml.i>
</children>
</node>
</children>
</node>
</interfaceDefinition>
30 changes: 30 additions & 0 deletions op-mode-definitions/include/rule-resequence.xml.i
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<!-- included start from show-nht.xml.i -->
<node name="rule-resequence">
<properties>
<help>Resequence rules</help>
</properties>
<command>${vyos_op_scripts_dir}/generate_service_rule-resequence.py --service $2</command>
<children>
<tagNode name="start">
<properties>
<help>Set the first sequence number</help>
<completionHelp>
<list>1-1000</list>
</completionHelp>
</properties>
<command>${vyos_op_scripts_dir}/generate_service_rule-resequence.py --service $2 --start $5</command>
<children>
<tagNode name="step">
<properties>
<help>Step between rules</help>
<completionHelp>
<list>1-1000</list>
</completionHelp>
</properties>
<command>${vyos_op_scripts_dir}/generate_service_rule-resequence.py --service $2 --start $5 --step $7</command>
</tagNode>
</children>
</tagNode>
</children>
</node>
<!-- included end -->
29 changes: 13 additions & 16 deletions ...mode/generate_firewall_rule-resequence.py → ..._mode/generate_service_rule-resequence.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def change_rule_numbers(config_dict, start, step):
change_rule_numbers(config_dict[key], start, step)


def convert_rule_keys_to_int(config_dict):
def convert_rule_keys_to_int(config_dict, prev_key=None):
"""
Converts rule keys in the configuration dictionary to integers.

Expand All @@ -91,11 +91,11 @@ def convert_rule_keys_to_int(config_dict):
new_dict = {}
for key, value in config_dict.items():
# Convert key to integer if possible
new_key = int(key) if key.isdigit() else key
new_key = int(key) if key.isdigit() and prev_key == 'rule' else key

# Recur for nested dictionaries
if isinstance(value, dict):
new_value = convert_rule_keys_to_int(value)
new_value = convert_rule_keys_to_int(value, key)
else:
new_value = value

Expand All @@ -111,27 +111,24 @@ def convert_rule_keys_to_int(config_dict):
if __name__ == "__main__":
# Parse command-line arguments
parser = argparse.ArgumentParser(description='Convert dictionary to set commands with rule number modifications.')
parser.add_argument('--start', type=int, default=100, help='Start rule number')
parser.add_argument('--service', type=str, help='Name of service')
parser.add_argument('--start', type=int, default=100, help='Start rule number (default: 100)')
parser.add_argument('--step', type=int, default=10, help='Step for rule numbers (default: 10)')
args = parser.parse_args()

config = ConfigTreeQuery()
if not config.exists('firewall'):
print('Firewall is not configured')
if not config.exists(args.service):
print(f'{args.service} is not configured')
exit(1)

config_dict = config.get_config_dict('firewall')
config_dict = config.get_config_dict(args.service)

# 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 'firewall' in config_dict:
# Remove global-options, group and flowtable as they don't need sequencing
c-po marked this conversation as resolved.
Show resolved Hide resolved
for item in ['global-options', 'group', 'flowtable']:
if item in config_dict['firewall']:
del config_dict['firewall'][item]

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)
Expand Down
Loading