From 5e8307bf3a7f816193ca9da8cb290d57bbb375f2 Mon Sep 17 00:00:00 2001
From: aapostoliuk <a.apostoliuk@vyos.io>
Date: Fri, 9 Aug 2024 18:08:56 +0300
Subject: nhrp: T2326: NHRP migration to FRR

NHRP migration to FRR
---
 .../include/version/nhrp-version.xml.i             |   3 +
 interface-definitions/protocols_nhrp.xml.in        | 186 +++++++++++++--------
 2 files changed, 120 insertions(+), 69 deletions(-)
 create mode 100644 interface-definitions/include/version/nhrp-version.xml.i

(limited to 'interface-definitions')

diff --git a/interface-definitions/include/version/nhrp-version.xml.i b/interface-definitions/include/version/nhrp-version.xml.i
new file mode 100644
index 000000000..7f6f3c4f7
--- /dev/null
+++ b/interface-definitions/include/version/nhrp-version.xml.i
@@ -0,0 +1,3 @@
+<!-- include start from include/version/nhrp-version.xml.i -->
+<syntaxVersion component='nhrp' version='1'></syntaxVersion>
+<!-- include end -->
diff --git a/interface-definitions/protocols_nhrp.xml.in b/interface-definitions/protocols_nhrp.xml.in
index d7663c095..5304fbd78 100644
--- a/interface-definitions/protocols_nhrp.xml.in
+++ b/interface-definitions/protocols_nhrp.xml.in
@@ -20,115 +20,163 @@
               </valueHelp>
             </properties>
             <children>
-              <leafNode name="cisco-authentication">
+              <node name="map">
                 <properties>
-                  <help>Pass phrase for cisco authentication</help>
-                  <valueHelp>
-                    <format>txt</format>
-                    <description>Pass phrase for cisco authentication</description>
-                  </valueHelp>
-                  <constraint>
-                    <regex>[^[:space:]]{1,8}</regex>
-                </constraint>
-                <constraintErrorMessage>Password should contain up to eight non-whitespace characters</constraintErrorMessage>
-                </properties>
-              </leafNode>
-              <tagNode name="dynamic-map">
-                <properties>
-                  <help>Set an HUB tunnel address</help>
-                  <valueHelp>
-                    <format>ipv4net</format>
-                    <description>Set the IP address and prefix length</description>
-                  </valueHelp>
+                  <help>Map tunnel IP to NBMA </help>
                 </properties>
                 <children>
-                  <leafNode name="nbma-domain-name">
+                  <tagNode name ="tunnel-ip">
                     <properties>
-                      <help>Set HUB fqdn (nbma-address - fqdn)</help>
+                      <help>Set a NHRP tunnel address</help>
                       <valueHelp>
-                        <format>&lt;fqdn&gt;</format>
-                        <description>Set the external HUB fqdn</description>
+                        <format>ipv4</format>
+                        <description>Set the IP address to map</description>
                       </valueHelp>
+                      <constraint>
+                        <validator name="ip-address"/>
+                      </constraint>
                     </properties>
-                  </leafNode>
+                    <children>
+                      <leafNode name="nbma">
+                        <properties>
+                          <help>Set NHRP NBMA address to map</help>
+                          <completionHelp>
+                            <list>local</list>
+                          </completionHelp>
+                          <valueHelp>
+                            <format>ipv4</format>
+                            <description>Set the IP address to map</description>
+                          </valueHelp>
+                          <valueHelp>
+                            <format>local</format>
+                            <description>Set the local address</description>
+                          </valueHelp>
+                          <constraint>
+                            <validator name="ip-address"/>
+                            <regex>(local)</regex>
+                          </constraint>
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </tagNode>
                 </children>
-              </tagNode>
-              <leafNode name="holding-time">
+              </node>
+              <node name="nhs">
                 <properties>
-                  <help>Holding time in seconds</help>
-                </properties>
-              </leafNode>
-              <tagNode name="map">
-                <properties>
-                  <help>Set an HUB tunnel address</help>
+                  <help>Map tunnel IP to NBMA of Next Hop Server</help>
                 </properties>
                 <children>
-                  <leafNode name="cisco">
-                    <properties>
-                      <help>If the statically mapped peer is running Cisco IOS, specify this</help>
-                      <valueless/>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="nbma-address">
+                  <tagNode name ="tunnel-ip">
                     <properties>
