Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix all eth* flagged mgmt_itf #273

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix all eth* flagged mgmt_itf #273

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1b65a06
ifupdownmain: improve LOOPBACK and MGMT_INTF setup
sohorx Sep 19, 2023
d53f2fc
ifupdownmain: clean get_mgmt_default_prefix func
sohorx Sep 19, 2023
ff9ab55
ifupdownmain: disable MGMT_ITF flag for eth*
sohorx Sep 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 16 additions & 28 deletions ifupdown2/ifupdown/ifupdownmain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import ifupdown2.ifupdown.ifupdownflags as ifupdownflags
import ifupdown2.ifupdown.ifupdownconfig as ifupdownConfig

from ifupdown2.ifupdown.policymanager import policymanager_api as pma
from ifupdown2.ifupdown.graph import *
from ifupdown2.ifupdown.iface import ifaceStatusUserStrs, ifaceType, ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType, ifaceDependencyType, ifaceStatus, iface
from ifupdown2.ifupdown.scheduler import *
Expand All @@ -47,6 +48,7 @@
import ifupdown.ifupdownflags as ifupdownflags
import ifupdown.ifupdownconfig as ifupdownConfig

from ifupdown.policymanager import policymanager_api as pma
from ifupdown.graph import *
from ifupdown.iface import ifaceStatusUserStrs, ifaceType, ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType, ifaceDependencyType, ifaceStatus, iface
from ifupdown.scheduler import *
Expand Down Expand Up @@ -424,22 +426,10 @@ def __init__(self, config={}, args=None,
}

def _get_mgmt_iface_default_prefix(self):
mgmt_iface_default_prefix = None
try:
mgmt_iface_default_prefix = ifupdown2.ifupdown.policymanager.policymanager_api.get_module_globals(
module_name='main', attr='mgmt_intf_prefix'
)
except Exception:
try:
mgmt_iface_default_prefix = ifupdown.policymanager.policymanager_api.get_module_globals(
module_name='main', attr='mgmt_intf_prefix'
)
except Exception:
pass
if not mgmt_iface_default_prefix:
mgmt_iface_default_prefix = "eth"
attr = 'mgmt_intf_prefix'
ret = pma.get_module_globals(module_name='main', attr=attr)
return ret or ''

return mgmt_iface_default_prefix

def link_master_slave_ignore_error(self, errorstr):
# If link master slave flag is set,
Expand Down Expand Up @@ -815,19 +805,17 @@ def populate_dependency_info(self, ops, ifacenames=None, old_ifaceobjs=False):
#if not self.dependency_graph.get(i):
# self.dependency_graph[i] = dlist

for i in list(self.ifaceobjdict.keys()):
iobj = self.get_ifaceobj_first(i)
if (not iobj.link_kind and
not (iobj.link_privflags & ifaceLinkPrivFlags.LOOPBACK) and
iobj.name == 'lo'):
iobj.link_privflags |= ifaceLinkPrivFlags.LOOPBACK
if iobj.name.startswith(self.mgmt_iface_default_prefix):
self.logger.debug('%s: marking interface with mgmt flag' %iobj.name)
iobj.link_privflags |= ifaceLinkPrivFlags.MGMT_INTF
if iobj.lowerifaces:
self.dependency_graph[i] = iobj.lowerifaces
else:
self.dependency_graph[i] = []
for ifname in self.ifaceobjdict:
iobj = self.get_ifaceobj_first(ifname)
if iobj.name == 'lo' and not \
(iobj.link_kind or (iobj.link_privflags & ifaceLinkPrivFlags.LOOPBACK)):
iobj.link_privflags |= ifaceLinkPrivFlags.LOOPBACK

if self.mgmt_iface_default_prefix and iobj.name.startswith(self.mgmt_iface_default_prefix):
self.logger.debug('%s: marking interface with mgmt flag', iobj.name)
iobj.link_privflags |= ifaceLinkPrivFlags.MGMT_INTF

self.dependency_graph[ifname] = iobj.lowerifaces or []

if not self.blacklisted_ifaces_present:
return
Expand Down