From 17bab6d94ee1fe11d71da8ec4069b54f66b98d06 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Tue, 1 Nov 2016 17:00:54 -0700 Subject: [PATCH 1/3] Install saithrift by default to ptf container. Install supervisor to docker-ptf. Don't wait until interfaces are active for syncd-rpc containers --- dockers/docker-ptf/Dockerfile | 5 +++++ dockers/docker-syncd-mlnx-rpc/Dockerfile | 2 +- dockers/docker-syncd-rpc/Dockerfile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dockers/docker-ptf/Dockerfile b/dockers/docker-ptf/Dockerfile index cf458af61949..dd65376019a4 100644 --- a/dockers/docker-ptf/Dockerfile +++ b/dockers/docker-ptf/Dockerfile @@ -39,6 +39,11 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / && dpkg_apt /root/deps/python-ptf_*.deb \ && dpkg_apt /root/deps/libthrift-0.9.2_*.deb \ && dpkg_apt /root/deps/python-thrift_*.deb \ + && cd /root/deps \ + && tar xvfz saithrift-0.9.tar.gz \ + && cd saithrift-0.9 \ + && python setup.py install \ + && cd \ && rm -rf /root/deps \ && apt-get -y autoclean \ && apt-get -y autoremove \ diff --git a/dockers/docker-syncd-mlnx-rpc/Dockerfile b/dockers/docker-syncd-mlnx-rpc/Dockerfile index ca68b8a29304..734171ffb3e0 100644 --- a/dockers/docker-syncd-mlnx-rpc/Dockerfile +++ b/dockers/docker-syncd-mlnx-rpc/Dockerfile @@ -16,6 +16,7 @@ RUN apt-get update \ python-dev \ wget \ cmake \ + supervisor \ && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \ && tar xvfz 1.0.0.tar.gz \ && cd nanomsg-1.0.0 \ @@ -44,5 +45,4 @@ COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf ENTRYPOINT service rsyslog start \ && service syncd start \ - && while [ "x$( ifconfig Ethernet12 | grep RUNNING )" = 'x' ] ; do sleep 1 ; done \ && /usr/bin/supervisord diff --git a/dockers/docker-syncd-rpc/Dockerfile b/dockers/docker-syncd-rpc/Dockerfile index e7f6912746fe..28108a82582c 100644 --- a/dockers/docker-syncd-rpc/Dockerfile +++ b/dockers/docker-syncd-rpc/Dockerfile @@ -16,6 +16,7 @@ RUN apt-get update \ python-dev \ wget \ cmake \ + supervisor \ && wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \ && tar xvfz 1.0.0.tar.gz \ && cd nanomsg-1.0.0 \ @@ -44,5 +45,4 @@ COPY ptf_nn_agent.conf /etc/supervisor/conf.d/ptf_nn_agent.conf ENTRYPOINT service rsyslog start \ && service syncd start \ - && while [ "x$( ifconfig Ethernet12 | grep RUNNING )" = 'x' ] ; do sleep 1 ; done \ && /usr/bin/supervisord From 7a53e3d5599c9ef3c3c2cf54a38afe1f5194dcd3 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Wed, 2 Nov 2016 12:18:16 -0700 Subject: [PATCH 2/3] Don't install saithrift --- dockers/docker-ptf/Dockerfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dockers/docker-ptf/Dockerfile b/dockers/docker-ptf/Dockerfile index dd65376019a4..cf458af61949 100644 --- a/dockers/docker-ptf/Dockerfile +++ b/dockers/docker-ptf/Dockerfile @@ -39,11 +39,6 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / && dpkg_apt /root/deps/python-ptf_*.deb \ && dpkg_apt /root/deps/libthrift-0.9.2_*.deb \ && dpkg_apt /root/deps/python-thrift_*.deb \ - && cd /root/deps \ - && tar xvfz saithrift-0.9.tar.gz \ - && cd saithrift-0.9 \ - && python setup.py install \ - && cd \ && rm -rf /root/deps \ && apt-get -y autoclean \ && apt-get -y autoremove \ From 9282968d8c502e156c94197315ea4e61166e88fa Mon Sep 17 00:00:00 2001 From: Taoyu Li Date: Wed, 2 Nov 2016 12:33:24 -0700 Subject: [PATCH 3/3] Add ptf docker with saithrift installed --- dockers/docker-ptf-saithrift/Dockerfile | 12 +++++++ .../brcm_interface_to_front_map.ini | 33 +++++++++++++++++++ .../msn_2700_interface_to_front_map.ini | 33 +++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 dockers/docker-ptf-saithrift/Dockerfile create mode 100644 dockers/docker-ptf-saithrift/brcm_interface_to_front_map.ini create mode 100644 dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini diff --git a/dockers/docker-ptf-saithrift/Dockerfile b/dockers/docker-ptf-saithrift/Dockerfile new file mode 100644 index 000000000000..88176faffb5f --- /dev/null +++ b/dockers/docker-ptf-saithrift/Dockerfile @@ -0,0 +1,12 @@ +FROM docker-ptf + +RUN apt-get update + +COPY ["deps/saithrift-0.9.tar.gz", "/deps/"] +COPY ["*.ini", "/etc/ptf/"] +COPY ["deps/SAI/test/saithrift/tests/*", "/usr/share/ptf-tests/"] + +RUN tar xzf /deps/saithrift-0.9.tar.gz -C /usr/share/; \ + cd usr/share/saithrift-0.9; \ + python setup.py install; \ + rm -rf /deps diff --git a/dockers/docker-ptf-saithrift/brcm_interface_to_front_map.ini b/dockers/docker-ptf-saithrift/brcm_interface_to_front_map.ini new file mode 100644 index 000000000000..0db110025b8a --- /dev/null +++ b/dockers/docker-ptf-saithrift/brcm_interface_to_front_map.ini @@ -0,0 +1,33 @@ +# ptf host interface @ switch front port name +0@Ethernet0 +1@Ethernet4 +2@Ethernet8 +3@Ethernet12 +4@Ethernet16 +5@Ethernet20 +6@Ethernet24 +7@Ethernet28 +8@Ethernet32 +9@Ethernet36 +10@Ethernet40 +11@Ethernet44 +12@Ethernet48 +13@Ethernet52 +14@Ethernet56 +15@Ethernet60 +16@Ethernet64 +17@Ethernet68 +18@Ethernet72 +19@Ethernet76 +20@Ethernet80 +21@Ethernet84 +22@Ethernet88 +23@Ethernet92 +24@Ethernet96 +25@Ethernet100 +26@Ethernet104 +27@Ethernet108 +28@Ethernet112 +29@Ethernet116 +30@Ethernet120 +31@Ethernet124 diff --git a/dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini b/dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini new file mode 100644 index 000000000000..4421812aeef9 --- /dev/null +++ b/dockers/docker-ptf-saithrift/msn_2700_interface_to_front_map.ini @@ -0,0 +1,33 @@ +# ptf host interface @ switch front port name +0@Ethernet1 +1@Ethernet2 +2@Ethernet3 +3@Ethernet4 +4@Ethernet5 +5@Ethernet6 +6@Ethernet7 +7@Ethernet8 +8@Ethernet9 +9@Ethernet10 +10@Ethernet11 +11@Ethernet12 +12@Ethernet13 +13@Ethernet14 +14@Ethernet15 +15@Ethernet16 +16@Ethernet17 +17@Ethernet18 +18@Ethernet19 +19@Ethernet20 +20@Ethernet21 +21@Ethernet22 +22@Ethernet23 +23@Ethernet24 +24@Ethernet25 +25@Ethernet26 +26@Ethernet27 +27@Ethernet28 +28@Ethernet29 +29@Ethernet30 +30@Ethernet31 +31@Ethernet32