Skip to content

[docker-sonic-mgmt] install ptf framework in mgmt container and upgra… #3239

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

Merged
lguohan merged 1 commit into from
Jul 30, 2019
Merged

[docker-sonic-mgmt] install ptf framework in mgmt container and upgra… #3239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 25 additions & 2 deletions dockers/docker-sonic-mgmt/Dockerfile.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ RUN apt-get install -y \
libxslt1-dev \
python-setuptools \
build-essential \
curl
curl \
cmake \
tcpdump \
python-dev \
python-scapy

# For JNLP launcher
RUN apt-get install -y default-jre
Expand All @@ -46,7 +50,26 @@ RUN pip install ipaddr \
jinja2==2.7.2 \
cffi==1.10.0 \
paramiko==2.1.2 \
passlib
passlib \
ipython==5.4.1 \
&& git clone https://github.com/p4lang/scapy-vxlan.git \
&& cd scapy-vxlan \
&& python setup.py install \
&& cd .. \
&& rm -fr scapy-vxlan \
&& wget https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz \
&& tar xvfz 1.0.0.tar.gz \
&& cd nanomsg-1.0.0 \
&& mkdir -p build \
&& cd build \
&& cmake .. \
&& make install \
&& ldconfig \
&& cd ../.. \
&& rm -fr nanomsg-1.0.0 \
&& rm -f 1.0.0.tar.gz \
&& pip install nnpy \
&& pip install dpkt

# Install Microsoft Azure Kusto Library for Python
RUN pip install azure-kusto-data==0.0.13 \
Expand Down
2 changes: 1 addition & 1 deletion rules/docker-sonic-mgmt.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# docker image for sonic-mgmt
DOCKER_SONIC_MGMT = docker-sonic-mgmt.gz
$(DOCKER_SONIC_MGMT)_PATH = $(DOCKERS_PATH)/docker-sonic-mgmt
$(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA)
$(DOCKER_SONIC_MGMT)_DEPENDS += $(SONIC_DEVICE_DATA) $(PTF)
SONIC_DOCKER_IMAGES += $(DOCKER_SONIC_MGMT)
2 changes: 1 addition & 1 deletion src/ptf
Open in desktop
Submodule ptf updated 10 files
+0 −6 .travis.yml
+8 −4 ptf
+53 −0 ptf_nn/ptf_nn_test/test.py
+1 −1 setup.py
+4 −2 src/ptf/afpacket.py
+38 −9 src/ptf/dataplane.py
+29 −3 src/ptf/mask.py
+12 −8 src/ptf/packet.py
+242 −65 src/ptf/testutils.py
+10 −1 src/ptf/thriftutils.py