Got index tests working. Grumble. Grr.

Author: Frederick Ross

splunklib/client.py

@@ -1475,9 +1475,9 @@ def default(self):
         index = self['_audit']
         return index['defaultDatabase']
 
-    def delete(self):
-        if self.splunk_version[0] >= 5:
-            Collection.delete(self.service, self.name)
+    def delete(self, name):
+        if self.service.splunk_version[0] >= 5:
+            Collection.delete(self, name)
         else:
             raise IllegalOperationException("Deleting indexes via the REST API is "
                                             "not supported before Splunk version 5.")
@@ -1548,8 +1548,6 @@ def clean(self, timeout=60):
                           default is 60).
         """
         self.refresh()
-        if self['disabled'] == '0':
-            raise IllegalOperationException('Cannot clean an enabled index.')
         tds = self['maxTotalDataSizeMB']
         ftp = self['frozenTimePeriodInSecs']
         self.update(maxTotalDataSizeMB=1, frozenTimePeriodInSecs=1)
@@ -2296,6 +2294,19 @@ def value(self):
         """Returns the message value."""
         return self[self.name]
 
+class ModularInputKind(Entity):
+    def __getitem__(self, name):
+        args = self['endpoint']['args']
+        if name in args:
+            return args['item']
+        else:
+            return Entity.__getitem__(self, name)
+
+    def update(self, **kwargs):
+        """Raises an error. Modular input kinds are read only."""
+        raise IllegalOperationException("Modular input kinds cannot be updated via the REST API.")
+
+
 class SavedSearch(Entity):
     """This class represents a saved search."""
     def __init__(self, service, path, **kwargs):

tests/test_index.py

@@ -63,10 +63,6 @@ def setUp(self):
         self.service.restart(timeout=300)
         self.index = self.service.indexes[self.index_name]
 
-    def test_cannot_clean_enabled(self):
-        self.assertEqual(self.index['disabled'], '0')
-        self.assertRaises(client.IllegalOperationException, self.index.clean)
-
     def test_prefresh(self):
         index = self.service.indexes[self.index_name]
         self.assertEqual(self.index['disabled'], '0') # Index is prefreshed
@@ -81,14 +77,15 @@ def test_submit(self):
         self.assertEqual(self.index['totalEventCount'], str(eventCount+1))
 
     def test_submit_and_clean(self):
+        # This fails on Ace beta because the index cannot be cleaned or deleted when disabled.
         self.index.refresh()
         originalCount = int(self.index['totalEventCount'])
         self.index.submit("Hello again!", sourcetype="Boris", host="meep")
         testlib.retry(self.index, 'totalEventCount', str(originalCount+1), step=1)
         self.assertEqual(self.index['totalEventCount'], str(originalCount+1))
         self.index.disable()
         self.index.clean()
-        testlib.retry(self.index, 'totalEventCount', '0', step=1)
+        testlib.retry(self.index, 'totalEventCount', '0', step=1, times=60)
         self.index.refresh()
         self.assertEqual(self.index['totalEventCount'], '0')
 

tests/testlib.py

@@ -169,7 +169,7 @@ def setUp(self):
         import splunklib.client as client
         self.opts = parse([], {}, ".splunkrc")
         self.service = client.connect(**self.opts.kwargs)
-        logging.debug("Connected to splunkd version %d", '.'.join(str(x) for x in self.service.splunk_version))
+        logging.debug("Connected to splunkd version %s", '.'.join(str(x) for x in self.service.splunk_version))
 
 def main():
     unittest.main()