diff options
| -rw-r--r-- | os_net_config/cli.py | 17 | ||||
| -rw-r--r-- | os_net_config/impl_eni.py | 4 | ||||
| -rw-r--r-- | os_net_config/impl_ifcfg.py | 15 |
3 files changed, 28 insertions, 8 deletions
diff --git a/os_net_config/cli.py b/os_net_config/cli.py index 2ebe8f3..89ba3d0 100644 --- a/os_net_config/cli.py +++ b/os_net_config/cli.py @@ -57,6 +57,13 @@ def parse_opts(argv): parser.add_argument('--version', action='version', version=os_net_config.__version__) + parser.add_argument( + '-m', '--mock', + dest="mock", + action='store_true', + help="Return the configuration commands, without applying them.", + required=False) + opts = parser.parse_args(argv[1:]) return opts @@ -89,7 +96,7 @@ def main(argv=sys.argv): elif opts.provider == 'eni': provider = impl_eni.ENINetConfig() elif opts.provider == 'iproute': - provider = impl_iproute.IprouteNetConfig() + provider = impl_iproute.IPRouteNetConfig() else: logger.error('Invalid provider specified.') return 1 @@ -115,8 +122,12 @@ def main(argv=sys.argv): for iface_json in iface_array: obj = objects.object_from_json(iface_json) provider.addObject(obj) - provider.apply() - return 0 + if opts.mock: + res = provider.apply(mock=True) + print res + else: + provider.apply() + return 0 if __name__ == '__main__': diff --git a/os_net_config/impl_eni.py b/os_net_config/impl_eni.py index f652c91..0df8b15 100644 --- a/os_net_config/impl_eni.py +++ b/os_net_config/impl_eni.py @@ -159,7 +159,7 @@ class ENINetConfig(os_net_config.NetConfig): self.routes[interface_name] = data logger.debug('route data: %s' % self.routes[interface_name]) - def apply(self): + def apply(self, mock=False): new_config = "" # write out bridges first. This ensures that an ifup -a @@ -175,6 +175,8 @@ class ENINetConfig(os_net_config.NetConfig): new_config += iface_data if (utils.diff(_network_config_path(), new_config)): + if mock: + return new_config for interface in self.interfaces.keys(): logger.info('running ifdown on interface: %s' % interface) processutils.execute('/sbin/ifdown', interface, diff --git a/os_net_config/impl_ifcfg.py b/os_net_config/impl_ifcfg.py index 2ba7502..6b920ae 100644 --- a/os_net_config/impl_ifcfg.py +++ b/os_net_config/impl_ifcfg.py @@ -162,8 +162,9 @@ class IfcfgNetConfig(os_net_config.NetConfig): if bond.routes: self._addRoutes(bond.name, bond.routes) - def apply(self): - logger.info('applying network configs...') + def apply(self, mock=False): + if not mock: + logger.info('applying network configs...') restart_interfaces = [] restart_bridges = [] update_files = {} @@ -175,7 +176,7 @@ class IfcfgNetConfig(os_net_config.NetConfig): restart_interfaces.append(interface_name) update_files[ifcfg_config_path(interface_name)] = iface_data update_files[route_config_path(interface_name)] = route_data - else: + elif not mock: logger.info('No changes required for interface: %s' % interface_name) @@ -186,9 +187,15 @@ class IfcfgNetConfig(os_net_config.NetConfig): restart_bridges.append(bridge_name) update_files[bridge_config_path(bridge_name)] = bridge_data update_files[route_config_path(bridge_name)] = route_data - else: + elif not mock: logger.info('No changes required for bridge: %s' % bridge_name) + if mock: + mock_str = "" + for location, data in update_files.iteritems(): + mock_str += "%s:\n%s" % (location, data) + return mock_str + for interface in restart_interfaces: logger.info('running ifdown on interface: %s' % interface) processutils.execute('/sbin/ifdown', interface, |