diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-04-24 16:16:06 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-24 16:16:06 +0100 |
| commit | 110b771303984478c6e2c5e2f015d6464c0732dc (patch) | |
| tree | fcb28006f895799b25397c497715f95a085e1bc4 | |
| parent | 3e08abf7606b05339afd669cbbdfb330a3995cde (diff) | |
| parent | cf206d311ae1539d0d200978a32eb63895609c1d (diff) | |
| download | vyos-1x-110b771303984478c6e2c5e2f015d6464c0732dc.tar.gz vyos-1x-110b771303984478c6e2c5e2f015d6464c0732dc.zip | |
Merge pull request #4414 from markh0338/op-fw-dyn-grps
T7282: op-mode: show firewall group filtering and tab completion update
| -rwxr-xr-x | op-mode-definitions/firewall.xml.in | 7 | ||||
| -rwxr-xr-x | scripts/build-command-op-templates | 2 | ||||
| -rwxr-xr-x | src/op_mode/firewall.py | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/op-mode-definitions/firewall.xml.in b/op-mode-definitions/firewall.xml.in index 82e6c8668..21159eb1b 100755 --- a/op-mode-definitions/firewall.xml.in +++ b/op-mode-definitions/firewall.xml.in @@ -14,9 +14,16 @@ <path>firewall group address-group</path> <path>firewall group network-group</path> <path>firewall group port-group</path> + <path>firewall group domain-group</path> + <path>firewall group dynamic-group address-group</path> + <path>firewall group dynamic-group ipv6-address-group</path> <path>firewall group interface-group</path> <path>firewall group ipv6-address-group</path> <path>firewall group ipv6-network-group</path> + <path>firewall group mac-group</path> + <path>firewall group network-group</path> + <path>firewall group port-group</path> + <path>firewall group remote-group</path> </completionHelp> </properties> <children> diff --git a/scripts/build-command-op-templates b/scripts/build-command-op-templates index d203fdcef..0bb62113e 100755 --- a/scripts/build-command-op-templates +++ b/scripts/build-command-op-templates @@ -116,7 +116,7 @@ def get_properties(p): if comptype is not None: props["comp_type"] = "imagefiles" comp_exprs.append("echo -n \"<imagefiles>\"") - comp_help = " && ".join(comp_exprs) + comp_help = " ; ".join(comp_exprs) props["comp_help"] = comp_help except: diff --git a/src/op_mode/firewall.py b/src/op_mode/firewall.py index 086536e4e..ac47e3273 100755 --- a/src/op_mode/firewall.py +++ b/src/op_mode/firewall.py @@ -598,6 +598,9 @@ def show_firewall_group(name=None): prefix = 'DA_' if dynamic_type == 'address_group' else 'DA6_' if dynamic_type in firewall['group']['dynamic_group']: for dynamic_name, dynamic_conf in firewall['group']['dynamic_group'][dynamic_type].items(): + if name and name != dynamic_name: + continue + references = find_references(dynamic_type, dynamic_name) row = [dynamic_name, textwrap.fill(dynamic_conf.get('description') or '', 50), dynamic_type + '(dynamic)', '\n'.join(references) or 'N/D'] |