From 752d656424afc908f87b2b0daf9bf3bd7e7f092b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Fri, 6 Mar 2020 20:03:36 +0100
Subject: vrf: T31: enable vrf support for bonding interface

---
 interface-definitions/interfaces-bonding.xml.in |  1 +
 src/conf_mode/interfaces-bonding.py             | 18 +++++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in
index 586a8437d..80943a1fd 100644
--- a/interface-definitions/interfaces-bonding.xml.in
+++ b/interface-definitions/interfaces-bonding.xml.in
@@ -53,6 +53,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="hash-policy">
             <properties>
               <help>Bonding transmit hash policy</help>
diff --git a/src/conf_mode/interfaces-bonding.py b/src/conf_mode/interfaces-bonding.py
index dcb0b59ed..617506c06 100755
--- a/src/conf_mode/interfaces-bonding.py
+++ b/src/conf_mode/interfaces-bonding.py
@@ -58,7 +58,8 @@ default_config_data = {
     'vif_s': [],
     'vif_s_remove': [],
     'vif': [],
-    'vif_remove': []
+    'vif_remove': [],
+    'vrf': ''
 }
 
 
@@ -221,8 +222,10 @@ def get_config():
     if conf.exists('primary'):
         bond['primary'] = conf.return_value('primary')
 
-    # re-set configuration level to parse new nodes
-    conf.set_level(cfg_base)
+    # retrieve VRF instance
+    if conf.exists('vrf'):
+        bond['vrf'] = conf.return_value('vrf')
+
     # get vif-s interfaces (currently effective) - to determine which vif-s
     # interface is no longer present and needs to be removed
     eff_intf = conf.list_effective_nodes('vif-s')
@@ -265,6 +268,9 @@ def verify(bond):
             raise ConfigError('Interface "{}" is not part of the bond' \
                               .format(bond['primary']))
 
+    vrf_name = bond['vrf']
+    if vrf_name and vrf_name not in interfaces():
+        raise ConfigError(f'VRF "{vrf_name}" does not exist')
 
     # DHCPv6 parameters-only and temporary address are mutually exclusive
     for vif_s in bond['vif_s']:
@@ -472,6 +478,12 @@ def apply(bond):
         for addr in bond['address']:
             b.add_addr(addr)
 
+        # assign to VRF
+        if bond['vrf']:
+            b.add_vrf(bond['vrf'])
+        else:
+            b.del_vrf(bond['vrf'])
+
         # remove no longer required service VLAN interfaces (vif-s)
         for vif_s in bond['vif_s_remove']:
             b.del_vlan(vif_s)
-- 
cgit v1.2.3