Skip to content

Feature/input kindpath perf improvement #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2016
Merged

Feature/input kindpath perf improvement #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
130c5c9
remove Inputs.kind check to reduce performance impact on each rest call
llisplunk Nov 2, 2016
4cc3c22
Add test coverage for unknown input types
Dec 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions splunklib/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2432,15 +2432,12 @@ def kindpath(self, kind):
:return: The relative endpoint path.
:rtype: ``string``
"""
if kind in self.kinds:
return UrlEncoded(kind, skip_encode=True)
# Special cases
elif kind == 'tcp':
if kind == 'tcp':
return UrlEncoded('tcp/raw', skip_encode=True)
elif kind == 'splunktcp':
return UrlEncoded('tcp/cooked', skip_encode=True)
else:
raise ValueError("No such kind on server: %s" % kind)
return UrlEncoded(kind, skip_encode=True)

def list(self, *kinds, **kwargs):
"""Returns a list of inputs that are in the :class:`Inputs` collection.
Expand Down
8 changes: 8 additions & 0 deletions tests/test_input.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,14 @@ def test_read_kind(self):
def test_inputs_list_on_one_kind(self):
self.service.inputs.list('monitor')

def test_read_invalid_input(self):
name = testlib.tmpname()
try:
self.service.inputs.get(name)
self.fail("Expected a 404 HTTPError")
except HTTPError as he:
self.assertTrue("HTTP 404 Not Found" in str(he))

def test_inputs_list_on_one_kind_with_count(self):
N = 10
expected = [x.name for x in self.service.inputs.list('monitor')[:10]]
Expand Down