linters fix

Signed-off-by: Sumit Jaiswal <[email protected]>

library/ios_facts.py

@@ -110,4 +110,3 @@ def main():
 
 if __name__ == '__main__':
     main()
-

library/ios_l3_interface.py

@@ -1,26 +1,25 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat Inc.
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# GNU General Public License v3.0+
+# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 ##############################################
-################# WARNING ####################
-##############################################
-###
-### This file is auto generated by the resource
-###   module builder playbook.
-###
-### Do not edit this file manually.
-###
-### Changes to this file will be over written
-###   by the resource module builder.
-###
-### Changes should be made in the model used to
-###   generate this file or in the resource module
-###   builder template.
-###
-##############################################
-##############################################
+#                 WARNING
+#
+# This file is auto generated by the resource
+#   module builder playbook.
+#
+# Do not edit this file manually.
+#
+# Changes to this file will be over written
+#   by the resource module builder.
+#
+# Changes should be made in the model used to
+#   generate this file or in the resource module
+#   builder template.
+#
+#
 ##############################################
 
 """
@@ -46,7 +45,9 @@
   module: ios_l3_interfaces
   version_added: 2.9
   short_description: Manage Layer-3 interface on Cisco IOS devices.
-  description: This module provides declarative management of Layer-3 interface on Cisco IOS devices.
+  description:
+    - This module provides declarative management of Layer-3 interface
+      on Cisco IOS devices.
   author: Sumit Jaiswal (@justjais)
   options:
     config:
@@ -56,14 +57,15 @@
       suboptions:
         name:
           description:
-          - Full name of the interface excluding any logical unit number, i.e. GigabitEthernet0/1.
+          - Full name of the interface excluding any logical unit number,
+            i.e. GigabitEthernet0/1.
           type: str
           required: True
         ipv4:
           description:
-          - IPv4 address to be set for the Layer-3 interface mentioned in I(name) option.
-            The address format is <ipv4 address>/<mask>, the mask is number in range 0-32
-            eg. 192.168.0.1/24
+          - IPv4 address to be set for the Layer-3 interface mentioned in
+            I(name) option. The address format is <ipv4 address>/<mask>,
+            the mask is number in range 0-32 eg. 192.168.0.1/24.
           suboptions:
             address:
               description:
@@ -75,19 +77,21 @@
               type: bool
             dhcp_client:
               description:
-              - Configures and specifies client-id to use over DHCP ip. Note, This option shall
-                work only when dhcp is configured as IP.
+              - Configures and specifies client-id to use over DHCP ip.
+                Note, This option shall work only when dhcp is configured
+                as IP.
               type: str
             dhcp_hostname:
               description:
-              - Configures and specifies value for hostname option over DHCP ip. Note, This option shall
-                work only when dhcp is configured as IP.
+              - Configures and specifies value for hostname option over
+                DHCP ip. Note, This option shall work only when dhcp is
+                configured as IP.
               type: str
        ipv6:
          description:
-         - IPv6 address to be set for the Layer-3 interface mentioned in I(name) option.
-           The address format is <ipv6 address>/<mask>, the mask is number in range 0-128
-           eg. fd5d:12c9:2201:1::1/64
+         - IPv6 address to be set for the Layer-3 interface mentioned in
+           I(name) option. The address format is <ipv6 address>/<mask>,
+           the mask is number in range 0-128 eg. fd5d:12c9:2201:1::1/64
          suboptions:
             address:
               description:
@@ -133,11 +137,11 @@
   ios_l3_interfaces:
     config:
       - name: GigabitEthernet0/1
-        ipv4: 
+        ipv4:
         - address: 192.168.0.1/24
           secondary: True
       - name: GigabitEthernet0/2
-        ipv4: 
+        ipv4:
         - address: 192.168.0.2/24
       - name: GigabitEthernet0/3
         ipv6:
@@ -199,7 +203,7 @@
         ipv4:
         - address: 192.168.2.0/24
       - name: GigabitEthernet0/3
-        ipv4: 
+        ipv4:
         - address: dhcp
           dhcp_client: 2
           dhcp_hostname: test.com

module_utils/ios/argspec/facts/facts.py

@@ -7,7 +7,7 @@
 """
 
 
