From a25205bb163e16532a72ad7b8cc8185acd7c5247 Mon Sep 17 00:00:00 2001
From: Danny Allen <daall@microsoft.com>
Date: Tue, 25 Feb 2020 13:42:39 -0800
Subject: [PATCH] [docker-ptf] Add support for spytest to ptf container -
 Install apt and pip dependencies - Define traffic generator service

Signed-off-by: Danny Allen <daall@microsoft.com>
---
 dockers/docker-ptf/Dockerfile.j2        | 16 ++++++++++------
 dockers/docker-ptf/conf.d/ptf_tgen.conf | 10 ++++++++++
 dockers/docker-ptf/ptf_tgen.sh          |  1 +
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 dockers/docker-ptf/conf.d/ptf_tgen.conf
 create mode 100755 dockers/docker-ptf/ptf_tgen.sh

diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2
index 8d529779ccdb..c9f7be803a20 100644
--- a/dockers/docker-ptf/Dockerfile.j2
+++ b/dockers/docker-ptf/Dockerfile.j2
@@ -22,6 +22,7 @@ debs/
 ENV DEBIAN_FRONTEND=noninteractive
 
 ## Set the apt source, update package cache and install necessary packages
+## TODO: Clean up this step
 RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /etc/apt/sources.list \
     && apt-get update          \
     && apt-get upgrade -y   \
@@ -39,7 +40,6 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
         unzip               \
         pkg-config          \
         binutils            \
-        net-tools           \
         build-essential     \
         libssl-dev          \
         libffi-dev          \
@@ -53,7 +53,6 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
         iputils-ping        \
         hping3              \
         curl                \
-        tcpdump             \
         tmux                \
         python              \
         python-dev          \
@@ -64,7 +63,9 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' /
         rsyslog             \
         ntp                 \
         ntpstat             \
-        ntpdate
+        ntpdate             \
+        arping              \
+        bridge-utils
 
 RUN dpkg -i \
 {% for deb in docker_ptf_debs.split(' ') -%}
@@ -72,6 +73,7 @@ debs/{{ deb }}{{' '}}
 {%- endfor %}
 
 # Install all python modules from pypi. python-scapy is exception, ptf debian package requires python-scapy
+# TODO: Clean up this step
 RUN rm -rf /debs \
     && apt-get -y autoclean \
     && apt-get -y autoremove \
@@ -115,6 +117,7 @@ RUN rm -rf /debs \
     && pip install flask   \
     && pip install exabgp==3.4.17\
     && pip install pyaml   \
+    && pip install pybrctl pyro4 rpyc yabgp \
     && mkdir -p /opt       \
     && cd /opt             \
     && wget https://raw.githubusercontent.com/p4lang/ptf/master/ptf_nn/ptf_nn_agent.py
@@ -126,8 +129,9 @@ RUN mkdir /var/run/sshd \
     && sed -ri '/^#?UsePAM/c\UsePAM no' /etc/ssh/sshd_config \
     && sed -ri '/^#?UseDNS/c\UseDNS no' /etc/ssh/sshd_config
 
-COPY ["supervisord.conf", "/etc/supervisor/"]
-COPY ["conf.d/supervisord.conf", "conf.d/sshd.conf", "conf.d/ptf_nn_agent.conf", "/etc/supervisor/conf.d/"]
+COPY supervisord.conf /etc/supervisor/
+COPY conf.d/ /etc/supervisor/conf.d/
+COPY ptf_tgen.sh /ptf_tgen/
 
 # Move tcpdump into /usr/bin Otherwise it's impossible to run tcpdump due to a docker bug
 RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump
@@ -135,6 +139,6 @@ RUN ln -s /usr/bin/tcpdump /usr/sbin/tcpdump
 
 RUN mkdir -p /var/log/supervisor
 
-EXPOSE 22
+EXPOSE 22 8009
 
 ENTRYPOINT ["/usr/local/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]
diff --git a/dockers/docker-ptf/conf.d/ptf_tgen.conf b/dockers/docker-ptf/conf.d/ptf_tgen.conf
new file mode 100644
index 000000000000..8efd3f1c15f7
--- /dev/null
+++ b/dockers/docker-ptf/conf.d/ptf_tgen.conf
@@ -0,0 +1,10 @@
+[program:ptf_tgen]
+command=/ptf_tgen/ptf_tgen.sh
+process_name=ptf_tgen
+stdout_logfile=/tmp/ptf_tgen.out.log
+stderr_logfile=/tmp/ptf_tgen.err.log
+redirect_stderr=false
+autostart=false
+autorestart=true
+startsecs=1
+numprocs=1
diff --git a/dockers/docker-ptf/ptf_tgen.sh b/dockers/docker-ptf/ptf_tgen.sh
new file mode 100755
index 000000000000..03593276bdd9
--- /dev/null
+++ b/dockers/docker-ptf/ptf_tgen.sh
@@ -0,0 +1 @@
+# PLACEHOLDER - This file is intended to be overwritten by SPYTest.