diff --git a/rally/plugins/openstack/scenario.py b/rally/plugins/openstack/scenario.py index 4389ff3a..0688a270 100644 --- a/rally/plugins/openstack/scenario.py +++ b/rally/plugins/openstack/scenario.py @@ -104,13 +104,3 @@ class OpenStackScenario(scenario.Scenario): client = getattr(self._admin_clients, client_type) return client(version) if version is not None else client() - - @classmethod - def validate(cls, name, config, admin=None, users=None, deployment=None): - if admin: - admin = admin.clients() - if users: - users = [user["credential"].clients() for user in users] - super(OpenStackScenario, cls).validate( - name=name, config=config, admin=admin, users=users, - deployment=deployment) diff --git a/tests/unit/plugins/openstack/test_scenario.py b/tests/unit/plugins/openstack/test_scenario.py index d1fd0aa4..68741701 100644 --- a/tests/unit/plugins/openstack/test_scenario.py +++ b/tests/unit/plugins/openstack/test_scenario.py @@ -18,7 +18,6 @@ import mock from oslotest import mockpatch from rally.plugins.openstack import scenario as base_scenario -from tests.unit import fakes from tests.unit import test @@ -128,24 +127,3 @@ class OpenStackScenarioTestCase(test.TestCase): self.assertEqual(self.context["tenants"][tenant_id], self.context["tenant"]) self.assertEqual(expected_tenant_id, tenant_id) - - @mock.patch("rally.task.scenario.Scenario.validate") - def test_validate(self, mock_scenario_validate): - cred1 = fakes.fake_credential(foo="bar1") - cred2 = fakes.fake_credential(foo="bar2") - cred3 = fakes.fake_credential(foo="bar3") - - base_scenario.OpenStackScenario.validate( - name="foo_name", - config="foo_config", - admin=cred1, - users=[{"credential": cred2}, - {"credential": cred3}], - deployment=None) - - mock_scenario_validate.assert_called_once_with( - name="foo_name", - config="foo_config", - admin=cred1.clients.return_value, - users=[cred2.clients.return_value, cred3.clients.return_value], - deployment=None)