From 403d2ffd6e46cb082b1d16ddf515e1784bee968c Mon Sep 17 00:00:00 2001
From: Christian Breunig <christian@breunig.cc>
Date: Mon, 13 Nov 2023 22:19:44 +0100
Subject: pim6: T5733: add missing FRR PIM6 related features

---
 .../include/policy/prefix-list6.xml.i              | 14 ++++
 interface-definitions/protocols-pim6.xml.in        | 97 ++++++++++++++++------
 2 files changed, 86 insertions(+), 25 deletions(-)
 create mode 100644 interface-definitions/include/policy/prefix-list6.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/policy/prefix-list6.xml.i b/interface-definitions/include/policy/prefix-list6.xml.i
new file mode 100644
index 000000000..101702f1f
--- /dev/null
+++ b/interface-definitions/include/policy/prefix-list6.xml.i
@@ -0,0 +1,14 @@
+<!-- include start from policy/prefix-list6.xml.i -->
+<leafNode name="prefix-list6">
+  <properties>
+    <help>Prefix-list to use</help>
+    <valueHelp>
+      <format>txt</format>
+      <description>Prefix-list to apply (IPv6)</description>
+    </valueHelp>
+    <completionHelp>
+      <path>policy prefix-list6</path>
+    </completionHelp>
+  </properties>
+</leafNode>
+<!-- include end -->
diff --git a/interface-definitions/protocols-pim6.xml.in b/interface-definitions/protocols-pim6.xml.in
index 58ef5a1e3..8bd3f3fee 100644
--- a/interface-definitions/protocols-pim6.xml.in
+++ b/interface-definitions/protocols-pim6.xml.in
@@ -5,7 +5,7 @@
     <children>
       <node name="pim6" owner="${vyos_conf_scripts_dir}/protocols_pim6.py">
         <properties>
-          <help>Protocol Independent Multicast for IPv6 (PIMv6)</help>
+          <help>Protocol Independent Multicast for IPv6 (PIMv6) and MLD</help>
           <priority>400</priority>
         </properties>
         <children>
@@ -15,8 +15,15 @@
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces</script>
               </completionHelp>
+              <constraint>
+                #include <include/constraint/interface-name.xml.i>
+              </constraint>
             </properties>
             <children>
+              #include <include/pim/bsm.xml.i>
+              #include <include/pim/dr-priority.xml.i>
+              #include <include/pim/hello.xml.i>
+              #include <include/pim/passive.xml.i>
               <node name="mld">
                 <properties>
                   <help>Multicast Listener Discovery (MLD)</help>
@@ -53,25 +60,29 @@
                       </leafNode>
                     </children>
                   </tagNode>
-                  <leafNode name="version">
+                  <leafNode name="last-member-query-count">
                     <properties>
-                      <help>MLD version</help>
-                      <completionHelp>
-                        <list>1 2</list>
-                      </completionHelp>
+                      <help>Last member query count</help>
                       <valueHelp>
-                        <format>1</format>
-                        <description>MLD version 1</description>
+                        <format>u32:1-255</format>
+                        <description>Count</description>
                       </valueHelp>
-                     <valueHelp>
-                        <format>2</format>
-                        <description>MLD version 2</description>
+                      <constraint>
+                        <validator name="numeric" argument="--range 1-255"/>
+                      </constraint>
+                    </properties>
+                  </leafNode>
+                  <leafNode name="last-member-query-interval">
+                    <properties>
+                      <help>Last member query interval</help>
+                      <valueHelp>
+                        <format>u32:100-6553500</format>
+                        <description>Last member query interval in milliseconds</description>
                       </valueHelp>
                       <constraint>
-                        <validator name="numeric" argument="--range 1-2"/>
+                        <validator name="numeric" argument="--range 100-6553500"/>
                       </constraint>
                     </properties>
-                    <defaultValue>2</defaultValue>
                   </leafNode>
                   <leafNode name="interval">
                     <properties>
@@ -97,34 +108,70 @@
                       </constraint>
                     </properties>
                   </leafNode>
-                  <leafNode name="last-member-query-count">
+                  <leafNode name="version">
                     <properties>
-                      <help>Last member query count</help>
+                      <help>MLD version</help>
+                      <completionHelp>
+                        <list>1 2</list>
+                      </completionHelp>
                       <valueHelp>
-                        <format>u32:1-255</format>
-                        <description>Count</description>
+                        <format>1</format>
+                        <description>MLD version 1</description>
+                      </valueHelp>
+                     <valueHelp>
+                        <format>2</format>
+                        <description>MLD version 2</description>
                       </valueHelp>
                       <constraint>
-                        <validator name="numeric" argument="--range 1-255"/>
+                        <validator name="numeric" argument="--range 1-2"/>
                       </constraint>
                     </properties>
+                    <defaultValue>2</defaultValue>
                   </leafNode>
-                  <leafNode name="last-member-query-interval">
+                </children>
+              </node>
+            </children>
+          </tagNode>
+          #include <include/pim/join-prune-interval.xml.i>
+          #include <include/pim/keep-alive-timer.xml.i>
+          #include <include/pim/packets.xml.i>
+          #include <include/pim/register-suppress-time.xml.i>
+          <node name="rp">
+            <properties>
+              <help>Rendezvous Point</help>
+            </properties>
+            <children>
+              <tagNode name="address">
+                <properties>
+                  <help>Rendezvous Point address</help>
+                  <valueHelp>
+                    <format>ipv6</format>
+                    <description>Rendezvous Point address</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="ipv6-address"/>
+                  </constraint>
+                </properties>
+                <children>
+                  <leafNode name="group">
                     <properties>
-                      <help>Last member query interval</help>
+                      <help>Group Address range</help>
                       <valueHelp>
-                        <format>u32:100-6553500</format>
-                        <description>Last member query interval in milliseconds</description>
+                        <format>ipv6net</format>
+                        <description>Group Address range</description>
                       </valueHelp>
                       <constraint>
-                        <validator name="numeric" argument="--range 100-6553500"/>
+                        <validator name="ipv6-prefix"/>
                       </constraint>
+                      <multi/>
                     </properties>
                   </leafNode>
+                  #include <include/policy/prefix-list6.xml.i>
                 </children>
-              </node>
+              </tagNode>
+              #include <include/pim/keep-alive-timer.xml.i>
             </children>
-          </tagNode>
+          </node>
         </children>
       </node>
     </children>
-- 
cgit v1.2.3