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

addressvirtual: _query_running : use cache instead glob

Browse Source
This commit is contained in:
Alexandre Derumier
2019-05-10 08:19:57 +02:00
parent c20b7810e4
commit 472db7e6a3
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ifupdown2/addons/addressvirtual.py
View File

@@ -18,6 +18,7 @@ try:
from ifupdown2.nlmanager.nlpacket import Link from ifupdown2.nlmanager.nlpacket import Link
from ifupdown2.ifupdownaddons.cache import *
from ifupdown2.ifupdownaddons.LinkUtils import LinkUtils from ifupdown2.ifupdownaddons.LinkUtils import LinkUtils
from ifupdown2.ifupdownaddons.modulebase import moduleBase from ifupdown2.ifupdownaddons.modulebase import moduleBase
@@ -32,6 +33,7 @@ except ImportError:
from nlmanager.nlpacket import Link from nlmanager.nlpacket import Link
from ifupdownaddons.cache import *
from ifupdownaddons.LinkUtils import LinkUtils from ifupdownaddons.LinkUtils import LinkUtils
from ifupdownaddons.modulebase import moduleBase from ifupdownaddons.modulebase import moduleBase
@@ -912,7 +914,11 @@ class addressvirtual(moduleBase):
def _query_running(self, ifaceobjrunning, ifaceobj_getfunc=None): def _query_running(self, ifaceobjrunning, ifaceobj_getfunc=None):
macvlan_prefix = self._get_macvlan_prefix(ifaceobjrunning) macvlan_prefix = self._get_macvlan_prefix(ifaceobjrunning)
address_virtuals = glob.glob("/sys/class/net/%s*" %macvlan_prefix) address_virtuals = []
for av in linkCache.links:
if av.startswith(macvlan_prefix):
address_virtuals.append(av)
macvlans_ipv6_addrgen_list = [] macvlans_ipv6_addrgen_list = []
for av in address_virtuals: for av in address_virtuals:
macvlan_ifacename = os.path.basename(av) macvlan_ifacename = os.path.basename(av)