[Scenario] Split Scenarios - P3

Move under plugins/openstack:
    * Sahara
    * Swift
    * Glance
    * Cinder

Implements: blueprint split-plugins

Change-Id: I095d4efe181308feffbd49c59a1c52fa2ce0ca59

rally/benchmark/scenarios/nova/servers.py

@@ -16,7 +16,6 @@
 import jsonschema
 
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.cinder import utils as cinder_utils
 from rally.benchmark.scenarios.nova import utils
 from rally.benchmark.scenarios import utils as scenario_utils
 from rally.benchmark import types as types
@@ -25,6 +24,7 @@ from rally.benchmark.wrappers import network as network_wrapper
 from rally.common import log as logging
 from rally import consts
 from rally import exceptions as rally_exceptions
+from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils
 
 
 LOG = logging.getLogger(__name__)

rally/benchmark/scenarios/vm/vmtasks.py

@@ -16,13 +16,13 @@
 import json
 
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.cinder import utils as cinder_utils
 from rally.benchmark.scenarios.nova import utils as nova_utils
 from rally.benchmark.scenarios.vm import utils as vm_utils
 from rally.benchmark import types as types
 from rally.benchmark import validation
 from rally import consts
 from rally import exceptions
+from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils
 
 
 class VMTasks(nova_utils.NovaScenario, vm_utils.VMScenario,

rally/common/opts.py

@@ -14,16 +14,17 @@
 
 import itertools
 
-from rally.benchmark.scenarios.cinder import utils as cinder_utils
+
 from rally.benchmark.scenarios.ec2 import utils as ec2_utils
-from rally.benchmark.scenarios.glance import utils as glance_utils
 from rally.benchmark.scenarios.heat import utils as heat_utils
 from rally.benchmark.scenarios.nova import utils as nova_utils
-from rally.benchmark.scenarios.sahara import utils as sahara_utils
 from rally.common import log
 from rally import exceptions
 from rally import osclients
 from rally.plugins.openstack.context import users
+from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils
+from rally.plugins.openstack.scenarios.glance import utils as glance_utils
+from rally.plugins.openstack.scenarios.sahara import utils as sahara_utils
 from rally.verification.tempest import config as tempest_conf
 
 

rally/plugins/openstack/context/images.py

@@ -13,13 +13,13 @@
 # under the License.
 
 from rally.benchmark.context import base
-from rally.benchmark.scenarios.glance import utils as glance_utils
 from rally.common.i18n import _
 from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import osclients
 from rally.plugins.openstack.context.cleanup import manager as resource_manager
+from rally.plugins.openstack.scenarios.glance import utils as glance_utils
 
 
 LOG = logging.getLogger(__name__)

rally/plugins/openstack/context/sahara/sahara_cluster.py

@@ -16,7 +16,6 @@
 from oslo_config import cfg
 
 from rally.benchmark.context import base
-from rally.benchmark.scenarios.sahara import utils
 from rally.benchmark import utils as bench_utils
 from rally.common.i18n import _
 from rally.common import log as logging
@@ -25,6 +24,7 @@ from rally import consts
 from rally import exceptions
 from rally import osclients
 from rally.plugins.openstack.context.cleanup import manager as resource_manager
+from rally.plugins.openstack.scenarios.sahara import utils
 
 
 CONF = cfg.CONF

rally/plugins/openstack/context/sahara/sahara_image.py

@@ -13,7 +13,6 @@
 # under the License.
 
 from rally.benchmark.context import base
-from rally.benchmark.scenarios.glance import utils as glance_utils
 from rally.common.i18n import _
 from rally.common import log as logging
 from rally.common import utils as rutils
@@ -21,6 +20,7 @@ from rally import consts
 from rally import exceptions
 from rally import osclients
 from rally.plugins.openstack.context.cleanup import manager as resource_manager
+from rally.plugins.openstack.scenarios.glance import utils as glance_utils
 
 
 LOG = logging.getLogger(__name__)

rally/plugins/openstack/context/volumes.py

@@ -14,13 +14,13 @@
 
 from rally.benchmark.context import base
 from rally.benchmark.scenarios import base as scenario_base
-from rally.benchmark.scenarios.cinder import utils as cinder_utils
 from rally.common.i18n import _
 from rally.common import log as logging
 from rally.common import utils as rutils
 from rally import consts
 from rally import osclients
 from rally.plugins.openstack.context.cleanup import manager as resource_manager
+from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils
 
 
 LOG = logging.getLogger(__name__)

rally/plugins/openstack/scenarios/cinder/volumes.py

@@ -13,16 +13,16 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import random
+
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.cinder import utils
-from rally.benchmark.scenarios.glance import utils as glance_utils
 from rally.benchmark.scenarios.nova import utils as nova_utils
 from rally.benchmark import types as types
 from rally.benchmark import validation
 from rally.common import log as logging
 from rally import consts
-
-import random
+from rally.plugins.openstack.scenarios.cinder import utils
+from rally.plugins.openstack.scenarios.glance import utils as glance_utils
 
 LOG = logging.getLogger(__name__)
 
@@ -430,4 +430,4 @@ class CinderVolumes(utils.CinderScenario,
 
         if do_delete:
             self._delete_volume(volume)
-            self._delete_backup(backup)
+            self._delete_backup(backup)

rally/plugins/openstack/scenarios/glance/images.py

@@ -14,11 +14,11 @@
 #    under the License.
 
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.glance import utils
 from rally.benchmark.scenarios.nova import utils as nova_utils
 from rally.benchmark import types as types
 from rally.benchmark import validation
 from rally import consts
+from rally.plugins.openstack.scenarios.glance import utils
 
 
 class GlanceImages(utils.GlanceScenario, nova_utils.NovaScenario):

rally/plugins/openstack/scenarios/sahara/clusters.py

@@ -14,11 +14,11 @@
 #    under the License.
 
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.sahara import utils
 from rally.benchmark import types
 from rally.benchmark import validation
 from rally.common import log as logging
 from rally import consts
+from rally.plugins.openstack.scenarios.sahara import utils
 
 LOG = logging.getLogger(__name__)
 

rally/plugins/openstack/scenarios/sahara/jobs.py

@@ -14,10 +14,10 @@
 #    under the License.
 
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.sahara import utils
 from rally.benchmark import validation
 from rally.common import log as logging
 from rally import consts
+from rally.plugins.openstack.scenarios.sahara import utils
 
 LOG = logging.getLogger(__name__)
 

rally/plugins/openstack/scenarios/sahara/node_group_templates.py

@@ -14,10 +14,10 @@
 #    under the License.
 
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.sahara import utils
 from rally.benchmark import types
 from rally.benchmark import validation
 from rally import consts
+from rally.plugins.openstack.scenarios.sahara import utils
 
 
 class SaharaNodeGroupTemplates(utils.SaharaScenario):

rally/plugins/openstack/scenarios/sahara/utils.py

@@ -20,12 +20,12 @@ from oslo_utils import uuidutils
 from saharaclient.api import base as sahara_base
 
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.sahara import consts as sahara_consts
 from rally.benchmark import utils as bench_utils
 from rally.common.i18n import _
 from rally.common import log as logging
 from rally import consts
 from rally import exceptions
+from rally.plugins.openstack.scenarios.sahara import consts as sahara_consts
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF

rally/plugins/openstack/scenarios/swift/objects.py

@@ -16,9 +16,9 @@
 import tempfile
 
 from rally.benchmark.scenarios import base
-from rally.benchmark.scenarios.swift import utils
 from rally.benchmark import validation
 from rally import consts
+from rally.plugins.openstack.scenarios.swift import utils
 
 
 class SwiftObjects(utils.SwiftScenario):

tests/unit/plugins/openstack/context/sahara/test_sahara_cluster.py

@@ -22,7 +22,6 @@ from tests.unit import test
 CONF = cfg.CONF
 
 CTX = "rally.plugins.openstack.context.sahara"
-SCN = "rally.benchmark.scenarios"
 
 
 class SaharaClusterTestCase(test.TestCase):

tests/unit/plugins/openstack/context/sahara/test_sahara_edp.py

@@ -18,7 +18,6 @@ from rally.plugins.openstack.context.sahara import sahara_edp
 from tests.unit import test
 
 CTX = "rally.plugins.openstack.context.sahara"
-SCN = "rally.benchmark.scenarios"
 
 
 class SaharaEDPTestCase(test.TestCase):

tests/unit/plugins/openstack/context/sahara/test_sahara_image.py

@@ -22,7 +22,7 @@ from tests.unit import test
 BASE_CTX = "rally.benchmark.context"
 CTX = "rally.plugins.openstack.context.sahara.sahara_image"
 BASE_SCN = "rally.benchmark.scenarios"
-SCN = "rally.benchmark.scenarios"
+SCN = "rally.plugins.openstack.scenarios"
 
 
 class SaharaImageTestCase(test.TestCase):

tests/unit/plugins/openstack/context/test_images.py

@@ -23,7 +23,7 @@ from tests.unit import fakes
 from tests.unit import test
 
 CTX = "rally.plugins.openstack.context"
-SCN = "rally.benchmark.scenarios"
+SCN = "rally.plugins.openstack.scenarios"
 
 
 class ImageGeneratorTestCase(test.TestCase):

tests/unit/plugins/openstack/context/test_volumes.py

@@ -22,7 +22,7 @@ from tests.unit import fakes
 from tests.unit import test
 
 CTX = "rally.plugins.openstack.context"
-SCN = "rally.benchmark.scenarios"
+SCN = "rally.plugins.openstack.scenarios"
 
 
 class VolumeGeneratorTestCase(test.TestCase):

tests/unit/plugins/openstack/scenarios/cinder/test_utils.py

@@ -17,11 +17,11 @@ import mock
 from oslo_config import cfg
 from oslotest import mockpatch
 
-from rally.benchmark.scenarios.cinder import utils
+from rally.plugins.openstack.scenarios.cinder import utils
 from tests.unit import test
 
 BM_UTILS = "rally.benchmark.utils"
-CINDER_UTILS = "rally.benchmark.scenarios.cinder.utils"
+CINDER_UTILS = "rally.plugins.openstack.scenarios.cinder.utils"
 
 
 class CinderScenarioTestCase(test.TestCase):
@@ -77,7 +77,7 @@ class CinderScenarioTestCase(test.TestCase):
         self._test_atomic_action_timer(self.scenario.atomic_actions(),
                                        "cinder.create_volume")
 
-    @mock.patch("rally.benchmark.scenarios.cinder.utils.random")
+    @mock.patch("rally.plugins.openstack.scenarios.cinder.utils.random")
     @mock.patch(CINDER_UTILS + ".CinderScenario.clients")
     def test__create_volume_with_size_range(self, mock_clients, mock_random):
         CONF = cfg.CONF
@@ -117,7 +117,7 @@ class CinderScenarioTestCase(test.TestCase):
         self._test_atomic_action_timer(self.scenario.atomic_actions(),
                                        "cinder.delete_volume")
 
-    @mock.patch("rally.benchmark.scenarios.cinder.utils.random")
+    @mock.patch("rally.plugins.openstack.scenarios.cinder.utils.random")
     @mock.patch(CINDER_UTILS + ".CinderScenario.clients")
     def test__extend_volume_with_size_range(self, mock_clients, mock_random):
         CONF = cfg.CONF

tests/unit/plugins/openstack/scenarios/cinder/test_volumes.py

@@ -15,11 +15,12 @@
 
 import mock
 
-from rally.benchmark.scenarios.cinder import volumes
+from rally.plugins.openstack.scenarios.cinder import volumes
 from tests.unit import fakes
 from tests.unit import test
 
-CINDER_VOLUMES = "rally.benchmark.scenarios.cinder.volumes.CinderVolumes"
+CINDER_VOLUMES = ("rally.plugins.openstack.scenarios.cinder.volumes"
+                  ".CinderVolumes")
 
 
 class fake_type(object):

tests/unit/plugins/openstack/scenarios/glance/test_images.py

@@ -15,14 +15,14 @@
 
 import mock
 
-from rally.benchmark.scenarios.glance import images
 from rally.benchmark.scenarios.nova import servers
 from rally import objects
 from rally import osclients
+from rally.plugins.openstack.scenarios.glance import images
 from tests.unit import fakes
 from tests.unit import test
 
-GLANCE_IMAGES = "rally.benchmark.scenarios.glance.images.GlanceImages"
+GLANCE_IMAGES = "rally.plugins.openstack.scenarios.glance.images.GlanceImages"
 
 
 class GlanceImagesTestCase(test.TestCase):
@@ -87,7 +87,8 @@ class GlanceImagesTestCase(test.TestCase):
         mock_boot_servers.return_value = fake_servers
         mock_random_name.return_value = "random_name"
         kwargs = {"fakearg": "f"}
-        with mock.patch("rally.benchmark.scenarios.glance.utils.time.sleep"):
+        with mock.patch("rally.plugins.openstack.scenarios."
+                        "glance.utils.time.sleep"):
             glance_scenario.create_image_and_boot_instances("cf", "url",
                                                             "df", "fid",
                                                             5, **kwargs)

tests/unit/plugins/openstack/scenarios/glance/test_utils.py

@@ -17,14 +17,14 @@ import tempfile
 import mock
 from oslotest import mockpatch
 
-from rally.benchmark.scenarios.glance import utils
 from rally.benchmark import utils as butils
 from rally import exceptions as rally_exceptions
+from rally.plugins.openstack.scenarios.glance import utils
 from tests.unit import fakes
 from tests.unit import test
 
 BM_UTILS = "rally.benchmark.utils"
-GLANCE_UTILS = "rally.benchmark.scenarios.glance.utils"
+GLANCE_UTILS = "rally.plugins.openstack.scenarios.glance.utils"
 
 
 class GlanceScenarioTestCase(test.TestCase):

tests/unit/plugins/openstack/scenarios/sahara/test_clusters.py

@@ -15,11 +15,12 @@
 
 import mock
 
-from rally.benchmark.scenarios.sahara import clusters
+from rally.plugins.openstack.scenarios.sahara import clusters
 from tests.unit import test
 
-SAHARA_CLUSTERS = "rally.benchmark.scenarios.sahara.clusters.SaharaClusters"
-SAHARA_UTILS = "rally.benchmark.scenarios.sahara.utils"
+SAHARA_CLUSTERS = ("rally.plugins.openstack.scenarios.sahara.clusters"
+                   ".SaharaClusters")
+SAHARA_UTILS = "rally.plugins.openstack.scenarios.sahara.utils"
 
 
 class SaharaClustersTestCase(test.TestCase):

tests/unit/plugins/openstack/scenarios/sahara/test_jobs.py

@@ -16,14 +16,13 @@
 import mock
 from oslo_config import cfg
 
-from rally.benchmark.scenarios.sahara import jobs
+from rally.plugins.openstack.scenarios.sahara import jobs
 from tests.unit import test
 
-
 CONF = cfg.CONF
 
-SAHARA_JOB = "rally.benchmark.scenarios.sahara.jobs.SaharaJob"
-SAHARA_UTILS = "rally.benchmark.scenarios.sahara.utils"
+SAHARA_JOB = "rally.plugins.openstack.scenarios.sahara.jobs.SaharaJob"
+SAHARA_UTILS = "rally.plugins.openstack.scenarios.sahara.utils"
 
 
 class SaharaJobTestCase(test.TestCase):

tests/unit/plugins/openstack/scenarios/sahara/test_node_group_templates.py

@@ -15,10 +15,11 @@
 
 import mock
 
-from rally.benchmark.scenarios.sahara import node_group_templates as ngts
+from rally.plugins.openstack.scenarios.sahara import (node_group_templates
+                                                      as ngts)
 from tests.unit import test
 
-SAHARA_NGTS = ("rally.benchmark.scenarios.sahara.node_group_templates"
+SAHARA_NGTS = ("rally.plugins.openstack.scenarios.sahara.node_group_templates"
                ".SaharaNodeGroupTemplates")
 
 
@@ -74,4 +75,4 @@ class SaharaNodeGroupTemplatesTestCase(test.TestCase):
 
         mock_delete.assert_has_calls(calls=[
             mock.call(mock_create_master.return_value),
-            mock.call(mock_create_worker.return_value)])
+            mock.call(mock_create_worker.return_value)])

tests/unit/plugins/openstack/scenarios/sahara/test_utils.py

@@ -18,14 +18,14 @@ from oslo_config import cfg
 from oslo_utils import uuidutils
 from saharaclient.api import base as sahara_base
 
-from rally.benchmark.scenarios.sahara import utils
 from rally import consts
 from rally import exceptions
+from rally.plugins.openstack.scenarios.sahara import utils
 from tests.unit import test
 
 CONF = cfg.CONF
 
-SAHARA_UTILS = "rally.benchmark.scenarios.sahara.utils"
+SAHARA_UTILS = "rally.plugins.openstack.scenarios.sahara.utils"
 
 
 class SaharaUtilsTestCase(test.TestCase):

tests/unit/plugins/openstack/scenarios/swift/test_objects.py

@@ -15,7 +15,7 @@
 
 import mock
 
-from rally.benchmark.scenarios.swift import objects
+from rally.plugins.openstack.scenarios.swift import objects
 from tests.unit import fakes
 from tests.unit import test
 

tests/unit/plugins/openstack/scenarios/swift/test_utils.py

@@ -15,10 +15,10 @@
 
 import mock
 
-from rally.benchmark.scenarios.swift import utils
+from rally.plugins.openstack.scenarios.swift import utils
 from tests.unit import test
 
-SWIFT_UTILS = "rally.benchmark.scenarios.swift.utils"
+SWIFT_UTILS = "rally.plugins.openstack.scenarios.swift.utils"
 
 
 class SwiftScenarioTestCase(test.TestCase):