From d0a20884614e773b074c39cd496717440faa89c1 Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Wed, 23 Apr 2025 20:14:56 +0200
Subject: interface: T4627: not every interface type supports IPv6
 interface-identifiers

Turns out commit b124f0b3b ("interface: T4627: support IPv6 Interface
Identifier (token) for SLAAC") uncovered a wrong assumption in VyOS that every
interface type in use always supports SLAAC and IPv6-ND (neighbor discovery).

This is not true for WireGuard, Tunnel and VTI interfaces, thus do not provide
that CLI option. In addition SLAAC support should be removed for those interface
types in a future PR.
---
 interface-definitions/include/interface/ipv6-address.xml.i  | 13 -------------
 .../include/interface/ipv6-options-with-nd.xml.i            |  9 +++++++++
 interface-definitions/include/interface/ipv6-options.xml.i  | 11 ++++++++++-
 interface-definitions/include/interface/vif-s.xml.i         |  2 ++
 interface-definitions/include/interface/vif.xml.i           |  1 +
 5 files changed, 22 insertions(+), 14 deletions(-)
 delete mode 100644 interface-definitions/include/interface/ipv6-address.xml.i
 create mode 100644 interface-definitions/include/interface/ipv6-options-with-nd.xml.i

(limited to 'interface-definitions/include/interface')

diff --git a/interface-definitions/include/interface/ipv6-address.xml.i b/interface-definitions/include/interface/ipv6-address.xml.i
deleted file mode 100644
index ff35b858c..000000000
--- a/interface-definitions/include/interface/ipv6-address.xml.i
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- include start from interface/ipv6-address.xml.i -->
-<node name="address">
-  <properties>
-    <help>IPv6 address configuration modes</help>
-  </properties>
-  <children>
-    #include <include/interface/ipv6-address-autoconf.xml.i>
-    #include <include/interface/ipv6-address-eui64.xml.i>
-    #include <include/interface/ipv6-address-interface-identifier.xml.i>
-    #include <include/interface/ipv6-address-no-default-link-local.xml.i>
-  </children>
-</node>
-<!-- include end -->
diff --git a/interface-definitions/include/interface/ipv6-options-with-nd.xml.i b/interface-definitions/include/interface/ipv6-options-with-nd.xml.i
new file mode 100644
index 000000000..5894104b3
--- /dev/null
+++ b/interface-definitions/include/interface/ipv6-options-with-nd.xml.i
@@ -0,0 +1,9 @@
+          <node name="ipv6">
+            <children>
+              <node name="address">
+                <children>
+                  #include <include/interface/ipv6-address-interface-identifier.xml.i>
+                </children>
+              </node>
+            </children>
+          </node>
diff --git a/interface-definitions/include/interface/ipv6-options.xml.i b/interface-definitions/include/interface/ipv6-options.xml.i
index ec6ec64ee..f84a9f2cd 100644
--- a/interface-definitions/include/interface/ipv6-options.xml.i
+++ b/interface-definitions/include/interface/ipv6-options.xml.i
@@ -8,9 +8,18 @@
     #include <include/interface/base-reachable-time.xml.i>
     #include <include/interface/disable-forwarding.xml.i>
     #include <include/interface/ipv6-accept-dad.xml.i>
-    #include <include/interface/ipv6-address.xml.i>
     #include <include/interface/ipv6-dup-addr-detect-transmits.xml.i>
     #include <include/interface/source-validation.xml.i>
+    <node name="address">
+      <properties>
+        <help>IPv6 address configuration modes</help>
+      </properties>
+      <children>
+        #include <include/interface/ipv6-address-autoconf.xml.i>
+        #include <include/interface/ipv6-address-eui64.xml.i>
+        #include <include/interface/ipv6-address-no-default-link-local.xml.i>
+      </children>
+    </node>
   </children>
 </node>
 <!-- include end -->
diff --git a/interface-definitions/include/interface/vif-s.xml.i b/interface-definitions/include/interface/vif-s.xml.i
index 02e7ab057..65ca10207 100644
--- a/interface-definitions/include/interface/vif-s.xml.i
+++ b/interface-definitions/include/interface/vif-s.xml.i
@@ -21,6 +21,7 @@
     #include <include/interface/vlan-protocol.xml.i>
     #include <include/interface/ipv4-options.xml.i>
     #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/ipv6-options-with-nd.xml.i>
     #include <include/interface/mac.xml.i>
     #include <include/interface/mirror.xml.i>
     #include <include/interface/mtu-68-16000.xml.i>
@@ -41,6 +42,7 @@
         #include <include/interface/disable.xml.i>
         #include <include/interface/ipv4-options.xml.i>
         #include <include/interface/ipv6-options.xml.i>
+        #include <include/interface/ipv6-options-with-nd.xml.i>
         #include <include/interface/mac.xml.i>
         #include <include/interface/mirror.xml.i>
         #include <include/interface/mtu-68-16000.xml.i>
diff --git a/interface-definitions/include/interface/vif.xml.i b/interface-definitions/include/interface/vif.xml.i
index ec3921bf6..87f91c5ce 100644
--- a/interface-definitions/include/interface/vif.xml.i
+++ b/interface-definitions/include/interface/vif.xml.i
@@ -46,6 +46,7 @@
     </leafNode>
     #include <include/interface/ipv4-options.xml.i>
     #include <include/interface/ipv6-options.xml.i>
+    #include <include/interface/ipv6-options-with-nd.xml.i>
     #include <include/interface/mac.xml.i>
     #include <include/interface/mirror.xml.i>
     #include <include/interface/mtu-68-16000.xml.i>
-- 
cgit v1.2.3