-class FactsArgs(object): #pylint: disable=R0903
+class FactsArgs(object):
     """ The arg spec for the ios facts module
     """
 

module_utils/ios/argspec/l3_interfaces/l3_interfaces.py

@@ -1,38 +1,37 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat Inc.
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
+# GNU General Public License v3.0+
+# (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+#
 #############################################
-################# WARNING ####################
-##############################################
-###
-### This file is auto generated by the resource
-###   module builder playbook.
-###
-### Do not edit this file manually.
-###
-### Changes to this file will be over written
-###   by the resource module builder.
-###
-### Changes should be made in the model used to
-###   generate this file or in the resource module
-###   builder template.
-###
-##############################################
-##############################################
+#                WARNING
+#
+# This file is auto generated by the resource
+#   module builder playbook.
+#
+# Do not edit this file manually.
+#
+# Changes to this file will be over written
+#   by the resource module builder.
+#
+# Changes should be made in the model used to
+# generate this file or in the resource module
+# builder template.
+#
 ##############################################
 """
 The arg spec for the ios_l3_interfaces module
 """
 
+
 class L3_InterfacesArgs(object):
 
     def __init__(self, **kwargs):
         pass
 
     ipv4addr_spec = dict(address=dict(type=str),
-                         secondary=dict(type=bool),
+                         secondary=dict(type=bool, default=True),
                          dhcp_client=dict(type=str),
                          dhcp_hostname=dict(type=str))
 
@@ -42,11 +41,11 @@ def __init__(self, **kwargs):
 
     config_spec = {
         'name': dict(type='str', required=True),
-        'ipv4':dict(type='list', elements='dict', options=ipv4addr_spec),
-        'ipv6':dict(type='list', elements='dict', options=ipv6addr_spec)
+        'ipv4': dict(type='list', elements='dict', options=ipv4addr_spec),
+        'ipv6': dict(type='list', elements='dict', options=ipv6addr_spec)
     }
 
     argument_spec = {
         'state': dict(default='merged', choices=['merged', 'replaced', 'overridden', 'deleted']),
         'config': dict(type='list', elements='dict', options=config_spec)
-    }
+    }

module_utils/ios/argspec/resource/resource.py

@@ -4,23 +4,20 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
 
 #############################################
-################# WARNING ####################
-##############################################
-###
-### This file is auto generated by the resource
-###   module builder playbook.
-###
-### Do not edit this file manually.
-###
-### Changes to this file will be over written
-###   by the resource module builder.
-###
-### Changes should be made in the model used to
-###   generate this file or in the resource module
-###   builder template.
-###
-##############################################
-##############################################
+#                 WARNING
+#
+# This file is auto generated by the resource
+#   module builder playbook.
+#
+# Do not edit this file manually.
+#
+# Changes to this file will be over written
+#   by the resource module builder.
+#
+# Changes should be made in the model used to
+#   generate this file or in the resource module
+#   builder template.
+#
 ##############################################
 """
 The arg spec for the ios_l3_interfaces module

module_utils/ios/config/base.py

@@ -8,7 +8,8 @@
 
 from ansible.module_utils.connection import Connection
 
-class ConfigBase(object): #pylint: disable=R0205,R0903
+
+class ConfigBase(object):
     """ The base class for all ios resource modules
     """
     _connection = None
@@ -20,5 +21,5 @@ def __init__(self, module):
     def _get_connection(self):
         if self._connection:
             return self._connection
-        self._connection = Connection(self._module._socket_path) #pylint: disable=W0212
-        return self._connection
+        self._connection = Connection(self._module._socket_path)
+        return self._connection

module_utils/ios/config/l3_interfaces/l3_interfaces.py

@@ -11,13 +11,13 @@
 """
 
 from ansible.module_utils.network.common.utils import to_list
-from ansible.module_utils.network.common.utils import is_netmask, is_masklen, to_netmask, to_masklen
+from ansible.module_utils.network.common.utils import is_masklen, to_netmask
 from ansible.module_utils.six import iteritems
 
 from ansible.module_utils.ios.argspec.l3_interfaces.l3_interfaces import L3_InterfacesArgs
 from ansible.module_utils.ios.config.base import ConfigBase
 from ansible.module_utils.ios.facts.facts import Facts
