From 336bb5a071b59264679be4f4f9bedbdecdbe2834 Mon Sep 17 00:00:00 2001
From: Viacheslav Hletenko <v.gletenko@vyos.io>
Date: Wed, 6 Dec 2023 07:10:46 +0000
Subject: 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'
```
---
 interface-definitions/include/nat64-protocol.xml.i | 27 ----------------------
 interface-definitions/include/nat64/protocol.xml.i | 27 ++++++++++++++++++++++
 interface-definitions/nat64.xml.in                 |  2 +-
 3 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 interface-definitions/include/nat64-protocol.xml.i
 create mode 100644 interface-definitions/include/nat64/protocol.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/nat64-protocol.xml.i b/interface-definitions/include/nat64-protocol.xml.i
deleted file mode 100644
index 9432e6a87..000000000
--- a/interface-definitions/include/nat64-protocol.xml.i
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- include start from nat64-protocol.xml.i -->
-<node name="protocol">
-  <properties>
-    <help>Apply translation address to a specfic protocol</help>
-  </properties>
-  <children>
-    <leafNode name="tcp">
-      <properties>
-        <help>Transmission Control Protocol</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="udp">
-      <properties>
-        <help>User Datagram Protocol</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-    <leafNode name="icmp">
-      <properties>
-        <help>Internet Control Message Protocol</help>
-        <valueless/>
-      </properties>
-    </leafNode>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/nat64/protocol.xml.i b/interface-definitions/include/nat64/protocol.xml.i
new file mode 100644
index 000000000..a640873b5
--- /dev/null
+++ b/interface-definitions/include/nat64/protocol.xml.i
@@ -0,0 +1,27 @@
+<!-- include start from nat64/protocol.xml.i -->
+<node name="protocol">
+  <properties>
+    <help>Apply translation address to a specfic protocol</help>
+  </properties>
+  <children>
+    <leafNode name="tcp">
+      <properties>
+        <help>Transmission Control Protocol</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="udp">
+      <properties>
+        <help>User Datagram Protocol</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="icmp">
+      <properties>
+        <help>Internet Control Message Protocol</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+  </children>
+</node>
+<!-- include end -->
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>
-- 
cgit v1.2.3