diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2023-12-06 07:10:46 +0000 |
|---|---|---|
| committer | Mergify <37929162+mergify[bot]@users.noreply.github.com> | 2023-12-07 14:11:00 +0000 |
| commit | 3aad7e75112d6e065d72d79dbdf61902cf19b63f (patch) | |
| tree | e73c576a9ad5028d2c84273f011803ad9459bff2 /interface-definitions | |
| parent | dfca06b0584116ac88bcb1585e8750ecfeeb4dd4 (diff) | |
| download | vyos-1x-3aad7e75112d6e065d72d79dbdf61902cf19b63f.tar.gz vyos-1x-3aad7e75112d6e065d72d79dbdf61902cf19b63f.zip | |
T160: Rebase and fixes for NAT64
- Update the base (rebase)
- Move include/nat64-protocol.xml.i => include/nat64/protocol.xml.i
- Delete unwanted `write_json`, use `write_file` instead
- Remove unnecessary deleting of default values for tagNodes T2665
- Add smoketest
Example:
```
set interfaces ethernet eth0 address '192.168.122.14/24'
set interfaces ethernet eth0 address '192.168.122.10/24'
set interfaces ethernet eth2 address '2001:db8::1/64'
set nat64 source rule 100 source prefix '64:ff9b::/96'
set nat64 source rule 100 translation pool 10 address '192.168.122.10'
set nat64 source rule 100 translation pool 10 port '1-65535'
```
(cherry picked from commit 336bb5a071b59264679be4f4f9bedbdecdbe2834)
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/include/nat64/protocol.xml.i (renamed from interface-definitions/include/nat64-protocol.xml.i) | 2 | ||||
| -rw-r--r-- | interface-definitions/nat64.xml.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/interface-definitions/include/nat64-protocol.xml.i b/interface-definitions/include/nat64/protocol.xml.i index 9432e6a87..a640873b5 100644 --- a/interface-definitions/include/nat64-protocol.xml.i +++ b/interface-definitions/include/nat64/protocol.xml.i @@ -1,4 +1,4 @@ -<!-- include start from nat64-protocol.xml.i --> +<!-- include start from nat64/protocol.xml.i --> <node name="protocol"> <properties> <help>Apply translation address to a specfic protocol</help> diff --git a/interface-definitions/nat64.xml.in b/interface-definitions/nat64.xml.in index 1522395e4..baf13e6cb 100644 --- a/interface-definitions/nat64.xml.in +++ b/interface-definitions/nat64.xml.in @@ -66,7 +66,7 @@ #include <include/generic-description.xml.i> #include <include/generic-disable-node.xml.i> #include <include/nat-translation-port.xml.i> - #include <include/nat64-protocol.xml.i> + #include <include/nat64/protocol.xml.i> <leafNode name="address"> <properties> <help>IPv4 address or prefix to translate to</help> |