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

Add a check to see if it is indeed a bridge port before applying mstpctl

Browse Source 
config

Ticket: CM-6965
Reviewed By: CCR-3472
Testing Done: Tested with interfaces file specified in the bug
This commit is contained in:
Roopa Prabhu
2015-09-09 11:43:19 -07:00
parent f6d2d5eab5
commit 42a9d19335
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
addons/mstpctl.py
View File

@@ -4,6 +4,7 @@
# Author: Roopa Prabhu, roopa@cumulusnetworks.com
#
import os
from sets import Set
from ifupdown.iface import *
from ifupdownaddons.modulebase import moduleBase
@@ -281,6 +282,9 @@ class mstpctl(moduleBase):
for p in portlist:
try:
(port, val) = p.split('=')
# if it is not bridge port, continue
if not os.path.exists('/sys/class/net/%s/brport' %port):
continue
self.mstpctlcmd.set_bridgeport_attr(ifaceobj.name,
port, dstattrname, val, check)
except Exception, e:
@@ -315,6 +319,9 @@ class mstpctl(moduleBase):
continue
if not mstpd_running:
continue
# if its not a bridge port, continue
if not os.path.exists('/sys/class/net/%s/brport' %ifaceobj.name):
continue
try:
self.mstpctlcmd.set_bridgeport_attr(bridgename,
ifaceobj.name, dstattrname, attrval, check)
@@ -336,6 +343,8 @@ class mstpctl(moduleBase):
%(ifaceobj.name, bport))
if not self.ipcmd.link_exists(bport):
continue
if not os.path.exists('/sys/class/net/%s/brport' %bport):
continue
bportifaceobjlist = ifaceobj_getfunc(bport)
if not bportifaceobjlist:
continue