From f152c69ee0e57c048bb43b50b9ea1a0417e994e2 Mon Sep 17 00:00:00 2001
From: IWASE Yusuke <iwase.yusuke0@gmail.com>
Date: Tue, 6 Dec 2016 15:14:42 +0900
Subject: [PATCH] bgp_scenario_test: Switch Python version

With Ubuntu base Docker image, Python 2.7 will always be used on
Scenario test containers if we just install "python-*".

This patch fixes to switch base Docker image and enables to use
the specific Python version.

Signed-off-by: IWASE Yusuke <iwase.yusuke0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
---
 ryu/tests/integrated/bgp/base.py           |  5 ++++-
 ryu/tests/integrated/bgp/base_ip6.py       |  5 ++++-
 ryu/tests/integrated/common/docker_base.py | 10 ----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/ryu/tests/integrated/bgp/base.py b/ryu/tests/integrated/bgp/base.py
index 39186bb6..26fa396c 100644
--- a/ryu/tests/integrated/bgp/base.py
+++ b/ryu/tests/integrated/bgp/base.py
@@ -17,6 +17,7 @@
 from __future__ import absolute_import
 
 import logging
+import sys
 import unittest
 
 from ryu.tests.integrated.common import docker_base as ctn_base
@@ -40,7 +41,9 @@ class BgpSpeakerTestBase(unittest.TestCase):
         cls.bridges.append(cls.brdc1)
 
         cls.dockerimg = ctn_base.DockerImage()
-        cls.r_img = cls.dockerimg.create_ryu(check_exist=True)
+        image = 'python:%d.%d' % (
+            sys.version_info.major, sys.version_info.minor)
+        cls.r_img = cls.dockerimg.create_ryu(image=image, check_exist=True)
         cls.images.append(cls.r_img)
         cls.q_img = 'osrg/quagga'
         cls.images.append(cls.q_img)
diff --git a/ryu/tests/integrated/bgp/base_ip6.py b/ryu/tests/integrated/bgp/base_ip6.py
index ebe4e5b6..be26fafd 100644
--- a/ryu/tests/integrated/bgp/base_ip6.py
+++ b/ryu/tests/integrated/bgp/base_ip6.py
@@ -17,6 +17,7 @@
 from __future__ import absolute_import
 
 import logging
+import sys
 import unittest
 
 from ryu.tests.integrated.common import docker_base as ctn_base
@@ -40,7 +41,9 @@ class BgpSpeakerTestBase(unittest.TestCase):
         cls.bridges.append(cls.brdc1)
 
         cls.dockerimg = ctn_base.DockerImage()
-        cls.r_img = cls.dockerimg.create_ryu(check_exist=True)
+        image = 'python:%d.%d' % (
+            sys.version_info.major, sys.version_info.minor)
+        cls.r_img = cls.dockerimg.create_ryu(image=image, check_exist=True)
         cls.images.append(cls.r_img)
         cls.q_img = 'osrg/quagga'
         cls.images.append(cls.q_img)
diff --git a/ryu/tests/integrated/common/docker_base.py b/ryu/tests/integrated/common/docker_base.py
index 7e133136..e2f9a985 100644
--- a/ryu/tests/integrated/common/docker_base.py
+++ b/ryu/tests/integrated/common/docker_base.py
@@ -196,18 +196,8 @@ class DockerImage(object):
         workdir = os.path.join(TEST_BASE_DIR, tagname)
         workdir_ctn = '/root/osrg/ryu'
         pkges = ' '.join([
-            'telnet',
             'tcpdump',
             'iproute2',
-            'python-setuptools',
-            'python-pip',
-            'gcc',
-            'python-dev',
-            'libffi-dev',
-            'libssl-dev',
-            'libxml2-dev',
-            'libxslt1-dev',
-            'zlib1g-dev',
         ])
         if image:
             use_image = image