added gitignore and new spl

Author: Ankit Bhagat

.gitignore

@@ -0,0 +1,138 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+*.py,cover
+.hypothesis/
+.pytest_cache/
+cover/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+db.sqlite3-journal
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+.pybuilder/
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+#   For a library or package, you might want to ignore these files since the code is
+#   intended to run in multiple environments; otherwise, check them in:
+# .python-version
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# PEP 582; used by e.g. github.com/David-OConnor/pyflow
+__pypackages__/
+
+# Celery stuff
+celerybeat-schedule
+celerybeat.pid
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# pytype static type analyzer
+.pytype/
+
+# Cython debug symbols
+cython_debug/

HadoopConnect.spl

@@ -137,8 +137,8 @@ def updateRED(self, action, id, **kwargs):
 
             if len(update_props):
                 exportJob.update(update_props)
-		if exportJob.entity and exportJob.entity.owner:
-		    exportJob.entity.owner='nobody'
+            if exportJob.entity and exportJob.entity.owner:
+                exportJob.entity.owner='nobody'
                 if not exportJob.passive_save():
                     cherrypy.response.status = 500
                     return self.render_json(dict(success = False, errors = [ str(e) for e in exportJob.errors ]))
@@ -179,7 +179,7 @@ def custom_action(self, action, id):
             exportJob = HDFSExport.get(id)
             done = getattr(exportJob, action)()
         #do we need generic exception here?
-        except Exception, e:
+        except Exception as e:
             logger.warn('Could not %s export job: %s, %s' % (action, id, str(e)))
         if done:
             return self.render_json(dict(success = True))

HadoopConnect/appserver/controllers/exportjobs.py

@@ -1,3 +1,5 @@
+import sys,os
+sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
 from hdfs_base import HDFSAppObjModel
 from splunk.models.field import Field, BoolField, IntField
 

HadoopConnect/bin/HadoopConnect/models/cluster.py

@@ -1,3 +1,5 @@
+import sys,os
+sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
 from hdfs_base import HDFSAppObjModel
 import time
 import logging

HadoopConnect/bin/HadoopConnect/models/export.py

@@ -1,4 +1,6 @@
 from splunk.models.base import SplunkAppObjModel
