Stability fixes for SR Tests and small fixes for running ONOS in docker
- move checkOptions to component driver
- use karafTimeout for SR tests
- Fix some docker options
- Make sure mn docker can resolve own hostname
- Fix config file ip format for DHCP relay app
Change-Id: I85e8c52384e0fb478462fa9bbaf0b31a599b632b
(cherry picked from commit 521ecde3f8d28288303ea11129faa0cfd86b9bcd)
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Dockerfile b/TestON/tests/USECASE/SegmentRouting/dependencies/Dockerfile
index bed2f54..be8d72d 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Dockerfile
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Dockerfile
@@ -29,4 +29,22 @@
&& alias sudo='' \
&& apt-get update \
&& ./install.sh -3fvn
+
+# Install scapy dependencies
+RUN apt-get update && \
+ apt-get -y install \
+ gcc tcpdump libpcap-dev \
+ python3 python3-pip tcpdump
+#install pip packages for scapy
+RUN pip3 install pexpect \
+ netaddr \
+ pyYaml \
+ ipaddr
+RUN git clone https://github.com/secdev/scapy.git \
+ && cd scapy \
+ && python setup.py install \
+ && pip install --pre scapy[basic]
+# Fix for tcpdump/docker bug
+RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump \
+ && ln -s /usr/bin/tcpdump /usr/sbin/tcpdump
ENTRYPOINT bash