bugfix on shared module utils from missed cherry-pick

One of the commits was missed when the branch was created.  This fixes the
modules so they work properly

4 files changed, 94 insertions, 65 deletions

diff --git a/lib/ansible/module_utils/eos.py b/lib/ansible/module_utils/eos.py
index 2448c79af0..71fa8802b6 100644
--- a/lib/ansible/module_utils/eos.py
+++ b/lib/ansible/module_utils/eos.py
@@ -26,7 +26,8 @@ NET_COMMON_ARGS = dict(
     authorize=dict(default=False, type='bool'),
     auth_pass=dict(no_log=True),
     transport=dict(choices=['cli', 'eapi']),
-    use_ssl=dict(default=True, type='bool')
+    use_ssl=dict(default=True, type='bool'),
+    provider=dict()
 )
 
 def to_list(val):
@@ -136,10 +137,11 @@ class Cli(object):
     def send(self, commands):
         return self.shell.send(commands)
 
+
 class NetworkModule(AnsibleModule):
 
     def __init__(self, *args, **kwargs):
-        super(EosModule, self).__init__(*args, **kwargs)
+        super(NetworkModule, self).__init__(*args, **kwargs)
         self.connection = None
         self._config = None
 
@@ -149,6 +151,15 @@ class NetworkModule(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():
+                if not params.get(key) and value is not None:
+                    params[key] = value
+        return params
+
     def connect(self):
         if self.params['transport'] == 'eapi':
             self.connection = Eapi(self)
@@ -170,8 +181,18 @@ class NetworkModule(AnsibleModule):
         commands.insert(0, 'configure terminal')
         responses = self.execute(commands)
         responses.pop(0)
+
         return responses
 
+    def config_replace(self, commands):
+        if self.params['transport'] == 'cli':
+            self.fail_json(msg='config replace only supported over eapi')
+
+        cmd = 'configure replace terminal:'
+        commands = '\n'.join(to_list(commands))
+        command = dict(cmd=cmd, input=commands)
+        self.execute(command)
+
     def execute(self, commands, **kwargs):
         try:
             return self.connection.send(commands, **kwargs)
@@ -196,26 +217,19 @@ class NetworkModule(AnsibleModule):
 
 
 def get_module(**kwargs):
-    """Return instance of EosModule
+    """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 = EosModule(**kwargs)
+    module = NetworkModule(**kwargs)
 
     # HAS_PARAMIKO is set by module_utils/shell.py
     if module.params['transport'] == 'cli' and 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/module_utils/ios.py b/lib/ansible/module_utils/ios.py
index 6261c785b9..00d746f0e0 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()
 )
 
 
@@ -66,10 +67,11 @@ class Cli(object):
     def send(self, commands):
         return self.shell.send(commands)
 
+
 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
 
@@ -79,6 +81,14 @@ class NetworkModule(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)
@@ -118,27 +128,19 @@ class NetworkModule(AnsibleModule):
 
 
 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/module_utils/iosxr.py b/lib/ansible/module_utils/iosxr.py
index 32c5662ec5..e2c7c98391 100644
--- a/lib/ansible/module_utils/iosxr.py
+++ b/lib/ansible/module_utils/iosxr.py
@@ -23,7 +23,8 @@ NET_COMMON_ARGS = dict(
     host=dict(required=True),
     port=dict(default=22, type='int'),
     username=dict(required=True),
-    password=dict(no_log=True)
+    password=dict(no_log=True),
+    provider=dict()
 )
 
 def to_list(val):
@@ -58,10 +59,10 @@ class Cli(object):
     def send(self, commands):
         return self.shell.send(commands)
 
-class IosxrModule(AnsibleModule):
+class NetworkModule(AnsibleModule):
 
     def __init__(self, *args, **kwargs):
-        super(IosxrModule, self).__init__(*args, **kwargs)
+        super(NetworkModule, self).__init__(*args, **kwargs)
         self.connection = None
         self._config = None
 
@@ -71,6 +72,14 @@ class IosxrModule(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)
@@ -101,26 +110,18 @@ class IosxrModule(AnsibleModule):
         return self.execute('show running-config')[0]
 
 def get_module(**kwargs):
