Modular input kind bindings.

Author: Frederick Ross

splunklib/client.py

@@ -402,7 +402,7 @@ def messages(self):
     def modular_input_kinds(self):
         """Returns a collection of the modular input kinds on this Splunk instance."""
         if self.splunk_version[0] >= 5:
-            return ReadOnlyCollection(self, PATH_MODULAR_INPUTS, item=Entity)
+            return ReadOnlyCollection(self, PATH_MODULAR_INPUTS, item=ModularInputKind)
         else:
             raise IllegalOperationException("Modular inputs are not supported before Splunk version 5.")
 
@@ -2295,13 +2295,24 @@ def value(self):
         return self[self.name]
 
 class ModularInputKind(Entity):
+    def __contains__(self, name):
+        args = self.state.content['endpoints']['args']
+        if name in args:
+            return True
+        else:
+            return Entity.__contains__(self, name)
+
     def __getitem__(self, name):
-        args = self['endpoint']['args']
+        args = self.state.content['endpoint']['args']
         if name in args:
             return args['item']
         else:
             return Entity.__getitem__(self, name)
 
+    @property
+    def arguments(self):
+        return self.state.content['endpoint']['args']
+
     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.")

tests/test_modular_input_kinds.py

@@ -18,4 +18,28 @@
 import splunklib.client as client
 
 class ModularInputKindTestCase(testlib.TestCase):
-    pass
+    def test_list_arguments(self):
+        test1 = self.service.modular_input_kinds['test1']
+
+        expected_args = set(["name", "resname", "key_id", "no_description", "empty_description",
+                             "arg_required_on_edit", "not_required_on_edit", "required_on_create",
+                            "not_required_on_create", "number_field", "string_field", "boolean_field"])
+        found_args = set(test1.arguments.keys())
+
+        self.assertEqual(expected_args, found_args)
+
+    def test_update_raises_exception(self):
+        test1 = self.service.modular_input_kinds['test1']
+        self.assertRaises(client.IllegalOperationException, test1.update, a="b")
+
+    def check_modular_input_kind(self, m):
+        if m.name == 'test1':
+            self.assertEqual('Test "Input" - 1', m['title'])
+            self.assertEqual("xml", m['streaming_mode'])
+        elif m.name == 'test2':
+            self.assertEqual('test2', m['title'])
+            self.assertEqual('simple', m['streaming_mode'])
+
+    def test_list_modular_inputs(self):
+        for m in self.service.modular_input_kinds:
+            self.check_modular_input_kind(m)