Merge pull request #33 from ansible-network/bt_add_test

README update, and fixes necessary for stub module and facts to work

Reviewed-by: https://github.com/ansible-zuul[bot]

Author: ansible-zuul[bot]

README.md

@@ -156,7 +156,6 @@ ansible-playbook -e parent=~/github/rm_example/roles/my_role \
 
 **Using the collection layout**
 
-Note: As of 3/26/2019, the following PR needs to be used:
 ```
 git clone [email protected]:ansible/ansible.git
 cd ansible
@@ -181,7 +180,7 @@ ln -s ~/github/rm_example ~/.ansible/collections/ansible_collections/cidrblock/m
        var: result
    - cidrblock.my_collection.myos_facts:
    - debug:
-       var: net_configuration
+       var: ansible_network_resources
 
 ```
 
@@ -203,7 +202,7 @@ ln -s ~/github/rm_example ~/.ansible/collections/ansible_collections/cidrblock/m
       var: result
   - myos_facts:
   - debug:
-      var: net_configuration
+      var: ansible_network_resources
 ```
 
 ### Resource Module Structure/Workflow

models/myos/interfaces/myos_interfaces.yml

@@ -53,16 +53,16 @@ DOCUMENTATION: |
               description:
               - The property_01
               type: str
-        state:
-          description:
-          - The state the configuration should be left in
-          type: str
-          choices:
-          - merged
-          - replaced
-          - overridden
-          - deleted
-          default: merged
+    state:
+      description:
+      - The state the configuration should be left in
+      type: str
+      choices:
+      - merged
+      - replaced
+      - overridden
+      - deleted
+      default: merged
 EXAMPLES:
   - deleted_example_01.txt
   - merged_example_01.txt

roles/resource_module/templates/module_directory/network_os/network_os_facts.py.j2

@@ -96,12 +96,9 @@ def main():
     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)
-    
-    try:
-        ansible_facts, warning = result
-        warnings.extend(warning)
-    except (TypeError, KeyError):
-        ansible_facts = result
+
+    ansible_facts, additional_warnings = result
+    warnings.extend(additional_warnings)
 
     module.exit_json(ansible_facts=ansible_facts, warnings=warnings)
 

roles/resource_module/templates/module_utils/network_os/facts/facts.py.j2

@@ -110,10 +110,8 @@ class Facts(FactsArgs, FactsBase): #pylint: disable=R0903
                     key = 'ansible_net_%s' % key
                     self.ansible_facts[key] = value
 
-        if warnings:
-            return self.ansible_facts, warnings
-        else:
-            return self.ansible_facts
+        return self.ansible_facts, warnings
+
 
 
     @staticmethod