Skip to content
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

Jump to bottom

Restore neighbor table to kernel during system warm-reboot #2213

Merged
merged 3 commits into from
Nov 10, 2018
Merged

Restore neighbor table to kernel during system warm-reboot #2213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ca4d2a
Restore neighbor table to kernel during system warm-reboot
zhenggen-xu Oct 18, 2018
e919245
Move the restore_neighbors.py to sonic-swss submodule
zhenggen-xu Nov 6, 2018
4e8d79c
Added PYTHON_SWSSCOMMON as swss runtime dependency
zhenggen-xu Nov 9, 2018
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-fpm-frr/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update

# Install required packages
RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libc-ares2 iproute
RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libc-ares2 iproute libpython2.7

{% if docker_fpm_frr_debs.strip() -%}
# Copy locally-built Debian package dependencies
Expand Down
2 changes: 1 addition & 1 deletion dockers/docker-fpm-quagga/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update

# Install required packages
RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4
RUN apt-get install -y libdbus-1-3 libdaemon0 libjansson4 libpython2.7

{% if docker_fpm_quagga_debs.strip() -%}
# Copy locally-built Debian package dependencies
Expand Down
8 changes: 6 additions & 2 deletions dockers/docker-orchagent/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,19 @@ ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update

RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4
RUN apt-get install -f -y ifupdown arping libdbus-1-3 libdaemon0 libjansson4 libpython2.7

RUN apt-get install -f -y ndisc6
RUN apt-get install -f -y ndisc6 tcpdump python-scapy
zhenggen-xu marked this conversation as resolved.
Show resolved Hide resolved
## Install redis-tools dependencies
## TODO: implicitly install dependencies
RUN apt-get -y install libjemalloc1

RUN apt-get install -y libelf1 libmnl0

RUN pip install setuptools
zhenggen-xu marked this conversation as resolved.
Show resolved Hide resolved
RUN pip install pyroute2==0.5.3 netifaces==0.10.7
RUN pip install monotonic==1.5

COPY \
{% for deb in docker_orchagent_debs.split(' ') -%}
debs/{{ deb }}{{' '}}
Expand Down
2 changes: 2 additions & 0 deletions dockers/docker-orchagent/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ supervisorctl start rsyslogd

supervisorctl start orchagent

supervisorctl start restore_neighbors

supervisorctl start portsyncd

supervisorctl start intfsyncd
Expand Down
11 changes: 11 additions & 0 deletions dockers/docker-orchagent/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,14 @@ autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:restore_neighbors]
command=/usr/bin/restore_neighbors.py
priority=15
autostart=false
autorestart=false
startsecs=0
startretries=0
stdout_logfile=syslog
stderr_logfile=syslog

2 changes: 1 addition & 1 deletion dockers/docker-teamd/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ENV DEBIAN_FRONTEND=noninteractive

RUN apt-get update

RUN apt-get install -f -y libdbus-1-3 libdaemon0 libjansson4
RUN apt-get install -f -y libdbus-1-3 libdaemon0 libjansson4 libpython2.7

## Install redis-tools dependencies
## TODO: implicitly install dependencies
Expand Down
9 changes: 8 additions & 1 deletion platform/vs/docker-sonic-vs/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,15 @@ RUN apt-get install -y net-tools \
libmnl0 \
logrotate \
apt-utils \
psmisc
psmisc \
tcpdump \
python-scapy

RUN pip install setuptools
RUN pip install py2_ipaddress
RUN pip install six
RUN pip install pyroute2==0.5.3 netifaces==0.10.7
RUN pip install monotonic==1.5

{% if docker_sonic_vs_debs.strip() -%}
# Copy locally-built Debian package dependencies
Expand Down Expand Up @@ -87,6 +91,9 @@ COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
COPY ["files/configdb-load.sh", "/usr/bin/"]
COPY ["files/arp_update", "/usr/bin"]

# Workaround the tcpdump issue
RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump

RUN echo "docker-sonic-vs" > /etc/hostname
RUN touch /etc/quagga/zebra.conf

Expand Down
10 changes: 10 additions & 0 deletions platform/vs/docker-sonic-vs/supervisord.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,13 @@ autostart=false
autorestart=false
stdout_logfile=syslog
stderr_logfile=syslog

[program:restore_neighbors]
command=/usr/bin/restore_neighbors.py
priority=19
autostart=false
autorestart=false
startsecs=0
startretries=0
stdout_logfile=syslog
stderr_logfile=syslog
2 changes: 1 addition & 1 deletion rules/swss.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SWSS = swss_1.0.0_amd64.deb
$(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss
$(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
$(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV)
$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON)
$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON) $(PYTHON_SWSSCOMMON)
SONIC_DPKG_DEBS += $(SWSS)

SWSS_DBG = swss-dbg_1.0.0_amd64.deb
Expand Down