diff options
| author | Nataliia S. <81954790+natali-rs1985@users.noreply.github.com> | 2025-04-08 17:15:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-08 15:15:42 +0100 |
| commit | 4d32bcddda72c1df944470f06b75908b2dc31667 (patch) | |
| tree | 80fcf34ef72675d2ee5b2407b350f301a1382f81 /src/op_mode | |
| parent | 07a3b0f5ae87a2ab400390c9fa0ca632d7815e15 (diff) | |
| download | vyos-1x-4d32bcddda72c1df944470f06b75908b2dc31667.tar.gz vyos-1x-4d32bcddda72c1df944470f06b75908b2dc31667.zip | |
T7315: Change CLI fot VPP NAT (#25)
New CLI
```
set vpp nat44 static rule 10 outside-interface 'eth0'
set vpp nat44 static rule 10 inside-interface 'eth1'
set vpp nat44 static rule 10 external address 192.168.122.10
set vpp nat44 static rule 10 external port 6545 # optional
set vpp nat44 static rule 10 protocol tcp|udp|icmp|all # optional, defaults to "all"
set vpp nat44 static rule 10 local address 100.64.0.10
set vpp nat44 static rule 10 local port 64010 # optional
```
Diffstat (limited to 'src/op_mode')
| -rw-r--r-- | src/op_mode/show_vpp_nat44.py | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/op_mode/show_vpp_nat44.py b/src/op_mode/show_vpp_nat44.py index 1aae8164e..fcf28f76a 100644 --- a/src/op_mode/show_vpp_nat44.py +++ b/src/op_mode/show_vpp_nat44.py @@ -116,27 +116,22 @@ def _get_raw_output_static_rules(vpp_api): return rules_list -def _get_formatted_output_rules(vpp, rules_list): +def _get_formatted_output_rules(rules_list): data_entries = [] for rule in rules_list: - dest_address = rule.get('external_ip_address') - dest_port = rule.get('external_port') or '' - trans_address = rule.get('local_ip_address') - trans_port = rule.get('local_port') or '' + external_address = rule.get('external_ip_address') + external_port = rule.get('external_port') or '' + local_address = rule.get('local_ip_address') + local_port = rule.get('local_port') or '' protocol = protocol_map[rule.get('protocol', 0)] - dest_sh_if_index = rule.get('external_sw_if_index') - vpp_if_name = vpp.get_interface_name(dest_sh_if_index) - if vpp_if_name: - dest_address = vpp_if_name - - values = [dest_address, dest_port, trans_address, trans_port, protocol] + values = [external_address, external_port, local_address, local_port, protocol] data_entries.append(values) headers = [ - 'Des_address/interface', - 'Dest_port', - 'Trans_address', - 'Trans_port', + 'External address', + 'External port', + 'Local address', + 'Local port', 'Protocol', ] out = sorted(data_entries, key=lambda x: x[2]) @@ -170,7 +165,7 @@ def show_static(raw: bool): return rules_list else: - return _get_formatted_output_rules(vpp, rules_list) + return _get_formatted_output_rules(rules_list) if __name__ == '__main__': |