Merge pull request #2489 from vyos/mergify/bp/sagitta/pr-2476

pim(6): T5733: add missing FRR related features (backport #2476)

1 files changed, 140 insertions, 26 deletions

diff --git a/interface-definitions/protocols-pim.xml.in b/interface-definitions/protocols-pim.xml.in
index e9475930c..4a20c0d9b 100644
--- a/interface-definitions/protocols-pim.xml.in
+++ b/interface-definitions/protocols-pim.xml.in
@@ -5,7 +5,7 @@
     <children>
       <node name="pim" owner="${vyos_conf_scripts_dir}/protocols_pim.py">
         <properties>
-          <help>Protocol Independent Multicast (PIM)</help>
+          <help>Protocol Independent Multicast (PIM) and IGMP</help>
           <priority>400</priority>
         </properties>
         <children>
@@ -15,34 +15,130 @@
               <completionHelp>
                 <script>${vyos_completion_dir}/list_interfaces</script>
               </completionHelp>
+              <constraint>
+                #include <include/constraint/interface-name.xml.i>
+              </constraint>
             </properties>
             <children>
-              <leafNode name="dr-priority">
+            #include <include/bfd/bfd.xml.i>
+            #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>
+            #include <include/source-address-ipv4.xml.i>
+            <node name="igmp">
+              <properties>
+                <help>Internet Group Management Protocol (IGMP) options</help>
+              </properties>
+              <children>
+                #include <include/generic-disable-node.xml.i>
+                <tagNode name="join">
+                  <properties>
+                    <help>IGMP join multicast group</help>
+                    <valueHelp>
+                      <format>ipv4</format>
+                      <description>Multicast group address</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="ipv4-address"/>
+                    </constraint>
+                  </properties>
+                  <children>
+                    #include <include/source-address-ipv4-multi.xml.i>
+                  </children>
+                </tagNode>
+                <leafNode name="query-interval">
+                  <properties>
+                    <help>IGMP host query interval</help>
+                    <valueHelp>
+                      <format>u32:1-1800</format>
+                      <description>Query interval in seconds</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="numeric" argument="--range 1-1800"/>
+                    </constraint>
+                  </properties>
+                </leafNode>
+                <leafNode name="query-max-response-time">
+                  <properties>
+                    <help>IGMP max query response time</help>
+                    <valueHelp>
+                      <format>u32:10-250</format>
+                      <description>Query response value in deci-seconds</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="numeric" argument="--range 10-250"/>
+                    </constraint>
+                  </properties>
+                </leafNode>
+                <leafNode name="version">
+                  <properties>
+                    <help>Interface IGMP version</help>
+                    <completionHelp>
+                      <list>2 3</list>
+                    </completionHelp>
+                    <valueHelp>
+                      <format>2</format>
+                      <description>IGMP version 2</description>
+                    </valueHelp>
+                    <valueHelp>
+                      <format>3</format>
+                      <description>IGMP version 3</description>
+                    </valueHelp>
+                    <constraint>
+                      <validator name="numeric" argument="--range 2-3"/>
+                    </constraint>
+                  </properties>
+                  <defaultValue>3</defaultValue>
+                  </leafNode>
+                </children>
+              </node>
+            </children>
+          </tagNode>
+          <node name="ecmp">
+            <properties>
+              <help>Enable PIM ECMP</help>
+            </properties>
+            <children>
+              <leafNode name="rebalance">
                 <properties>
-                  <help>Designated Router Election Priority</help>
-                  <valueHelp>
-                    <format>u32:1-4294967295</format>
-                    <description>Value of the new DR Priority</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 1-4294967295"/>
-                  </constraint>
+                  <help>Enable PIM ECMP Rebalance</help>
+                  <valueless/>
                 </properties>
               </leafNode>
-              <leafNode name="hello">
+            </children>
+          </node>
+          <node name="igmp">
+            <properties>
+              <help>Internet Group Management Protocol (IGMP) options</help>
+            </properties>
+            <children>
+              <leafNode name="watermark-warning">
                 <properties>
-                  <help>Hello Interval</help>
+                  <help>Configure group limit for watermark warning</help>
                   <valueHelp>
-                    <format>u32:1-180</format>
-                    <description>Hello Interval in seconds</description>
+                    <format>u32:1-65535</format>
+                    <description>Group count to generate watermark warning</description>
                   </valueHelp>
                   <constraint>
-                    <validator name="numeric" argument="--range 1-180"/>
+                    <validator name="numeric" argument="--range 1-65535"/>
                   </constraint>
                 </properties>
               </leafNode>
             </children>
-          </tagNode>
+          </node>
+          #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="register-accept-list">
+            <properties>
+              <help>Only accept registers from a specific source prefix list</help>
+            </properties>
+            <children>
+              #include <include/policy/prefix-list.xml.i>
+            </children>
+          </node>
           <node name="rp">
             <properties>
               <help>Rendezvous Point</help>
@@ -75,18 +171,36 @@
                   </leafNode>
                 </children>
               </tagNode>
-              <leafNode name="keep-alive-timer">
+              #include <include/pim/keep-alive-timer.xml.i>
+            </children>
+          </node>
+          <leafNode name="no-v6-secondary">
+            <properties>
+              <help>Disable IPv6 secondary address in hello packets</help>
+              <valueless/>
+            </properties>
+          </leafNode>
+          <node name="spt-switchover">
+            <properties>
+              <help>Shortest-path tree (SPT) switchover</help>
+            </properties>
+            <children>
+              <node name="infinity-and-beyond">
                 <properties>
-                  <help>Keep alive Timer</help>
-                  <valueHelp>
-                    <format>u32:31-60000</format>
-                    <description>Keep alive Timer in seconds</description>
-                  </valueHelp>
-                  <constraint>
-                    <validator name="numeric" argument="--range 31-60000"/>
-                  </constraint>
+                  <help>Never switch to SPT Tree</help>
                 </properties>
-              </leafNode>
+                <children>
+                  #include <include/policy/prefix-list.xml.i>
+                </children>
+              </node>
+            </children>
+          </node>
+          <node name="ssm">
+            <properties>
+              <help>Source-Specific Multicast</help>
+            </properties>
+            <children>
+              #include <include/policy/prefix-list.xml.i>
             </children>
           </node>
         </children>