matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[swsssdk]: Update nomenclature: 'sswsdk' -> 'swsssdk' (#445)

Browse Source
This commit is contained in:
Joe LeVeque 2017-03-30 11:51:05 -07:00 committed by GitHub
parent 94934f7b3b
commit 71d299bed4
14 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dockers/docker-lldp-sv2/Dockerfile.j2
View File

@ -13,16 +13,16 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y python-pip supervisor libbsd0 libevent-2.0-5 libjansson4 libwrap0 libxml2 libpci3 libperl5.20 RUN apt-get update && apt-get install -y python-pip supervisor libbsd0 libevent-2.0-5 libjansson4 libwrap0 libxml2 libpci3 libperl5.20
## Pre-install the fundamental packages # Pre-install the fundamental packages
## Install Python SSWSDK # Install Python SwSS SDK
## Install LLDP Sync Daemon # Install LLDP Sync Daemon
RUN dpkg -i \ RUN dpkg -i \
{% for deb in docker_lldp_sv2_debs.split(' ') -%} {% for deb in docker_lldp_sv2_debs.split(' ') -%}
debs/{{ deb }}{{' '}} debs/{{ deb }}{{' '}}
{%- endfor %} {%- endfor %}
RUN pip install /python-wheels/sswsdk-2.0.1-py2-none-any.whl && \ RUN pip install /python-wheels/swsssdk-2.0.1-py2-none-any.whl && \
pip install /python-wheels/sonic_d-2.0.0-py2-none-any.whl && \ pip install /python-wheels/sonic_d-2.0.0-py2-none-any.whl && \
apt-get remove -y python-pip && \ apt-get remove -y python-pip && \
apt-get purge -y && apt-get autoclean -y && apt-get autoremove -y && \ apt-get purge -y && apt-get autoclean -y && apt-get autoremove -y && \

16
dockers/docker-lldp/Dockerfile
View File

@ -1,21 +1,21 @@
FROM docker-base FROM docker-base
COPY deps/sswsdk*.whl deps/lldpsyncd_*.deb deps/lldpd_*.deb /deps/ COPY deps/swsssdk*.whl deps/lldpsyncd_*.deb deps/lldpd_*.deb /deps/
## Make apt-get non-interactive # Make apt-get non-interactive
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
## Pre-install the fundamental packages # Pre-install the fundamental packages
## Install Python SSWSDK (lldpsyncd dependency) # Install Python SwSS SDK (lldpsyncd dependency)
## Install LLDP Sync Daemon # Install LLDP Sync Daemon
## Note: dpkg_apt function has the benefit to detect missing .deb file # Note: dpkg_apt function has the benefit to detect missing .deb file
## Clean up # Clean up
RUN apt-get update && \ RUN apt-get update && \
dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } && \ dpkg_apt() { [ -f $1 ] && { dpkg -i $1 || apt-get -y install -f; } || return 1; } && \
dpkg_apt /deps/lldpd_*.deb && \ dpkg_apt /deps/lldpd_*.deb && \
dpkg_apt /deps/lldpsyncd_*.deb && \ dpkg_apt /deps/lldpsyncd_*.deb && \
apt-get install -y python-pip supervisor && \ apt-get install -y python-pip supervisor && \
pip install /deps/sswsdk*.whl && \ pip install /deps/swsssdk*.whl && \
apt-get remove -y python-pip && \ apt-get remove -y python-pip && \
apt-get purge -y && apt-get autoclean -y && apt-get autoremove -y && \ apt-get purge -y && apt-get autoclean -y && apt-get autoremove -y && \
rm -rf /deps ~/.cache rm -rf /deps ~/.cache

3
dockers/docker-snmp-sv2/Dockerfile.j2
View File

@ -6,7 +6,8 @@ COPY [ \
{%- endfor %} \ {%- endfor %} \
"/debs/"] "/debs/"]
COPY python-wheels/sswsdk-*-py3-*.whl /python-wheels/ # Install Python SwSSSDK (SNMP subagent dependency)
COPY python-wheels/swsssdk-*-py3-*.whl /python-wheels/
COPY python-wheels/asyncsnmp-*-py3-*.whl /python-wheels/ COPY python-wheels/asyncsnmp-*-py3-*.whl /python-wheels/
# enable -O for all Python calls # enable -O for all Python calls

1
dockers/docker-snmp/Dockerfile
View File

@ -10,7 +10,6 @@ ENV PYTHONOPTIMIZE 1
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
## Pre-install the fundamental packages ## Pre-install the fundamental packages
## Install Python SSWSDK (SNMP subagent dependency)
## Install SNMP subagent ## Install SNMP subagent
## Note: dpkg_apt function has the benefit to detect missing .deb file ## Note: dpkg_apt function has the benefit to detect missing .deb file
## Clean up ## Clean up

2
rules/asyncsnmp-py3.mk
View File

