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

ifupdown: add new ifupdownflags class to carry ifupdown flags

Browse Source 
Ticket: cleanup
Reviewed By:
Testing Done: Tested ifupdown sanity

This gets rid of some ugly previous flag handling which was
passed through modules. This creates a global instance of
flags that all addon modules and helper modules can use.

Signed-off-by: Roopa Prabhu <roopa@cumulusnetworks.com>
This commit is contained in:
Roopa Prabhu
2016-04-14 14:45:47 -07:00
parent 96a71b65cb
commit fc5e1735c0
24 changed files with 144 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
addons/vrf.py
View File

@@ -13,6 +13,7 @@ from ifupdown.iface import *
import ifupdown.policymanager as policymanager
import ifupdownaddons
import ifupdown.rtnetlink_api as rtnetlink_api
import ifupdown.ifupdownflags as ifupdownflags
from ifupdownaddons.modulebase import moduleBase
from ifupdownaddons.bondutil import bondutil
from ifupdownaddons.iproute2 import iproute2
@@ -50,7 +51,7 @@ class vrf(moduleBase):
self.bondcmd = None
self.dhclientcmd = None
self.name = self.__class__.__name__
if self.PERFMODE:
if ifupdownflags.flags.PERFMODE:
# if perf mode is set, remove vrf map file.
# start afresh. PERFMODE is set at boot
if os.path.exists(self.iproute2_vrf_filename):
@@ -325,7 +326,7 @@ class vrf(moduleBase):
pass
def _handle_existing_connections(self, ifaceobj, vrfname):
if not ifaceobj or self.PERFMODE:
if not ifaceobj or ifupdownflags.flags.PERFMODE:
return
if (self.vrf_mgmt_devname and
self.vrf_mgmt_devname == vrfname):
@@ -843,13 +844,12 @@ class vrf(moduleBase):
return self._run_ops.keys()
def _init_command_handlers(self):
flags = self.get_flags()
if not self.ipcmd:
self.ipcmd = iproute2(**flags)
self.ipcmd = iproute2()
if not self.bondcmd:
self.bondcmd = bondutil(**flags)
self.bondcmd = bondutil()
if not self.dhclientcmd:
self.dhclientcmd = dhclient(**flags)
self.dhclientcmd = dhclient()
def run(self, ifaceobj, operation, query_ifaceobj=None,
ifaceobj_getfunc=None, **extra_args):