commit e025341c8d616c4a1eaa78c5c7757e7641b66690
author Jenkins <jenkins@review.openstack.org> Tue Nov 15 09:24:47 2016 +0000
committer Gerrit Code Review <review@openstack.org> Tue Nov 15 09:24:47 2016 +0000
tree 3c0299a05cab4dd9e23c39b5dd5f6b85297ab456
parent f88949f6a50452d584dc0d12d570ed99e1653833
parent ffc4fc0538a9d223e82fcbf0bf9fe7e6a027cd54

Merge "Use the correct path of InvalidConfiguration"

tempest/api/compute/base.py

diff --git a/tempest/api/compute/base.py b/tempest/api/compute/base.py
index b738e82..d8294f7 100644
--- a/tempest/api/compute/base.py
+++ b/tempest/api/compute/base.py
@@ -365,7 +365,7 @@
                     return address['addr']
             raise exceptions.ServerUnreachable(server_id=server['id'])
         else:
-            raise exceptions.InvalidConfiguration()
+            raise lib_exc.InvalidConfiguration()
 
     def setUp(self):
         super(BaseV2ComputeTest, self).setUp()

tempest/api/compute/images/test_image_metadata.py

diff --git a/tempest/api/compute/images/test_image_metadata.py b/tempest/api/compute/images/test_image_metadata.py
index 999233d..26d4efe 100644
--- a/tempest/api/compute/images/test_image_metadata.py
+++ b/tempest/api/compute/images/test_image_metadata.py
@@ -20,7 +20,7 @@
 from tempest.common.utils import data_utils
 from tempest.common import waiters
 from tempest import config
-from tempest import exceptions
+from tempest.lib import exceptions
 from tempest import test
 
 CONF = config.CONF