+import sys,os
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..",".."))
 import errors
 
 '''

HadoopConnect/bin/HadoopConnect/models/hdfs_base.py

@@ -1,3 +1,5 @@
+import sys,os
+sys.path.insert(0, os.path.join(os.path.dirname(__file__)))
 from hdfs_base import HDFSAppObjModel
 from splunk.models.field import Field
 

HadoopConnect/bin/HadoopConnect/models/principal.py

@@ -80,7 +80,7 @@ def getLocalHadoopVersion(self):
         try:
             process = self.openProcess(args, env)
             output = process.communicate()
-        except Exception, e:
+        except Exception as e:
             logger.exception('Failed to run process')
             raise HcException(HCERR0013, {'error':str(e)})
         if process.returncode != 0:
@@ -97,7 +97,7 @@ def save(self):
             if not os.path.isdir(dir):
                 os.makedirs(dir)
             self.saveXml()
-        except Exception, e:
+        except Exception as e:
             logger.exception('Failed to create cluster xml configurations')
             raise HcException(HCERR1518, {'name':self.name, 'error':str(e)})    
 
@@ -107,7 +107,7 @@ def remove(self):
             if os.path.isdir(dir):
                 import shutil
                 shutil.rmtree(dir)
-        except Exception, e:
+        except Exception as e:
             raise HcException(HCERR1516, {'name':self.name, 'error':str(e)})
 
     def getClusterDir(self):

HadoopConnect/bin/clusters.py

@@ -77,7 +77,7 @@ def saveConf(self, confName, stanzaName, settingsDict):
     def simpleRequest(self, uri, method='GET', postargs=None, raiseAllErrors=True):
         try:
             response, content = rest.simpleRequest(uri, self.getSessionKey(), method=method, postargs=postargs, raiseAllErrors=raiseAllErrors)
-        except Exception, e:
+        except Exception as e:
             raise HcException(HCERR2006, {'uri':uri, 'status':'', 'reason':str(e), 'response':''})    
 
         if response.status not in [200, 201] and raiseAllErrors:

HadoopConnect/bin/delegating_handler.py

@@ -223,7 +223,7 @@ def __init__(self, message_format, options={}):
         if len(options) > 0:
             try:
                 d = json.loads(message_format)
-                for k,v in options.iteritems():
+                for k,v in options.items():
                     d[k] = v
                 self.value = json.dumps(d)
             except:
@@ -256,25 +256,23 @@ def __str__(self):
     e = HcException(HCERR2002, {'entity_path':'', 'search':'', 'uri':uri, 'error':msg})
 
     # case 0: fill up a int value and get it back later
-    print 'case 0'
+    print ('case 0')
     d = json.loads(HCERR1505)
     d['peer_count'] = 5
     s = json.dumps(d)
     d = json.loads(s)
-    print 'peer_count: %d' % d['peer_count']
-    print 
+    print ('peer_count: %d' % d['peer_count'])
 
     # case 1, msg is a simple error message, manually construct a json error message, then convert to dict object, should pass test
-    print 'case 1'
+    print ('case 1')
     msg = "In handler \'savedsearch\': Unable to create a saved search with name \'ExportSearch:test-error-message\'. A saved search with that name already exists."
     json_str = HCERR1506 % ('test-error-message', msg)
-    print json_str
-    print json.loads(json_str)
-    print 
+    print (json_str)
+    print (json.loads(json_str))
 
     # case 2: msg is very complex: 
     # 1) manually build dict object 2) convert dict to json error message 3) convert json string back to dict. should pass test 
-    print 'case 2'
+    print ('case 2')
     msg = "[HTTP 409] [{'text': \"In handler 'savedsearch': Unable to create saved search with name 'ExportSearch: test-error-message'. A saved search with that name already exists.\", 'code': None, 'type': 'ERROR'}]"
     # 1) manually build dict object
     d = {}
@@ -284,94 +282,88 @@ def __str__(self):
     d['error'] = msg
     # 2) convert dict to json error message
     json_str = json.dumps(d)
-    print json_str
+    print (json_str)
     # 3) convert json string back to dict
     d = json.loads(json_str)
-    print d
-    print d['id']
-    print d['message']
-    print d['export']
-    print d['error']
-    print 
+    print (d)
+    print (d['id'])
+    print (d['message'])
+    print (d['export'])
+    print (d['error'])
 
     # case 3: msg is very complex, but HCERR1506 is a simple json string and is sure to be able to convert to dict. 
     # 1) convert HCERR1506 to dict
     # 2) fill up the blank (export and error in this case)
     # 3) convert dict to json error message
     # 4) convert json string back to dict
     # should pass test.
-    print 'case 3' 
+    print ('case 3') 
     # 1) convert HCERR1506 to dict
     d = json.loads(HCERR1506)
     # 2) fill up the blank (export and error in this case)
     d['export'] = 'test-error-message'
     d['error'] = msg
     # 3) convert dict to json error message
     json_str = json.dumps(d)
-    print json_str
+    print (json_str)
     # 4) convert json string back to dict
     d = json.loads(json_str)
-    print d
-    print d['id']
-    print d['message']
-    print d['export']
-    print d['error']
-    print 
+    print (d)
+    print (d['id'])
+    print (d['message'])
+    print (d['export'])
+    print (d['error'])
 
     # case 4: msg is very complex. 
     # 1) create HcExeption with msg 2) get error dict from the exception
     # should pass test
-    print 'case 4'
+    print ('case 4')
     # 1) create HcExeption with msg 
     e = HcException(HCERR1506, {'export':'test-error-message', 'error':msg})
     # 2) get error dict from the exception
     d = e.error
-    print d
-    print d['id']
-    print d['message']
-    print d['export']
-    print d['error']
-    print 
+    print (d)
+    print (d['id'])
+    print (d['message'])
+    print (d['export'])
+    print (d['error'])
 
     # case 5: msg is very complex. 
     # 1) create HcExeption with msg and more fields (foo) than it is needed 2) get error dict from the exception
     # should pass test
-    print 'case 5'
+    print ('case 5')
     # 1) create HcExeption with msg 
     e = HcException(HCERR1506, {'export':'test-error-message', 'error':msg, 'foo':'bar'})
     # 2) get error dict from the exception
     d = e.error
-    print d
-    print d['id']
-    print d['message']
-    print d['export']
-    print d['error']
-    print d['foo']
-    print 
-    
+    print (d)
+    print (d['id'])
+    print (d['message'])
+    print (d['export'])
+    print (d['error'])
+    print (d['foo'])
+
     # case 6: msg is very complex. 
     # 1) create HcExeption with msg and less fields (export) than it is needed 2) get error dict from the exception
     # should pass test
-    print 'case 6'
+    print ('case 6')
     # 1) create HcExeption with msg 
     e = HcException(HCERR1506, {'error':msg})
     # 2) get error dict from the exception
     d = e.error
-    print d
-    print d['id']
-    print d['message']
-    print d['export']
-    print d['error']
-    print 
+    print (d)
+    print (d['id'])
+    print (d['message'])
+    print (d['export'])
+    print (d['error'])
 
     # case 7: msg is very complex
     # 1) manually construct a json error string
     # 2 ) convert it to dict object
     # should fail test
-    print 'case 7' 
+    print ('case 7') 
     # 1) manually construct a json error string
     json_str = HCERR1506 % ('test-error-message', msg)
-    print json_str
+    print (json_str)
     # 2 ) convert it to dict object
-    print json.loads(json_str)
-    
+    print (json.loads(json_str))