From 112f14866a8a7e98bcbce6cad88cd28cbef541e7 Mon Sep 17 00:00:00 2001 From: Peter Sprygada Date: Fri, 19 Aug 2016 10:42:55 -0400 Subject: [PATCH] pull Config object out of network and into netcfg This moves the Config class from network and into netcfg module with no added features. This is simply a reorganization of code. --- lib/ansible/module_utils/netcfg.py | 37 +++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/lib/ansible/module_utils/netcfg.py b/lib/ansible/module_utils/netcfg.py index 298f2b89e5c..49de624e51c 100644 --- a/lib/ansible/module_utils/netcfg.py +++ b/lib/ansible/module_utils/netcfg.py @@ -33,11 +33,46 @@ import shlex import itertools from ansible.module_utils.basic import BOOLEANS_TRUE, BOOLEANS_FALSE -from ansible.module_utils.network import to_list DEFAULT_COMMENT_TOKENS = ['#', '!', '/*', '*/'] +def to_list(val): + if isinstance(val, (list, tuple)): + return list(val) + elif val is not None: + return [val] + else: + return list() + +class Config(object): + + def __init__(self, connection): + self.connection = connection + + def invoke(self, method, *args, **kwargs): + try: + return method(*args, **kwargs) + except AttributeError: + exc = get_exception() + raise NetworkError('undefined method "%s"' % method.__name__, exc=str(exc)) + except NotImplementedError: + raise NetworkError('method not supported "%s"' % method.__name__) + + def __call__(self, commands): + lines = to_list(commands) + return self.invoke(self.connection.configure, commands) + + def load_config(self, commands, **kwargs): + commands = to_list(commands) + return self.invoke(self.connection.load_config, commands, **kwargs) + + def get_config(self, **kwargs): + return self.invoke(self.connection.get_config, **kwargs) + + def save_config(self): + return self.invoke(self.connection.save_config) + class ConfigLine(object): def __init__(self, text):