Skip to content

Commit 037cb93

Browse files
marian-pritsakmarian-pritsak
committed
Add ENABLE_SYNCD_RPC option
Under rules/config now there's additional configuration option ENABLE_SYNCD_RPC that allows building SONIC installer with docker-syncd-*-rpc for evaluation purposes. Signed-off-by: marian-pritsak <[email protected]>
1 parent 17f0633 commit 037cb93

11 files changed

+51
-0
lines changed

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ DOCKER_MGMT_BUILD = docker build --no-cache \
5353
PLATFORM=$(PLATFORM) \
5454
BUILD_NUMBER=$(BUILD_NUMBER) \
5555
ENABLE_DHCP_GRAPH_SERVICE=$(ENABLE_DHCP_GRAPH_SERVICE) \
56+
SONIC_ENABLE_SYNCD_RPC=$(ENABLE_SYNCD_RPC) \
5657
PASSWORD=$(PASSWORD) \
5758
USERNAME=$(USERNAME) \
5859
$@

‎platform/broadcom/docker-syncd-brcm-rpc.mk

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,12 @@ $(DOCKER_SYNCD_BRCM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT)
66
$(DOCKER_SYNCD_BRCM_RPC)_FILES += $(DSSERVE) $(BCMCMD)
77
$(DOCKER_SYNCD_BRCM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_BRCM)
88
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_RPC)
9+
ifeq ($(ENABLE_SYNCD_RPC),y)
10+
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM_RPC)
11+
endif
12+
13+
$(DOCKER_SYNCD_BRCM_RPC)_CONTAINER_NAME = syncd
14+
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += --net=host --privileged -t
15+
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
16+
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
17+
$(DOCKER_SYNCD_BRCM_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

‎platform/broadcom/docker-syncd-brcm.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ $(DOCKER_SYNCD_BRCM)_DEPENDS += $(SYNCD)
66
$(DOCKER_SYNCD_BRCM)_FILES += $(DSSERVE) $(BCMCMD)
77
$(DOCKER_SYNCD_BRCM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
88
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM)
9+
ifneq ($(ENABLE_SYNCD_RPC),y)
910
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_BRCM)
11+
endif
1012

1113
$(DOCKER_SYNCD_BRCM)_CONTAINER_NAME = syncd
1214
$(DOCKER_SYNCD_BRCM)_RUN_OPT += --net=host --privileged -t

