Skip to content

Lldp docker to use python3 version of sonic-db-syncd package. #6046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 5 commits into from
Nov 30, 2020
Merged

Lldp docker to use python3 version of sonic-db-syncd package. #6046

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a26b5ff
[submodule update] sonic-db-syncd
abdosi Nov 26, 2020
807ea35
Removed blank line.
abdosi Nov 26, 2020
d9df3ba
Updated Submodule
abdosi Nov 26, 2020
8247450
Updated monit check from python 2 to 3
abdosi Nov 26, 2020
62a5daa
Removed python2 swssdk
abdosi Nov 26, 2020
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/supervisord.conf.j2
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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)
2 changes: 1 addition & 1 deletion rules/docker-lldp.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ $(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
Open in desktop
Submodule sonic-dbsyncd updated from 95824a to 5c2337