From 016b6d88f287e5d709ef1e796b9d71a545d6c809 Mon Sep 17 00:00:00 2001 From: Cédric Ollivier Date: Mon, 26 Feb 2018 10:42:02 +0100 Subject: Host openstack utils in SDNVPN MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SDNVPN is the last project using the deprecated openstack utils which are being removed from Functest tree. All methods unused by SDNVPN could be safely removed in a second change. This patch aims at publishing them asis. Change-Id: I4e479e6def2c691799c9bd86ba325e3d1544ef0d Signed-off-by: Cédric Ollivier --- sdnvpn/test/functest/run_sdnvpn_tests.py | 2 +- sdnvpn/test/functest/testcase_1.py | 2 +- sdnvpn/test/functest/testcase_10.py | 2 +- sdnvpn/test/functest/testcase_11.py | 2 +- sdnvpn/test/functest/testcase_12.py | 4 ++-- sdnvpn/test/functest/testcase_13.py | 2 +- sdnvpn/test/functest/testcase_2.py | 2 +- sdnvpn/test/functest/testcase_3.py | 2 +- sdnvpn/test/functest/testcase_4.py | 2 +- sdnvpn/test/functest/testcase_7.py | 2 +- sdnvpn/test/functest/testcase_8.py | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) (limited to 'sdnvpn/test/functest') diff --git a/sdnvpn/test/functest/run_sdnvpn_tests.py b/sdnvpn/test/functest/run_sdnvpn_tests.py index 1ddc4c6..7da6571 100644 --- a/sdnvpn/test/functest/run_sdnvpn_tests.py +++ b/sdnvpn/test/functest/run_sdnvpn_tests.py @@ -16,8 +16,8 @@ import traceback import yaml from functest.core import feature as base -from functest.utils import openstack_utils as os_utils from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib.gather_logs import gather_logs from sdnvpn.lib import utils as test_utils diff --git a/sdnvpn/test/functest/testcase_1.py b/sdnvpn/test/functest/testcase_1.py index b60a3c3..74105de 100644 --- a/sdnvpn/test/functest/testcase_1.py +++ b/sdnvpn/test/functest/testcase_1.py @@ -12,9 +12,9 @@ import logging import sys import time -from functest.utils import openstack_utils as os_utils from random import randint from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_10.py b/sdnvpn/test/functest/testcase_10.py index 02956c4..7a3f563 100644 --- a/sdnvpn/test/functest/testcase_10.py +++ b/sdnvpn/test/functest/testcase_10.py @@ -13,9 +13,9 @@ import re import sys import time -from functest.utils import openstack_utils as os_utils from multiprocessing import Process, Manager, Lock from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_11.py b/sdnvpn/test/functest/testcase_11.py index 40de205..3d9123f 100644 --- a/sdnvpn/test/functest/testcase_11.py +++ b/sdnvpn/test/functest/testcase_11.py @@ -11,8 +11,8 @@ import logging import sys -from functest.utils import openstack_utils as os_utils from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_12.py b/sdnvpn/test/functest/testcase_12.py index 0916e9f..ebbb67a 100644 --- a/sdnvpn/test/functest/testcase_12.py +++ b/sdnvpn/test/functest/testcase_12.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +!/usr/bin/python # # Copyright (c) 2017 All rights reserved # This program and the accompanying materials @@ -11,8 +11,8 @@ import logging import sys -from functest.utils import openstack_utils as os_utils from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_13.py b/sdnvpn/test/functest/testcase_13.py index 7211668..9905cf3 100644 --- a/sdnvpn/test/functest/testcase_13.py +++ b/sdnvpn/test/functest/testcase_13.py @@ -11,9 +11,9 @@ import logging import sys -from functest.utils import openstack_utils as os_utils from random import randint from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_2.py b/sdnvpn/test/functest/testcase_2.py index d136d8f..1d1ea42 100644 --- a/sdnvpn/test/functest/testcase_2.py +++ b/sdnvpn/test/functest/testcase_2.py @@ -11,9 +11,9 @@ import logging import sys -from functest.utils import openstack_utils as os_utils from random import randint from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_3.py b/sdnvpn/test/functest/testcase_3.py index 88fb421..6e7cbae 100644 --- a/sdnvpn/test/functest/testcase_3.py +++ b/sdnvpn/test/functest/testcase_3.py @@ -17,8 +17,8 @@ import os import sys from functest.utils import functest_utils as ft_utils -from functest.utils import openstack_utils as os_utils from sdnvpn.lib import quagga +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib import config as sdnvpn_config from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_4.py b/sdnvpn/test/functest/testcase_4.py index 042fb59..5d94861 100644 --- a/sdnvpn/test/functest/testcase_4.py +++ b/sdnvpn/test/functest/testcase_4.py @@ -12,9 +12,9 @@ import logging import sys import time -from functest.utils import openstack_utils as os_utils from random import randint from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_7.py b/sdnvpn/test/functest/testcase_7.py index 0e3a8f5..61ac6d0 100644 --- a/sdnvpn/test/functest/testcase_7.py +++ b/sdnvpn/test/functest/testcase_7.py @@ -21,8 +21,8 @@ network associated: import logging import sys -from functest.utils import openstack_utils as os_utils from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results diff --git a/sdnvpn/test/functest/testcase_8.py b/sdnvpn/test/functest/testcase_8.py index e372fe1..4d57bae 100644 --- a/sdnvpn/test/functest/testcase_8.py +++ b/sdnvpn/test/functest/testcase_8.py @@ -21,8 +21,8 @@ Test whether router assoc can coexist with floating IP import logging import sys -from functest.utils import openstack_utils as os_utils from sdnvpn.lib import config as sdnvpn_config +from sdnvpn.lib import openstack_utils as os_utils from sdnvpn.lib import utils as test_utils from sdnvpn.lib.results import Results -- cgit 1.2.3-korg