[system-health] Convert to Python 3 (#5886)

- Convert system-health scripts to Python 3
- Build and install system-health as a Python 3 wheel
- Also convert newlines from DOS to UNIX

files/build_templates/sonic_debian_extension.j2

@@ -201,12 +201,6 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install $PLATF
 sudo rm -rf $FILESYSTEM_ROOT/$PLATFORM_PDDF_COMMON_PY2_WHEEL_NAME
 {% endif %}
 
-# Install system-health Python 2 package
-SYSTEM_HEALTH_PY2_WHEEL_NAME=$(basename {{system_health_py2_wheel_path}})
-sudo cp {{system_health_py2_wheel_path}} $FILESYSTEM_ROOT/$SYSTEM_HEALTH_PY2_WHEEL_NAME
-sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install $SYSTEM_HEALTH_PY2_WHEEL_NAME
-sudo rm -rf $FILESYSTEM_ROOT/$SYSTEM_HEALTH_PY2_WHEEL_NAME
-
 # Install sonic-platform-common Python 3 package
 PLATFORM_COMMON_PY3_WHEEL_NAME=$(basename {{platform_common_py3_wheel_path}})
 sudo cp {{platform_common_py3_wheel_path}} $FILESYSTEM_ROOT/$PLATFORM_COMMON_PY3_WHEEL_NAME
@@ -219,6 +213,12 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip2 install thrift
 sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install thrift==0.13.0
 {% endif %}
 
+# Install system-health Python 3 package
+SYSTEM_HEALTH_PY3_WHEEL_NAME=$(basename {{system_health_py3_wheel_path}})
+sudo cp {{system_health_py3_wheel_path}} $FILESYSTEM_ROOT/$SYSTEM_HEALTH_PY3_WHEEL_NAME
+sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install $SYSTEM_HEALTH_PY3_WHEEL_NAME
+sudo rm -rf $FILESYSTEM_ROOT/$SYSTEM_HEALTH_PY3_WHEEL_NAME
+
 # Install prerequisites needed for installing the Python m2crypto package, used by sonic-utilities
 # These packages can be uninstalled after intallation
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install build-essential libssl-dev swig

rules/system-health.mk

@@ -1,9 +1,9 @@
-# system health python2 wheel
+# system health Python wheel
 
-SYSTEM_HEALTH = system_health-1.0-py2-none-any.whl
+SYSTEM_HEALTH = system_health-1.0-py3-none-any.whl
 $(SYSTEM_HEALTH)_SRC_PATH = $(SRC_PATH)/system-health
-$(SYSTEM_HEALTH)_PYTHON_VERSION = 2
-$(SYSTEM_HEALTH)_DEPENDS = $(SONIC_PY_COMMON_PY2) $(SWSSSDK_PY2) $(SONIC_CONFIG_ENGINE)
+$(SYSTEM_HEALTH)_PYTHON_VERSION = 3
+$(SYSTEM_HEALTH)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SWSSSDK_PY3) $(SONIC_CONFIG_ENGINE_PY3)
 SONIC_PYTHON_WHEELS += $(SYSTEM_HEALTH)
 
-export system_health_py2_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH))"
+export system_health_py3_wheel_path="$(addprefix $(PYTHON_WHEELS_PATH)/,$(SYSTEM_HEALTH))"

src/system-health/health_checker/manager.py

@@ -74,9 +74,9 @@ class HealthCheckerManager(object):
             from .health_checker import HealthChecker
             error_msg = 'Failed to perform health check for {} due to exception - {}'.format(checker, repr(e))
             entry = {str(checker): {
-                    HealthChecker.INFO_FIELD_OBJECT_STATUS: HealthChecker.STATUS_NOT_OK,
-                    HealthChecker.INFO_FIELD_OBJECT_MSG: error_msg
-                }}
+                HealthChecker.INFO_FIELD_OBJECT_STATUS: HealthChecker.STATUS_NOT_OK,
+                HealthChecker.INFO_FIELD_OBJECT_MSG: error_msg
+            }}
             if 'Internal' not in stats:
                 stats['Internal'] = entry
             else:

src/system-health/health_checker/user_defined_checker.py

@@ -19,6 +19,7 @@ class UserDefinedChecker(HealthChecker):
     Device2:OK
     Device3:Out of power
     """
+
     def __init__(self, cmd):
         """
         Constructor.

src/system-health/scripts/healthd

@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python3
 
 """
     healthd

src/system-health/setup.py

@@ -24,10 +24,10 @@ setup(
     scripts=[
         'scripts/healthd',
     ],
-    setup_requires= [
+    setup_requires=[
         'pytest-runner'
     ],
-    tests_require = [
+    tests_require=[
         'pytest',
         'mock>=2.0.0'
     ],
@@ -40,10 +40,9 @@ setup(
         'License :: OSI Approved :: Apache Software License',
         'Natural Language :: English',
         'Operating System :: POSIX :: Linux',
-        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3.7',
         'Topic :: System :: Hardware',
     ],
     keywords='SONiC sonic HEALTH health',
     test_suite='setup.get_test_suite'
 )
-

src/system-health/tests/mock_connector.py

@@ -22,4 +22,3 @@ class MockConnector(object):
 
     def get_all(self, db_id, key):
         return MockConnector.data[key]
-