[pull] master from Azure:master

dockers/docker-sonic-telemetry/base_image_files/monit_telemetry

@@ -1,14 +1,5 @@
 ###############################################################################
 ## Monit configuration for telemetry container
-## process list:
-##  telemetry
-##  dialout_client
 ###############################################################################
-check program telemetry|telemetry with path "/usr/bin/process_checker telemetry /usr/sbin/telemetry"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
-check program telemetry|dialout_client with path "/usr/bin/process_checker telemetry /usr/sbin/dialout_client_cli"
-    if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles
-
 check program container_memory_telemetry with path "/usr/bin/memory_checker telemetry 419430400"
     if status == 3 for 10 times within 20 cycles then exec "/usr/bin/restart_service telemetry"

files/build_templates/sonic_debian_extension.j2

@@ -330,8 +330,6 @@ sudo cp $IMAGE_CONFIGS/monit/monitrc $FILESYSTEM_ROOT/etc/monit/
 sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/monitrc
 sudo cp $IMAGE_CONFIGS/monit/conf.d/* $FILESYSTEM_ROOT/etc/monit/conf.d/
 sudo chmod 600 $FILESYSTEM_ROOT/etc/monit/conf.d/*
-sudo cp $IMAGE_CONFIGS/monit/process_checker $FILESYSTEM_ROOT/usr/bin/
-sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/process_checker
 sudo cp $IMAGE_CONFIGS/monit/container_checker $FILESYSTEM_ROOT/usr/bin/
 sudo chmod 755 $FILESYSTEM_ROOT/usr/bin/container_checker
 sudo cp $IMAGE_CONFIGS/monit/memory_checker $FILESYSTEM_ROOT/usr/bin/

platform/barefoot/docker-syncd-bfn.mk

@@ -15,5 +15,3 @@ $(DOCKER_SYNCD_BASE)_VERSION = 1.0.0
 $(DOCKER_SYNCD_BASE)_PACKAGE_NAME = syncd
 
 $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /host/warmboot:/var/warmboot
-
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d

platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py

@@ -3,8 +3,8 @@
 try:
     import sys
     from sonic_platform_base.chassis_base import ChassisBase
-    from sonic_platform.sfp import Sfp
-    from sonic_platform.psu import Psu
+    from sonic_platform.sfp import Sfp, sfp_list_get
+    from sonic_platform.psu import psu_list_get
     from sonic_platform.fan_drawer import fan_drawer_list_get
     from sonic_platform.thermal import thermal_list_get
     from eeprom import Eeprom
@@ -18,18 +18,21 @@ class Chassis(ChassisBase):
     def __init__(self):
         ChassisBase.__init__(self)
 
-        self._eeprom = Eeprom()
-
-        for index in range(Sfp.port_start(), Sfp.port_end() + 1):
-            sfp_node = Sfp(index)
-            self._sfp_list.append(sfp_node)
-
-        for i in range(1, Psu.get_num_psus() + 1):
-            psu = Psu(i)
-            self._psu_list.append(psu)
-
+        self.__eeprom = None
         self.__fan_drawers = None
         self.__thermals = None
+        self.__psu_list = None
+        self.__sfp_list = None
+
+    @property
+    def _eeprom(self):
+        if self.__eeprom is None:
+            self.__eeprom = Eeprom()
+        return self.__eeprom
+
+    @_eeprom.setter
+    def _eeprom(self, value):
+        pass
 
     @property
     def _fan_drawer_list(self):
@@ -51,6 +54,26 @@ def _thermal_list(self):
     def _thermal_list(self, value):
         pass
 
+    @property
+    def _psu_list(self):
+        if self.__psu_list is None:
+            self.__psu_list = psu_list_get()
+        return self.__psu_list
+
+    @_psu_list.setter
+    def _psu_list(self, value):
+        pass
+
+    @property
+    def _sfp_list(self):
+        if self.__sfp_list is None:
+            self.__sfp_list = sfp_list_get()
+        return self.__sfp_list
+
+    @_sfp_list.setter
+    def _sfp_list(self, value):
+        pass
+
     def get_name(self):
         """
         Retrieves the name of the chassis

platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/psu.py

@@ -104,3 +104,10 @@ def get_model(self):
 
     def is_replaceable(self):
         return True
+
+def psu_list_get():
+    psu_list = []
+    for i in range(1, Psu.get_num_psus() + 1):
+        psu = Psu(i)
+        psu_list.append(psu)
+    return psu_list

platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/sfp.py

@@ -269,3 +269,10 @@ def get_transceiver_threshold_info(self):
 
     def get_change_event(self, timeout=0):
         return Sfp.get_transceiver_change_event(timeout)
+
+def sfp_list_get():
+    sfp_list = []
+    for index in range(Sfp.port_start(), Sfp.port_end() + 1):
+        sfp_node = Sfp(index)
+        sfp_list.append(sfp_node)
+    return sfp_list

platform/broadcom/docker-syncd-brcm.mk

@@ -20,4 +20,3 @@ $(DOCKER_SYNCD_BASE)_RUN_OPT += -v /usr/share/sonic/device/x86_64-broadcom_commo
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmcmd:/usr/bin/bcmcmd
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcmsh:/usr/bin/bcmsh
 $(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += bcm_common:/usr/bin/bcm_common
-$(DOCKER_SYNCD_BASE)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d

platform/cavium/docker-syncd-cavm.mk

@@ -23,4 +23,3 @@ $(DOCKER_SYNCD_CAVM)_CONTAINER_NAME = syncd
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += --net=host --privileged -t
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
 $(DOCKER_SYNCD_CAVM)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro
-$(DOCKER_SYNCD_CAVM)_BASE_IMAGE_FILES += monit_syncd:/etc/monit/conf.d