Performance improvement for updating or deleting input (splunk#247)

shakeelmohamed · web-flow · commit 44eb11c3b09a · 2019-02-25T15:13:49.000-08:00
diff --git a/splunklib/client.py b/splunklib/client.py
@@ -463,6 +463,13 @@ def info(self):
         response = self.get("/services/server/info")
         return _filter_content(_load_atom(response, MATCH_ENTRY_CONTENT))
 
+    def input(self, path, kind=None):
+        """Retrieves an input by path, and optionally kind.
+
+        :return: A :class:`Input` object.
+        """
+        return Input(self, path, kind=kind).refresh()
+
     @property
     def inputs(self):
         """Returns the collection of inputs configured on this Splunk instance.
diff --git a/tests/test_input.py b/tests/test_input.py
@@ -16,8 +16,6 @@
 from __future__ import absolute_import
 from __future__ import print_function
 
-import unittest2
-
 from splunklib.binding import HTTPError
 
 from tests import testlib
@@ -30,6 +28,7 @@
 
 import splunklib.client as client
 
+
 def highest_port(service, base_port, *kinds):
     """Find the first port >= base_port not in use by any input in kinds."""
     highest_port = base_port
@@ -38,6 +37,7 @@ def highest_port(service, base_port, *kinds):
         highest_port = max(port, highest_port)
     return highest_port
 
+
 class TestTcpInputNameHandling(testlib.SDKTestCase):
     def setUp(self):
         super(TestTcpInputNameHandling, self).setUp()
@@ -116,6 +116,7 @@ def test_update_restrictToHost_fails(self):
                 lambda: boris.update(restrictToHost='hilda')
             )
 
+
 class TestRead(testlib.SDKTestCase):
     def test_read(self):
         inputs = self.service.inputs
@@ -188,6 +189,7 @@ def test_oneshot_on_nonexistant_file(self):
         self.assertRaises(HTTPError,
             self.service.inputs.oneshot, name)
 
+
 class TestInput(testlib.SDKTestCase):
     def setUp(self):
         super(TestInput, self).setUp()
@@ -243,7 +245,6 @@ def test_lists_modular_inputs(self):
             input = inputs['abcd', 'test2']
             self.assertEqual(input.field1, 'boris')
 
-
     def test_create(self):
         inputs = self.service.inputs
         for entity in six.itervalues(self._test_entities):
@@ -264,6 +265,13 @@ def test_read(self):
             self.assertEqual(this_entity.name, read_entity.name)
             self.assertEqual(this_entity.host, read_entity.host)
 
+    def test_read_indiviually(self):
+        tcp_input = self.service.input(self._test_entities['tcp'].path,
+                                       self._test_entities['tcp'].kind)
+        self.assertIsNotNone(tcp_input)
+        self.assertTrue('tcp', tcp_input.kind)
+        self.assertTrue(self._test_entities['tcp'].name, tcp_input.name)
+
     def test_update(self):
         inputs = self.service.inputs
         for entity in six.itervalues(self._test_entities):
@@ -273,7 +281,7 @@ def test_update(self):
             entity.refresh()
             self.assertEqual(entity.host, kwargs['host'])
 
-    @unittest2.skip('flaky')
+    @unittest.skip('flaky')
     def test_delete(self):
         inputs = self.service.inputs
         remaining = len(self._test_entities)-1
