fix build error (#9902)

Signed-off-by: vaibhav-dahiya <vdahiya@microsoft.com>

device/virtual/x86_64-kvm_x86_64-r0/pmon_daemon_control.json

@@ -4,5 +4,6 @@
     "skip_pcied": true,
     "skip_psud": true,
     "skip_syseepromd": true,
-    "skip_thermalctld": true
+    "skip_thermalctld": true,
+    "skip_ycabled": false
 }

dockers/docker-platform-monitor/docker-pmon.supervisord.conf.j2

@@ -97,10 +97,29 @@ dependent_startup=true
 dependent_startup_wait_for=rsyslogd:running
 {% endif %}
 
+{% if 'subtype' in DEVICE_METADATA['localhost'] and DEVICE_METADATA['localhost']['subtype'] == 'DualToR' %}
+{% if not skip_ycabled %}
+[program:ycabled]
+{% if delay_ycabled %}
+command=bash -c "sleep 30 && nice -n -20 python3 /usr/local/bin/ycabled"
+{% else %}
+command=nice -n -20 python3 /usr/local/bin/ycabled
+{% endif %}
+priority=7
+autostart=false
+autorestart=unexpected
+stdout_logfile=syslog
+stderr_logfile=syslog
+startsecs=10
+dependent_startup=true
+dependent_startup_wait_for=rsyslogd:running
+{% endif %}
+{% endif %}
+
 {% if not skip_psud %}
 [program:psud]
 command={% if API_VERSION == 3 and 'psud' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/psud
-priority=7
+priority=8
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
@@ -113,7 +132,7 @@ dependent_startup_wait_for=rsyslogd:running
 {% if not skip_syseepromd %}
 [program:syseepromd]
 command={% if API_VERSION == 3 and 'syseepromd' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/syseepromd
-priority=8
+priority=9
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
@@ -126,7 +145,7 @@ dependent_startup_wait_for=rsyslogd:running
 {% if not skip_thermalctld %}
 [program:thermalctld]
 command={% if API_VERSION == 3 and 'thermalctld' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/thermalctld
-priority=9
+priority=10
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog
@@ -140,7 +159,7 @@ dependent_startup_wait_for=rsyslogd:running
 {% if not skip_pcied %}
 [program:pcied]
 command={% if API_VERSION == 3 and 'pcied' not in python2_daemons %}python3 {% else %} python2 {% endif %}/usr/local/bin/pcied
-priority=10
+priority=11
 autostart=false
 autorestart=unexpected
 stdout_logfile=syslog

dockers/docker-platform-monitor/docker_init.j2

@@ -105,9 +105,9 @@ confvar="{\"HAVE_SENSORS_CONF\":$HAVE_SENSORS_CONF, \"HAVE_FANCONTROL_CONF\":$HA
 
 if [ -e $PMON_DAEMON_CONTROL_FILE ];
 then
-    sonic-cfggen -j $PMON_DAEMON_CONTROL_FILE -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE
+    sonic-cfggen -d -j $PMON_DAEMON_CONTROL_FILE -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE
 else
-    sonic-cfggen -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE
+    sonic-cfggen -d -a "$confvar" -t $SUPERVISOR_CONF_TEMPLATE > $SUPERVISOR_CONF_FILE
 fi
 
 exec /usr/local/bin/supervisord

rules/docker-platform-monitor.mk

@@ -29,6 +29,7 @@ $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_PSUD_PY3)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_SYSEEPROMD_PY3)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_THERMALCTLD_PY3)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_XCVRD_PY3)
+$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_YCABLED_PY3)
 $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_CHASSISD_PY3)
 
 ifeq ($(PDDF_SUPPORT),y)

rules/sonic-ycabled.dep

@@ -0,0 +1,10 @@
+SPATH       := $($(SONIC_YCABLED_PY3)_SRC_PATH)
+DEP_FILES   := $(SONIC_COMMON_FILES_LIST) rules/sonic-ycabled.mk rules/sonic-ycabled.dep
+DEP_FILES   += $(SONIC_COMMON_BASE_FILES_LIST)
+SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
+
+$(SONIC_YCABLED_PY3)_CACHE_MODE  := GIT_CONTENT_SHA
+$(SONIC_YCABLED_PY3)_DEP_FLAGS   := $(SONIC_COMMON_FLAGS_LIST)
+$(SONIC_YCABLED_PY3)_DEP_FILES   := $(DEP_FILES)
+$(SONIC_YCABLED_PY3)_SMDEP_FILES := $(SMDEP_FILES)
+$(SONIC_YCABLED_PY3)_SMDEP_PATHS := $(SPATH)

rules/sonic-ycabled.mk

@@ -0,0 +1,10 @@
+# sonic-ycabled (SONiC Y-Cable daemon) Debian package
+
+# SONIC_YCABLED_PY3 package
+
+SONIC_YCABLED_PY3 = sonic_ycabled-1.0-py3-none-any.whl
+$(SONIC_YCABLED_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-ycabled
+$(SONIC_YCABLED_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3) $(SONIC_PLATFORM_COMMON_PY3)
+$(SONIC_YCABLED_PY3)_DEBS_DEPENDS = $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)
+$(SONIC_YCABLED_PY3)_PYTHON_VERSION = 3
+SONIC_PYTHON_WHEELS += $(SONIC_YCABLED_PY3)

src/sonic-platform-daemons

@@ -1 +1 @@
-Subproject commit d6ae3ef074792f145437c6e2f04262696ea25019
+Subproject commit 0328497966cdc750055ed47cef71f1f89f614b41