Skip to content

Commit 4d6d808

Browse files
assrinivasanassrinivasan
authored
Added makefile and dependencies for building sonic-stormond whl (sonic-net#19042)
* Added makefile and dependencies for building sonic-stormond whl * Added sonic-stormond to supervisord and wheel to pmon container makefile * Advanced submodules of platform-common and daemons to pick up stormond * Changed the import path of ssdutil in vendor ssdutil to match stormon changes * Advancing the sonic-utilities submodule to include stormon-related change * Advanced sonic-platform-daemons submodule to the latest HEAD * Advanced sonic-utilities to include fix for test_iface_namingmode
1 parent 268e02f commit 4d6d808

File tree

16 files changed

+53
-20
lines changed

16 files changed

+53
-20
lines changed

‎device/arista/x86_64-arista_common/plugins/ssd_util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
try:
33
from arista.utils.sonic_ssd import SsdUtil
44
except ImportError:
5-
from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil
5+
from sonic_platform_base.sonic_storage.ssd import SsdUtil

‎device/micas/arm64-micas_m2-w6010-48gt4x-fa-r0/plugins/ssd_util.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
try:
1111
import subprocess
12-
from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
12+
from sonic_platform_base.sonic_storage.storage_base import StorageBase
1313
except ImportError as e:
1414
raise ImportError (str(e) + "- required module not found")
1515

@@ -18,7 +18,7 @@
1818
FIRMWARE_CMD = "cat /sys/kernel/debug/mmc0/mmc0:0001/ext_csd | cut -c 509-522"
1919
NOT_AVAILABLE = "N/A"
2020

21-
class SsdUtil(SsdBase):
21+
class SsdUtil(StorageBase):
2222
"""
2323
Generic implementation of the SSD health API
2424
"""

‎device/micas/arm64-micas_m2-w6010-48gt4x-ra-r0/plugins/ssd_util.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
try:
1111
import subprocess
12-
from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
12+
from sonic_platform_base.sonic_storage.storage_base import StorageBase
1313
except ImportError as e:
1414
raise ImportError (str(e) + "- required module not found")
1515

@@ -18,7 +18,7 @@
1818
FIRMWARE_CMD = "cat /sys/kernel/debug/mmc0/mmc0:0001/ext_csd | cut -c 509-522"
1919
NOT_AVAILABLE = "N/A"
2020

21-
class SsdUtil(SsdBase):
21+
class SsdUtil(StorageBase):
2222
"""
2323
Generic implementation of the SSD health API
2424
"""

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/plugins/ssd_util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
try:
22
from sonic_ssd import SsdUtil
33
except ImportError:
4-
from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil
4+
from sonic_platform_base.sonic_storage.ssd import SsdUtil

‎device/nvidia-bluefield/arm64-nvda_bf-9009d3b600cvaa/plugins/ssd_util.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
import os
33

4-
from sonic_platform_base.sonic_ssd.ssd_emmc import EmmcUtil
5-
from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil as SsdUtilDefault
4+
from sonic_platform_base.sonic_storage.emmc import EmmcUtil
5+
from sonic_platform_base.sonic_storage.ssd import SsdUtil as SsdUtilDefault
66

77
def SsdUtil(diskdev):
88
if os.path.basename(diskdev).startswith('mmcblk'):

‎device/pensando/arm64-elba-asic-r0/plugins/ssd_util.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
try:
1111
import re
1212
import subprocess
13-
from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
13+
from sonic_platform_base.sonic_storage.storage_base import StorageBase
1414
except ImportError as e:
1515
raise ImportError (str(e) + "- required module not found")
1616

1717
NOT_AVAILABLE = "N/A"
1818
MMC_DATA_PATH = "/sys/class/mmc_host/mmc0/mmc0:0001/{}"
1919

20-
class SsdUtil(SsdBase):
20+
class SsdUtil(StorageBase):
2121
"""
2222
Generic implementation of the SSD health API
2323
"""

‎device/ragile/x86_64-ragile_ra-b6510-48v8c-r0/plugins/ssd_util.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import re
1212
import os
1313
import subprocess
14-
from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
14+
from sonic_platform_base.sonic_storage.storage_base import StorageBase
1515
except ImportError as e:
1616
raise ImportError (str(e) + "- required module not found")
1717

@@ -30,7 +30,7 @@
3030
INNODISK_HEALTH_ID = 169
3131
INNODISK_TEMPERATURE_ID = 194
3232

33-
class SsdUtil(SsdBase):
33+
class SsdUtil(StorageBase):
3434
"""
3535
Generic implementation of the SSD health API
3636
"""

‎device/ragile/x86_64-ragile_ra-b6920-4s-r0/plugins/ssd_util.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
# ssd_health
33
#
44

5-
from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
5+
from sonic_platform_base.sonic_storage.storage_base import StorageBase
66
from subprocess import Popen, PIPE
77
from re import findall
88
from os.path import exists
99

1010
NOT_AVAILABLE = "N/A"
1111

12-
class SsdUtil(SsdBase):
12+
class SsdUtil(StorageBase):
1313

1414
def __init__(self, diskdev):
1515
"""

‎device/supermicro/x86_64-supermicro_sse_t7132s-r0/plugins/ssd_util.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil as SsdUtilGeneric
1+
from sonic_platform_base.sonic_storage.ssd import SsdUtil as SsdUtilGeneric
22

33
class SsdUtil(SsdUtilGeneric):
44
def parse_innodisk_info(self):

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

+13
Original file line numberDiff line numberDiff line change
@@ -206,3 +206,16 @@ startsecs=10
206206
dependent_startup=true
207207
dependent_startup_wait_for=rsyslogd:running
208208
{% endif %}
209+
210+
{% if not skip_stormond %}
211+
[program:stormond]
212+
command=/usr/local/bin/stormond
213+
priority=10
214+
autostart=false
215+
autorestart=unexpected
216+
stdout_logfile=syslog
217+
stderr_logfile=syslog
218+
startsecs=10
219+
dependent_startup=true
220+
dependent_startup_wait_for=rsyslogd:running
221+
{% endif %}

‎platform/marvell/sonic-platform-nokia/7215-a1/utils/sonic_ssd.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import os
33

44
# pylint: disable=import-error
5-
from sonic_platform_base.sonic_ssd.ssd_base import SsdBase
6-
from sonic_platform_base.sonic_ssd.ssd_generic import SsdUtil as SsdUtilDefault
5+
from sonic_platform_base.sonic_storage.storage_base import StorageBase
6+
from sonic_platform_base.sonic_storage.ssd import SsdUtil as SsdUtilDefault
77

8-
class EmmcUtil(SsdBase):
8+
class EmmcUtil(StorageBase):
99
def __init__(self, diskdev):
1010
self.diskdev = diskdev
1111
self.path = os.path.join('/sys/block', os.path.basename(diskdev))

‎rules/docker-platform-monitor.mk

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ $(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_SENSORMOND_PY3)
2222
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_XCVRD_PY3)
2323
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_YCABLED_PY3)
2424
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_CHASSISD_PY3)
25+
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(SONIC_STORMOND_PY3)
2526

2627
ifeq ($(PDDF_SUPPORT),y)
2728
$(DOCKER_PLATFORM_MONITOR)_PYTHON_WHEELS += $(PDDF_PLATFORM_API_BASE_PY3)

‎rules/sonic-stormond.dep

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
SPATH:= $($(SONIC_STORMOND_PY3)_SRC_PATH)
2+
DEP_FILES:= $(SONIC_COMMON_FILES_LIST) rules/sonic-stormond.mk rules/sonic-stormond.dep
3+
DEP_FILES+= $(SONIC_COMMON_BASE_FILES_LIST)
4+
SMDEP_FILES:= $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))
5+
6+
$(SONIC_STORMOND_PY3)_CACHE_MODE:= GIT_CONTENT_SHA
7+
$(SONIC_STORMOND_PY3)_DEP_FLAGS:= $(SONIC_COMMON_FLAGS_LIST)
8+
$(SONIC_STORMOND_PY3)_DEP_FILES:= $(DEP_FILES)
9+
$(SONIC_STORMOND_PY3)_SMDEP_FILES:= $(SMDEP_FILES)
10+
$(SONIC_STORMOND_PY3)_SMDEP_PATHS:= $(SPATH)

‎rules/sonic-stormond.mk

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# sonic-stormond (SONiC Storage Monitoring daemon) Debian package
2+
3+
# SONIC_STORMOND_PY3 package
4+
5+
SONIC_STORMOND_PY3 = sonic_stormond-1.0-py3-none-any.whl
6+
$(SONIC_STORMOND_PY3)_SRC_PATH = $(SRC_PATH)/sonic-platform-daemons/sonic-stormond
7+
$(SONIC_STORMOND_PY3)_DEPENDS = $(SONIC_PY_COMMON_PY3)
8+
$(SONIC_STORMOND_PY3)_PYTHON_VERSION = 3
9+
SONIC_PYTHON_WHEELS += $(SONIC_STORMOND_PY3)

‎src/sonic-platform-common

‎src/sonic-utilities

Submodule sonic-utilities updated 93 files

0 commit comments

Comments
 (0)