From d5484f8250233f3d941ae72c65e797b65b721d6c Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 6 Mar 2020 20:06:55 +0100
Subject: vrf: T31: enable vrf support for bridge interface

---
 interface-definitions/interfaces-bridge.xml.in |  1 +
 src/conf_mode/interfaces-bridge.py             | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in
index e8285b16c..d36a1abbc 100644
--- a/interface-definitions/interfaces-bridge.xml.in
+++ b/interface-definitions/interfaces-bridge.xml.in
@@ -37,6 +37,7 @@
           #include <include/dhcp-dhcpv6-options.xml.i>
           #include <include/interface-disable-link-detect.xml.i>
           #include <include/interface-disable.xml.i>
+          #include <include/interface-vrf.xml.i>
           <leafNode name="forwarding-delay">
             <properties>
               <help>Forwarding delay</help>
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index 0810d63d6..f189ce36d 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -52,7 +52,8 @@ default_config_data = {
     'member': [],
     'member_remove': [],
     'priority': 32768,
-    'stp': 0
+    'stp': 0,
+    'vrf': ''
 }
 
 def get_config():
@@ -191,12 +192,20 @@ def get_config():
     if conf.exists('stp'):
         bridge['stp'] = 1
 
+    # retrieve VRF instance
+    if conf.exists('vrf'):
+        bridge['vrf'] = conf.return_value('vrf')
+
     return bridge
 
 def verify(bridge):
     if bridge['dhcpv6_prm_only'] and bridge['dhcpv6_temporary']:
         raise ConfigError('DHCPv6 temporary and parameters-only options are mutually exclusive!')
 
+    vrf_name = bridge['vrf']
+    if vrf_name and vrf_name not in interfaces():
+        raise ConfigError(f'VRF "{vrf_name}" does not exist')
+
     conf = Config()
     for br in conf.list_nodes('interfaces bridge'):
         # it makes no sense to verify ourself in this case
@@ -286,6 +295,12 @@ def apply(bridge):
         # store DHCPv6 config dictionary - used later on when addresses are aquired
         br.set_dhcpv6_options(opt)
 
+        # assign to VRF
+        if bridge['vrf']:
+            br.add_vrf(bridge['vrf'])
+        else:
+            br.del_vrf(bridge['vrf'])
+
         # Change interface MAC address
         if bridge['mac']:
             br.set_mac(bridge['mac'])
-- 
cgit v1.2.3