Merge pull request #48 from ganeshrn/rmb_refactor

Resource module facts and config code refactor

Reviewed-by: Ganesh Nalawade
             https://github.com/ganeshrn

Author: ansible-zuul[bot]

rmb_tests/roles/my_role/library/myos_facts.py

@@ -8,13 +8,11 @@
 """
 
 from __future__ import absolute_import, division, print_function
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.connection import Connection
-from ansible.module_utils.network. \
-    myos.facts.facts import Facts
+__metaclass__ = type
+
 
 ANSIBLE_METADATA = {'metadata_version': '1.1',
-                    'status': ['preview'],
+                    'status': [u'preview'],
                     'supported_by': '<support_group>'}
 
 
@@ -83,23 +81,23 @@
 See the respective resource module parameters for the tree.
 """
 
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.network.myos.argspec.facts.facts import FactsArgs
+from ansible.module_utils.network.myos.facts.facts import Facts
+
 
 def main():
     """
     Main entry point for module execution
 
     :returns: ansible_facts
     """
-    module = AnsibleModule(argument_spec=Facts.argument_spec,
+    module = AnsibleModule(argument_spec=FactsArgs.argument_spec,
                            supports_check_mode=True)
-    warnings = ['default value for `gather_subset` \
-                will be changed to `min` from `!config` v2.11 onwards']
-
-    connection = Connection(module._socket_path)  # pylint: disable=W0212
-    gather_subset = module.params['gather_subset']
-    gather_network_resources = module.params['gather_network_resources']
-    result = Facts().get_facts(module, connection, gather_subset,
-                               gather_network_resources)
+    warnings = ['default value for `gather_subset` '
+                'will be changed to `min` from `!config` v2.11 onwards']
+
+    result = Facts(module).get_facts()
 
     ansible_facts, additional_warnings = result
     warnings.extend(additional_warnings)

rmb_tests/roles/my_role/library/myos_interfaces.py

@@ -27,7 +27,7 @@
 """
 
 from __future__ import absolute_import, division, print_function
-__metaclass__ = type  # pylint: disable=C0103
+__metaclass__ = type
 
 ANSIBLE_METADATA = {
     'metadata_version': '1.1',
@@ -179,11 +179,9 @@
 """
 
 
-# pylint: disable=C0413
 from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.network. \
-    myos.config.interfaces.interfaces import Interfaces
-# pylint: enable=C0413
+from ansible.module_utils.network.myos.argspec.interfaces.interfaces import InterfacesArgs
+from ansible.module_utils.network.myos.config.interfaces.interfaces import Interfaces
 
 
 def main():
@@ -192,7 +190,7 @@ def main():
 
     :returns: the result form module invocation
     """
-    module = AnsibleModule(argument_spec=Interfaces.argument_spec,
+    module = AnsibleModule(argument_spec=InterfacesArgs.argument_spec,
                            supports_check_mode=True)
 
     result = Interfaces(module).execute_module()

rmb_tests/roles/my_role/module_utils/network/myos/config/base.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#
 # -*- coding: utf-8 -*-
 # Copyright 2019 Red Hat
 # GNU General Public License v3.0+
@@ -10,19 +10,12 @@
 necessary to bring the current configuration to it's desired end-state is
 created
 """
-
+from ansible.module_utils.network.common.cfg.base import ConfigBase
 from ansible.module_utils.network.common.utils import to_list
-
-from ansible.module_utils.network. \
-    myos.argspec.interfaces.interfaces import InterfacesArgs
-from ansible.module_utils.network. \
-    myos. \
-    config.base import ConfigBase
-from ansible.module_utils.network. \
-    myos.facts.facts import Facts
+from ansible.module_utils.network.myos.facts.facts import Facts
 
 
-class Interfaces(ConfigBase, InterfacesArgs):
+class Interfaces(ConfigBase):
     """
     The myos_interfaces class
     """
@@ -36,16 +29,16 @@ class Interfaces(ConfigBase, InterfacesArgs):
         'interfaces',
     ]
 
+    def __init__(self, module):
+        super(Interfaces, self).__init__(module)
+
     def get_interfaces_facts(self):
         """ Get the 'facts' (the current configuration)
 
         :rtype: A dictionary
         :returns: The current configuration as a dictionary
         """
-        facts, _warnings = Facts().get_facts(self._module,
-                                             self._connection,
-                                             self.gather_subset,
-                                             self.gather_network_resources)
+        facts, _warnings = Facts(self._module).get_facts(self.gather_subset, self.gather_network_resources)
         interfaces_facts = facts['ansible_network_resources'].get('interfaces')
         if not interfaces_facts:
             return []