Merge branch 'T4449' of https://github.com/nicolas-fort/vyos-1x into current

* 'T4449' of https://github.com/nicolas-fort/vyos-1x:
  Policy: T4449: Extend matching options for route-map ip nexthop

3 files changed, 86 insertions, 4 deletions

diff --git a/data/templates/frr/policy.frr.j2 b/data/templates/frr/policy.frr.j2
index a42b73e98..01884101f 100644
--- a/data/templates/frr/policy.frr.j2
+++ b/data/templates/frr/policy.frr.j2
@@ -188,9 +188,18 @@ route-map {{ route_map }} {{ rule_config.action }} {{ rule }}
 {%                     if rule_config.match.ip.nexthop.access_list is vyos_defined %}
  match ip next-hop {{ rule_config.match.ip.nexthop.access_list }}
 {%                     endif %}
+{%                     if rule_config.match.ip.nexthop.address is vyos_defined %}
+ match ip next-hop address {{ rule_config.match.ip.nexthop.address }}
+{%                     endif %}
+{%                     if rule_config.match.ip.nexthop.prefix_len is vyos_defined %}
+ match ip next-hop prefix-len {{ rule_config.match.ip.nexthop.prefix_len }}
+{%                     endif %}
 {%                     if rule_config.match.ip.nexthop.prefix_list is vyos_defined %}
  match ip next-hop prefix-list {{ rule_config.match.ip.nexthop.prefix_list }}
 {%                     endif %}
+{%                     if rule_config.match.ip.nexthop.type is vyos_defined %}
+ match ip next-hop type {{ rule_config.match.ip.nexthop.type }}
+{%                     endif %}
 {%                     if rule_config.match.ip.route_source.access_list is vyos_defined %}
  match ip route-source {{ rule_config.match.ip.route_source.access_list }}
 {%                     endif %}
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">
diff --git a/smoketest/scripts/cli/test_policy.py b/smoketest/scripts/cli/test_policy.py
index e8c6ff19b..2a8843faf 100755
--- a/smoketest/scripts/cli/test_policy.py
+++ b/smoketest/scripts/cli/test_policy.py
@@ -718,6 +718,11 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
         tag = '6542'
         goto = '25'
 
+        ipv4_nexthop_address= '192.0.2.2'
+        ipv4_nexthop_plen= '18'
+        ipv4_nexthop_type= 'blackhole'
+        
+
         test_data = {
             'foo-map-bar' : {
                 'rule' : {
@@ -793,6 +798,24 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
                             'peer' : peer,
                         },
                     },
+                    '40' : {
+                        'action' : 'permit',
+                        'match' : {
+                            'ip-nexthop-addr' : ipv4_nexthop_address,
+                        },
+                    },
+                    '42' : {
+                        'action' : 'deny',
+                        'match' : {
+                            'ip-nexthop-plen' : ipv4_nexthop_plen,
+                        },
+                    },
+                    '44' : {
+                        'action' : 'permit',
+                        'match' : {
+                            'ip-nexthop-type' : ipv4_nexthop_type,
+                        },
+                    },
                 },
             },
             'complicated-configuration' : {
@@ -921,6 +944,12 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
                         self.cli_set(path + ['rule', rule, 'match', 'ip', 'nexthop', 'access-list', rule_config['match']['ip-nexthop-acl']])
                     if 'ip-nexthop-pfx' in rule_config['match']:
                         self.cli_set(path + ['rule', rule, 'match', 'ip', 'nexthop', 'prefix-list', rule_config['match']['ip-nexthop-pfx']])
+                    if 'ip-nexthop-addr' in rule_config['match']:
+                        self.cli_set(path + ['rule', rule, 'match', 'ip', 'nexthop', 'address', rule_config['match']['ip-nexthop-addr']])
+                    if 'ip-nexthop-plen' in rule_config['match']:
+                        self.cli_set(path + ['rule', rule, 'match', 'ip', 'nexthop', 'prefix-len', rule_config['match']['ip-nexthop-plen']])
+                    if 'ip-nexthop-type' in rule_config['match']:
+                        self.cli_set(path + ['rule', rule, 'match', 'ip', 'nexthop', 'type', rule_config['match']['ip-nexthop-type']])
                     if 'ip-route-source-acl' in rule_config['match']:
                         self.cli_set(path + ['rule', rule, 'match', 'ip', 'route-source', 'access-list', rule_config['match']['ip-route-source-acl']])
                     if 'ip-route-source-pfx' in rule_config['match']:
@@ -1063,6 +1092,15 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
                     if 'ip-nexthop-pfx' in rule_config['match']:
                         tmp = f'match ip next-hop prefix-list {rule_config["match"]["ip-nexthop-pfx"]}'
                         self.assertIn(tmp, config)
+                    if 'ip-nexthop-addr' in rule_config['match']:
+                        tmp = f'match ip next-hop address {rule_config["match"]["ip-nexthop-addr"]}'
+                        self.assertIn(tmp, config)
+                    if 'ip-nexthop-plen' in rule_config['match']:
+                        tmp = f'match ip next-hop prefix-len {rule_config["match"]["ip-nexthop-plen"]}'
+                        self.assertIn(tmp, config)
+                    if 'ip-nexthop-type' in rule_config['match']:
+                        tmp = f'match ip next-hop type {rule_config["match"]["ip-nexthop-type"]}'
+                        self.assertIn(tmp, config)
                     if 'ip-route-source-acl' in rule_config['match']:
                         tmp = f'match ip route-source {rule_config["match"]["ip-route-source-acl"]}'
                         self.assertIn(tmp, config)