From a55b88e3133decf76140f18075c36ffc07170ca7 Mon Sep 17 00:00:00 2001 From: Shi Su Date: Wed, 5 May 2021 06:05:52 +0000 Subject: [PATCH] remove quagga and gobgp related --- platform/vs/docker-sonic-vs.mk | 6 +--- rules/docker-fpm-gobgp.dep | 10 ------- rules/docker-fpm-gobgp.mk | 16 ----------- rules/docker-fpm-quagga.dep | 10 ------- rules/docker-fpm-quagga.mk | 20 -------------- rules/docker-fpm.mk | 6 +--- rules/gobgp.dep | 10 ------- rules/gobgp.mk | 5 ---- rules/quagga.dep | 13 --------- rules/quagga.mk | 11 -------- src/gobgp/Makefile | 23 ---------------- src/gobgp/debian/changelog | 5 ---- src/gobgp/debian/compat | 1 - src/gobgp/debian/control | 12 -------- src/gobgp/debian/gobgp.dirs | 1 - src/gobgp/debian/gobgp.init.d | 50 ---------------------------------- src/gobgp/debian/gobgp.service | 16 ----------- src/gobgp/debian/rules | 3 -- src/gobgp/gobgpd.conf.sample | 21 -------------- 19 files changed, 2 insertions(+), 237 deletions(-) delete mode 100644 rules/docker-fpm-gobgp.dep delete mode 100644 rules/docker-fpm-gobgp.mk delete mode 100644 rules/docker-fpm-quagga.dep delete mode 100644 rules/docker-fpm-quagga.mk delete mode 100644 rules/gobgp.dep delete mode 100644 rules/gobgp.mk delete mode 100644 rules/quagga.dep delete mode 100644 rules/quagga.mk delete mode 100644 src/gobgp/Makefile delete mode 100644 src/gobgp/debian/changelog delete mode 100644 src/gobgp/debian/compat delete mode 100644 src/gobgp/debian/control delete mode 100644 src/gobgp/debian/gobgp.dirs delete mode 100644 src/gobgp/debian/gobgp.init.d delete mode 100644 src/gobgp/debian/gobgp.service delete mode 100755 src/gobgp/debian/rules delete mode 100644 src/gobgp/gobgpd.conf.sample diff --git a/platform/vs/docker-sonic-vs.mk b/platform/vs/docker-sonic-vs.mk index c48c8f12c704..8370bb20bd9b 100644 --- a/platform/vs/docker-sonic-vs.mk +++ b/platform/vs/docker-sonic-vs.mk @@ -34,12 +34,8 @@ $(DOCKER_SONIC_VS)_DEPENDS += $(SWSS_DBG) \ $(SYNCD_VS_DBG) endif -ifeq ($(SONIC_ROUTING_STACK), quagga) -$(DOCKER_SONIC_VS)_DEPENDS += $(QUAGGA) -else ifeq ($(SONIC_ROUTING_STACK), frr) +ifeq ($(SONIC_ROUTING_STACK), frr) $(DOCKER_SONIC_VS)_DEPENDS += $(FRR) -else -$(DOCKER_SONIC_VS)_DEPENDS += $(GOBGP) endif $(DOCKER_SONIC_VS)_FILES += $(CONFIGDB_LOAD_SCRIPT) \ diff --git a/rules/docker-fpm-gobgp.dep b/rules/docker-fpm-gobgp.dep deleted file mode 100644 index 4cbb49578754..000000000000 --- a/rules/docker-fpm-gobgp.dep +++ /dev/null @@ -1,10 +0,0 @@ - -DPATH := $($(DOCKER_FPM_GOBGP)_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/docker-fpm-gobgp.mk rules/docker-fpm-gobgp.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(DPATH)) - -$(DOCKER_FPM_GOBGP)_CACHE_MODE := GIT_CONTENT_SHA -$(DOCKER_FPM_GOBGP)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(DOCKER_FPM_GOBGP)_DEP_FILES := $(DEP_FILES) - diff --git a/rules/docker-fpm-gobgp.mk b/rules/docker-fpm-gobgp.mk deleted file mode 100644 index a773651ae14f..000000000000 --- a/rules/docker-fpm-gobgp.mk +++ /dev/null @@ -1,16 +0,0 @@ -# docker image for fpm-gobgp - -DOCKER_FPM_GOBGP = docker-fpm-gobgp.gz -$(DOCKER_FPM_GOBGP)_PATH = $(DOCKERS_PATH)/docker-fpm-gobgp -$(DOCKER_FPM_GOBGP)_DEPENDS += $(GOBGP) -$(DOCKER_FPM_GOBGP)_LOAD_DOCKERS += $(DOCKER_FPM_QUAGGA) - -$(DOCKER_FPM_GOBGP)_VERSION = 1.0.0 -$(DOCKER_FPM_GOBGP)_PACKAGE_NAME = fpm-gobgp - -SONIC_DOCKER_IMAGES += $(DOCKER_FPM_GOBGP) - -$(DOCKER_FPM_GOBGP)_CONTAINER_NAME = bgp -$(DOCKER_FPM_GOBGP)_RUN_OPT += --privileged -t -$(DOCKER_FPM_GOBGP)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro -$(DOCKER_FPM_GOBPG)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) diff --git a/rules/docker-fpm-quagga.dep b/rules/docker-fpm-quagga.dep deleted file mode 100644 index 987e22b596c6..000000000000 --- a/rules/docker-fpm-quagga.dep +++ /dev/null @@ -1,10 +0,0 @@ - -DPATH := $($(DOCKER_FPM_QUAGGA)_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/docker-fpm-quagga.mk rules/docker-fpm-quagga.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(DPATH)) - -$(DOCKER_FPM_QUAGGA)_CACHE_MODE := GIT_CONTENT_SHA -$(DOCKER_FPM_QUAGGA)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(DOCKER_FPM_QUAGGA)_DEP_FILES := $(DEP_FILES) - diff --git a/rules/docker-fpm-quagga.mk b/rules/docker-fpm-quagga.mk deleted file mode 100644 index 2d11ed79472e..000000000000 --- a/rules/docker-fpm-quagga.mk +++ /dev/null @@ -1,20 +0,0 @@ -# docker image for fpm-quagga - -DOCKER_FPM_QUAGGA = docker-fpm-quagga.gz -$(DOCKER_FPM_QUAGGA)_PATH = $(DOCKERS_PATH)/docker-fpm-quagga -$(DOCKER_FPM_QUAGGA)_DEPENDS += $(QUAGGA) $(SWSS) -$(DOCKER_FPM_QUAGGA)_LOAD_DOCKERS += $(DOCKER_CONFIG_ENGINE) - -$(DOCKER_FPM_QUAGGA)_VERSION = 1.0.0 -$(DOCKER_FPM_QUAGGA)_PACKAGE_NAME = fpm-quagga - -SONIC_DOCKER_IMAGES += $(DOCKER_FPM_QUAGGA) - -$(DOCKER_FPM_QUAGGA)_CONTAINER_NAME = bgp -$(DOCKER_FPM_QUAGGA)_RUN_OPT += --privileged -t -$(DOCKER_FPM_QUAGGA)_RUN_OPT += -v /etc/sonic:/etc/sonic:ro - -$(DOCKER_FPM_QUAGGA)_FILES += $(SUPERVISOR_PROC_EXIT_LISTENER_SCRIPT) - -$(DOCKER_FPM_QUAGGA)_BASE_IMAGE_FILES += vtysh:/usr/bin/vtysh -$(DOCKER_FPM_QUAGGA)_BASE_IMAGE_FILES += rvtysh:/usr/bin/rvtysh diff --git a/rules/docker-fpm.mk b/rules/docker-fpm.mk index 72d89999c47a..889f0cf4c6ab 100644 --- a/rules/docker-fpm.mk +++ b/rules/docker-fpm.mk @@ -1,10 +1,6 @@ # Docker-fpm rule-file is simply a wrapper containing routing-stack selection logic. -ifeq ($(SONIC_ROUTING_STACK), quagga) -SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_FPM_QUAGGA) -else ifeq ($(SONIC_ROUTING_STACK), frr) +ifeq ($(SONIC_ROUTING_STACK), frr) SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_FPM_FRR) SONIC_INSTALL_DOCKER_DBG_IMAGES += $(DOCKER_FPM_FRR_DBG) -else -SONIC_INSTALL_DOCKER_IMAGES += $(DOCKER_FPM_GOBGP) endif diff --git a/rules/gobgp.dep b/rules/gobgp.dep deleted file mode 100644 index f7462c6b8dbc..000000000000 --- a/rules/gobgp.dep +++ /dev/null @@ -1,10 +0,0 @@ - -SPATH := $($(GOBGP)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/gobgp.mk rules/gobgp.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -DEP_FILES += $(shell git ls-files $(SPATH)) - -$(GOBGP)_CACHE_MODE := GIT_CONTENT_SHA -$(GOBGP)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(GOBGP)_DEP_FILES := $(DEP_FILES) - diff --git a/rules/gobgp.mk b/rules/gobgp.mk deleted file mode 100644 index 2d8a9d3f9c32..000000000000 --- a/rules/gobgp.mk +++ /dev/null @@ -1,5 +0,0 @@ -# gobgp package - -GOBGP = gobgp_1.16-01_$(CONFIGURED_ARCH).deb -$(GOBGP)_SRC_PATH = $(SRC_PATH)/gobgp -SONIC_DPKG_DEBS += $(GOBGP) diff --git a/rules/quagga.dep b/rules/quagga.dep deleted file mode 100644 index abaf234a4fee..000000000000 --- a/rules/quagga.dep +++ /dev/null @@ -1,13 +0,0 @@ - -SPATH := $($(QUAGGA)_SRC_PATH) -DEP_FILES := $(SONIC_COMMON_FILES_LIST) rules/quagga.mk rules/quagga.dep -DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST) -SMDEP_FILES := $(addprefix $(SPATH)/,$(shell cd $(SPATH) && git ls-files)) - -#DPKG_FRK -$(QUAGGA)_CACHE_MODE := GIT_CONTENT_SHA -$(QUAGGA)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) -$(QUAGGA)_DEP_FILES := $(DEP_FILES) -$(QUAGGA)_SMDEP_FILES := $(SMDEP_FILES) -$(QUAGGA)_SMDEP_PATHS := $(SPATH) - diff --git a/rules/quagga.mk b/rules/quagga.mk deleted file mode 100644 index 2caef76b2cfd..000000000000 --- a/rules/quagga.mk +++ /dev/null @@ -1,11 +0,0 @@ -# quagga package - -QUAGGA_VERSION_FULL = 0.99.24.1-2.1 - -QUAGGA = quagga_$(QUAGGA_VERSION_FULL)_$(CONFIGURED_ARCH).deb -$(QUAGGA)_DEPENDS += $(LIBSNMP_DEV) -$(QUAGGA)_SRC_PATH = $(SRC_PATH)/sonic-quagga -SONIC_DPKG_DEBS += $(QUAGGA) - -QUAGGA_DBG = quagga-dbg_$(QUAGGA_VERSION_FULL)_$(CONFIGURED_ARCH).deb -$(eval $(call add_derived_package,$(QUAGGA),$(QUAGGA_DBG))) diff --git a/src/gobgp/Makefile b/src/gobgp/Makefile deleted file mode 100644 index 4fda21013afb..000000000000 --- a/src/gobgp/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -export GOPATH=/tmp/go - -INSTALL := /usr/bin/install - -all: gobgp gobgpd - -gobgpd: - /usr/local/go/bin/go get -v github.com/osrg/gobgp/cmd/gobgpd - -gobgp: - /usr/local/go/bin/go get -v github.com/osrg/gobgp/cmd/gobgp - -install: - $(INSTALL) -D ${GOPATH}/bin/gobgp $(DESTDIR)/usr/bin/gobgp - $(INSTALL) -D ${GOPATH}/bin/gobgpd $(DESTDIR)/usr/sbin/gobgpd - $(INSTALL) -D gobgpd.conf.sample $(DESTDIR)/etc/gobgp/gobgpd.conf.sample - -deinstall: - rm $(DESTDIR)/usr/bin/gobgp - rm $(DESTDIR)/usr/sbin/gobgpd - -clean: - rm -fr ${GOPATH} diff --git a/src/gobgp/debian/changelog b/src/gobgp/debian/changelog deleted file mode 100644 index ba412cc45ede..000000000000 --- a/src/gobgp/debian/changelog +++ /dev/null @@ -1,5 +0,0 @@ -gobgp (1.16-01) UNRELEASED; urgency=low - - * Initial release. - - -- Pavel Shirshov Sat, 25 Feb 2017 00:25:19 +0000 diff --git a/src/gobgp/debian/compat b/src/gobgp/debian/compat deleted file mode 100644 index ec635144f600..000000000000 --- a/src/gobgp/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/src/gobgp/debian/control b/src/gobgp/debian/control deleted file mode 100644 index 7d534852a383..000000000000 --- a/src/gobgp/debian/control +++ /dev/null @@ -1,12 +0,0 @@ -Source: gobgp -Maintainer: Pavel Shirshov -Build-Depends: debhelper (>= 8.0.0), - dh-systemd -Standards-Version: 3.9.3 -Section: net - -Package: gobgp -Priority: extra -Architecture: amd64 -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: gobgp BGP daemon diff --git a/src/gobgp/debian/gobgp.dirs b/src/gobgp/debian/gobgp.dirs deleted file mode 100644 index 3e9f1c594d41..000000000000 --- a/src/gobgp/debian/gobgp.dirs +++ /dev/null @@ -1 +0,0 @@ -etc/gobgp diff --git a/src/gobgp/debian/gobgp.init.d b/src/gobgp/debian/gobgp.init.d deleted file mode 100644 index 189fdad05690..000000000000 --- a/src/gobgp/debian/gobgp.init.d +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash -# -### BEGIN INIT INFO -# Provides: gobgp -# Required-Start: $local_fs $network $remote_fs $syslog -# Required-Stop: $local_fs $network $remote_fs $syslog -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -# Short-Description: start and stop the gobgpd -# Description: gobgpd is an implementation of bgp daemon in Go -### END INIT INFO -# - -PATH=/bin:/usr/bin:/sbin:/usr/sbin -D_PATH=/usr/sbin -C_PATH=/etc/gobgp - -. /lib/lsb/init-functions - -######################################################### -# Main program # -######################################################### - -case "$1" in - start) - if [ -f /etc/gobgp/gobgpd.conf ] - then - /usr/sbin/gobgpd -f /etc/gobgp/gobgpd.conf -r - echo $! > /var/run/gobgpd.pid - else - echo /etc/gobgp/gobgpd.conf not found - fi - ;; - - stop) - kill -9 $(echo /var/run/gobgpd.pid) - ;; - - restart|force-reload) - $0 stop $2 - sleep 1 - $0 start $2 - ;; - *) - echo "Usage: /etc/init.d/gobgp {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/src/gobgp/debian/gobgp.service b/src/gobgp/debian/gobgp.service deleted file mode 100644 index 68a0b595aa1d..000000000000 --- a/src/gobgp/debian/gobgp.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=gobgp service -After=network.target -ConditionPathExists=/etc/gobgp/gobgpd.yml - -[Service] -EnvironmentFile=-/etc/default/gobgp -ExecStart=/usr/sbin/gobgpd $DAEMON_ARGS -#ExecReload=/bin/kill -HUP $MAINPID -KillMode=process -Restart=on-failure - -[Install] -WantedBy=multi-user.target -Alias=gobgpd.service - diff --git a/src/gobgp/debian/rules b/src/gobgp/debian/rules deleted file mode 100755 index b6bee2ee4e76..000000000000 --- a/src/gobgp/debian/rules +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/make -f -%: - dh $@ --with systemd diff --git a/src/gobgp/gobgpd.conf.sample b/src/gobgp/gobgpd.conf.sample deleted file mode 100644 index c308df15be2c..000000000000 --- a/src/gobgp/gobgpd.conf.sample +++ /dev/null @@ -1,21 +0,0 @@ -[global.config] - as = 65501 - router-id = "192.168.0.1" -[[neighbors]] - [neighbors.config] - peer-as = 65502 - neighbor-address = "192.168.0.2" - [neighbors.graceful-restart.config] - enabled = true - restart-time = 120 - [[neighbors.afi-safis]] - [neighbors.afi-safis.config] - afi-safi-name = "ipv4-unicast" - [neighbors.afi-safis.mp-graceful-restart.config] - enabled = true - -[zebra] - [zebra.config] - enabled = true - url = "unix:/var/run/quagga/zserv.api" - redistribute-route-type-list = ["connect"]