diff --git a/lib/ansible/module_utils/ios.py b/lib/ansible/module_utils/ios.py index f6d6037f808..95937ca2191 100644 --- a/lib/ansible/module_utils/ios.py +++ b/lib/ansible/module_utils/ios.py @@ -26,6 +26,7 @@ NET_COMMON_ARGS = dict( password=dict(no_log=True), authorize=dict(default=False, type='bool'), auth_pass=dict(no_log=True), + provider=dict() ) def to_list(val): @@ -59,10 +60,10 @@ class Cli(object): def send(self, commands): return self.shell.send(commands) -class IosModule(AnsibleModule): +class NetworkModule(AnsibleModule): def __init__(self, *args, **kwargs): - super(IosModule, self).__init__(*args, **kwargs) + super(NetworkModule, self).__init__(*args, **kwargs) self.connection = None self._config = None @@ -72,6 +73,14 @@ class IosModule(AnsibleModule): self._config = self.get_config() return self._config + def _load_params(self): + params = super(NetworkModule, self)._load_params() + provider = params.get('provider') or dict() + for key, value in provider.items(): + if key in NET_COMMON_ARGS.keys(): + params[key] = value + return params + def connect(self): try: self.connection = Cli(self) @@ -107,27 +116,19 @@ class IosModule(AnsibleModule): return self.execute(cmd)[0] def get_module(**kwargs): - """Return instance of IosModule + """Return instance of NetworkModule """ - argument_spec = NET_COMMON_ARGS.copy() if kwargs.get('argument_spec'): argument_spec.update(kwargs['argument_spec']) kwargs['argument_spec'] = argument_spec - kwargs['check_invalid_arguments'] = False - module = IosModule(**kwargs) + module = NetworkModule(**kwargs) # HAS_PARAMIKO is set by module_utils/shell.py if not HAS_PARAMIKO: module.fail_json(msg='paramiko is required but does not appear to be installed') - # copy in values from local action. - params = json_dict_unicode_to_bytes(json.loads(MODULE_COMPLEX_ARGS)) - for key, value in params.iteritems(): - module.params[key] = value - module.connect() - return module diff --git a/lib/ansible/utils/module_docs_fragments/ios.py b/lib/ansible/utils/module_docs_fragments/ios.py index 5f07bbfde76..66ba28ad021 100644 --- a/lib/ansible/utils/module_docs_fragments/ios.py +++ b/lib/ansible/utils/module_docs_fragments/ios.py @@ -63,5 +63,12 @@ options: does nothing required: false default: none + provider: + description: + - Convience method that allows all M(ios) arguments to be passed as + a dict object. All constraints (required, choices, etc) must be + met either by individual arguments or values in this dict. + required: false + default: null """