Merge branch 'feature/typeProperty' into develop

Author: Shakeel Mohamed

splunklib/client.py

@@ -237,7 +237,18 @@ def _parse_atom_entry(entry):
 
     # Filter some of the noise out of the content record
     content = record((k, v) for k, v in content.iteritems()
-        if k not in ['eai:acl', 'eai:attributes', 'type'])
+                     if k not in ['eai:acl', 'eai:attributes'])
+
+    if isinstance(content['type'], list):
+        content['type'] = [t for t in content['type'] if t != 'text/xml']
+        # Unset type if it was only 'text/xml'
+        if len(content['type']) == 0:
+            content.pop('type', None)
+        # Flatten 1 element list
+        if len(content['type']) == 1:
+            content['type'] = content['type'][0]
+    else:
+        content.pop('type', None)
 
     return record({
         'title': title,
@@ -521,7 +532,7 @@ def restart(self, timeout=None):
         # This message will be deleted once the server actually restarts.
         self.messages.create(name="restart_required", **msg)
         result = self.post("server/control/restart")
-        if timeout is None: 
+        if timeout is None:
             return result
         start = datetime.now()
         diff = timedelta(seconds=timeout)
@@ -1610,7 +1621,7 @@ def get(self, name="", owner=None, app=None, sharing=None, **query):
         name = UrlEncoded(name, encode_slash=True)
         return super(Collection, self).get(name, owner, app, sharing, **query)
 
-    
+
 
 
 class ConfigurationFile(Collection):
@@ -1790,7 +1801,7 @@ def create(self, password, username, realm=None):
         storage_password = StoragePassword(self.service, self._entity_path(state), state=state, skip_refresh=True)
 
         return storage_password
-    
+
     def delete(self, username, realm=None):
         """Delete a storage password by username and/or realm.
 
@@ -1961,7 +1972,7 @@ def clean(self, timeout=60):
         :return: The :class:`Index`.
         """
         self.refresh()
-        
+
         tds = self['maxTotalDataSizeMB']
         ftp = self['frozenTimePeriodInSecs']
         was_disabled_initially = self.disabled
@@ -1980,7 +1991,7 @@ def clean(self, timeout=60):
             while self.content.totalEventCount != '0' and datetime.now() < start+diff:
                 sleep(1)
                 self.refresh()
-            
+
             if self.content.totalEventCount != '0':
                 raise OperationError, "Cleaning index %s took longer than %s seconds; timing out." %\
                                       (self.name, timeout)
@@ -2925,7 +2936,7 @@ def export(self, query, **params):
             raise TypeError("Cannot specify an exec_mode to export.")
         params['segmentation'] = params.get('segmentation', 'none')
         return self.post(path_segment="export",
-                         search=query, 
+                         search=query,
                          **params).body
 
     def itemmeta(self):
@@ -2988,7 +2999,7 @@ def oneshot(self, query, **params):
             raise TypeError("Cannot specify an exec_mode to oneshot.")
         params['segmentation'] = params.get('segmentation', 'none')
         return self.post(search=query,
-                         exec_mode="oneshot", 
+                         exec_mode="oneshot",
                          **params).body
 
 

tests/test_service.py

@@ -103,6 +103,20 @@ def test_restart(self):
         self.service.restart(timeout=120)
         service.login() # Make sure we are awake
 
+    def test_read_outputs_with_type(self):
+        name = testlib.tmpname()
+        service = client.connect(**self.opts.kwargs)
+        service.post('data/outputs/tcp/syslog', name=name, type='tcp')
+        entity = client.Entity(service, 'data/outputs/tcp/syslog/' + name)
+        self.assertTrue('tcp', entity.content.type)
+
+        if service.restart_required:
+            self.restartSplunk()
+        service = client.connect(**self.opts.kwargs)
+        client.Entity(service, 'data/outputs/tcp/syslog/' + name).delete()
+        if service.restart_required:
+            self.restartSplunk()
+
     def test_splunk_version(self):
         service = client.connect(**self.opts.kwargs)
         v = service.splunk_version