Extended test suite a little more for restrictToHost, got it all passing again.

Author: Frederick Ross

splunklib/client.py

@@ -1670,17 +1670,19 @@ def __init__(self, service, path, kind=None, **kwargs):
         Entity.__init__(self, service, path, **kwargs)
         if kind is None:
             path_segments = path.split('/')
-            i = path_segments.index('inputs')
-            self.kind = '/'.join(path_segments[i+1:-1])
-            assert self.kind is not None
+            i = path_segments.index('inputs')+1
+            if path_segments[i] == 'tcp':
+                self.kind = path_segments[i] + '/' + path_segments[i+1]
+            else:
+                self.kind = path_segments[i]
         else:
             self.kind = kind
 
-        # Maintain compatibility with older kind labels
-        if self.kind == 'tcp/raw':
-            self.kind = 'tcp'
-        if self.kind == 'tcp/cooked':
-            self.kind = 'splunktcp'
+        # Handle old input kind names.
+        if self.kind == 'tcp':
+            self.kind = 'tcp/raw'
+        if self.kind == 'splunktcp':
+            self.kind = 'tcp/cooked'
 
     def update(self, **kwargs):
         if self.kind not in ['tcp', 'splunktcp', 'tcp/raw', 'tcp/cooked']:
@@ -1698,7 +1700,7 @@ def update(self, **kwargs):
                 base_path, name = self.path.rsplit('/', 2)[:-1]
             else:
                 base_path, name = self.path.rsplit('/', 1)
-            if 'restrictToHost' in new_kwargs:
+            if 'restrictToHost' in new_kwargs and new_kwargs['restrictToHost'] != '':
                 self.path = base_path + '/' + new_kwargs['restrictToHost'] + ':' + port
             else:
                 self.path = base_path + '/' + port
@@ -1839,7 +1841,8 @@ def _get_kind_list(self, subpath=[]):
             if entry.title == 'all' or this_subpath == ['tcp','ssl']:
                 continue
             elif 'create' in [x.rel for x in entry.link]:
-                kinds.append('/'.join(subpath + [entry.title]))
+                path = '/'.join(subpath + [entry.title])
+                kinds.append(path)
             else:
                 subkinds = self._get_kind_list(subpath + [entry.title])
                 kinds.extend(subkinds)

tests/test_input.py

@@ -51,6 +51,13 @@ def test_cannot_create_with_restrictToHost_in_name(self):
             lambda: self.service.inputs.create('tcp', 'boris:10000')
         )
 
+    def test_remove_host_restriction(self):
+        input = self.service.inputs.create('tcp', str(self.base_port), restrictToHost='boris')
+        input.update(restrictToHost='')
+        input.refresh()
+        self.check_entity(input)
+        input.delete()
+
     def test_create_tcp_ports_with_restrictToHost(self):
         for kind in ['tcp', 'splunktcp']:
             # Make sure we can create two restricted inputs on the same port
@@ -101,9 +108,13 @@ def test_update_restrictToHost(self):
     def test_update_nonrestrictToHost(self):
         for kind in ['tcp', 'splunktcp']:
             input = self.service.inputs.create(kind, str(self.base_port), restrictToHost='boris')
-            input.update(host='meep')
-            input.refresh()
-            self.assertTrue(input.name.startswith('boris'))
+            try:
+                input.update(host='meep')
+                input.refresh()
+                self.assertTrue(input.name.startswith('boris'))
+            except:
+                input.delete()
+                raise
 
 class TestRead(testlib.SDKTestCase):
     def test_read(self):
@@ -170,20 +181,19 @@ class TestInput(testlib.SDKTestCase):
     def setUp(self):
         super(TestInput, self).setUp()
         inputs = self.service.inputs
-        tcp_port = str(highest_port(self.service, 10000, 'tcp', 'splunktcp')+1)
-        udp_port = str(highest_port(self.service, 10000, 'udp')+1)
-        restricted_tcp_port = str(highest_port(self.service, int(tcp_port)+1, 'tcp', 'splunktcp')+1)
-        test_inputs = [{'kind': 'tcp', 'name': tcp_port, 'host': 'sdk-test'},
-                       {'kind': 'udp', 'name': udp_port, 'host': 'sdk-test'},
-                       {'kind': 'tcp', 'name': 'boris:' + restricted_tcp_port, 'host': 'sdk-test'}]
+        unrestricted_port = str(highest_port(self.service, 10000, 'tcp', 'splunktcp', 'udp')+1)
+        restricted_port = str(highest_port(self.service, int(unrestricted_port)+1, 'tcp', 'splunktcp')+1)
+        test_inputs = [{'kind': 'tcp', 'name': unrestricted_port, 'host': 'sdk-test'},
+                       {'kind': 'udp', 'name': unrestricted_port, 'host': 'sdk-test'},
+                       {'kind': 'tcp', 'name': 'boris:' + restricted_port, 'host': 'sdk-test'}]
         self._test_entities = {}
 
         self._test_entities['tcp'] = \
-            inputs.create('tcp', str(tcp_port), host='sdk-test')
+            inputs.create('tcp', unrestricted_port, host='sdk-test')
         self._test_entities['udp'] = \
-            inputs.create('udp', str(udp_port), host='sdk-test')
+            inputs.create('udp', unrestricted_port, host='sdk-test')
         self._test_entities['restrictedTcp'] = \
-            inputs.create('tcp', restricted_tcp_port, restrictToHost='boris')
+            inputs.create('tcp', restricted_port, restrictToHost='boris')
 
     def tearDown(self):
         super(TestInput, self).tearDown()
@@ -260,8 +270,9 @@ def test_delete(self):
                 inputs.delete(name)
                 self.assertFalse(name in inputs)
             else:
-                self.assertRaises(client.AmbiguousReferenceException,
-                                  inputs.delete, name)
+                if not name.startswith('boris'):
+                    self.assertRaises(client.AmbiguousReferenceException,
+                        inputs.delete, name)
                 self.service.inputs.delete(kind, name)
                 self.assertFalse((kind,name) in inputs)
             self.assertRaises(client.EntityDeletedException,