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

addons: vxlan: continue to add or delete fdb entry after catching exception

Browse Source 
Ticket: CM-13767
Reviewed By: Roopa, Purna, Nikhil G
Testing Done:

auto vx-1000
iface vx-1000
      vxlan-id 1000
      bridge-access 100
      vxlan-local-tunnelip 27.0.0.2
      vxlan-remoteip 27.0.0.1
      vxlan-remoteip 27.0.0.2
      vxlan-remoteip 27.0.0.3
      mstpctl-portbpdufilter yes
      mstpctl-bpduguard yes

Signed-off-by: Julien Fortin <julien@cumulusnetworks.com>
This commit is contained in:
Julien Fortin
2016-11-29 01:20:38 +01:00
parent ff59bbc370
commit 88d946862f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
addons/vxlan.py
View File

@ -30,7 +30,7 @@ class vxlan(moduleBase):
'example': ['vxlan-svcnodeip 172.16.22.125']},
'vxlan-remoteip' :
{'help' : 'vxlan remote ip',
'validvals' : ['<ipv4>', '<ipv6>'],
'validvals' : ['<ipv4>'],
'example': ['vxlan-remoteip 172.16.22.127']},
'vxlan-learning' :
{'help' : 'vxlan learning yes/no',
@ -91,8 +91,8 @@ class vxlan(moduleBase):
ageing=ageing,
group=group)
remoteips = ifaceobj.get_attr_value('vxlan-remoteip')
if not systemUtils.is_service_running(None, '/var/run/vxrd.pid'):
remoteips = ifaceobj.get_attr_value('vxlan-remoteip')
# figure out the diff for remotes and do the bridge fdb updates
# only if provisioned by user and not by vxrd
cur_peers = set(self.ipcmd.get_vxlan_peers(ifaceobj.name, group))
@ -104,21 +104,21 @@ class vxlan(moduleBase):
del_list = cur_peers
add_list = []
try:
for addr in del_list:
for addr in del_list:
try:
self.ipcmd.bridge_fdb_del(ifaceobj.name,
'00:00:00:00:00:00',
None, True, addr)
except:
pass
except:
pass
try:
for addr in add_list:
for addr in add_list:
try:
self.ipcmd.bridge_fdb_append(ifaceobj.name,
'00:00:00:00:00:00',
None, True, addr)
except:
pass
except:
pass
if ifaceobj.addr_method == 'manual':
netlink.link_set_updown(ifaceobj.name, "up")