From 8681a62fbb413ad3a613ebedb430919a940beef7 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 11 Aug 2021 21:11:48 +0200
Subject: bgp: evpn: T3739: add prefix-list match support

FRR 7.5.1 supports:

vyos(config-route-map)# match evpn
  default-route  default EVPN type-5 route
  rd             Route Distinguisher
  route-type     Match route-type
  vni            Match VNI

This commit adds a proper VyOS CLI abstraction.
---
 data/templates/frr/policy.frr.tmpl   | 12 ++++++++++++
 interface-definitions/policy.xml.in  | 38 ++++++++++++++++++++++++++++++++++++
 smoketest/scripts/cli/test_policy.py | 33 +++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)

diff --git a/data/templates/frr/policy.frr.tmpl b/data/templates/frr/policy.frr.tmpl
index b5649b44e..89bd558dc 100644
--- a/data/templates/frr/policy.frr.tmpl
+++ b/data/templates/frr/policy.frr.tmpl
@@ -165,6 +165,18 @@ route-map {{ route_map }} {{ rule_config.action }} {{ rule }}
 {%           if rule_config.match.extcommunity is defined and rule_config.match.extcommunity is not none %}
  match extcommunity {{ rule_config.match.extcommunity }}
 {%           endif %}
+{%           if rule_config.match.evpn is defined and rule_config.match.evpn.default_route is defined %}
+ match evpn default-route
+{%           endif %}
+{%           if rule_config.match.evpn is defined and rule_config.match.evpn.rd is defined and rule_config.match.evpn.rd is not none %}
+ match evpn rd {{ rule_config.match.evpn.rd }}
+{%           endif %}
+{%           if rule_config.match.evpn is defined and rule_config.match.evpn.route_type is defined and rule_config.match.evpn.route_type is not none %}
+ match evpn route-type {{ rule_config.match.evpn.route_type }}
+{%           endif %}
+{%           if rule_config.match.evpn is defined and rule_config.match.evpn.vni is defined and rule_config.match.evpn.vni is not none %}
+ match evpn vni {{ rule_config.match.evpn.vni }}
+{%           endif %}
 {%           if rule_config.match.interface is defined and rule_config.match.interface is not none %}
  match interface {{ rule_config.match.interface }}
 {%           endif %}
diff --git a/interface-definitions/policy.xml.in b/interface-definitions/policy.xml.in
index 5a3c58fa8..fb62d2f89 100644
--- a/interface-definitions/policy.xml.in
+++ b/interface-definitions/policy.xml.in
@@ -535,6 +535,44 @@
                       </leafNode>
                     </children>
                   </node>
+                  <node name="evpn">
+                    <properties>
+                      <help>Ethernet Virtual Private Network</help>
+                    </properties>
+                    <children>
+                      <leafNode name="default-route">
+                        <properties>
+                          <help>Default EVPN type-5 route</help>
+                          <valueless/>
+                        </properties>
+                      </leafNode>
+                      #include <include/bgp/route-distinguisher.xml.i>
+                      <leafNode name="route-type">
+                        <properties>
+                          <help>Match route-type</help>
+                          <completionHelp>
+                            <list>macip multicast prefix</list>
+                          </completionHelp>
+                          <valueHelp>
+                            <format>macip</format>
+                            <description>mac-ip route</description>
+                          </valueHelp>
+                          <valueHelp>
+                            <format>multicast</format>
+                            <description>IMET route</description>
+                          </valueHelp>
+                          <valueHelp>
+                            <format>prefix</format>
+                            <description>Prefix route</description>
+                          </valueHelp>
+                          <constraint>
+                            <regex>^(macip|multicast|prefix)$</regex>
+                          </constraint>
+                        </properties>
+                      </leafNode>
+                      #include <include/vni.xml.i>
+                    </children>
+                  </node>
                   <leafNode name="extcommunity">
                     <properties>
                       <help>BGP extended community to match</help>
diff --git a/smoketest/scripts/cli/test_policy.py b/smoketest/scripts/cli/test_policy.py
index 2d7b78048..66d3f3812 100755
--- a/smoketest/scripts/cli/test_policy.py
+++ b/smoketest/scripts/cli/test_policy.py
@@ -804,6 +804,19 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
                     },
                 },
             },
+            'evpn-configuration' : {
+                'rule' : {
+                    '10' : {
+                        'action' : 'permit',
+                        'match' : {
+                            'evpn-default-route'  : '',
+                            'evpn-rd'             : '100:300',
+                            'evpn-route-type'     : 'prefix',
+                            'evpn-vni'            : '1234',
+                        },
+                    },
+                },
+            },
         }
 
         self.cli_set(['policy', 'access-list', access_list, 'rule', '10', 'action', 'permit'])
@@ -847,6 +860,14 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
                     if 'community' in rule_config['match']:
                         self.cli_set(path + ['rule', rule, 'match', 'community', 'community-list', rule_config['match']['community']])
                         self.cli_set(path + ['rule', rule, 'match', 'community', 'exact-match'])
+                    if 'evpn-default-route' in rule_config['match']:
+                        self.cli_set(path + ['rule', rule, 'match', 'evpn', 'default-route'])
+                    if 'evpn-rd' in rule_config['match']:
+                        self.cli_set(path + ['rule', rule, 'match', 'evpn', 'rd', rule_config['match']['evpn-rd']])
+                    if 'evpn-route-type' in rule_config['match']:
+                        self.cli_set(path + ['rule', rule, 'match', 'evpn', 'route-type', rule_config['match']['evpn-route-type']])
+                    if 'evpn-vni' in rule_config['match']:
+                        self.cli_set(path + ['rule', rule, 'match', 'evpn', 'vni', rule_config['match']['evpn-vni']])
                     if 'extcommunity' in rule_config['match']:
                         self.cli_set(path + ['rule', rule, 'match', 'extcommunity', rule_config['match']['extcommunity']])
                     if 'interface' in rule_config['match']:
@@ -967,6 +988,18 @@ class TestPolicy(VyOSUnitTestSHIM.TestCase):
                     if 'community' in rule_config['match']:
                         tmp = f'match community {rule_config["match"]["community"]} exact-match'
                         self.assertIn(tmp, config)
+                    if 'evpn-default-route' in rule_config['match']:
+                        tmp = f'match evpn default-route'
+                        self.assertIn(tmp, config)
+                    if 'evpn-rd' in rule_config['match']:
+                        tmp = f'match evpn rd {rule_config["match"]["evpn-rd"]}'
+                        self.assertIn(tmp, config)
+                    if 'evpn-route-type' in rule_config['match']:
+                        tmp = f'match evpn route-type {rule_config["match"]["evpn-route-type"]}'
+                        self.assertIn(tmp, config)
+                    if 'evpn-vni' in rule_config['match']:
+                        tmp = f'match evpn vni {rule_config["match"]["evpn-vni"]}'
+                        self.assertIn(tmp, config)
                     if 'extcommunity' in rule_config['match']:
                         tmp = f'match extcommunity {rule_config["match"]["extcommunity"]}'
                         self.assertIn(tmp, config)
-- 
cgit v1.2.3