‎platform/cavium/docker-syncd-cavm-rpc.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ $(DOCKER_SYNCD_CAVM_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-cavm-rpc
55
$(DOCKER_SYNCD_CAVM_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT) $(CAVM_LIBSAI) $(XP_TOOLS) $(REDIS_TOOLS)
66
$(DOCKER_SYNCD_CAVM_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_CAVM)
77
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM_RPC)
8+
ifeq ($(ENABLE_SYNCD_RPC),y)
9+
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM_RPC)
10+
endif
11+
12+
$(DOCKER_SYNCD_CAVM_RPC)_CONTAINER_NAME = syncd
13+
$(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += --net=host --privileged -t
14+
$(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
15+
$(DOCKER_SYNCD_CAVM_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

‎platform/cavium/docker-syncd-cavm.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ $(DOCKER_SYNCD_CAVM)_PATH = $(PLATFORM_PATH)/docker-syncd-cavm
55
$(DOCKER_SYNCD_CAVM)_DEPENDS += $(SYNCD) $(CAVM_LIBSAI) $(XP_TOOLS) $(REDIS_TOOLS)
66
$(DOCKER_SYNCD_CAVM)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
77
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM)
8+
ifneq ($(ENABLE_SYNCD_RPC),y)
89
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CAVM)
10+
endif
911

1012
$(DOCKER_SYNCD_CAVM)_CONTAINER_NAME = syncd
1113
$(DOCKER_SYNCD_CAVM)_RUN_OPT += --net=host --privileged -t

‎platform/centec/docker-syncd-centec-rpc.mk

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,12 @@ $(DOCKER_SYNCD_CENTEC_RPC)_PATH = $(PLATFORM_PATH)/docker-syncd-centec-rpc
55
$(DOCKER_SYNCD_CENTEC_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT)
66
$(DOCKER_SYNCD_CENTEC_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_CENTEC)
77
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC_RPC)
8+
ifeq ($(ENABLE_SYNCD_RPC),y)
9+
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC_RPC)
10+
endif
11+
12+
$(DOCKER_SYNCD_CENTEC_RPC)_CONTAINER_NAME = syncd
13+
$(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += --net=host --privileged -t
14+
$(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
15+
$(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /var/run/docker-syncd:/var/run/sswsyncd
16+
$(DOCKER_SYNCD_CENTEC_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

‎platform/centec/docker-syncd-centec.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ $(DOCKER_SYNCD_CENTEC)_PATH = $(PLATFORM_PATH)/docker-syncd-centec
55
$(DOCKER_SYNCD_CENTEC)_DEPENDS += $(SYNCD)
66
$(DOCKER_SYNCD_CENTEC)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
77
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC)
8+
ifneq ($(ENABLE_SYNCD_RPC),y)
89
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_CENTEC)
10+
endif
911

1012
$(DOCKER_SYNCD_CENTEC)_CONTAINER_NAME = syncd
1113
$(DOCKER_SYNCD_CENTEC)_RUN_OPT += --net=host --privileged -t

‎platform/mellanox/docker-syncd-mlnx-rpc.mk

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,11 @@ $(DOCKER_SYNCD_MLNX_RPC)_DEPENDS += $(SYNCD_RPC) $(LIBTHRIFT)
66
$(DOCKER_SYNCD_MLNX_RPC)_FILES += $(MLNX_FW)
77
$(DOCKER_SYNCD_MLNX_RPC)_LOAD_DOCKERS += $(DOCKER_SYNCD_MLNX)
88
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
9+
ifeq ($(ENABLE_SYNCD_RPC),y)
10+
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX_RPC)
11+
endif
12+
13+
$(DOCKER_SYNCD_MLNX_RPC)_CONTAINER_NAME = syncd
14+
$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += --net=host --privileged -t
15+
$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /host/machine.conf:/etc/machine.conf
16+
$(DOCKER_SYNCD_MLNX_RPC)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro

‎platform/mellanox/docker-syncd-mlnx.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ $(DOCKER_SYNCD_MLNX)_DEPENDS += $(SYNCD) $(MFT) $(PYTHON_SDK_API)
66
$(DOCKER_SYNCD_MLNX)_FILES += $(MLNX_FW)
77
$(DOCKER_SYNCD_MLNX)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE)
88
SONIC_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
9+
ifneq ($(ENABLE_SYNCD_RPC),y)
910
SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_SYNCD_MLNX)
11+
endif
1012

1113
$(DOCKER_SYNCD_MLNX)_CONTAINER_NAME = syncd
1214
$(DOCKER_SYNCD_MLNX)_RUN_OPT += --net=host --privileged -t

‎rules/config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,7 @@ DEFAULT_PASSWORD = YourPaSsWoRd
4646
# Quagga will be the default routing-stack for all the SONiC platforms. Other supported
4747
# routing-stacks: frr, gobgp.
4848
SONIC_ROUTING_STACK = quagga
49+
50+
# ENABLE_SYNCD_RPC - build docker-syncd with rpc packages for testing purposes.
51+
# Uncomment to enable:
52+
# ENABLE_SYNCD_RPC = y

‎slave.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ ifeq ($(PASSWORD),)
6767
override PASSWORD := $(DEFAULT_PASSWORD)
6868
endif
6969

70+
ifeq ($(SONIC_ENABLE_SYNCD_RPC),y)
71+
ENABLE_SYNCD_RPC = y
72+
endif
73+
7074
MAKEFLAGS += -j $(SONIC_CONFIG_BUILD_JOBS)
7175

7276
###############################################################################

0 commit comments

Comments
 (0)