Merge branch 'fross/restrictToHost' into develop

Author: Frederick Ross

splunklib/client.py

@@ -1684,13 +1684,6 @@ def __init__(self, service, path, kind=None, **kwargs):
         if self.kind == 'splunktcp':
             self.kind = 'tcp/cooked'
 
-    @property
-    def restrictToHost(self):
-        if 'restrictToHost' in self._state.content:
-            return self._state.content['restrictToHost']
-        else:
-            return ''
-
     def update(self, **kwargs):
         if self.kind not in ['tcp', 'splunktcp', 'tcp/raw', 'tcp/cooked']:
             result = super(Input, self).update(**kwargs)
@@ -1709,7 +1702,7 @@ def update(self, **kwargs):
             # TCP input, our update request will fail, since our reference to it still uses
             # the old path.
             to_update = kwargs.copy()
-            to_update['restrictToHost'] = kwargs.get('restrictToHost', self['restrictToHost'])
+            to_update['restrictToHost'] = kwargs.get('restrictToHost', self._state.content.get('restrictToHost', ''))
 
             # Do the actual update operation.
             result = super(Input, self).update(**to_update)
@@ -1723,7 +1716,8 @@ def update(self, **kwargs):
             host = to_update['restrictToHost'] + ':' if to_update['restrictToHost'] != '' else ''
             port = self.name.split(':', 1)[-1]
             self.path = base_path + '/' + host + port
-
+            # We don't have to update self.name, since it's part of the data
+            # fetched from splunkd.
             return result
 
 

tests/test_input.py

@@ -39,6 +39,16 @@ def tearDown(self):
                 input.delete()
         super(TestTcpInputNameHandling, self).tearDown()
 
+    def create_tcp_input(self, base_port, kind, **options):
+        port = base_port
+        while True: # Find the next unbound port
+            try:
+                input = self.service.inputs.create(kind, str(port), **options)
+                return input
+            except client.HTTPError as he:
+                if he.status == 400:
+                    port += 1
+
     def test_create_tcp_port(self):
         for kind in ['tcp', 'splunktcp']:
             input = self.service.inputs.create(kind, str(self.base_port))
@@ -96,15 +106,7 @@ def test_unrestricted_to_restricted_collision(self):
 
     def test_update_restrictToHost(self):
         for kind in ['tcp', 'splunktcp']: # No UDP, since it's broken in Splunk
-            port = self.base_port
-            while True: # Find the next unbound port
-                try:
-                    boris = self.service.inputs.create(kind, str(port), restrictToHost='boris')
-                except client.HTTPError as he:
-                    if he.status == 400:
-                        port += 1
-                else:
-                    break
+            boris = self.create_tcp_input(self.base_port, kind, restrictToHost='boris')
 
             # No matter what version we're actually running against,
             # we can check that on Splunk < 5.0, we get an exception
@@ -126,15 +128,8 @@ def test_update_restrictToHost(self):
 
     def test_update_nonrestrictToHost(self):
         for kind in ['tcp', 'splunktcp']: # No UDP since it's broken in Splunk
-            port = self.base_port
-            while True: # Find the next unbound port
-                try:
-                    input = self.service.inputs.create(kind, str(port), restrictToHost='boris')
-                except client.HTTPError as he:
-                    if he.status == 400:
-                        port += 1
-                else:
-                    break
+            input = self.create_tcp_input(self.base_port, kind, restrictToHost='boris')
+
             try:
                 input.update(host='meep')
                 input.refresh()