-                      <help>Set HUB address (nbma-address - external hub address or fqdn)</help>
-                    </properties>
-                  </leafNode>
-                  <leafNode name="register">
-                    <properties>
-                      <help>Specifies that Registration Request should be sent to this peer on startup</help>
-                      <valueless/>
+                      <help>Set a NHRP NHS tunnel address</help>
+                      <completionHelp>
+                        <list>dynamic</list>
+                      </completionHelp>
+                      <valueHelp>
+                        <format>ipv4</format>
+                        <description>Set the IP address to map</description>
+                      </valueHelp>
+                      <valueHelp>
+                        <format>dynamic</format>
+                        <description> Set Next Hop Server to have a dynamic address </description>
+                      </valueHelp>
+                      <constraint>
+                        <validator name="ip-address"/>
+                        <regex>(dynamic)</regex>
+                      </constraint>
                     </properties>
-                  </leafNode>
+                    <children>
+                      <leafNode name="nbma">
+                        <properties>
+                          <help>Set NHRP NBMA address of NHS</help>
+                          <valueHelp>
+                            <format>ipv4</format>
+                            <description>Set the IP address to map</description>
+                          </valueHelp>
+                          <constraint>
+                            <validator name="ip-address"/>
+                          </constraint>
+                          <multi/>
+                        </properties>
+                      </leafNode>
+                    </children>
+                  </tagNode>
                 </children>
-              </tagNode>
+              </node>
               <leafNode name="multicast">
                 <properties>
-                  <help>Set multicast for NHRP</help>
+                  <help>Map multicast to NBMA</help>
                   <completionHelp>
-                    <list>dynamic nhs</list>
+                    <list>dynamic</list>
                   </completionHelp>
+                  <valueHelp>
+                    <format>ipv4</format>
+                    <description>Set the IP address to map(IP|FQDN)</description>
+                  </valueHelp>
+                  <valueHelp>
+                    <format>dynamic</format>
+                    <description>NBMA address is learnt dynamically</description>
+                  </valueHelp>
                   <constraint>
-                    <regex>(dynamic|nhs)</regex>
+                    <validator name="ip-address"/>
+                    <regex>(dynamic)</regex>
                   </constraint>
+                  <multi/>
                 </properties>
               </leafNode>
-              <leafNode name="non-caching">
+              <leafNode name="registration-no-unique">
                 <properties>
-                  <help>This can be used to reduce memory consumption on big NBMA subnets</help>
+                  <help>Don't set unique flag</help>
                   <valueless/>
                 </properties>
               </leafNode>
-              <leafNode name="redirect">
+              <leafNode name="authentication">
                 <properties>
-                  <help>Enable sending of Cisco style NHRP Traffic Indication packets</help>
-                  <valueless/>
+                  <help>NHRP authentication</help>
+                  <valueHelp>
+                    <format>txt</format>
+                    <description>Pass phrase for NHRP authentication</description>
+                  </valueHelp>
+                  <constraint>
+                    <regex>[^[:space:]]{1,8}</regex>
+                </constraint>
+                <constraintErrorMessage>Password should contain up to eight non-whitespace characters</constraintErrorMessage>
                 </properties>
               </leafNode>
-              <leafNode name="shortcut-destination">
+              <leafNode name="holdtime">
                 <properties>
-                  <help>This instructs opennhrp to reply with authorative answers on NHRP Resolution Requests destined to addresses in this interface</help>
-                  <valueless/>
+                  <help>Holding time in seconds</help>
+                  <valueHelp>
+                    <format>u32:1-65000</format>
+                    <description>ring buffer size</description>
+                  </valueHelp>
+                  <constraint>
+                    <validator name="numeric" argument="--range 1-65000"/>
+                  </constraint>
                 </properties>
               </leafNode>
-              <tagNode name="shortcut-target">
+              <leafNode name="redirect">
                 <properties>
-                  <help>Defines an off-NBMA network prefix for which the GRE interface will act as a gateway</help>
+                  <help>Enable sending of Cisco style NHRP Traffic Indication packets</help>
+                  <valueless/>
                 </properties>
-                <children>
-                  <leafNode name="holding-time">
-                    <properties>
-                      <help>Holding time in seconds</help>
-                    </properties>
-                  </leafNode>
-                </children>
-              </tagNode>
+              </leafNode>
               <leafNode name="shortcut">
                 <properties>
                   <help>Enable creation of shortcut routes. A received NHRP Traffic Indication will trigger the resolution and establishment of a shortcut route</help>
                   <valueless/>
                 </properties>
               </leafNode>
+              #include <include/interface/mtu-68-16000.xml.i>
+              <leafNode name="network-id">
+                <properties>
+                  <help>NHRP network id</help>
+                  <valueHelp>
+                    <format>&lt;1-4294967295&gt;</format>
+                    <description>NHRP network id</description>
+                  </valueHelp>
+                </properties>
+              </leafNode>
             </children>
           </tagNode>
         </children>
-- 
cgit v1.2.3