From 222e491d5050c29a1a97e5f141fd5f09ea28d97a Mon Sep 17 00:00:00 2001 From: jhiggins-NZ Date: Wed, 27 Feb 2019 21:48:44 +1300 Subject: [PATCH 1/2] Update vrf.py Fixed variables for ip rule commands. Was incorrectly referencing vrf_dev_name, instead of vrf_table. E.g. Before: ip rule add pref 200 oif {{vrf_dev_name}} table {{vrf_dev_name}} After: ip rule add pref 200 oif {{vrf_dev_name}} table {{vrf_table}} --- ifupdown2/addons/vrf.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ifupdown2/addons/vrf.py b/ifupdown2/addons/vrf.py index 3fbec5b6..dc59f2c7 100644 --- a/ifupdown2/addons/vrf.py +++ b/ifupdown2/addons/vrf.py @@ -588,32 +588,32 @@ def _add_vrf_rules(self, vrf_dev_name, vrf_table): #200: from all oif blue lookup blue #200: from all iif blue lookup blue - rule = ip_rule_out_format %(pref, 'oif', vrf_dev_name, vrf_dev_name) + rule = ip_rule_out_format %(pref, 'oif', vrf_dev_name, vrf_table) if not self.l3mdev4_rule and rule not in self.ip_rule_cache: rule_cmd = ip_rule_cmd %(utils.ip_cmd, '', pref, 'oif', vrf_dev_name, - vrf_dev_name) + vrf_table) utils.exec_command(rule_cmd) - rule = ip_rule_out_format %(pref, 'iif', vrf_dev_name, vrf_dev_name) + rule = ip_rule_out_format %(pref, 'iif', vrf_dev_name, vrf_table) if not self.l3mdev4_rule and rule not in self.ip_rule_cache: rule_cmd = ip_rule_cmd %(utils.ip_cmd, '', pref, 'iif', vrf_dev_name, - vrf_dev_name) + vrf_table) utils.exec_command(rule_cmd) - rule = ip_rule_out_format %(pref, 'oif', vrf_dev_name, vrf_dev_name) + rule = ip_rule_out_format %(pref, 'oif', vrf_dev_name, vrf_table) if not self.l3mdev6_rule and rule not in self.ip6_rule_cache: rule_cmd = ip_rule_cmd %(utils.ip_cmd, '-6', pref, 'oif', vrf_dev_name, - vrf_dev_name) + vrf_table) utils.exec_command(rule_cmd) - rule = ip_rule_out_format %(pref, 'iif', vrf_dev_name, vrf_dev_name) + rule = ip_rule_out_format %(pref, 'iif', vrf_dev_name, vrf_table) if not self.l3mdev6_rule and rule not in self.ip6_rule_cache: rule_cmd = ip_rule_cmd %(utils.ip_cmd, '-6', pref, 'iif', vrf_dev_name, - vrf_dev_name) + vrf_table) utils.exec_command(rule_cmd) def _is_address_virtual_slaves(self, vrfobj, config_vrfslaves, From d8f128d0afbf8b04ede00ce1169847d387322fef Mon Sep 17 00:00:00 2001 From: jhiggins-NZ Date: Sun, 17 Mar 2019 21:54:22 +1300 Subject: [PATCH 2/2] Update vrf.py Change vrf_dev_name to vrf_table for VRF ip rule delete --- ifupdown2/addons/vrf.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ifupdown2/addons/vrf.py b/ifupdown2/addons/vrf.py index dc59f2c7..783523ae 100644 --- a/ifupdown2/addons/vrf.py +++ b/ifupdown2/addons/vrf.py @@ -509,32 +509,32 @@ def _del_vrf_rules(self, vrf_dev_name, vrf_table): ip_rule_out_format = '%s: from all %s %s lookup %s' ip_rule_cmd = '%s %s rule del pref %s %s %s table %s' - rule = ip_rule_out_format %(pref, 'oif', vrf_dev_name, vrf_dev_name) + rule = ip_rule_out_format %(pref, 'oif', vrf_dev_name, vrf_table) if rule in self.ip_rule_cache: rule_cmd = ip_rule_cmd %(utils.ip_cmd, '', pref, 'oif', vrf_dev_name, - vrf_dev_name) + vrf_table) utils.exec_command(rule_cmd) - rule = ip_rule_out_format %(pref, 'iif', vrf_dev_name, vrf_dev_name) + rule = ip_rule_out_format %(pref, 'iif', vrf_dev_name, vrf_table) if rule in self.ip_rule_cache: rule_cmd = ip_rule_cmd %(utils.ip_cmd, '', pref, 'iif', vrf_dev_name, - vrf_dev_name) + vrf_table) utils.exec_command(rule_cmd) - rule = ip_rule_out_format %(pref, 'oif', vrf_dev_name, vrf_dev_name) + rule = ip_rule_out_format %(pref, 'oif', vrf_dev_name, vrf_table) if rule in self.ip6_rule_cache: rule_cmd = ip_rule_cmd %(utils.ip_cmd, '-6', pref, 'oif', vrf_dev_name, - vrf_dev_name) + vrf_table) utils.exec_command(rule_cmd) - rule = ip_rule_out_format %(pref, 'iif', vrf_dev_name, vrf_dev_name) + rule = ip_rule_out_format %(pref, 'iif', vrf_dev_name, vrf_table) if rule in self.ip6_rule_cache: rule_cmd = ip_rule_cmd %(utils.ip_cmd, '-6', pref, 'iif', vrf_dev_name, - vrf_dev_name) + vrf_table) utils.exec_command(rule_cmd) def _l3mdev_rule(self, ip_rules):