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

Move LINK_MASTER/LINK_SLAVE to a new field link_type (purna hit some

Browse Source 
issues with having it in flags) + add check for bond slave being already up

Ticket: CM-4408
Reviewed By:
Testing Done: some bond sanity test
This commit is contained in:
Roopa Prabhu
2014-12-08 22:59:41 -08:00
parent 7f045fd868
commit c9bba7539d
5 changed files with 37 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ifupdown/ifupdownmain.py
View File

@@ -112,7 +112,7 @@ class ifupdownMain(ifupdownBase):
# by its link master interface, then dont set the link state.
# But do allow user to change state of the link if the interface
# is already with its link master (hence the master check).
if ((ifaceobj.flags & iface.LINK_SLAVE) and
if ((ifaceobj.link_type == ifaceLinkType.LINK_SLAVE) and
not os.path.exists('/sys/class/net/%s/master' %ifaceobj.name)):
return
if self.link_exists(ifaceobj.name):
@@ -123,7 +123,7 @@ class ifupdownMain(ifupdownBase):
# by its link master interface, then dont set the link state.
# But do allow user to change state of the link if the interface
# is already with its link master (hence the master check).
if ((ifaceobj.flags & iface.LINK_SLAVE) and
if ((ifaceobj.link_type == ifaceLinkType.LINK_SLAVE) and
not os.path.exists('/sys/class/net/%s/master' %ifaceobj.name)):
return
if self.link_exists(ifaceobj.name):
@@ -357,14 +357,14 @@ class ifupdownMain(ifupdownBase):
del_list.append(d)
if ni:
ni.add_to_upperifaces(upperifaceobj.name)
if (upperifaceobj.flags & iface.LINK_MASTER):
ni.flags |= iface.LINK_SLAVE
if upperifaceobj.link_type == ifaceLinkType.LINK_MASTER:
ni.link_type = ifaceLinkType.LINK_SLAVE
else:
for di in dilist:
di.inc_refcnt()
di.add_to_upperifaces(upperifaceobj.name)
if (upperifaceobj.flags & iface.LINK_MASTER):
di.flags |= iface.LINK_SLAVE
if upperifaceobj.flags == ifaceLinkType.LINK_MASTER:
di.link_type = ifaceLinkType.LINK_SLAVE
for d in del_list:
dlist.remove(d)