From: fumihiko kakuma <kak...@valinux.co.jp>
Signed-off-by: Fumihiko Kakuma <kak...@valinux.co.jp>
---
.travis.yml | 2 +-
ryu/{tests/integrated/common => lib/docker}/__init__.py | 0
ryu/{tests/integrated/common => lib/docker}/docker_base.py | 0
.../integrated/common => lib/docker}/install_docker_test_pkg.sh | 0
.../common => lib/docker}/install_docker_test_pkg_common.sh | 0
.../common => lib/docker}/install_docker_test_pkg_for_travis.sh | 0
ryu/{tests/integrated/common => lib/docker}/quagga.py | 0
ryu/{tests/integrated/common => lib/docker}/ryubgp.py | 0
ryu/tests/integrated/__init__.py | 0
tests/integrated/bgp/base.py | 6 +++---
tests/integrated/bgp/base_ip6.py | 6 +++---
tests/integrated/bgp/test_basic.py | 2 +-
tests/integrated/bgp/test_ip6_basic.py | 2 +-
13 files changed, 9 insertions(+), 9 deletions(-)
rename ryu/{tests/integrated/common => lib/docker}/__init__.py (100%)
rename ryu/{tests/integrated/common => lib/docker}/docker_base.py (100%)
rename ryu/{tests/integrated/common => lib/docker}/install_docker_test_pkg.sh
(100%)
rename ryu/{tests/integrated/common =>
lib/docker}/install_docker_test_pkg_common.sh (100%)
rename ryu/{tests/integrated/common =>
lib/docker}/install_docker_test_pkg_for_travis.sh (100%)
rename ryu/{tests/integrated/common => lib/docker}/quagga.py (100%)
rename ryu/{tests/integrated/common => lib/docker}/ryubgp.py (100%)
delete mode 100644 ryu/tests/integrated/__init__.py
diff --git a/.travis.yml b/.travis.yml
index 9e5474a..cd35aac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ sudo: required # Required to enable Docker service
install:
- pip install tox coveralls
- - bash ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
+ - bash ryu/lib/docker/install_docker_test_pkg_for_travis.sh
script:
- NOSE_VERBOSE=0 tox -e $TOX_ENV
diff --git a/ryu/tests/integrated/common/__init__.py
b/ryu/lib/docker/__init__.py
similarity index 100%
rename from ryu/tests/integrated/common/__init__.py
rename to ryu/lib/docker/__init__.py
diff --git a/ryu/tests/integrated/common/docker_base.py
b/ryu/lib/docker/docker_base.py
similarity index 100%
rename from ryu/tests/integrated/common/docker_base.py
rename to ryu/lib/docker/docker_base.py
diff --git a/ryu/tests/integrated/common/install_docker_test_pkg.sh
b/ryu/lib/docker/install_docker_test_pkg.sh
similarity index 100%
rename from ryu/tests/integrated/common/install_docker_test_pkg.sh
rename to ryu/lib/docker/install_docker_test_pkg.sh
diff --git a/ryu/tests/integrated/common/install_docker_test_pkg_common.sh
b/ryu/lib/docker/install_docker_test_pkg_common.sh
similarity index 100%
rename from ryu/tests/integrated/common/install_docker_test_pkg_common.sh
rename to ryu/lib/docker/install_docker_test_pkg_common.sh
diff --git a/ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
b/ryu/lib/docker/install_docker_test_pkg_for_travis.sh
similarity index 100%
rename from ryu/tests/integrated/common/install_docker_test_pkg_for_travis.sh
rename to ryu/lib/docker/install_docker_test_pkg_for_travis.sh
diff --git a/ryu/tests/integrated/common/quagga.py b/ryu/lib/docker/quagga.py
similarity index 100%
rename from ryu/tests/integrated/common/quagga.py
rename to ryu/lib/docker/quagga.py
diff --git a/ryu/tests/integrated/common/ryubgp.py b/ryu/lib/docker/ryubgp.py
similarity index 100%
rename from ryu/tests/integrated/common/ryubgp.py
rename to ryu/lib/docker/ryubgp.py
diff --git a/ryu/tests/integrated/__init__.py b/ryu/tests/integrated/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/tests/integrated/bgp/base.py b/tests/integrated/bgp/base.py
index 26fa396..2f210de 100644
--- a/tests/integrated/bgp/base.py
+++ b/tests/integrated/bgp/base.py
@@ -20,9 +20,9 @@ import logging
import sys
import unittest
-from ryu.tests.integrated.common import docker_base as ctn_base
-from ryu.tests.integrated.common import ryubgp
-from ryu.tests.integrated.common import quagga
+from ryu.lib.docker import docker_base as ctn_base
+from ryu.lib.docker import ryubgp
+from ryu.lib.docker import quagga
LOG = logging.getLogger(__name__)
diff --git a/tests/integrated/bgp/base_ip6.py b/tests/integrated/bgp/base_ip6.py
index be26faf..d867920 100644
--- a/tests/integrated/bgp/base_ip6.py
+++ b/tests/integrated/bgp/base_ip6.py
@@ -20,9 +20,9 @@ import logging
import sys
import unittest
-from ryu.tests.integrated.common import docker_base as ctn_base
-from ryu.tests.integrated.common import ryubgp
-from ryu.tests.integrated.common import quagga
+from ryu.lib.docker import docker_base as ctn_base
+from ryu.lib.docker import ryubgp
+from ryu.lib.docker import quagga
LOG = logging.getLogger(__name__)
diff --git a/tests/integrated/bgp/test_basic.py
b/tests/integrated/bgp/test_basic.py
index 5817d44..d1eda39 100644
--- a/tests/integrated/bgp/test_basic.py
+++ b/tests/integrated/bgp/test_basic.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
import time
-from ryu.tests.integrated.common import docker_base as ctn_base
+from ryu.lib.docker import docker_base as ctn_base
from . import base
diff --git a/tests/integrated/bgp/test_ip6_basic.py
b/tests/integrated/bgp/test_ip6_basic.py
index 40461a5..911a0b5 100644
--- a/tests/integrated/bgp/test_ip6_basic.py
+++ b/tests/integrated/bgp/test_ip6_basic.py
@@ -18,7 +18,7 @@ from __future__ import absolute_import
import time
-from ryu.tests.integrated.common import docker_base as ctn_base
+from ryu.lib.docker import docker_base as ctn_base
from . import base_ip6 as base
--
2.7.4
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Ryu-devel mailing list
Ryu-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ryu-devel
