Merge branch 't1831-ipv6' into current

* t1831-ipv6:
  ipv6: T1831: migrate eui64 addressing to XML and python
  vyos.util: import cleanup
  ipv6: T1831: migrate autoconf node
  ipv6: T1831: use integers over bool in interface configuration
  ipv6: T1831: migrate forwarding and dup-addr-detect-transmits nodes
  ipv6: T1831: Makefile: remove node.def files in ipv6 folder
  ifconfig: T2057: explicity name state functions
  ifconfig: T2167: get_mac was not returning
  ifconfig: T2057: add get_alias function
  ifconfig: T2057: option forcing
  merge config: T2169: remove redundant use of show_config

13 files changed, 114 insertions, 17 deletions

diff --git a/interface-definitions/include/ipv6-address.xml.i b/interface-definitions/include/ipv6-address.xml.i
new file mode 100644
index 000000000..507d5dcc1
--- /dev/null
+++ b/interface-definitions/include/ipv6-address.xml.i
@@ -0,0 +1,22 @@
+<node name="address">
+  <children>
+    <leafNode name="autoconf">
+      <properties>
+        <help>Enable acquisition of IPv6 address using stateless autoconfig (SLAAC)</help>
+        <valueless/>
+      </properties>
+    </leafNode>
+    <leafNode name="eui64">
+      <properties>
+        <help>ssign IPv6 address using EUI-64 based on MAC address</help>
+        <valueHelp>
+          <format>ipv6net</format>
+          <description>IPv6 address and prefix length</description>
+        </valueHelp>
+        <constraint>
+          <validator name="ipv6-prefix"/>
+        </constraint>
+      </properties>
+    </leafNode>
+  </children>
+</node>
diff --git a/interface-definitions/include/ipv6-disable-forwarding.xml.i b/interface-definitions/include/ipv6-disable-forwarding.xml.i
new file mode 100644
index 000000000..3f90c7e34
--- /dev/null
+++ b/interface-definitions/include/ipv6-disable-forwarding.xml.i
@@ -0,0 +1,6 @@
+<leafNode name="disable-forwarding">
+  <properties>
+    <help>Disable IPv6 forwarding on this interface</help>
+    <valueless/>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
new file mode 100644
index 000000000..728187560
--- /dev/null
+++ b/interface-definitions/include/ipv6-dup-addr-detect-transmits.xml.i
@@ -0,0 +1,16 @@
+<leafNode name="dup-addr-detect-transmits">
+  <properties>
+    <help>Number of NS messages to send while performing DAD (default: 1)</help>
+    <valueHelp>
+      <format>1-n</format>
+      <description>Number of NS messages to send while performing DAD</description>
+    </valueHelp>
+    <valueHelp>
+      <format>0</format>
+      <description>Disable Duplicate Address Dectection (DAD)</description>
+    </valueHelp>
+    <constraint>
+      <validator name="numeric" argument="--non-negative"/>
+    </constraint>
+  </properties>
+</leafNode>
diff --git a/interface-definitions/include/vif.xml.i b/interface-definitions/include/vif.xml.i
index 88693e0d3..819534dc1 100644
--- a/interface-definitions/include/vif.xml.i
+++ b/interface-definitions/include/vif.xml.i
@@ -51,6 +51,13 @@
         #include <include/interface-enable-proxy-arp.xml.i>
       </children>
     </node>
+    <node name="ipv6">
+      <children>
+        #include <include/ipv6-address.xml.i>
+        #include <include/ipv6-disable-forwarding.xml.i>
+        #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+      </children>
+    </node>
     #include <include/interface-mac.xml.i>
     #include <include/interface-mtu-68-9000.xml.i>
   </children>
diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 80943a1fd..166f23285 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -89,6 +89,13 @@
               #include <include/interface-proxy-arp-pvlan.xml.i>
             </children>
           </node>
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           #include <include/interface-mac.xml.i>
           <leafNode name="mode">
             <properties>
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index d36a1abbc..f41110a3f 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -86,6 +86,13 @@
               #include <include/interface-disable-arp-filter.xml.i>
             </children>
           </node>
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           #include <include/interface-mac.xml.i>
           <leafNode name="max-age">
             <properties>
diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 5728d2f37..2b461cfaa 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -79,6 +79,13 @@
               #include <include/interface-proxy-arp-pvlan.xml.i>
             </children>
           </node>
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           #include <include/interface-mac.xml.i>
           #include <include/interface-mtu-68-9000.xml.i>
           <node name="offload-options">
diff --git a/interface-definitions/interfaces-l2tpv3.xml.in b/interface-definitions/interfaces-l2tpv3.xml.in
index a408e58c1..161a37df8 100644
--- a/interface-definitions/interfaces-l2tpv3.xml.in
+++ b/interface-definitions/interfaces-l2tpv3.xml.in
@@ -51,6 +51,13 @@
               <constraintErrorMessage>Encapsulation must be UDP or IP</constraintErrorMessage>
             </properties>
           </leafNode>
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           <leafNode name="local-ip">
             <properties>
               <help>Local IP address for L2TPv3 tunnel</help>
diff --git a/interface-definitions/interfaces-openvpn.xml.in b/interface-definitions/interfaces-openvpn.xml.in
index cac0ee417..cd5b5f29e 100644
--- a/interface-definitions/interfaces-openvpn.xml.in
+++ b/interface-definitions/interfaces-openvpn.xml.in
@@ -162,6 +162,13 @@
               </leafNode>
             </children>
           </node>
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           <leafNode name="hash">
             <properties>
               <help>Hashing Algorithm</help>
