From 807974f515330fabd95ed54a29052613d772aaf1 Mon Sep 17 00:00:00 2001 From: Peter Sprygada Date: Sun, 4 Sep 2016 09:11:10 -0400 Subject: [PATCH] updates nxos_config to remove state argument The state argument should not be in the nxos_config module. This change removes the state argument for this release --- .../modules/network/nxos/nxos_config.py | 28 ++----------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/lib/ansible/modules/network/nxos/nxos_config.py b/lib/ansible/modules/network/nxos/nxos_config.py index b7e40dd1edc..0a49460255a 100644 --- a/lib/ansible/modules/network/nxos/nxos_config.py +++ b/lib/ansible/modules/network/nxos/nxos_config.py @@ -157,16 +157,6 @@ options: required: false default: false version_added: "2.2" - state: - description: - - The I(state) argument specifies the state of the config - file on the device. When set to present, the configuration - is updated based on the values of the module. When the value - is set to absent, the device startup config is erased. - required: true - default: present - choices: ['present', 'absent'] - version_added: "2.2" """ @@ -223,11 +213,6 @@ from ansible.module_utils.netcfg import NetworkConfig, dumps from ansible.module_utils.nxos import NetworkModule, NetworkError from ansible.module_utils.basic import get_exception -def invoke(name, *args, **kwargs): - func = globals().get(name) - if func: - return func(*args, **kwargs) - def check_args(module, warnings): if module.params['save'] and module.check_mode: warnings.append('will not save configuration due to checkmode') @@ -287,7 +272,7 @@ def load_checkpoint(module, result): msg = 'unable to rollback configuration' module.fail_json(msg=msg, checkpoint=checkpoint, **exc.kwargs) -def present(module, result): +def run(module, result): match = module.params['match'] replace = module.params['replace'] update = module.params['update'] @@ -328,11 +313,6 @@ def present(module, result): module.config.save_config() result['changed'] = True -def absent(module, result): - if not module.check_mode: - module.cli('write erase') - result['changed'] = True - def main(): """ main entry point for module execution """ @@ -360,8 +340,6 @@ def main(): defaults=dict(type='bool', default=False), save=dict(type='bool', default=False), - - state=dict(default='present', choices=['absent', 'present']) ) mutually_exclusive = [('lines', 'src')] @@ -371,8 +349,6 @@ def main(): mutually_exclusive=mutually_exclusive, supports_check_mode=True) - state = module.params['state'] - if module.params['force'] is True: module.params['match'] = 'none' @@ -382,7 +358,7 @@ def main(): result = dict(changed=False, warnings=warnings) try: - invoke(state, module, result) + run(module, result) except NetworkError: load_checkpoint(module, result) exc = get_exception()