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: delete rules before deleting the vrf interface on down

Browse Source 
Ticket: CM-10057
Reviewed By: trivial
Testing Done: Tested ifdown of a vrf interface
This commit is contained in:
Roopa Prabhu
2016-03-23 21:12:47 -07:00
parent fd8c6caf7f
commit f1c9248267
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
addons/vrf.py
View File

@@ -544,6 +544,17 @@ class vrf(moduleBase):
# if dhcp slave, release the dhcp lease # if dhcp slave, release the dhcp lease
if sobj and self._is_dhcp_slave(sobj[0]): if sobj and self._is_dhcp_slave(sobj[0]):
self._down_dhcp_slave(sobj[0]) self._down_dhcp_slave(sobj[0])
except Exception, e:
self.logger.info('%s: %s' %(ifaceobj.name, str(e)))
pass
try:
self._del_vrf_rules(ifaceobj.name, vrf_table)
except Exception, e:
self.logger.info('%s: %s' %(ifaceobj.name, str(e)))
pass
try:
self.ipcmd.link_delete(ifaceobj.name) self.ipcmd.link_delete(ifaceobj.name)
except Exception, e: except Exception, e:
self.logger.info('%s: %s' %(ifaceobj.name, str(e))) self.logger.info('%s: %s' %(ifaceobj.name, str(e)))
@@ -556,11 +567,6 @@ class vrf(moduleBase):
self.logger.info('%s: %s' %(ifaceobj.name, str(e))) self.logger.info('%s: %s' %(ifaceobj.name, str(e)))
pass pass
try:
self._del_vrf_rules(ifaceobj.name, vrf_table)
except Exception, e:
self.logger.info('%s: %s' %(ifaceobj.name, str(e)))
pass
def _down_vrf_slave(self, ifacename, vrf): def _down_vrf_slave(self, ifacename, vrf):
try: try: