Merge "Switch to plugin base: context, sla, runners"

rally/consts.py

@@ -82,13 +82,6 @@ class _EndpointType(utils.ImmutableMixin, utils.EnumMixin):
     PUBLIC = "public"
 
 
-class _RunnerType(utils.ImmutableMixin, utils.EnumMixin):
-    SERIAL = "serial"
-    CONSTANT = "constant"
-    CONSTANT_FOR_DURATION = "constant_for_duration"
-    RPS = "rps"
-
-
 class _Service(utils.ImmutableMixin, utils.EnumMixin):
     """OpenStack services names, by rally convention."""
 
@@ -171,7 +164,6 @@ class _ServiceType(utils.ImmutableMixin, utils.EnumMixin):
 TaskStatus = _TaskStatus()
 DeployStatus = _DeployStatus()
 EndpointPermission = _EndpointPermission()
-RunnerType = _RunnerType()
 ServiceType = _ServiceType()
 Service = _Service()
 EndpointType = _EndpointType()

tests/unit/fakes.py

@@ -1498,7 +1498,7 @@ class FakeTimer(rally_utils.Timer):
         return 0
 
 
-@context.context("fake", order=1)
+@context.context(name="fake", order=1)
 class FakeContext(context.Context):
 
     CONFIG_SCHEMA = {
@@ -1519,6 +1519,7 @@ class FakeContext(context.Context):
         pass
 
 
+@context.context(name="fake_user_context", order=1)
 class FakeUserContext(FakeContext):
 
     admin = {

tests/unit/plugins/openstack/context/vm/test_custom_image.py

@@ -17,6 +17,7 @@
 
 import mock
 
+from rally.benchmark import context
 from rally.plugins.openstack.context.vm import custom_image
 from tests.unit import test
 
@@ -24,6 +25,7 @@ from tests.unit import test
 BASE = "rally.plugins.openstack.context.vm.custom_image"
 
 
+@context.context(name="test_custom_image", order=500)
 class TestImageGenerator(custom_image.BaseCustomImageGenerator):
     def _customize_image(self, *args):
         pass
@@ -37,7 +39,7 @@ class BaseCustomImageContextVMTestCase(test.TestCase):
         self.context = {
             "task": mock.MagicMock(),
             "config": {
-                "custom_image": {
+                "test_custom_image": {
                     "image": {"name": "image"},
                     "flavor": {"name": "flavor"},
                     "username": "fedora",