@ -3,5 +3,5 @@
ASYNCSNMP_PY3 = asyncsnmp-2.1.0-py3-none-any.whl ASYNCSNMP_PY3 = asyncsnmp-2.1.0-py3-none-any.whl
$(ASYNCSNMP_PY3)_SRC_PATH = $(SRC_PATH)/sonic-snmpagent $(ASYNCSNMP_PY3)_SRC_PATH = $(SRC_PATH)/sonic-snmpagent
$(ASYNCSNMP_PY3)_PYTHON_VERSION = 3 $(ASYNCSNMP_PY3)_PYTHON_VERSION = 3
$(ASYNCSNMP_PY3)_DEPENDS += $(SSWSDK_PY3) $(ASYNCSNMP_PY3)_DEPENDS += $(SWSSSDK_PY3)
SONIC_PYTHON_WHEELS += $(ASYNCSNMP_PY3) SONIC_PYTHON_WHEELS += $(ASYNCSNMP_PY3)

2
rules/dbsyncd-py2.mk
View File

@ -3,5 +3,5 @@
DBSYNCD_PY2 = sonic_d-2.0.0-py2-none-any.whl DBSYNCD_PY2 = sonic_d-2.0.0-py2-none-any.whl
$(DBSYNCD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-dbsyncd $(DBSYNCD_PY2)_SRC_PATH = $(SRC_PATH)/sonic-dbsyncd
$(DBSYNCD_PY2)_PYTHON_VERSION = 2 $(DBSYNCD_PY2)_PYTHON_VERSION = 2
$(DBSYNCD_PY2)_DEPENDS += $(SSWSDK_PY2) $(DBSYNCD_PY2)_DEPENDS += $(SWSSSDK_PY2)
SONIC_PYTHON_WHEELS += $(DBSYNCD_PY2) SONIC_PYTHON_WHEELS += $(DBSYNCD_PY2)

6
rules/sswsdk-py2.mk
View File

@ -1,6 +0,0 @@
# sswsdk python2 wheel
SSWSDK_PY2 = sswsdk-2.0.1-py2-none-any.whl
$(SSWSDK_PY2)_SRC_PATH = $(SRC_PATH)/sonic-py-swsssdk
$(SSWSDK_PY2)_PYTHON_VERSION = 2
SONIC_PYTHON_WHEELS += $(SSWSDK_PY2)

8
rules/sswsdk-py3.mk
View File

@ -1,8 +0,0 @@
# sswsdk python3 wheel
SSWSDK_PY3 = sswsdk-2.0.1-py3-none-any.whl
$(SSWSDK_PY3)_SRC_PATH = $(SRC_PATH)/sonic-py-swsssdk
$(SSWSDK_PY3)_PYTHON_VERSION = 3
# Synthetic dependency just to avoid race condition
$(SSWSDK_PY3)_DEPENDS += $(SSWSDK_PY2)
SONIC_PYTHON_WHEELS += $(SSWSDK_PY3)

6
rules/swsssdk-py2.mk Normal file
View File

@ -0,0 +1,6 @@
# swsssdk python2 wheel
SWSSSDK_PY2 = swsssdk-2.0.1-py2-none-any.whl
$(SWSSSDK_PY2)_SRC_PATH = $(SRC_PATH)/sonic-py-swsssdk
$(SWSSSDK_PY2)_PYTHON_VERSION = 2
SONIC_PYTHON_WHEELS += $(SWSSSDK_PY2)

8
rules/swsssdk-py3.mk Normal file
View File

@ -0,0 +1,8 @@
# swsssdk python3 wheel
SWSSSDK_PY3 = swsssdk-2.0.1-py3-none-any.whl
$(SWSSSDK_PY3)_SRC_PATH = $(SRC_PATH)/sonic-py-swsssdk
$(SWSSSDK_PY3)_PYTHON_VERSION = 3
# Synthetic dependency just to avoid race condition
$(SWSSSDK_PY3)_DEPENDS += $(SWSSSDK_PY2)
SONIC_PYTHON_WHEELS += $(SWSSSDK_PY3)

2
src/sonic-dbsyncd

@ -1 +1 @@
Subproject commit 3d30cfc9318d03652df01c0871090f5ef6c8ccb2 Subproject commit 812f2cd50f83c1b83fbfc2688752e969cd5cd6f9

2
src/sonic-py-swsssdk

@ -1 +1 @@
Subproject commit 497bdfe64c3ddc2ce711ec8a2b0839d9d26f5666 Subproject commit ebb5ec6870acccfde267e513d68d107873b0960e

2
src/sonic-snmpagent

@ -1 +1 @@
Subproject commit c0e022addaaa0af857331d36e3766a88a2095941 Subproject commit d39b66b354af4db07313af82341fdc20762e89fc

2
src/sonic-utilities

@ -1 +1 @@
Subproject commit edbda467002700230f89a7362a21b3d3909b1079 Subproject commit 5c59ec6b8e067dab8c3d786432d6d2c9b961ec78