From 70c235d30aee3a401414f622b3de4f09f4b3d180 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 22 Jan 2015 11:33:38 +0000 Subject: Move noop flag to provider base-class Moving this flag makes it easier to implement additional functions which work differently depending on noop mode being set, vs passing it into every function like apply() Change-Id: I796792aece3e40322523e910a3b87f7ab9a451dd --- os_net_config/impl_eni.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'os_net_config/impl_eni.py') diff --git a/os_net_config/impl_eni.py b/os_net_config/impl_eni.py index ce4ffe9..57f554a 100644 --- a/os_net_config/impl_eni.py +++ b/os_net_config/impl_eni.py @@ -39,7 +39,8 @@ class ENINetConfig(os_net_config.NetConfig): /etc/network/interfaces format. """ - def __init__(self): + def __init__(self, noop=False): + super(ENINetConfig, self).__init__(noop) self.interfaces = {} self.routes = {} self.bridges = {} @@ -188,13 +189,13 @@ class ENINetConfig(os_net_config.NetConfig): self.routes[interface_name] = data logger.debug('route data: %s' % self.routes[interface_name]) - def apply(self, noop=False, cleanup=False): + def apply(self, cleanup=False): """Apply the network configuration. - :param noop: A boolean which indicates whether this is a no-op. :returns: a dict of the format: filename/data which contains info for each file that was changed (or would be changed if in --noop mode). + Note the noop mode is set via the constructor noop boolean """ new_config = "" @@ -211,7 +212,7 @@ class ENINetConfig(os_net_config.NetConfig): new_config += iface_data if (utils.diff(_network_config_path(), new_config)): - if noop: + if self.noop: return {"/etc/network/interfaces": new_config} for interface in self.interfaces.keys(): logger.info('running ifdown on interface: %s' % interface) -- cgit 1.2.3-korg