-    """Return instance of IosxrModule
+    """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 = IosxrModule(**kwargs)
+    module = NetworkModule(**kwargs)
 
     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/module_utils/nxos.py b/lib/ansible/module_utils/nxos.py
index 56985a26c5..e18aea4773 100644
--- a/lib/ansible/module_utils/nxos.py
+++ b/lib/ansible/module_utils/nxos.py
@@ -23,8 +23,9 @@ NET_COMMON_ARGS = dict(
     port=dict(type='int'),
     username=dict(required=True),
     password=dict(no_log=True),
-    transport=dict(choices=['cli', 'nxapi']),
-    use_ssl=dict(default=False, type='bool')
+    transport=dict(default='cli', choices=['cli', 'nxapi']),
+    use_ssl=dict(default=False, type='bool'),
+    provider=dict()
 )
 
 NXAPI_COMMAND_TYPES = ['cli_show', 'cli_show_ascii', 'cli_conf', 'bash']
@@ -99,18 +100,33 @@ class Nxapi(object):
 
         headers = {'Content-Type': 'application/json'}
 
-        response, headers = fetch_url(self.module, self.url, data=data, headers=headers,
-                                      method='POST')
+        response, headers = fetch_url(self.module, self.url, data=data,
+                headers=headers, method='POST')
 
         if headers['status'] != 200:
             self.module.fail_json(**headers)
 
         response = self.module.from_json(response.read())
-        if 'error' in response:
-            err = response['error']
-            self.module.fail_json(msg='json-rpc error % ' % str(err))
+        result = list()
 
-        return response
+        try:
+            output = response['ins_api']['outputs']['output']
+            if isinstance(output, list):
+                for item in response['ins_api']['outputs']['output']:
+                    if item['code'] != '200':
+                        self.module.fail_json(msg=item['msg'], command=item['input'],
+                                code=item['code'])
+                    else:
+                        result.append(item['body'])
+            elif output['code'] != '200':
+                self.module.fail_json(msg=item['msg'], command=item['input'],
+                        code=item['code'])
+            else:
+                result.append(output['body'])
+        except Exception:
+            self.module.fail_json(**headers)
+
+        return result
 
 
 class Cli(object):
@@ -137,10 +153,11 @@ class Cli(object):
     def send(self, commands, encoding='text'):
         return self.shell.send(commands)
 
+
 class NetworkModule(AnsibleModule):
 
     def __init__(self, *args, **kwargs):
-        super(NxosModule, self).__init__(*args, **kwargs)
+        super(NetworkModule, self).__init__(*args, **kwargs)
         self.connection = None
         self._config = None
 
@@ -150,17 +167,24 @@ class NetworkModule(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():
+                if not params.get(key) and value is not None:
+                    params[key] = value
+        return params
+
     def connect(self):
         if self.params['transport'] == 'nxapi':
             self.connection = Nxapi(self)
         else:
             self.connection = Cli(self)
 
-        try:
-            self.connection.connect()
+        self.connection.connect()
+        if self.params['transport'] == 'cli':
             self.execute('terminal length 0')
-        except Exception, exc:
-            self.fail_json(msg=exc.message)
 
     def configure(self, commands):
         commands = to_list(commands)
@@ -188,36 +212,24 @@ class NetworkModule(AnsibleModule):
         cmd = 'show running-config'
         if self.params.get('include_defaults'):
             cmd += ' all'
-        if self.params['transport'] == 'cli':
-            return self.execute(cmd)[0]
-        else:
-            resp = self.execute(cmd)
-            if not resp.get('ins_api').get('outputs').get('output').get('body'):
-                self.fail_json(msg="Unrecognized response: %s" % str(resp))
-            return resp['ins_api']['outputs']['output']['body']
+
+        response = self.execute(cmd)
+        return response[0]
 
 
 def get_module(**kwargs):
-    """Return instance of EosModule
+    """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 = NxosModule(**kwargs)
+    module = NetworkModule(**kwargs)
 
     # HAS_PARAMIKO is set by module_utils/shell.py
     if module.params['transport'] == 'cli' and 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