Merge pull request #520 from jack9603301/nptv6

nptv6: T2518: Initial support for nat66 (NPT)

2 files changed, 192 insertions, 67 deletions

diff --git a/interface-definitions/nat.xml.in b/interface-definitions/nat.xml.in
index d6bed5b27..3cff8abc9 100644
--- a/interface-definitions/nat.xml.in
+++ b/interface-definitions/nat.xml.in
@@ -56,73 +56,6 @@
           </tagNode>
         </children>
       </node>
-      <node name="nptv6">
-        <properties>
-          <help>IPv6-to-IPv6 Network Prefix Translation Settings</help>
-        </properties>
-        <children>
-          <tagNode name="rule">
-            <properties>
-              <help>NPTv6 rule number</help>
-              <valueHelp>
-                <format>1-999999</format>
-                <description>Number for this rule</description>
-              </valueHelp>
-              <constraint>
-                <validator name="numeric" argument="--range 1-999999"/>
-              </constraint>
-              <constraintErrorMessage>NAT rule number must be between 1 and 999999</constraintErrorMessage>
-            </properties>
-            <children>
-              <leafNode name="description">
-                <properties>
-                  <help>Rule description</help>
-                </properties>
-              </leafNode>
-              #include <include/generic-disable-node.xml.i>
-              #include <include/nat-interface.xml.i>
-              <node name="source">
-                <properties>
-                  <help>IPv6 source prefix options</help>
-                </properties>
-                <children>
-                  <leafNode name="prefix">
-                    <properties>
-                      <help>IPv6 prefix to be translated</help>
-                      <valueHelp>
-                        <format>ipv6net</format>
-                        <description>IPv6 prefix</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv6-prefix"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-              <node name="translation">
-                <properties>
-                  <help>Translated IPv6 prefix options</help>
-                </properties>
-                <children>
-                  <leafNode name="prefix">
-                    <properties>
-                      <help>IPv6 prefix to translate to</help>
-                      <valueHelp>
-                        <format>ipv6net</format>
-                        <description>IPv6 prefix</description>
-                      </valueHelp>
-                      <constraint>
-                        <validator name="ipv6-prefix"/>
-                      </constraint>
-                    </properties>
-                  </leafNode>
-                </children>
-              </node>
-            </children>
-          </tagNode>
-        </children>
-      </node>
       <node name="source">
         <properties>
           <help>Source NAT settings</help>
diff --git a/interface-definitions/nat66.xml.in b/interface-definitions/nat66.xml.in
new file mode 100644
index 000000000..b45ebc0a8
--- /dev/null
+++ b/interface-definitions/nat66.xml.in
@@ -0,0 +1,192 @@
+<?xml version="1.0"?>
+<interfaceDefinition>
+  <node name="nat66" owner="${vyos_conf_scripts_dir}/nat66.py">
+    <properties>
+      <help>IPv6-to-IPv6 Network Prefix Translation (NAT66/NPT) Settings</help>
+      <priority>220</priority>
+    </properties>
+    <children>
+      <node name="source">
+        <properties>
+          <help>Prefix mapping of IPv6 source address translation</help>
+        </properties>
+        <children>
+          <tagNode name="rule">
+            <properties>
+              <help>Source NAT66 rule number</help>
+              <valueHelp>
+                <format>1-999999</format>
+                <description>Number for this rule</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-999999"/>
+              </constraint>
+              <constraintErrorMessage>NAT66 rule number must be between 1 and 999999</constraintErrorMessage>
+            </properties>
+            <children>
+              <leafNode name="description">
+                <properties>
+                  <help>Rule description</help>
+                </properties>
+              </leafNode>
+              <leafNode name="disable">
+                <properties>
+                  <help>Disable NAT66 rule</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="log">
+                <properties>
+                  <help>NAT66 rule logging</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="outbound-interface">
+                <properties>
+                  <help>Outbound interface of NAT66 traffic</help>
+                  <completionHelp>
+                    <script>${vyos_completion_dir}/list_interfaces.py</script>
+                  </completionHelp>
+                </properties>
+              </leafNode>
+              <node name="source">
+                <properties>
+                  <help>IPv6 source prefix options</help>
+                </properties>
+                <children>
+                  <leafNode name="prefix">
+                    <properties>
+                      <help>IPv6 prefix to be translated</help>
+                      <valueHelp>
+                        <format>ipv6net</format>
+                        <description>IPv6 prefix</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv6-prefix"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="translation">
+                <properties>
+                  <help>Translated IPv6 prefix options</help>
+                </properties>
+                <children>
+                  <leafNode name="prefix">
+                    <properties>
+                      <help>IPv6 prefix to translate to</help>
+                      <valueHelp>
+                        <format>ipv6net</format>
+                        <description>IPv6 prefix</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv6-prefix"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+      <node name="destination">
+        <properties>
+          <help>Prefix mapping for IPv6 destination address translation</help>
+        </properties>
+        <children>
+          <tagNode name="rule">
+            <properties>
+              <help>Destination NAT66 rule number</help>
+              <valueHelp>
+                <format>1-999999</format>
+                <description>Number for this rule</description>
+              </valueHelp>
+              <constraint>
+                <validator name="numeric" argument="--range 1-999999"/>
+              </constraint>
+              <constraintErrorMessage>NAT66 rule number must be between 1 and 999999</constraintErrorMessage>
+            </properties>
+            <children>
+              <leafNode name="description">
+                <properties>
+                  <help>Rule description</help>
+                </properties>
+              </leafNode>
+              <leafNode name="disable">
+                <properties>
+                  <help>Disable NAT66 rule</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="log">
+                <properties>
+                  <help>NAT66 rule logging</help>
+                  <valueless/>
+                </properties>
+              </leafNode>
+              <leafNode name="inbound-interface">
+                <properties>
+                  <help>Inbound interface of NAT66 traffic</help>
+                  <completionHelp>
+                    <list>any</list>
+                    <script>${vyos_completion_dir}/list_interfaces.py</script> 
+                  </completionHelp>
+                </properties>
+              </leafNode>
+              <node name="destination">
+                <properties>
+                  <help>IPv6 destination prefix options</help>
+                </properties>
+                <children>
+                  <leafNode name="address">
+                    <properties>
+                      <help>IPv6 address or prefix to be translated</help>
+                      <valueHelp>
+                        <format>ipv6</format>
+                        <description>IPv6 address</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>ipv6net</format>
+                        <description>IPv6 prefix</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv6-address"/>
+                        <validator name="ipv6-prefix"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+              <node name="translation">
+                <properties>
+                  <help>Translated IPv6 address options</help>
+                </properties>
+                <children>
+                  <leafNode name="address">
+                    <properties>
+                      <help>IPv6 address or prefix to translate to</help>
+                      <valueHelp>
+                        <format>ipv6</format>
+                        <description>IPv6 address</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>ipv6net</format>
+                        <description>IPv6 prefix</description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ipv6-address"/>
+                        <validator name="ipv6-prefix"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                </children>
+              </node>
+            </children>
+          </tagNode>
+        </children>
+      </node>
+    </children>
+  </node>
+</interfaceDefinition>