summaryrefslogtreecommitdiff
path: root/functional
diff options
context:
space:
mode:
Diffstat (limited to 'functional')
-rw-r--r--functional/common/test.py4
-rw-r--r--functional/tests/compute/v2/test_keypair.py4
-rw-r--r--functional/tests/compute/v2/test_server.py4
-rw-r--r--functional/tests/identity/v2/test_identity.py2
-rw-r--r--functional/tests/identity/v2/test_project.py2
-rw-r--r--functional/tests/identity/v2/test_user.py4
-rw-r--r--functional/tests/identity/v3/test_domain.py4
-rw-r--r--functional/tests/identity/v3/test_endpoint.py2
-rw-r--r--functional/tests/identity/v3/test_group.py2
-rw-r--r--functional/tests/identity/v3/test_identity.py2
-rw-r--r--functional/tests/identity/v3/test_idp.py2
-rw-r--r--functional/tests/identity/v3/test_project.py2
-rw-r--r--functional/tests/identity/v3/test_role.py2
-rw-r--r--functional/tests/identity/v3/test_service.py2
-rw-r--r--functional/tests/identity/v3/test_service_provider.py2
-rw-r--r--functional/tests/identity/v3/test_user.py2
16 files changed, 21 insertions, 21 deletions
diff --git a/functional/common/test.py b/functional/common/test.py
index 9887c765..43615615 100644
--- a/functional/common/test.py
+++ b/functional/common/test.py
@@ -17,8 +17,8 @@ import subprocess
import testtools
import six
-from tempest_lib.cli import output_parser
-from tempest_lib import exceptions
+from tempest.lib.cli import output_parser
+from tempest.lib import exceptions
COMMON_DIR = os.path.dirname(os.path.abspath(__file__))
diff --git a/functional/tests/compute/v2/test_keypair.py b/functional/tests/compute/v2/test_keypair.py
index 80cd4b46..6bc5cdb7 100644
--- a/functional/tests/compute/v2/test_keypair.py
+++ b/functional/tests/compute/v2/test_keypair.py
@@ -14,8 +14,8 @@ import tempfile
from functional.common import test
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
class KeypairBase(test.TestCase):
diff --git a/functional/tests/compute/v2/test_server.py b/functional/tests/compute/v2/test_server.py
index 198bd56b..4309aeaa 100644
--- a/functional/tests/compute/v2/test_server.py
+++ b/functional/tests/compute/v2/test_server.py
@@ -12,11 +12,11 @@
import time
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
import testtools
from functional.common import test
-from tempest_lib import exceptions
+from tempest.lib import exceptions
class ServerTests(test.TestCase):
diff --git a/functional/tests/identity/v2/test_identity.py b/functional/tests/identity/v2/test_identity.py
index 4346499c..9adbe49f 100644
--- a/functional/tests/identity/v2/test_identity.py
+++ b/functional/tests/identity/v2/test_identity.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.common import test
diff --git a/functional/tests/identity/v2/test_project.py b/functional/tests/identity/v2/test_project.py
index 3a5e8e81..e9580ecf 100644
--- a/functional/tests/identity/v2/test_project.py
+++ b/functional/tests/identity/v2/test_project.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.tests.identity.v2 import test_identity
diff --git a/functional/tests/identity/v2/test_user.py b/functional/tests/identity/v2/test_user.py
index a0c1a46b..34cabf7b 100644
--- a/functional/tests/identity/v2/test_user.py
+++ b/functional/tests/identity/v2/test_user.py
@@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
from functional.tests.identity.v2 import test_identity
diff --git a/functional/tests/identity/v3/test_domain.py b/functional/tests/identity/v3/test_domain.py
index 221efd6a..0708e420 100644
--- a/functional/tests/identity/v3/test_domain.py
+++ b/functional/tests/identity/v3/test_domain.py
@@ -10,8 +10,8 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
-from tempest_lib import exceptions
+from tempest.lib.common.utils import data_utils
+from tempest.lib import exceptions
from functional.tests.identity.v3 import test_identity
diff --git a/functional/tests/identity/v3/test_endpoint.py b/functional/tests/identity/v3/test_endpoint.py
index e68aa848..ec11deab 100644
--- a/functional/tests/identity/v3/test_endpoint.py
+++ b/functional/tests/identity/v3/test_endpoint.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.tests.identity.v3 import test_identity
diff --git a/functional/tests/identity/v3/test_group.py b/functional/tests/identity/v3/test_group.py
index 156a9ff1..3f58864d 100644
--- a/functional/tests/identity/v3/test_group.py
+++ b/functional/tests/identity/v3/test_group.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.tests.identity.v3 import test_identity
diff --git a/functional/tests/identity/v3/test_identity.py b/functional/tests/identity/v3/test_identity.py
index b8c652ab..3f988742 100644
--- a/functional/tests/identity/v3/test_identity.py
+++ b/functional/tests/identity/v3/test_identity.py
@@ -12,7 +12,7 @@
import os
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.common import test
diff --git a/functional/tests/identity/v3/test_idp.py b/functional/tests/identity/v3/test_idp.py
index 3d6739d7..08f660f6 100644
--- a/functional/tests/identity/v3/test_idp.py
+++ b/functional/tests/identity/v3/test_idp.py
@@ -11,7 +11,7 @@
# under the License.
from functional.tests.identity.v3 import test_identity
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
class IdentityProviderTests(test_identity.IdentityTests):
diff --git a/functional/tests/identity/v3/test_project.py b/functional/tests/identity/v3/test_project.py
index 6c278691..d060c7b1 100644
--- a/functional/tests/identity/v3/test_project.py
+++ b/functional/tests/identity/v3/test_project.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.tests.identity.v3 import test_identity
diff --git a/functional/tests/identity/v3/test_role.py b/functional/tests/identity/v3/test_role.py
index 5f150b05..29dc4b20 100644
--- a/functional/tests/identity/v3/test_role.py
+++ b/functional/tests/identity/v3/test_role.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.tests.identity.v3 import test_identity
diff --git a/functional/tests/identity/v3/test_service.py b/functional/tests/identity/v3/test_service.py
index 147208a2..684fa5fe 100644
--- a/functional/tests/identity/v3/test_service.py
+++ b/functional/tests/identity/v3/test_service.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.tests.identity.v3 import test_identity
diff --git a/functional/tests/identity/v3/test_service_provider.py b/functional/tests/identity/v3/test_service_provider.py
index eed9fccb..936c6620 100644
--- a/functional/tests/identity/v3/test_service_provider.py
+++ b/functional/tests/identity/v3/test_service_provider.py
@@ -11,7 +11,7 @@
# under the License.
from functional.tests.identity.v3 import test_identity
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
class ServiceProviderTests(test_identity.IdentityTests):
diff --git a/functional/tests/identity/v3/test_user.py b/functional/tests/identity/v3/test_user.py
index 00b9bdc2..cc3e08a0 100644
--- a/functional/tests/identity/v3/test_user.py
+++ b/functional/tests/identity/v3/test_user.py
@@ -10,7 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib.common.utils import data_utils
+from tempest.lib.common.utils import data_utils
from functional.tests.identity.v3 import test_identity
View Lorry Controller Status