From 0c8e57f9724f144aa3e321af0bd153c5019017c8 Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Fri, 26 May 2017 18:08:20 -0700 Subject: [PATCH 1/3] Install scapy from p4lang --- dockers/docker-ptf/Dockerfile.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index d1d8e2466fa..41e1d330d8f 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -21,7 +21,6 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / openssh-server \ vim \ python \ - python-scapy \ net-tools \ python-setuptools \ supervisor \ @@ -43,8 +42,11 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / libqt5network5 \ less \ ipython \ + git \ iputils-ping +## Install scapy from p4lang +RUN git clone https://github.com/p4lang/scapy-vxlan.git && cd scapy-vxlan && python setup.py install RUN dpkg -i \ {% for deb in docker_ptf_debs.split(' ') -%} From b9e541e7d1e3cdee04ae3672eb20bb90c4fc319f Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Fri, 26 May 2017 18:13:58 -0700 Subject: [PATCH 2/3] Overwrite standard scapy version --- dockers/docker-ptf/Dockerfile.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dockers/docker-ptf/Dockerfile.j2 b/dockers/docker-ptf/Dockerfile.j2 index 41e1d330d8f..963282b27cb 100644 --- a/dockers/docker-ptf/Dockerfile.j2 +++ b/dockers/docker-ptf/Dockerfile.j2 @@ -21,6 +21,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / openssh-server \ vim \ python \ + python-scapy \ net-tools \ python-setuptools \ supervisor \ @@ -45,7 +46,7 @@ RUN sed --in-place 's/httpredir.debian.org/debian-archive.trafficmanager.net/' / git \ iputils-ping -## Install scapy from p4lang +## Reinstall scapy by version from p4lang RUN git clone https://github.com/p4lang/scapy-vxlan.git && cd scapy-vxlan && python setup.py install RUN dpkg -i \ From a9409acb1e2f0792781f24fd688fce4947bff07f Mon Sep 17 00:00:00 2001 From: Pavel Shirshov Date: Tue, 30 May 2017 12:14:27 -0700 Subject: [PATCH 3/3] Update SAI and sonic-utilites submodules --- src/SAI | 2 +- src/sonic-utilities | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SAI b/src/SAI index 499ad727226..a6b5b3115f3 160000 --- a/src/SAI +++ b/src/SAI @@ -1 +1 @@ -Subproject commit 499ad727226405b425473d6ed170c3bee1112cca +Subproject commit a6b5b3115f39f599d39629ab9bfaeea17333d0bc diff --git a/src/sonic-utilities b/src/sonic-utilities index b158a565ba5..de5c31874bb 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit b158a565ba5ff85665c225d12908a3b588552db5 +Subproject commit de5c31874bb89c62d50efec6d8541e85fe678548