From 98e7250c8b81e8990e51bddffd3ce999a3b99e22 Mon Sep 17 00:00:00 2001 From: ghanshyam Date: Fri, 7 Oct 2016 18:44:20 +0900 Subject: [PATCH] Fix more import --- requirements.txt | 2 +- tempest_stress/actions/server_create_destroy.py | 2 +- tempest_stress/actions/ssh_floating.py | 2 +- tempest_stress/actions/unit_test.py | 2 +- tempest_stress/actions/volume_attach_delete.py | 2 +- tempest_stress/actions/volume_attach_verify.py | 2 +- tempest_stress/actions/volume_create_delete.py | 2 +- tempest_stress/cmd/run_stress.py | 2 +- tempest_stress/driver.py | 2 +- tempest_stress/tests/stress/test_stressaction.py | 2 +- tempest_stress/tools/cleanup.py | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index d639e14..0515bcd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ pbr>=1.6 # Apache-2.0 Babel>=1.3 oslo.log>=1.14.0 # Apache-2.0 -tempest>=1333.0.0 +tempest>=13.0.0 diff --git a/tempest_stress/actions/server_create_destroy.py b/tempest_stress/actions/server_create_destroy.py index e64a54b..22d088b 100644 --- a/tempest_stress/actions/server_create_destroy.py +++ b/tempest_stress/actions/server_create_destroy.py @@ -15,7 +15,7 @@ from tempest.common.utils import data_utils from tempest.common import waiters from tempest import config -import tempest_stress.stress.stressaction as stressaction +import tempest_stress.stressaction as stressaction CONF = config.CONF diff --git a/tempest_stress/actions/ssh_floating.py b/tempest_stress/actions/ssh_floating.py index 9dea668..c6bd35a 100644 --- a/tempest_stress/actions/ssh_floating.py +++ b/tempest_stress/actions/ssh_floating.py @@ -17,7 +17,7 @@ from tempest.common.utils import data_utils from tempest.common import waiters from tempest import config from tempest.lib.common.utils import test_utils -import tempest_stress.stress.stressaction as stressaction +import tempest_stress.stressaction as stressaction CONF = config.CONF diff --git a/tempest_stress/actions/unit_test.py b/tempest_stress/actions/unit_test.py index 4a43ac6..46c4d07 100644 --- a/tempest_stress/actions/unit_test.py +++ b/tempest_stress/actions/unit_test.py @@ -14,7 +14,7 @@ from oslo_log import log as logging from oslo_utils import importutils from tempest import config -import tempest_stress.stress.stressaction as stressaction +import tempest_stress.stressaction as stressaction CONF = config.CONF diff --git a/tempest_stress/actions/volume_attach_delete.py b/tempest_stress/actions/volume_attach_delete.py index 2b0f429..2307885 100644 --- a/tempest_stress/actions/volume_attach_delete.py +++ b/tempest_stress/actions/volume_attach_delete.py @@ -14,7 +14,7 @@ from tempest.common.utils import data_utils from tempest.common import waiters from tempest import config -import tempest_stress.stress.stressaction as stressaction +import tempest_stress.stressaction as stressaction CONF = config.CONF diff --git a/tempest_stress/actions/volume_attach_verify.py b/tempest_stress/actions/volume_attach_verify.py index 3bc8004..444920d 100644 --- a/tempest_stress/actions/volume_attach_verify.py +++ b/tempest_stress/actions/volume_attach_verify.py @@ -17,7 +17,7 @@ from tempest.common.utils.linux import remote_client from tempest.common import waiters from tempest import config from tempest.lib.common.utils import test_utils -import tempest_stress.stress.stressaction as stressaction +import tempest_stress.stressaction as stressaction CONF = config.CONF diff --git a/tempest_stress/actions/volume_create_delete.py b/tempest_stress/actions/volume_create_delete.py index f2e956a..ea75418 100644 --- a/tempest_stress/actions/volume_create_delete.py +++ b/tempest_stress/actions/volume_create_delete.py @@ -12,7 +12,7 @@ from tempest.common.utils import data_utils from tempest import config -import tempest_stress.stress.stressaction as stressaction +import tempest_stress.stressaction as stressaction CONF = config.CONF diff --git a/tempest_stress/cmd/run_stress.py b/tempest_stress/cmd/run_stress.py index f99a4d9..0fafbea 100755 --- a/tempest_stress/cmd/run_stress.py +++ b/tempest_stress/cmd/run_stress.py @@ -27,7 +27,7 @@ except ImportError: from oslo_log import log as logging from testtools import testsuite -from tempest_stress.stress import driver +from tempest_stress import driver LOG = logging.getLogger(__name__) diff --git a/tempest_stress/driver.py b/tempest_stress/driver.py index 0316010..3aa815c 100644 --- a/tempest_stress/driver.py +++ b/tempest_stress/driver.py @@ -28,7 +28,7 @@ from tempest.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.lib.common import ssh -from tempest_stress.stress import cleanup +from tempest_stress import cleanup CONF = config.CONF diff --git a/tempest_stress/tests/stress/test_stressaction.py b/tempest_stress/tests/stress/test_stressaction.py index 0b2d3ae..946a864 100644 --- a/tempest_stress/tests/stress/test_stressaction.py +++ b/tempest_stress/tests/stress/test_stressaction.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -import tempest_stress.stress.stressaction as stressaction +import tempest_stress.stressaction as stressaction import tempest.test diff --git a/tempest_stress/tools/cleanup.py b/tempest_stress/tools/cleanup.py index 36d3233..7e3ae1e 100755 --- a/tempest_stress/tools/cleanup.py +++ b/tempest_stress/tools/cleanup.py @@ -14,6 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -from tempest_stress.stress import cleanup +from tempest_stress import cleanup cleanup.cleanup()