From 84fb72fc70c671f462564825f097f820a11aa26e Mon Sep 17 00:00:00 2001
From: Nicolas Fort <nicolasfort1988@gmail.com>
Date: Sat, 28 May 2022 13:12:38 +0000
Subject: Policy: T4449: Extend matching options for route-map ip nexthop

---
 interface-definitions/policy.xml.in | 43 +++++++++++++++++++++++++++++++++----
 1 file changed, 39 insertions(+), 4 deletions(-)

(limited to 'interface-definitions')

diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in
index 50b7cbc84..d4aa4e024 100644
--- a/interface-definitions/policy.xml.in
+++ b/interface-definitions/policy.xml.in
@@ -655,12 +655,20 @@
                       <node name="nexthop">
                         <properties>
                           <help>IP next-hop of route to match</help>
-                          <valueHelp>
-                            <format>ipv4</format>
-                            <description>Next-hop IPv4 router address</description>
-                          </valueHelp>
                         </properties>
                         <children>
+                          <leafNode name="address">
+                            <properties>
+                              <help>IP address to match</help>
+                              <valueHelp>
+                                <format>ipv4</format>
+                                <description>Nexthop IP address</description>
+                              </valueHelp>
+                              <constraint>
+                                <validator name="ipv4-address"/>
+                              </constraint>
+                            </properties>
+                          </leafNode>
                           <leafNode name="access-list">
                             <properties>
                               <help>IP access-list to match</help>
@@ -682,6 +690,18 @@
                               </valueHelp>
                             </properties>
                           </leafNode>
+                          <leafNode name="prefix-len">
+                            <properties>
+                              <help>IP prefix-lenght to match</help>
+                              <valueHelp>
+                                <format>u32:0-32</format>
+                                <description>Prefix length</description>
+                              </valueHelp>
+                              <constraint>
+                                <validator name="numeric" argument="--range 0-32"/>
+                              </constraint>
+                            </properties>
+                          </leafNode>
                           <leafNode name="prefix-list">
                             <properties>
                               <help>IP prefix-list to match</help>
@@ -690,6 +710,21 @@
                               </completionHelp>
                             </properties>
                           </leafNode>
+                          <leafNode name="type">
+                            <properties>
+                              <help>Match type</help>
+                              <completionHelp>
+                                <list>blackhole</list>
+                              </completionHelp>
+                              <valueHelp>
+                                <format>blackhole</format>
+                                <description>Blackhole</description>
+                              </valueHelp>
+                              <constraint>
+                                <regex>(blackhole)</regex>
+                              </constraint>
+                            </properties>
+                          </leafNode>
                         </children>
                       </node>
                       <node name="route-source">
-- 
cgit v1.2.3