diff --git a/interface-definitions/interfaces-pseudo-ethernet.xml.in b/interface-definitions/interfaces-pseudo-ethernet.xml.in
index e6e8fd20c..772056bd2 100644
--- a/interface-definitions/interfaces-pseudo-ethernet.xml.in
+++ b/interface-definitions/interfaces-pseudo-ethernet.xml.in
@@ -33,6 +33,13 @@
               #include <include/interface-proxy-arp-pvlan.xml.i>
             </children>
           </node>
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           <leafNode name="link">
             <properties>
               <help>Lower link device</help>
diff --git a/interface-definitions/interfaces-tunnel.xml.in b/interface-definitions/interfaces-tunnel.xml.in
index c66628ec8..fe4a81f92 100644
--- a/interface-definitions/interfaces-tunnel.xml.in
+++ b/interface-definitions/interfaces-tunnel.xml.in
@@ -15,7 +15,6 @@
             <description>Tunnel interface name</description>
           </valueHelp>
         </properties>
-
         <children>
           #include <include/interface-description.xml.i>
           #include <include/address-ipv4-ipv6.xml.i>
@@ -23,7 +22,13 @@
           #include <include/interface-disable-link-detect.xml.i>
           #include <include/interface-vrf.xml.i>
           #include <include/interface-mtu-64-8024.xml.i>
-
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           <leafNode name="local-ip">
             <properties>
               <help>Local IP address for this tunnel</help>
@@ -44,7 +49,6 @@
               </constraint>
             </properties>
           </leafNode>
-
           <leafNode name="remote-ip">
             <properties>
               <help>Remote IP address for this tunnel</help>
@@ -62,7 +66,6 @@
               </constraint>
             </properties>
           </leafNode>
-
           <leafNode name="6rd-prefix">
             <properties>
               <help>6rd network prefix</help>
@@ -75,7 +78,6 @@
               </constraint>
             </properties>
           </leafNode>
-
           <leafNode name="6rd-relay-prefix">
             <properties>
               <help>6rd relay prefix</help>
@@ -88,7 +90,6 @@
               </constraint>
             </properties>
           </leafNode>
-
           <leafNode name="dhcp-interface">
             <properties>
               <help>dhcp interface</help>
@@ -104,7 +105,6 @@
               </constraint>
             </properties>
           </leafNode>
-
           <leafNode name="encapsulation">
             <properties>
               <help>Ignore link state changes</help>
@@ -141,7 +141,6 @@
               <constraintErrorMessage>Must be one of 'gre' 'gre-bridge' 'ipip' 'sit' 'ipip6' 'ip6ip6' 'ip6gre'</constraintErrorMessage>
             </properties>
           </leafNode>
-
           <leafNode name="multicast">
             <properties>
               <help>Multicast operation over tunnel</help>
@@ -162,12 +161,10 @@
               <constraintErrorMessage>Must be 'disable' or 'enable'</constraintErrorMessage>
             </properties>
           </leafNode>
-
           <node name="parameters">
             <properties>
               <help>Tunnel parameters</help>
             </properties>
-
             <children>
               <node name="ip">
                 <properties>
@@ -187,7 +184,6 @@
                       <constraintErrorMessage>TTL must be between 0 and 255</constraintErrorMessage>
                     </properties>
                   </leafNode>
-
                   <leafNode name="tos">
                     <properties>
                       <help>Type of Service (TOS)</help>
@@ -201,7 +197,6 @@
                       <constraintErrorMessage>TOS must be between 0 and 99</constraintErrorMessage>
                     </properties>
                   </leafNode>
-
                   <leafNode name="key">
                     <properties>
                       <help>Tunnel key</help>
@@ -217,12 +212,10 @@
                   </leafNode>
                 </children>
               </node>
-
               <node name="ipv6">
                 <properties>
                   <help>IPv6 specific tunnel parameters</help>
                 </properties>
-
                 <children>
                   <leafNode name="encaplimit">
                     <properties>
@@ -237,7 +230,6 @@
                       <constraintErrorMessage>key must be between 0-255</constraintErrorMessage>
                     </properties>
                   </leafNode>
-
                   <leafNode name="flowlabel">
                     <properties>
                       <help>Flowlabel</help>
@@ -251,7 +243,6 @@
                       <constraintErrorMessage>Must be 'inherit' or a number</constraintErrorMessage>
                     </properties>
                   </leafNode>
-
                   <leafNode name="hoplimit">
                     <properties>
                       <help>Hoplimit</help>
@@ -265,7 +256,6 @@
                       <constraintErrorMessage>hoplimit must be between 0-255</constraintErrorMessage>
                     </properties>
                   </leafNode>
-
                   <leafNode name="tclass">
                     <properties>
                       <help>Traffic class (Tclass)</help>
diff --git a/interface-definitions/interfaces-vxlan.xml.in b/interface-definitions/interfaces-vxlan.xml.in
index 16cb2c169..70c45d1fd 100644
--- a/interface-definitions/interfaces-vxlan.xml.in
+++ b/interface-definitions/interfaces-vxlan.xml.in
@@ -45,6 +45,13 @@
               #include <include/interface-enable-proxy-arp.xml.i>
             </children>
           </node>
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           <leafNode name="link">
             <properties>
               <help>Underlay device of VXLAN interface</help>
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in
index 8632bb881..2c224987e 100644
--- a/interface-definitions/interfaces-wireless.xml.in
+++ b/interface-definitions/interfaces-wireless.xml.in
@@ -469,6 +469,13 @@
               #include <include/interface-enable-arp-ignore.xml.i>
             </children>
           </node>
+          <node name="ipv6">
+            <children>
+              #include <include/ipv6-address.xml.i>
+              #include <include/ipv6-disable-forwarding.xml.i>
+              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
+            </children>
+          </node>
           <leafNode name="hw-id">
             <properties>
               <help>Media Access Control (MAC) address</help>