-import q
+
 
 class L3_Interfaces(ConfigBase, L3_InterfacesArgs):
     """
@@ -296,7 +296,8 @@ def set_interface(**kwargs):
                     ip_addr_want = L3_Interfaces.validate_n_expand_ipv4(module, each)
                     each['address'] = ip_addr_want
 
-        want_ipv4 = set(tuple({k:v for k,v in iteritems(address) if v is not None}.items()) for address in want.get("ipv4") or [])
+        want_ipv4 = set(tuple({k: v for k, v in iteritems(address) if v is not None}.items())
+                        for address in want.get("ipv4") or [])
         have_ipv4 = set(tuple(address.items()) for address in have.get("ipv4") or [])
         diff = want_ipv4 - have_ipv4
         for address in diff:
@@ -307,17 +308,19 @@ def set_interface(**kwargs):
                     cmd += " secondary"
             elif address.get('address') == 'dhcp':
                 if address.get('dhcp_client') and address.get('dhcp_hostname'):
-                    cmd = "ip address dhcp client-id GigabitEthernet 0/{} hostname {}".format\
-                        (address.get('dhcp_client'),address.get('dhcp_hostname'))
+                    cmd = "ip address dhcp client-id GigabitEthernet 0/{} hostname {}".\
+                        format(address.get('dhcp_client'), address.get('dhcp_hostname'))
                 elif address.get('dhcp_client') and not address.get('dhcp_hostname'):
-                    cmd = "ip address dhcp client-id GigabitEthernet 0/{}".format(address.get('dhcp_client'))
+                    cmd = "ip address dhcp client-id GigabitEthernet 0/{}".\
+                        format(address.get('dhcp_client'))
                 elif not address.get('dhcp_client') and address.get('dhcp_hostname'):
                     cmd = "ip address dhcp hostname {}".format(address.get('dhcp_client'))
 
             L3_Interfaces._add_command_to_interface(interface, cmd, commands)
 
         # To handle L3 IPV6 configuration
-        want_ipv6 = set(tuple({k:v for k,v in iteritems(address) if v is not None}.items()) for address in want.get("ipv6") or [])
+        want_ipv6 = set(tuple({k: v for k, v in iteritems(address) if v is not None}.items())
+                        for address in want.get("ipv6") or [])
         have_ipv6 = set(tuple(address.items()) for address in have.get("ipv6") or [])
         diff = want_ipv6 - have_ipv6
         for address in diff:

module_utils/ios/facts/base.py

@@ -12,7 +12,7 @@
 from ansible.module_utils.six import iteritems
 
 
-class FactsBase(object): #pylint: disable=R0205
+class FactsBase(object):
     """
     The ios facts base class
     """
@@ -102,5 +102,5 @@ def generate_final_config(cfg_dict):
 
         for key, val in iteritems(cfg_dict):
             if val:
-                final_cfg.update({key:val})
+                final_cfg.update({key: val})
         return final_cfg

module_utils/ios/facts/facts.py

@@ -20,7 +20,7 @@
 FACT_SUBSETS = {}
 
 
-class Facts(FactsArgs, FactsBase): #pylint: disable=R0903
+class Facts(FactsArgs, FactsBase):
     """ The fact class for ios l3 interface
     """
 

module_utils/ios/facts/l3_interfaces/l3_interfaces.py

@@ -14,7 +14,7 @@
 
 from ansible.module_utils.ios.facts.base import FactsBase
 from ansible.module_utils.ios.utils.utils import get_interface_type, normalize_interface
-import q
+
 
 class L3_interfacesFacts(FactsBase):
     """ The ios l3 interfaces fact class
@@ -54,7 +54,6 @@ def render_config(self, spec, conf):
         :rtype: dictionary
         :returns: The generated config
         """
-        import q
         config = deepcopy(spec)
         match = re.search(r'^(\S+)', conf)
         intf = match.group(1)
@@ -70,6 +69,7 @@ def render_config(self, spec, conf):
             each_ipv4 = dict()
             if 'secondary' not in each and 'dhcp' not in each:
                 each_ipv4['address'] = each
+                each_ipv4['secondary'] = False
             elif 'secondary' in each:
                 each_ipv4['secondary'] = True
                 each_ipv4['address'] = each.split(' secondary')[0]