mirror/CumulusNetworks-ifupdown2
1
0
Fork 0
mirror of https://github.com/CumulusNetworks/ifupdown2.git synced 2024-05-06 15:54:50 +00:00
Code Activity

addons: vrf: fix cases where auto was getting written to iproute2 vrf map

Browse Source 
Ticket:
Reviewed By: trivial
Testing Done:

This also changes a few errors to warn

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
This commit is contained in:
Roopa Prabhu
2016-03-18 11:22:22 -07:00
parent aa4e30220a
commit d54baa2232
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
addons/vrf.py
View File

@@ -267,7 +267,7 @@ class vrf(moduleBase):
self._handle_dhcp_slaves(ifacename, vrfname, ifaceobj, self._handle_dhcp_slaves(ifacename, vrfname, ifaceobj,
ifaceobj_getfunc) ifaceobj_getfunc)
except Exception, e: except Exception, e:
self.logger.warn('%s: %s' %(ifacename, str(e))) self.log_error('%s: %s' %(ifacename, str(e)))
def _del_vrf_rules(self, vrf_dev_name, vrf_table): def _del_vrf_rules(self, vrf_dev_name, vrf_table):
pref = 200 pref = 200
@@ -401,6 +401,11 @@ class vrf(moduleBase):
%ifaceobj.name) %ifaceobj.name)
self.logger.info('%s: table id auto: selected table id %s\n' self.logger.info('%s: table id auto: selected table id %s\n'
%(ifaceobj.name, vrf_table)) %(ifaceobj.name, vrf_table))
if not vrf_table.isdigit():
self.log_error('%s: vrf-table must be an integer or \'auto\''
%(ifaceobj.name), ifaceobj)
# XXX: If we decide to not allow vrf id usages out of # XXX: If we decide to not allow vrf id usages out of
# the reserved ifupdown range, then uncomment this code. # the reserved ifupdown range, then uncomment this code.
#else: #else:
@@ -429,6 +434,8 @@ class vrf(moduleBase):
if vrf_table != running_table: if vrf_table != running_table:
self.log_error('%s: cannot change vrf table id,running table id %s is different from config id %s' %(ifaceobj.name, self.log_error('%s: cannot change vrf table id,running table id %s is different from config id %s' %(ifaceobj.name,
running_table, vrf_table)) running_table, vrf_table))
if vrf_table != 'auto':
self._iproute2_vrf_table_entry_add(ifaceobj.name, vrf_table)
def _add_vrf_default_route(self, ifaceobj, vrf_table): def _add_vrf_default_route(self, ifaceobj, vrf_table):
vrf_default_route = ifaceobj.get_attr_value_first('vrf-default-route') vrf_default_route = ifaceobj.get_attr_value_first('vrf-default-route')
@@ -464,7 +471,6 @@ class vrf(moduleBase):
self._create_vrf_dev(ifaceobj, vrf_table) self._create_vrf_dev(ifaceobj, vrf_table)
try: try:
self._iproute2_vrf_table_entry_add(ifaceobj.name, vrf_table)
self._add_vrf_rules(ifaceobj.name, vrf_table) self._add_vrf_rules(ifaceobj.name, vrf_table)
self._create_cgroup(ifaceobj) self._create_cgroup(ifaceobj)
if add_slaves: if add_slaves: