From 0bef4837811daeb06980faaa4adaaa998c1cfe9f Mon Sep 17 00:00:00 2001 From: Anusha Ramineni Date: Fri, 11 Mar 2016 11:32:04 +0530 Subject: [PATCH] Use tempest.lib instead of tempest_lib Recent change in tempest migrated to tempest.lib instead of tempest-lib and soon tempest_lib will be deprecated. Ref: db9672e3473cd6046f269d63435e102a477d8cdd This commit is to update the same. Change-Id: Ifd8a79bdaf98d56dbb1855a7ce02888eb65840a3 --- .../congress_datasources/test_ceilometer.py | 11 +++++------ .../scenario/congress_datasources/test_cinder.py | 11 +++++------ .../scenario/congress_datasources/test_glancev2.py | 13 +++++++------ .../congress_datasources/test_keystonev2.py | 11 +++++------ .../scenario/congress_datasources/test_murano.py | 4 ++-- .../scenario/congress_datasources/test_neutronv2.py | 8 ++++---- .../scenario/congress_datasources/test_nova.py | 6 +++--- .../tests/scenario/congress_ha/test_ha.py | 6 +++--- .../tests/scenario/manager_congress.py | 12 ++++++------ .../tests/scenario/test_congress_basic_ops.py | 7 +++---- requirements.txt | 1 - 11 files changed, 43 insertions(+), 47 deletions(-) diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py index 175dc1a38..ff6af5d06 100644 --- a/congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py +++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_ceilometer.py @@ -14,13 +14,12 @@ # under the License. from oslo_log import log as logging -from tempest_lib import exceptions +from tempest import clients +from tempest import config +from tempest.lib import exceptions +from tempest import test -from tempest import clients # noqa -from tempest import config # noqa -from tempest import test # noqa - -from congress_tempest_tests.tests.scenario import manager_congress # noqa +from congress_tempest_tests.tests.scenario import manager_congress CONF = config.CONF diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py index f15fd8df3..aa81129c5 100644 --- a/congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py +++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_cinder.py @@ -14,13 +14,12 @@ # under the License. from oslo_log import log as logging -from tempest_lib import exceptions +from tempest import clients +from tempest import config +from tempest.lib import exceptions +from tempest import test -from tempest import clients # noqa -from tempest import config # noqa -from tempest import test # noqa - -from congress_tempest_tests.tests.scenario import manager_congress # noqa +from congress_tempest_tests.tests.scenario import manager_congress CONF = config.CONF diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_glancev2.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_glancev2.py index 2d5104393..d94119934 100644 --- a/congress_tempest_tests/tests/scenario/congress_datasources/test_glancev2.py +++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_glancev2.py @@ -12,13 +12,14 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from oslo_log import log as logging -from tempest import clients # noqa -from tempest import config # noqa -from tempest import test # noqa -from tempest_lib import exceptions -from congress_tempest_tests.tests.scenario import manager_congress # noqa +from oslo_log import log as logging +from tempest import clients +from tempest import config +from tempest.lib import exceptions +from tempest import test + +from congress_tempest_tests.tests.scenario import manager_congress CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py index 931925f9d..149c4c15c 100644 --- a/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py +++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_keystonev2.py @@ -14,13 +14,12 @@ # under the License. from oslo_log import log as logging -from tempest_lib import exceptions +from tempest import clients +from tempest import config +from tempest.lib import exceptions +from tempest import test -from tempest import clients # noqa -from tempest import config # noqa -from tempest import test # noqa - -from congress_tempest_tests.tests.scenario import manager_congress # noqa +from congress_tempest_tests.tests.scenario import manager_congress CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_murano.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_murano.py index ee9469086..14951bfde 100644 --- a/congress_tempest_tests/tests/scenario/congress_datasources/test_murano.py +++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_murano.py @@ -15,10 +15,10 @@ import random import string from tempest import config +from tempest.lib import decorators from tempest import test -from tempest_lib import decorators -from congress_tempest_tests.tests.scenario import manager_congress # noqa +from congress_tempest_tests.tests.scenario import manager_congress CONF = config.CONF diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_neutronv2.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_neutronv2.py index d84acbd1f..3dfdf1c25 100644 --- a/congress_tempest_tests/tests/scenario/congress_datasources/test_neutronv2.py +++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_neutronv2.py @@ -15,10 +15,10 @@ import time from oslo_log import log as logging -from tempest import clients # noqa -from tempest import config # noqa -from tempest import test # noqa -from tempest_lib import exceptions +from tempest import clients +from tempest import config +from tempest.lib import exceptions +from tempest import test from congress_tempest_tests.tests.scenario import helper from congress_tempest_tests.tests.scenario import manager_congress diff --git a/congress_tempest_tests/tests/scenario/congress_datasources/test_nova.py b/congress_tempest_tests/tests/scenario/congress_datasources/test_nova.py index 6c5802639..db3e5f69e 100644 --- a/congress_tempest_tests/tests/scenario/congress_datasources/test_nova.py +++ b/congress_tempest_tests/tests/scenario/congress_datasources/test_nova.py @@ -14,9 +14,9 @@ # under the License. from oslo_log import log as logging -from tempest import config # noqa -from tempest import test # noqa -from tempest_lib import exceptions +from tempest import config +from tempest.lib import exceptions +from tempest import test from congress_tempest_tests.tests.scenario import helper from congress_tempest_tests.tests.scenario import manager_congress diff --git a/congress_tempest_tests/tests/scenario/congress_ha/test_ha.py b/congress_tempest_tests/tests/scenario/congress_ha/test_ha.py index 0c0493815..2ee97142b 100644 --- a/congress_tempest_tests/tests/scenario/congress_ha/test_ha.py +++ b/congress_tempest_tests/tests/scenario/congress_ha/test_ha.py @@ -21,13 +21,13 @@ import tempfile from oslo_log import log as logging from tempest.common import cred_provider from tempest import config +from tempest.lib import decorators +from tempest.lib import exceptions from tempest import manager as tempestmanager from tempest import test -from tempest_lib import decorators -from tempest_lib import exceptions from congress_tempest_tests.services.policy import policy_client -from congress_tempest_tests.tests.scenario import manager_congress # noqa +from congress_tempest_tests.tests.scenario import manager_congress CONF = config.CONF LOG = logging.getLogger(__name__) diff --git a/congress_tempest_tests/tests/scenario/manager_congress.py b/congress_tempest_tests/tests/scenario/manager_congress.py index e0ce4b09d..f641d54b4 100644 --- a/congress_tempest_tests/tests/scenario/manager_congress.py +++ b/congress_tempest_tests/tests/scenario/manager_congress.py @@ -18,13 +18,13 @@ import re from oslo_log import log as logging from tempest.common import credentials_factory as credentials -from tempest import config # noqa +from tempest import config +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions from tempest import manager as tempestmanager -from tempest.scenario import manager # noqa -from tempest.services.network import resources as net_resources # noqa -from tempest import test # noqa -from tempest_lib.common.utils import data_utils -from tempest_lib import exceptions +from tempest.scenario import manager +from tempest.services.network import resources as net_resources +from tempest import test from congress_tempest_tests.services.policy import policy_client diff --git a/congress_tempest_tests/tests/scenario/test_congress_basic_ops.py b/congress_tempest_tests/tests/scenario/test_congress_basic_ops.py index ab57e2ce2..a45bd37f1 100644 --- a/congress_tempest_tests/tests/scenario/test_congress_basic_ops.py +++ b/congress_tempest_tests/tests/scenario/test_congress_basic_ops.py @@ -15,10 +15,9 @@ # under the License. from oslo_log import log as logging -from tempest_lib import exceptions - -from tempest import config # noqa -from tempest import test # noqa +from tempest import config +from tempest.lib import exceptions +from tempest import test from congress_tempest_tests.tests.scenario import helper from congress_tempest_tests.tests.scenario import manager_congress diff --git a/requirements.txt b/requirements.txt index 4df4d3878..8040febb0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -35,5 +35,4 @@ oslo.utils>=3.5.0 # Apache-2.0 oslo.middleware>=3.0.0 # Apache-2.0 oslo.vmware>=1.16.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 -tempest-lib>=0.14.0 # Apache-2.0 WebOb>=1.2.3 # MIT