Merge pull request #16 from trishnaguha/facts_scaffold

update facts scaffolding

Author: trishnaguha

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

@@ -13,6 +13,11 @@ class FactsArgs(object): #pylint: disable=R0903
     def __init__(self, **kwargs):
         pass
 
+    choices = [
+        'all',
+        'net_configuration_{{ resource }}',
+    ]
+
     argument_spec = {
-        'gather_subset': dict(default=['all'], type='list')
+        'gather_subset': dict(default=['all'], choices=choices, type='list')
     }

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

@@ -21,11 +21,7 @@ class Facts(FactsArgs, FactsBase): #pylint: disable=R0903
     """ The fact class for {{ network_os }}
     """
 
-    VALID_SUBSETS = [
-        'net_configuration_{{ resource }}',
-    ]
-
-    def get_facts(self, module, connection, gather_subset=None):
+    def get_facts(self, module, connection, gather_subset=['all']):
         """ Collect the facts for {{ network_os }}
 
         :param module: The module instance
@@ -34,25 +30,29 @@ class Facts(FactsArgs, FactsBase): #pylint: disable=R0903
         :rtype: dict
         :returns: the facts gathered
         """
+        valid_subsets = self.argument_spec['gather_subset'].get('choices', [])
+        if valid_subsets and 'all' in valid_subsets:
+            valid_subsets.remove('all')
+
         runable_subsets = set()
         exclude_subsets = set()
         if not gather_subset:
             gather_subset = ['all']
 
         for subset in gather_subset:
             if subset == 'all':
-                runable_subsets.update(self.VALID_SUBSETS)
+                runable_subsets.update(valid_subsets)
                 continue
             if subset.startswith('!'):
                 subset = subset[1:]
                 if subset == 'all':
-                    exclude_subsets.update(self.VALID_SUBSETS)
+                    exclude_subsets.update(valid_subsets)
                     continue
                 exclude = True
             else:
                 exclude = False
 
-            if subset not in self.VALID_SUBSETS:
+            if subset not in valid_subsets:
                 module.fail_json(msg='Bad subset')
 
             if exclude:
@@ -61,7 +61,7 @@ class Facts(FactsArgs, FactsBase): #pylint: disable=R0903
                 runable_subsets.add(subset)
 
         if not runable_subsets:
-            runable_subsets.update(self.VALID_SUBSETS)
+            runable_subsets.update(valid_subsets)
 
         runable_subsets.difference_update(exclude_subsets)
         self.ansible_facts['gather_subset'] = list(runable_subsets)