Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update vrf.py #97

Closed
wants to merge 2 commits into from
Closed

Update vrf.py #97

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
222e491
Update vrf.py
jhiggins-NZ Feb 27, 2019
d8f128d
Update vrf.py
jhiggins-NZ Mar 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions ifupdown2/addons/vrf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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,
Expand Down