Merge pull request cbabs#1 from seismiccollision/master

Looks good.   Thanks for the improvement.

Author: cbabs

swinds.ini

@@ -0,0 +1,4 @@
+[solarwinds]
+npm_server = 10.10.10.10
+npm_user = ansible
+npm_password = password

swinds.py

@@ -27,8 +27,8 @@
 to something public.
 
 '''
-import simplejson
 import argparse
+import ConfigParser
 import requests
 import re
 
@@ -38,24 +38,38 @@
     import simplejson as json
 
 
+config_file = 'swinds.ini'
+
+# Get configuration variables
+config = ConfigParser.ConfigParser()
+config.readfp(open(config_file))
+
+
+
 # Orion Server IP or DNS/hostname
-server = '10.10.10.10'
+server = config.get('solarwinds', 'npm_server')
 # Orion Username
-user = 'ansible'
+user = config.get('solarwinds', 'npm_user')
 # Orion Password
-password = 'password'
+password = config.get('solarwinds', 'npm_password')
 # Field for groups
-groupField = 'Vendor'
+groupField = 'GroupName'
 # Field for host
-hostField = 'IPAddress'
+hostField = 'SysName'
+
+payload = "query=SELECT C.Name as GroupName, N.SysName FROM Orion.Nodes as N JOIN Orion.ContainerMemberSnapshots as CM on N.NodeID = CM.EntityID JOIN Orion.Container as C on CM.ContainerID=C.ContainerID WHERE CM.EntityDisplayName = 'Node' AND N.Vendor = 'Cisco'"
+
+use_groups = True
+parentField = 'ParentGroupName'
+childField = 'ChildGroupName'
 
+group_payload = "query=SELECT C.Name as ParentGroupName, CM.Name as ChildGroupName FROM Orion.ContainerMemberSnapshots as CM JOIN Orion.Container as C on CM.ContainerID=C.ContainerID WHERE CM.EntityDisplayName = 'Group'"
 
-payload = "query=SELECT+" + hostField + "+," + groupField + "+FROM+Orion.Nodes"
+#payload = "query=SELECT+" + hostField + "+," + groupField + "+FROM+Orion.Nodes"
 url = "https://"+server+":17778/SolarWinds/InformationService/v3/Json/Query"
 req = requests.get(url, params=payload, verify=False, auth=(user, password))
 
 jsonget = req.json()
-# json_resp = json.loads(req)
 
 
 class SwInventory(object):
@@ -74,6 +88,9 @@ def __init__(self):
         # Called with `--list`.
         if self.args.list:
             self.inventory = self.get_list()
+            if use_groups:
+                self.groups = self.get_groups()
+                self.add_groups_to_hosts(self.groups)
         # Called with `--host [hostname]`.
         elif self.args.host:
             # Not implemented, since we return _meta info `--list`.
@@ -83,25 +100,50 @@ def __init__(self):
             self.inventory = self.empty_inventory()
 
         print(json.dumps(self.inventory, indent=2))
-
     def get_list(self):
         hostsData = jsonget
-        dumped = eval(simplejson.dumps(jsonget))
+        dumped = eval(json.dumps(jsonget))
 
         # Inject data below to speed up script
         final_dict = {'_meta': {'hostvars': {}}}
 
         # Loop hosts in groups and remove special chars from group names
         for m in dumped['results']:
-            # Allow Upper/lower letters and numbers.  Remove everything else
-            m[groupField] = re.sub('[^A-Za-z0-9]+', '', m[groupField])
+            # Allow Upper/lower letters and numbers. Replace everything else with underscore
+            m[groupField] = self.clean_inventory_item(m[groupField])
             if m[groupField] in final_dict:
                 final_dict[m[groupField]]['hosts'].append(m[hostField])
             else:
                 final_dict[m[groupField]] = {'hosts': [m[hostField]]}
+        return final_dict
 
+        #if self.args.groups:
+    def get_groups(self):
+        req = requests.get(url, params=group_payload, verify=False, auth=(user, password))
+        hostsData = req.json()
+        dumped = eval(json.dumps(hostsData))
+        
+        parentField = 'ParentGroupName'
+        childField = 'ChildGroupName'
+        final_dict = {} 
+        for m in dumped['results']:
+            # Allow Upper/lower letters and numbers. Replace everything else with underscore
+            m[parentField] = self.clean_inventory_item(m[parentField])
+            m[childField] = self.clean_inventory_item(m[childField])
+            if m[parentField] in final_dict:
+                final_dict[m[parentField]]['children'].append(m[childField])
+            else:
+                final_dict[m[parentField]] = {'children': [m[childField]]}
         return final_dict
 
+    def add_groups_to_hosts (self, groups):
+        self.inventory.update(groups)
+
+    @staticmethod
+    def clean_inventory_item(item):
+        item = re.sub('[^A-Za-z0-9]+', '_', item)
+        return item
+
     # Empty inventory for testing.
     def empty_inventory(self):
         return {'_meta': {'hostvars': {}}}