From c9b4f432189444b2bd2c42c1c6876d22b8d4548b Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Mon, 15 Jun 2020 17:48:33 -0400
Subject: [PATCH 1/9] CSM FVT: Updated big data store testcases to run to
 completion even if an error occurs.

---
 csmtest/buckets/BDS/python_scripts.sh | 32 +++++++++++++--------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/csmtest/buckets/BDS/python_scripts.sh b/csmtest/buckets/BDS/python_scripts.sh
index c43a4adda..2267eafeb 100755
--- a/csmtest/buckets/BDS/python_scripts.sh
+++ b/csmtest/buckets/BDS/python_scripts.sh
@@ -2,7 +2,7 @@
 #   
 #    buckets/BDS/python_scripts.sh
 # 
-#  © Copyright IBM Corporation 2015-2019. All Rights Reserved
+#  © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -44,12 +44,12 @@ echo "------------------------------------------------------------" >> ${LOG}
 
 #Test Case 0 Setup Compute Nodes to "IN_SERVICE":
 ${FVT_PATH}/tools/update_computes_in_service.sh > ${TEMP_LOG} 2>&1
-check_return_exit $? 0 "Set Compute Nodes to (IN_SERVICE): Calling update_computes_in_service"
+check_return_flag_value $? 0 "Set Compute Nodes to (IN_SERVICE): Calling update_computes_in_service"
 
 rm -f ${TEMP_LOG}
 #Test Case 1 setup:
 ${CSM_PATH}/csm_allocation_create -j 1 -n ${COMPUTE_NODES} > ${TEMP_LOG} 2>&1
-check_return_exit $? 0 "PRE SETUP: Calling csm_allocation_create"
+check_return_flag_value $? 0 "PRE SETUP: Calling csm_allocation_create"
 
 # Grab & Store Allocation ID from csm_allocation_create.log
 allocation_id=`grep allocation_id ${TEMP_LOG} | awk -F': ' '{print $2}'`
