Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dockers/docker-lldp/base_image_files/monit_lldp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
check program lldp|lldpd_monitor with path "/usr/bin/process_checker lldp lldpd:"
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles

check program lldp|lldp_syncd with path "/usr/bin/process_checker lldp python2 -m lldp_syncd"
check program lldp|lldp_syncd with path "/usr/bin/process_checker lldp python3 -m lldp_syncd"
if status != 0 for 5 times within 5 cycles then alert repeat every 1 cycles

check program lldp|lldpmgrd with path "/usr/bin/process_checker lldp python3 /usr/bin/lldpmgrd"
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-lldp/supervisord.conf.j2
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ dependent_startup=true
dependent_startup_wait_for=lldpd:running

[program:lldp-syncd]
command=/usr/bin/env python2 -m lldp_syncd
command=/usr/bin/env python3 -m lldp_syncd
priority=4
autostart=false
autorestart=false
Expand Down
11 changes: 11 additions & 0 deletions rules/dbsyncd-py3.dep
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
SPATH := $($(DBSYNCD_PY3)_SRC_PATH)
DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/dbsyncd-py3.mk rules/dbsyncd-py3.dep
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files))

$(DBSYNCD_PY3)_CACHE_MODE := GIT_CONTENT_SHA
$(DBSYNCD_PY3)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
$(DBSYNCD_PY3)_DEP_FILES := $(DEP_FILES)
$(DBSYNCD_PY3)_SMDEP_FILES := $(SMDEP_FILES)
$(DBSYNCD_PY3)_SMDEP_PATHS := $(SPATH)

7 changes: 7 additions & 0 deletions rules/dbsyncd-py3.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# sonic-dbsyncd python3 wheel

DBSYNCD_PY3 = sonic_d-2.0.0-py3-none-any.whl
$(DBSYNCD_PY3)_SRC_PATH = $(SRC_PATH)/sonic-dbsyncd
$(DBSYNCD_PY3)_PYTHON_VERSION = 3
$(DBSYNCD_PY3)_DEPENDS += $(SWSSSDK_PY3)
SONIC_PYTHON_WHEELS += $(DBSYNCD_PY3)
4 changes: 2 additions & 2 deletions rules/docker-lldp.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ DOCKER_LLDP_DBG = $(DOCKER_LLDP_STEM)-$(DBG_IMAGE_MARK).gz

$(DOCKER_LLDP)_PATH = $(DOCKERS_PATH)/docker-lldp

$(DOCKER_LLDP)_DEPENDS += $(LLDPD) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON) $(PYTHON3_SWSSCOMMON)
$(DOCKER_LLDP)_DEPENDS += $(LLDPD) $(LIBSWSSCOMMON) $(PYTHON3_SWSSCOMMON)

$(DOCKER_LLDP)_DBG_DEPENDS = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_DEPENDS)
$(DOCKER_LLDP)_DBG_DEPENDS += $(LLDPD_DBG) $(LIBSWSSCOMMON_DBG)

$(DOCKER_LLDP)_DBG_IMAGE_PACKAGES = $($(DOCKER_CONFIG_ENGINE_BUSTER)_DBG_IMAGE_PACKAGES)

$(DOCKER_LLDP)_PYTHON_WHEELS += $(DBSYNCD_PY2)
$(DOCKER_LLDP)_PYTHON_WHEELS += $(DBSYNCD_PY3)
$(DOCKER_LLDP)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE_BUSTER)

SONIC_DOCKER_IMAGES += $(DOCKER_LLDP)
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-dbsyncd