From f5ff3e3add75160f62ae11cad074314a78422a54 Mon Sep 17 00:00:00 2001 From: Nathaniel Case Date: Tue, 23 Aug 2016 11:24:48 -0400 Subject: [PATCH] Remove abort_config and commit_config Also move unimplemented command methods to CliBase, where they can be overridden as needed --- lib/ansible/module_utils/asa.py | 15 --------------- lib/ansible/module_utils/shell.py | 13 +++++++++++++ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/ansible/module_utils/asa.py b/lib/ansible/module_utils/asa.py index 49755af322b..d39b762a925 100644 --- a/lib/ansible/module_utils/asa.py +++ b/lib/ansible/module_utils/asa.py @@ -85,19 +85,4 @@ class Cli(CliBase): if params.get('include_defaults'): cmd += ' all' return self.execute(cmd) - - def load_config(self, commands, **kwargs): - raise NotImplementedError - - def replace_config(self, commands, **kwargs): - raise NotImplementedError - - def commit_config(self, **kwargs): - raise NotImplementedError - - def abort_config(self, **kwargs): - raise NotImplementedError - - def save_config(self): - raise NotImplementedError Cli = register_transport('cli', default=True)(Cli) diff --git a/lib/ansible/module_utils/shell.py b/lib/ansible/module_utils/shell.py index 68e99e787f6..7ba3a7ddf35 100644 --- a/lib/ansible/module_utils/shell.py +++ b/lib/ansible/module_utils/shell.py @@ -231,6 +231,8 @@ class CliBase(object): def authorize(self, params, **kwargs): pass + ### Command methods ### + def execute(self, commands, **kwargs): try: return self.shell.send(commands) @@ -240,3 +242,14 @@ class CliBase(object): def run_commands(self, commands, **kwargs): return self.execute(to_list(commands)) + + ### Config methods ### + + def load_config(self, commands, **kwargs): + raise NotImplementedError + + def replace_config(self, commands, **kwargs): + raise NotImplementedError + + def save_config(self): + raise NotImplementedError