@@ -61,7 +61,7 @@ echo "allocation_id: " $allocation_id >> ${LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findJobsRunning.py > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 0 "Test Case 1 : Calling findJobsRunning.py "
+check_return_flag_value $? 0 "Test Case 1 : Calling findJobsRunning.py "
 
 # Grab & Store number of jobs found from findJobsRunning.py.
 # we will need later for logical tests
@@ -72,9 +72,9 @@ rm -f ${TEMP_LOG}
 
 # Clean Up allocation
 ${CSM_PATH}/csm_allocation_delete -a ${allocation_id} > ${TEMP_LOG} 2>&1
-check_return_exit $? 0 "Clean up allocation"
+check_return_flag_value $? 0 "Clean up allocation"
 ${CSM_PATH}/csm_allocation_query_active_all > ${TEMP_LOG} 2>&1
-check_return_exit $? 4 "Validating no active allocations"
+check_return_flag_value $? 4 "Validating no active allocations"
 
 rm -f ${TEMP_LOG}
 
@@ -82,7 +82,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findJobKeys.py > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 0 "Test Case 2 : Calling findJobKeys.py "
+check_return_flag_value $? 0 "Test Case 2 : Calling findJobKeys.py "
 
 rm -f ${TEMP_LOG}
 
@@ -90,7 +90,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findJobMetrics.py -f "host" > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 0 "Test Case 3 : Calling findJobMetrics.py "
+check_return_flag_value $? 0 "Test Case 3 : Calling findJobMetrics.py "
 
 rm -f ${TEMP_LOG}
 
@@ -98,7 +98,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findJobMetrics.py > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 2 "Test Case 3a: Calling findJobMetrics.py without required fields"
+check_return_flag_value $? 2 "Test Case 3a: Calling findJobMetrics.py without required fields"
 
 rm -f ${TEMP_LOG}
 
@@ -106,7 +106,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findJobsInRange.py > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 0 "Test Case 4 : Calling findJobsInRange.py "
+check_return_flag_value $? 0 "Test Case 4 : Calling findJobsInRange.py "
 
 rm -f ${TEMP_LOG}
 
@@ -114,7 +114,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findJobTimeRange.py -a 1 > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 0 "Test Case 5 : Calling findJobTimeRange.py "
+check_return_flag_value $? 0 "Test Case 5 : Calling findJobTimeRange.py "
 
 rm -f ${TEMP_LOG}
 
@@ -122,7 +122,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findJobTimeRange.py > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 2 "Test Case 5a: Calling findJobTimeRange.py without either allocation_id or job_id"
+check_return_flag_value $? 2 "Test Case 5a: Calling findJobTimeRange.py without either allocation_id or job_id"
 
 rm -f ${TEMP_LOG}
 
@@ -130,7 +130,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findUserJobs.py -u "root" > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 0 "Test Case 6 : Calling findUserJobs.py "
+check_return_flag_value $? 0 "Test Case 6 : Calling findUserJobs.py "
 
 rm -f ${TEMP_LOG}
 
@@ -138,7 +138,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findUserJobs.py > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 2 "Test Case 6a: Calling findUserJobs.py without required field -u user"
+check_return_flag_value $? 2 "Test Case 6a: Calling findUserJobs.py without required field -u user"
 
 rm -f ${TEMP_LOG}
 
@@ -146,7 +146,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findWeightedErrors.py --errormap "/opt/ibm/csm/bigdata/python/sampleWeightedErrorMap.json" > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 0 "Test Case 7 : Calling findWeightedErrors.py "
+check_return_flag_value $? 0 "Test Case 7 : Calling findWeightedErrors.py "
 
 rm -f ${TEMP_LOG}
 
@@ -154,7 +154,7 @@ rm -f ${TEMP_LOG}
 # switch to csm path later
 /opt/ibm/csm/bigdata/python/findWeightedErrors.py > ${TEMP_LOG} 2>&1
 #echo ${CSM_PATH}
-check_return_exit $? 2 "Test Case 7a: Calling findWeightedErrors.py without --errormap required field"
+check_return_flag_value $? 2 "Test Case 7a: Calling findWeightedErrors.py without --errormap required field"
 
 rm -f ${TEMP_LOG}
 

From 4410c6f4cff1206ceae48928ae523856df3ccb2d Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Mon, 15 Jun 2020 17:51:10 -0400
Subject: [PATCH 2/9] Updated CSM BDS python use cases to use python3 on RHEL8

---
 csm_big_data/python/cast_helper.py        | 13 +++++++++++--
 csm_big_data/python/findJobKeys.py        | 12 ++++++++++--
 csm_big_data/python/findJobMetrics.py     | 13 +++++++++++--
 csm_big_data/python/findJobTimeRange.py   | 12 ++++++++++--
 csm_big_data/python/findJobsInRange.py    | 13 +++++++++++--
 csm_big_data/python/findJobsRunning.py    | 13 +++++++++++--
 csm_big_data/python/findUserJobs.py       | 12 ++++++++++--
 csm_big_data/python/findWeightedErrors.py | 12 ++++++++++--
 csm_big_data/setupRPM.cmake               |  2 ++
 9 files changed, 86 insertions(+), 16 deletions(-)

diff --git a/csm_big_data/python/cast_helper.py b/csm_big_data/python/cast_helper.py
index 4124521e2..67c1df09f 100755
--- a/csm_big_data/python/cast_helper.py
+++ b/csm_big_data/python/cast_helper.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python2
+#!/bin/sh
 # encoding: utf-8
 #================================================================================
 #
 #    cast_helper.py
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -15,6 +15,15 @@
 #
 #================================================================================
 
+# The beginning of this script is both valid shell and valid python,
+# such that the script starts with the shell and is reexecuted with
+# the right python.
+#
+# The intent is to run as python3 on RHEL8 and python2 on RHEL7
+#
+'''which' python3 > /dev/null 2>&1 && exec python3 "$0" "$@" || exec python2 "$0" "$@"
+'''
+
 '''
 .. module:: cast_helper
     :platform: Linux
diff --git a/csm_big_data/python/findJobKeys.py b/csm_big_data/python/findJobKeys.py
index 91342e9d5..76d4379e5 100755
--- a/csm_big_data/python/findJobKeys.py
+++ b/csm_big_data/python/findJobKeys.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python2
+#!/bin/sh
 # encoding: utf-8
 #================================================================================
 #
 #    findJobKeys.py
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -15,6 +15,14 @@
 #
 #================================================================================
 
+# The beginning of this script is both valid shell and valid python,
+# such that the script starts with the shell and is reexecuted with
+# the right python.
+#
+# The intent is to run as python3 on RHEL8 and python2 on RHEL7
+#
+'''which' python3 > /dev/null 2>&1 && exec python3 "$0" "$@" || exec python2 "$0" "$@"
+'''
 
 import argparse
 import sys
diff --git a/csm_big_data/python/findJobMetrics.py b/csm_big_data/python/findJobMetrics.py
index acd8748e0..e20e2bed0 100755
--- a/csm_big_data/python/findJobMetrics.py
+++ b/csm_big_data/python/findJobMetrics.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python2
+#!/bin/sh
 # encoding: utf-8
 #================================================================================
 #
 #    findJobMetrics.py
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -15,6 +15,15 @@
 #
 #================================================================================
 
+# The beginning of this script is both valid shell and valid python,
+# such that the script starts with the shell and is reexecuted with
+# the right python.
+#
+# The intent is to run as python3 on RHEL8 and python2 on RHEL7
+#
+'''which' python3 > /dev/null 2>&1 && exec python3 "$0" "$@" || exec python2 "$0" "$@"
+'''
+
 import argparse
 import sys
 import os
diff --git a/csm_big_data/python/findJobTimeRange.py b/csm_big_data/python/findJobTimeRange.py
index 7792b09b2..6666228ed 100755
--- a/csm_big_data/python/findJobTimeRange.py
+++ b/csm_big_data/python/findJobTimeRange.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python2
+#!/bin/sh
 # encoding: utf-8
 #================================================================================
 #
 #    findJobTimeRange.py
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -15,6 +15,14 @@
 #
 #================================================================================
 
+# The beginning of this script is both valid shell and valid python,
+# such that the script starts with the shell and is reexecuted with
+# the right python.
+#
+# The intent is to run as python3 on RHEL8 and python2 on RHEL7
+#
+'''which' python3 > /dev/null 2>&1 && exec python3 "$0" "$@" || exec python2 "$0" "$@"
+'''
 
 import argparse
 import sys
diff --git a/csm_big_data/python/findJobsInRange.py b/csm_big_data/python/findJobsInRange.py
index aed376d72..fc0ee10f3 100755
--- a/csm_big_data/python/findJobsInRange.py
+++ b/csm_big_data/python/findJobsInRange.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python2
+#!/bin/sh
 # encoding: utf-8
 #================================================================================
 #
 #    findJobsInRange.py
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -15,6 +15,15 @@
 #
 #================================================================================
 
+# The beginning of this script is both valid shell and valid python,
+# such that the script starts with the shell and is reexecuted with
+# the right python.
+#
+# The intent is to run as python3 on RHEL8 and python2 on RHEL7
+#
+'''which' python3 > /dev/null 2>&1 && exec python3 "$0" "$@" || exec python2 "$0" "$@"
+'''
+
 import argparse
 import sys
 import os
diff --git a/csm_big_data/python/findJobsRunning.py b/csm_big_data/python/findJobsRunning.py
index bfa1d9200..0252a730b 100755
--- a/csm_big_data/python/findJobsRunning.py
+++ b/csm_big_data/python/findJobsRunning.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python2
+#!/bin/sh
 # encoding: utf-8
 #================================================================================
 #
 #    findJobsRunning.py
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -15,6 +15,15 @@
 #
 #================================================================================
 
+# The beginning of this script is both valid shell and valid python,
+# such that the script starts with the shell and is reexecuted with
+# the right python.
+#
+# The intent is to run as python3 on RHEL8 and python2 on RHEL7
+#
+'''which' python3 > /dev/null 2>&1 && exec python3 "$0" "$@" || exec python2 "$0" "$@"
+'''
+
 import argparse
 import sys
 import os
diff --git a/csm_big_data/python/findUserJobs.py b/csm_big_data/python/findUserJobs.py
index c895df793..011686e15 100755
--- a/csm_big_data/python/findUserJobs.py
+++ b/csm_big_data/python/findUserJobs.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python2
+#!/bin/sh
 # encoding: utf-8
 #================================================================================
 #
 #    findUserJobs.py
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -15,6 +15,14 @@
 #
 #================================================================================
 
+# The beginning of this script is both valid shell and valid python,
+# such that the script starts with the shell and is reexecuted with
+# the right python.
+#
+# The intent is to run as python3 on RHEL8 and python2 on RHEL7
+#
+'''which' python3 > /dev/null 2>&1 && exec python3 "$0" "$@" || exec python2 "$0" "$@"
+'''
 
 import argparse
 import sys
diff --git a/csm_big_data/python/findWeightedErrors.py b/csm_big_data/python/findWeightedErrors.py
index e1a0a6b1d..b9d4a8d92 100755
--- a/csm_big_data/python/findWeightedErrors.py
+++ b/csm_big_data/python/findWeightedErrors.py
@@ -1,10 +1,10 @@
-#!/usr/bin/python2
+#!/bin/sh
 # encoding: utf-8
 #================================================================================
 #
 #    findWeightedErrors.py
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -15,6 +15,14 @@
 #
 #================================================================================
 
+# The beginning of this script is both valid shell and valid python,
+# such that the script starts with the shell and is reexecuted with
+# the right python.
+#
+# The intent is to run as python3 on RHEL8 and python2 on RHEL7
+#
+'''which' python3 > /dev/null 2>&1 && exec python3 "$0" "$@" || exec python2 "$0" "$@"
+'''
 
 import argparse
 import json
diff --git a/csm_big_data/setupRPM.cmake b/csm_big_data/setupRPM.cmake
index aedac367c..daa10d5a5 100644
--- a/csm_big_data/setupRPM.cmake
+++ b/csm_big_data/setupRPM.cmake
@@ -20,6 +20,8 @@ set( CPACK_RPM_csm-bds_PRE_UNINSTALL_SCRIPT_FILE
     "${CMAKE_CURRENT_SOURCE_DIR}/csm_big_data/rpmscripts/cast-bds.pre.uninstall" )
 if(${EXPLICIT_PYTHON_VERSION})
    set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python2-psycopg2 >= 2.5.1")
+   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-dateutil >= 2.6.1")
+   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-elasticsearch >= 7.0.5")
 else()
    set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python-psycopg2 >= 2.5.1")
 endif()

From a0266bba5e07e0fac4f28da88b6c4987ac34cba0 Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Mon, 15 Jun 2020 18:11:10 -0400
Subject: [PATCH 3/9] Updated license field in csm_event_correlator.gemspec to
 fix build warning

---
 .../logstash-filter-csm_event_correlator.gemspec                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/csm_big_data/logstash/plugins/csm_event_correlator/logstash-filter-csm_event_correlator.gemspec b/csm_big_data/logstash/plugins/csm_event_correlator/logstash-filter-csm_event_correlator.gemspec
index d68fe901a..0e16baf54 100644
--- a/csm_big_data/logstash/plugins/csm_event_correlator/logstash-filter-csm_event_correlator.gemspec
+++ b/csm_big_data/logstash/plugins/csm_event_correlator/logstash-filter-csm_event_correlator.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = 'logstash-filter-csm-event-correlator'
   s.version         = "0.1.0"
-  s.licenses = ["Eclipse Public License v1.0"]
+  s.licenses = ["EPL-1.0"]
   s.summary = "A filter for generating RAS events in response to log patterns."
   s.description     = "This gem is a Logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program"
   s.authors = ["John Dunham"]

From 947415c62e4031b56c12e214bf04ca36e35dcc1f Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Tue, 16 Jun 2020 13:21:50 -0400
Subject: [PATCH 4/9] CSM BDS Python3: added import reduce in cast_helper.py

---
 csm_big_data/python/cast_helper.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/csm_big_data/python/cast_helper.py b/csm_big_data/python/cast_helper.py
index 67c1df09f..dfa7d9080 100755
--- a/csm_big_data/python/cast_helper.py
+++ b/csm_big_data/python/cast_helper.py
@@ -39,6 +39,7 @@
 from elasticsearch.serializer import JSONSerializer
 from elasticsearch import exceptions
 from datetime import datetime
+from functools import reduce
    
 TARGET_ENV='CAST_ELASTIC'
 

From fed74d40ca8c51646b8a6440a9f955fb9025579e Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Tue, 16 Jun 2020 13:33:59 -0400
Subject: [PATCH 5/9] CSM BDS python3: fixed string to int comparisons in
 cast_helper.py

---
 csm_big_data/python/cast_helper.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/csm_big_data/python/cast_helper.py b/csm_big_data/python/cast_helper.py
index dfa7d9080..4c1403f7e 100755
--- a/csm_big_data/python/cast_helper.py
+++ b/csm_big_data/python/cast_helper.py
@@ -317,7 +317,7 @@ def search_job( es, allocation_id=0, primary_job_id=0, secondary_job_id=0, size=
 
     query={ "bool" : { "should" : [] } }
     
-    if allocation_id > 0 : 
+    if int(allocation_id) > 0 : 
         query={ 
             "bool" : { 
                 "should" : [ 
@@ -325,7 +325,7 @@ def search_job( es, allocation_id=0, primary_job_id=0, secondary_job_id=0, size=
                 ] 
             } 
         }
-    elif primary_job_id > 0 and secondary_job_id >= 0:
+    elif int(primary_job_id) > 0 and int(secondary_job_id) >= 0:
         query={ 
             "bool" : { 
                 "should" : [ 

From b13f1f3908e25d8e38baf87e434cd5afc66177e2 Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Tue, 16 Jun 2020 13:49:17 -0400
Subject: [PATCH 6/9] CSM BDS python3: fixed key value lambda expressions

---
 csm_big_data/python/findUserJobs.py       | 2 +-
 csm_big_data/python/findWeightedErrors.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/csm_big_data/python/findUserJobs.py b/csm_big_data/python/findUserJobs.py
index 011686e15..3c1012404 100755
--- a/csm_big_data/python/findUserJobs.py
+++ b/csm_big_data/python/findUserJobs.py
@@ -155,7 +155,7 @@ def main(args):
         print("{0:>{1}} : {2}".format("node", max_width, "common count"))
         
         node_count=int(args.commonnodes)
-        for key,value in sorted( node_collisions.iteritems(), key=lambda (k,v): (v,k), reverse=False):
+        for key,value in sorted( node_collisions.iteritems(), key=lambda k_v: (k_v[1],k_v[0]), reverse=False):
             if int(value) > node_count:
                 collision_found = True
                 print("{0:>{1}} : {2}".format(key, max_width, value))
diff --git a/csm_big_data/python/findWeightedErrors.py b/csm_big_data/python/findWeightedErrors.py
index b9d4a8d92..c2bf62c9b 100755
--- a/csm_big_data/python/findWeightedErrors.py
+++ b/csm_big_data/python/findWeightedErrors.py
@@ -243,8 +243,8 @@ def main(args):
 
     print(" ")
     # Print the results.
-    for category, response in sorted(results.iteritems(), 
-            key=lambda (k, v): cast.deep_get( v, "hits", "max_score" ), reverse=True ):
+    for category, response in sorted(results.iteritems(),
+            key=lambda k_v1: cast.deep_get( k_v1[1], "hits", "max_score" ), reverse=True ):
 
         # Get aggregations. 
         aggregations = response.get("aggregations", [])
@@ -257,7 +257,7 @@ def main(args):
         if aggregations is not None:
             # Sort aggregations by document count.
             for (aggregation,value) in sorted(aggregations.iteritems(), 
-                    key=lambda (k, v): v.get("doc_count"), reverse=True):
+                    key=lambda k_v2: k_v2[1].get("doc_count"), reverse=True):
                 print("  \"{0}\" : {1}".format( aggregation, value.get("doc_count") ) ) 
 
         if args.verbose:

From 008e8364dab68f8b5cb8024d2be3eab55cbbb513 Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Tue, 16 Jun 2020 13:52:56 -0400
Subject: [PATCH 7/9] CSM BDS python3: removed unneeded import of sets

---
 csm_big_data/python/findWeightedErrors.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/csm_big_data/python/findWeightedErrors.py b/csm_big_data/python/findWeightedErrors.py
index c2bf62c9b..8efe69d98 100755
--- a/csm_big_data/python/findWeightedErrors.py
+++ b/csm_big_data/python/findWeightedErrors.py
@@ -26,7 +26,6 @@
 
 import argparse
 import json
-import sets
 import sys
 import os
 

From db1293f17602618b1b08a5d2005fd033363e2a7b Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Tue, 16 Jun 2020 14:13:03 -0400
Subject: [PATCH 8/9] Updated ibm-csm-bds rpm required packages

---
 csm_big_data/setupRPM.cmake | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/csm_big_data/setupRPM.cmake b/csm_big_data/setupRPM.cmake
index daa10d5a5..4ae5b810d 100644
--- a/csm_big_data/setupRPM.cmake
+++ b/csm_big_data/setupRPM.cmake
@@ -1,8 +1,8 @@
 #================================================================================
 #
-#    csm_big_data/castBDS.cmake
+#    csm_big_data/setupRPM.cmake
 #
-#    © Copyright IBM Corporation 2015-2018. All Rights Reserved
+#    © Copyright IBM Corporation 2015-2020. All Rights Reserved
 #
 #    This program is licensed under the terms of the Eclipse Public License
 #    v1.0 as published by the Eclipse Foundation and available at
@@ -20,10 +20,12 @@ set( CPACK_RPM_csm-bds_PRE_UNINSTALL_SCRIPT_FILE
     "${CMAKE_CURRENT_SOURCE_DIR}/csm_big_data/rpmscripts/cast-bds.pre.uninstall" )
 if(${EXPLICIT_PYTHON_VERSION})
    set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python2-psycopg2 >= 2.5.1")
-   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-dateutil >= 2.6.1")
-   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-elasticsearch >= 7.0.5")
+   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-dateutil >= 1.5")
+   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-elasticsearch >= 1.9.0")
 else()
    set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python-psycopg2 >= 2.5.1")
+   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python-dateutil >= 1.5")
+   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python-elasticsearch >= 1.9.0")
 endif()
 
 # Setup Kibana RPM

From 58edba9cd45808994c4eb2bdeac255f3863d6f05 Mon Sep 17 00:00:00 2001
From: besawn <38794505+besawn@users.noreply.github.com>
Date: Tue, 16 Jun 2020 16:45:40 -0400
Subject: [PATCH 9/9] Relaxed ibm-csm-bds required packages for RHEL7, handled
 via pip on that release

---
 csm_big_data/setupRPM.cmake | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/csm_big_data/setupRPM.cmake b/csm_big_data/setupRPM.cmake
index 4ae5b810d..b2ab3fcf0 100644
--- a/csm_big_data/setupRPM.cmake
+++ b/csm_big_data/setupRPM.cmake
@@ -20,12 +20,10 @@ set( CPACK_RPM_csm-bds_PRE_UNINSTALL_SCRIPT_FILE
     "${CMAKE_CURRENT_SOURCE_DIR}/csm_big_data/rpmscripts/cast-bds.pre.uninstall" )
 if(${EXPLICIT_PYTHON_VERSION})
    set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python2-psycopg2 >= 2.5.1")
-   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-dateutil >= 1.5")
-   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-elasticsearch >= 1.9.0")
+   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-dateutil >= 2.6")
+   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python3-elasticsearch >= 7.0")
 else()
    set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python-psycopg2 >= 2.5.1")
-   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python-dateutil >= 1.5")
-   set(CPACK_RPM_csm-bds_PACKAGE_REQUIRES "python-elasticsearch >= 1.9.0")
 endif()
 
 # Setup Kibana RPM