test_vsctl: Use osrg/ryu-book image as Mininet container

This patch fixes test_vsctl.py to use osrg/ryu-book image as
Mininet container and shortens the testing hours.

Also, this patch removes the Dockerfile for building the Mininet
Docker image.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>

.travis.yml

@@ -15,7 +15,6 @@ services:
 sudo: required  # Required to enable Docker service
 
 install:
-  - docker build -t ut_mininet ryu/tests/docker/mininet/
   - pip install tox coveralls
 
 script:

ryu/tests/docker/mininet/Dockerfile

@@ -1,21 +0,0 @@
-FROM ubuntu:16.04
-
-MAINTAINER IWASE Yusuke <iwase.yusuke0@gmail.com>
-
-USER root
-WORKDIR /root
-
-COPY ENTRYPOINT.sh /
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    iproute2 \
-    mininet \
-    net-tools \
- && rm -rf /var/lib/apt/lists/* \
- && sed -i -e "s/datapath='kernel'/datapath='user'/" \
-        /usr/lib/python2.7/dist-packages/mininet/node.py \
- && chmod +x /ENTRYPOINT.sh
-
-EXPOSE 6640
-
-ENTRYPOINT ["/ENTRYPOINT.sh"]

ryu/tests/docker/mininet/ENTRYPOINT.sh

@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-service openvswitch-switch start
-
-bash
-
-service openvswitch-switch stop

ryu/tests/unit/lib/ovs/test_vsctl.py

@@ -27,7 +27,7 @@ from ryu.lib.ovs import vsctl
 
 LOG = logging.getLogger(__name__)
 
-DOCKER_IMAGE_MININET = 'ut_mininet'
+DOCKER_IMAGE_MININET = 'osrg/ryu-book'
 
 OVSDB_MANAGER_ADDR = 'ptcp:6640'
 OVSDB_SWITCH_ADDR = 'tcp:%s:6640'