From 156b3d2a6e095379167b2d9a0c97ee3c02b14848 Mon Sep 17 00:00:00 2001
From: IWASE Yusuke <iwase.yusuke0@gmail.com>
Date: Thu, 17 Nov 2016 15:32:44 +0900
Subject: [PATCH] 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                            |  1 -
 ryu/tests/docker/mininet/Dockerfile    | 21 ---------------------
 ryu/tests/docker/mininet/ENTRYPOINT.sh |  7 -------
 ryu/tests/unit/lib/ovs/test_vsctl.py   |  2 +-
 4 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 ryu/tests/docker/mininet/Dockerfile
 delete mode 100644 ryu/tests/docker/mininet/ENTRYPOINT.sh

diff --git a/.travis.yml b/.travis.yml
index b98a6e25..67e9f8be 100644
--- a/.travis.yml
+++ b/.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:
diff --git a/ryu/tests/docker/mininet/Dockerfile b/ryu/tests/docker/mininet/Dockerfile
deleted file mode 100644
index 6e048bc3..00000000
--- a/ryu/tests/docker/mininet/Dockerfile
+++ /dev/null
@@ -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"]
diff --git a/ryu/tests/docker/mininet/ENTRYPOINT.sh b/ryu/tests/docker/mininet/ENTRYPOINT.sh
deleted file mode 100644
index 2b7e3180..00000000
--- a/ryu/tests/docker/mininet/ENTRYPOINT.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-service openvswitch-switch start
-
-bash
-
-service openvswitch-switch stop
diff --git a/ryu/tests/unit/lib/ovs/test_vsctl.py b/ryu/tests/unit/lib/ovs/test_vsctl.py
index c7fe8355..d32a536b 100644
--- a/ryu/tests/unit/lib/ovs/test_vsctl.py
+++ b/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'