resolve conficts

Author: Leon Zhang

.travis.yml

@@ -30,8 +30,8 @@ before_install:
     - mkdir -p $SPLUNK_HOME/var/log/splunk
 
 env:
-    - SPLUNK_VERSION=6.4-sdk
-    - SPLUNK_VERSION=6.5-sdk
+    - SPLUNK_VERSION=6.6-sdk
+    - SPLUNK_VERSION=7.0-sdk
 
 language: python
 

README.md

@@ -36,7 +36,7 @@ Here's what you need to get going with the Splunk SDK for Python.
 
 #### Python
 
-The Splunk SDK for Python requires Python 2.6+. 
+The Splunk SDK for Python requires Python 2.7+. 
 
 #### Splunk
 
@@ -168,9 +168,7 @@ prompt in the **/splunk-sdk-python/tests** subdirectory and enter:
     python test_app.py
 
 The test suite uses Python's standard library and the built-in `unittest` 
-library. If you're using Python 2.7, you're all set. However, if you are using 
-Python 2.6, you'll also need to install the `unittest2` library to
-get the additional features that were added to Python 2.7.
+library. 
 
 You can read more about our testing framework on
 [GitHub](https://github.com/splunk/splunk-sdk-python/tree/master/tests).
@@ -315,7 +313,3 @@ You can reach the Developer Platform team at _devinfo@splunk.com_.
 The Splunk Software Development Kit for Python is licensed under the Apache
 License 2.0. Details can be found in the file LICENSE.
 
-For compatibility with Python 2.6, The Splunk Software Development Kit
-for Python ships with ordereddict.py from the ordereddict package on
-[PyPI](http://pypi.python.org/pypi/ordereddict/1.1), which is licensed
-under the MIT license (see the top of splunklib/ordereddict.py).

examples/handlers/cacert.pem

@@ -1,16 +1,21 @@
 -----BEGIN CERTIFICATE-----
-MIICdTCCAd4CCQDlsvzBaZf1RjANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJV
+MIIDejCCAmICCQCNHBN8tj/FwzANBgkqhkiG9w0BAQsFADB/MQswCQYDVQQGEwJV
 UzELMAkGA1UECAwCQ0ExFjAUBgNVBAcMDVNhbiBGcmFuY2lzY28xDzANBgNVBAoM
 BlNwbHVuazEXMBUGA1UEAwwOU3BsdW5rQ29tbW9uQ0ExITAfBgkqhkiG9w0BCQEW
-EnN1cHBvcnRAc3BsdW5rLmNvbTAeFw0xNTA1MTExOTUxMzdaFw0yNTA1MDgxOTUx
-MzdaMH8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy
+EnN1cHBvcnRAc3BsdW5rLmNvbTAeFw0xNzAxMzAyMDI2NTRaFw0yNzAxMjgyMDI2
+NTRaMH8xCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJDQTEWMBQGA1UEBwwNU2FuIEZy
 YW5jaXNjbzEPMA0GA1UECgwGU3BsdW5rMRcwFQYDVQQDDA5TcGx1bmtDb21tb25D
-QTEhMB8GCSqGSIb3DQEJARYSc3VwcG9ydEBzcGx1bmsuY29tMIGfMA0GCSqGSIb3
-DQEBAQUAA4GNADCBiQKBgQDJmb55yvam1GqGgTK0dfHXWJiB0Fh8fsdJFRc5dxBJ
-PFaC/klmtbLFLbYuXdC2Jh4cm/uhj1/FWmA0Wbhb02roAV03Z3SX0pHyFa3Udyqr
-9f5ERJ0AYFA+y5UhbMnD9zlhs7J8ucub3XvA8rn79ejkYtDX2rMQWPNZYPcrxUEh
-iwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFd9dzyyb2wnlDy3tlFVH2BUXdJZPKIC
-E3VyMsPTNhXDq7ESVWBLJeUQh6uJ1A3QyLrtTqG/1h62vvP+UxAw4THZ4g3a2i65
-3T1q78dhq1cKneOuE83Te/fREH54QokzrnAXoz+v/aGJkzjEpSEwrWUwLA1koE8I
-/0XFEwxWbEbt
+QTEhMB8GCSqGSIb3DQEJARYSc3VwcG9ydEBzcGx1bmsuY29tMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzB9ltVEGk73QvPlxXtA0qMW/SLDQlQMFJ/C/
+tXRVJdQsmcW4WsaETteeWZh8AgozO1LqOa3I6UmrWLcv4LmUAh/T3iZWXzHLIqFN
+WLSVU+2g0Xkn43xSgQEPSvEK1NqZRZv1SWvx3+oGHgu03AZrqTj0HyLujqUDARFX
+sRvBPW/VfDkomHj9b8IuK3qOUwQtIOUr+oKx1tM1J7VNN5NflLw9NdHtlfblw0Ys
+5xI5Qxu3rcCxkKQuwz9KRe4iijOIRMAKX28pbakxU9Nk38Ac3PNadgIk0s7R829k
+980sqGWkd06+C17OxgjpQbvLOR20FtmQybttUsXGR7Bp07YStwIDAQABMA0GCSqG
+SIb3DQEBCwUAA4IBAQCxhQd6KXP2VzK2cwAqdK74bGwl5WnvsyqdPWkdANiKksr4
+ZybJZNfdfRso3fA2oK1R8i5Ca8LK3V/UuAsXvG6/ikJtWsJ9jf+eYLou8lS6NVJO
+xDN/gxPcHrhToGqi1wfPwDQrNVofZcuQNklcdgZ1+XVuotfTCOXHrRoNmZX+HgkY
+gEtPG+r1VwSFowfYqyFXQ5CUeRa3JB7/ObF15WfGUYplbd3wQz/M3PLNKLvz5a1z
+LMNXDwN5Pvyb2epyO8LPJu4dGTB4jOGpYLUjG1UUqJo9Oa6D99rv6sId+8qjERtl
+ZZc1oaC0PKSzBmq+TpbR27B8Zra3gpoA+gavdRZj
 -----END CERTIFICATE-----

splunklib/searchcommands/generating_command.py

@@ -193,6 +193,18 @@ def _execute(self, ifile, process):
         :return: `None`.
 
         """
+        if self._protocol_version == 2:
+            result = self._read_chunk(ifile)
+
+            if not result:
+                return
+
+            metadata, body = result
+            action = getattr(metadata, 'action', None)
+
+            if action != 'execute':
+                raise RuntimeError('Expected execute action, not {}'.format(action))
+
         self._record_writer.write_records(self.generate())
         self.finish()
 
@@ -308,7 +320,7 @@ def iteritems(self):
             version = self.command.protocol_version
             if version == 2:
                 iteritems = ifilter(lambda name_value1: name_value1[0] != 'distributed', iteritems)
-                if self.distributed and self.type == 'streaming':
+                if not self.distributed and self.type == 'streaming':
                     iteritems = imap(
                         lambda name_value: (name_value[0], 'stateful') if name_value[0] == 'type' else (name_value[0], name_value[1]), iteritems)
             return iteritems

splunklib/searchcommands/search_command.py

@@ -55,7 +55,7 @@
 
 # Relative imports
 
-from . internals import (
+from .internals import (
     CommandLineParser,
     CsvDialect,
     InputHeader,
@@ -71,6 +71,7 @@
 from . import Boolean, Option, environment
 from ..client import Service
 
+
 # ----------------------------------------------------------------------------------------------------------------------
 
 # P1 [ ] TODO: Log these issues against ChunkedExternProcessor
@@ -97,6 +98,7 @@ class SearchCommand(object):
     """ Represents a custom search command.
 
     """
+
     def __init__(self):
 
         # Variables that may be used, but not altered by derived classes
@@ -882,8 +884,10 @@ def _read_chunk(ifile):
         # if body_length <= 0:
         #     return metadata, ''
 
+        body = ""
         try:
-            body = ifile.read(body_length)
+            if body_length > 0:
+                body = ifile.read(body_length)
         except Exception as error:
             raise RuntimeError('Failed to read body of length {}: {}'.format(body_length, error))
 

splunklib/searchcommands/streaming_command.py

@@ -180,7 +180,7 @@ def iteritems(self):
                     iteritems = ifilter(lambda name_value: name_value[0] != 'clear_required_fields', iteritems)
             else:
                 iteritems = ifilter(lambda name_value2: name_value2[0] != 'distributed', iteritems)
-                if self.distributed:
+                if not self.distributed:
                     iteritems = imap(
                         lambda name_value1: (name_value1[0], 'stateful') if name_value1[0] == 'type' else (name_value1[0], name_value1[1]), iteritems)
             return iteritems

tests/searchcommands/recordings/scpv2/Splunk-6.3/countmatches.output

@@ -1,5 +1,5 @@
-chunked 1.0,19,0
-{"type":"stateful"}
+chunked 1.0,20,0
+{"type":"streaming"}
 chunked 1.0,17,49651
 {"finished":true}_serial,__mv__serial,_time,__mv__time,text,__mv_text,word_count,__mv_word_count
 0,,1380899494,,excellent review my friend loved it yours always guppyman @GGreeny62... http://t.co/fcvq7NDHxl,,14,