From 352f67b01297ddbf6016802b7cab688d8da48ea4 Mon Sep 17 00:00:00 2001 From: Kun Huang Date: Thu, 27 Mar 2014 09:51:23 +0800 Subject: [PATCH] rename DummyProvider to ExistingServers fix one task: https://trello.com/c/5w4pF7me/182-rename-dummyprovider-to-existingservers Change-Id: Ic0ca93f00292e9d053a654c9bacf4c76922551ee --- ...-dummy.json => devstack-in-existing-servers.json} | 2 +- doc/samples/deployments/devstack-in-lxc.json | 2 +- .../deployments/{dummy.json => existing.json} | 2 +- rally/deploy/engines/devstack.py | 2 +- .../providers/{dummy.py => existing.py} | 4 ++-- rally/deploy/serverprovider/providers/lxc.py | 2 +- tests/deploy/engines/test_devstack.py | 2 +- .../providers/{test_dummy.py => test_existing.py} | 12 ++++++------ tests/deploy/serverprovider/providers/test_lxc.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) rename doc/samples/deployments/{devstack-in-dummy.json => devstack-in-existing-servers.json} (77%) rename doc/samples/deployments/{dummy.json => existing.json} (85%) rename rally/deploy/serverprovider/providers/{dummy.py => existing.py} (94%) rename tests/deploy/serverprovider/providers/{test_dummy.py => test_existing.py} (82%) diff --git a/doc/samples/deployments/devstack-in-dummy.json b/doc/samples/deployments/devstack-in-existing-servers.json similarity index 77% rename from doc/samples/deployments/devstack-in-dummy.json rename to doc/samples/deployments/devstack-in-existing-servers.json index b9cbfe4796..fc7b7073e1 100644 --- a/doc/samples/deployments/devstack-in-dummy.json +++ b/doc/samples/deployments/devstack-in-existing-servers.json @@ -1,7 +1,7 @@ { "name": "DevstackEngine", "provider": { - "name": "DummyProvider", + "name": "ExistingServers", "credentials": [{"user": "root", "host": "10.2.0.8"}] } } diff --git a/doc/samples/deployments/devstack-in-lxc.json b/doc/samples/deployments/devstack-in-lxc.json index 5780d580b3..45cc759cd6 100644 --- a/doc/samples/deployments/devstack-in-lxc.json +++ b/doc/samples/deployments/devstack-in-lxc.json @@ -11,7 +11,7 @@ "tunnel_to": ["10.5.0.1"], "distribution": "ubuntu", "host_provider": { - "name": "DummyProvider", + "name": "ExistingServers", "credentials": [{"user": "root", "host": "10.2.250.103"}] } } diff --git a/doc/samples/deployments/dummy.json b/doc/samples/deployments/existing.json similarity index 85% rename from doc/samples/deployments/dummy.json rename to doc/samples/deployments/existing.json index 329bb09772..39e24c3409 100644 --- a/doc/samples/deployments/dummy.json +++ b/doc/samples/deployments/existing.json @@ -1,5 +1,5 @@ { - "name": "DummyEngine", + "name": "ExistingCloud", "endpoint": { "auth_url": "http://example.net:5000/v2.0/", "username": "admin", diff --git a/rally/deploy/engines/devstack.py b/rally/deploy/engines/devstack.py index e9c5e54f3c..b35d76fc2a 100644 --- a/rally/deploy/engines/devstack.py +++ b/rally/deploy/engines/devstack.py @@ -52,7 +52,7 @@ class DevstackEngine(engine.EngineFactory): "ADMIN_PASSWORD": "secret" }, "provider": { - "name": "DummyProvider", + "name": "ExistingServers", "credentials": [{'user': 'root', 'host': '10.2.0.8'}] } } diff --git a/rally/deploy/serverprovider/providers/dummy.py b/rally/deploy/serverprovider/providers/existing.py similarity index 94% rename from rally/deploy/serverprovider/providers/dummy.py rename to rally/deploy/serverprovider/providers/existing.py index 8989e1570e..ad78ebc02a 100644 --- a/rally/deploy/serverprovider/providers/dummy.py +++ b/rally/deploy/serverprovider/providers/existing.py @@ -17,7 +17,7 @@ from rally.deploy.serverprovider import provider -class DummyProvider(provider.ProviderFactory): +class ExistingServers(provider.ProviderFactory): """Just return endpoints from own configuration.""" CREDENTIALS_SCHEMA = { @@ -45,7 +45,7 @@ class DummyProvider(provider.ProviderFactory): } def __init__(self, deployment, config): - super(DummyProvider, self).__init__(deployment, config) + super(ExistingServers, self).__init__(deployment, config) self.credentials = config['credentials'] def create_servers(self): diff --git a/rally/deploy/serverprovider/providers/lxc.py b/rally/deploy/serverprovider/providers/lxc.py index e52cc65276..14ba89b646 100644 --- a/rally/deploy/serverprovider/providers/lxc.py +++ b/rally/deploy/serverprovider/providers/lxc.py @@ -261,7 +261,7 @@ class LxcProvider(provider.ProviderFactory): "forward_ssh": false, "container_name_prefix": "rally-multinode-02", "host_provider": { - "name": "DummyProvider", + "name": "ExistingServers", "credentials": [{"user": "root", "host": "host.net"}] } } diff --git a/tests/deploy/engines/test_devstack.py b/tests/deploy/engines/test_devstack.py index a3e2bf0abf..47373dd46e 100644 --- a/tests/deploy/engines/test_devstack.py +++ b/tests/deploy/engines/test_devstack.py @@ -24,7 +24,7 @@ from rally.openstack.common import test SAMPLE_CONFIG = { 'name': 'DevstackEngine', 'provider': { - 'name': 'DummyProvider', + 'name': 'ExistingServers', 'credentials': [{'user': 'root', 'host': 'example.com'}], }, 'localrc': { diff --git a/tests/deploy/serverprovider/providers/test_dummy.py b/tests/deploy/serverprovider/providers/test_existing.py similarity index 82% rename from tests/deploy/serverprovider/providers/test_dummy.py rename to tests/deploy/serverprovider/providers/test_existing.py index 7e9e516119..979db1106d 100644 --- a/tests/deploy/serverprovider/providers/test_dummy.py +++ b/tests/deploy/serverprovider/providers/test_existing.py @@ -16,17 +16,17 @@ import jsonschema from rally.deploy import serverprovider -from rally.deploy.serverprovider.providers import dummy +from rally.deploy.serverprovider.providers import existing from tests import test ProviderFactory = serverprovider.ProviderFactory -class DummyProviderTestCase(test.TestCase): +class ExistingServersTestCase(test.TestCase): def setUp(self): - super(DummyProviderTestCase, self).setUp() - self.config = {'name': 'DummyProvider', + super(ExistingServersTestCase, self).setUp() + self.config = {'name': 'ExistingServers', 'credentials': [{'user': 'user', 'host': 'host1'}, {'user': 'user', 'host': 'host2'}]} @@ -40,9 +40,9 @@ class DummyProviderTestCase(test.TestCase): def test_invalid_config(self): self.config['name'] = 42 self.assertRaises(jsonschema.ValidationError, - dummy.DummyProvider, None, self.config) + existing.ExistingServers, None, self.config) def test_invalid_credentials(self): self.config['credentials'] = ['user@host1', 'user@host2'] self.assertRaises(jsonschema.ValidationError, - dummy.DummyProvider, None, self.config) + existing.ExistingServers, None, self.config) diff --git a/tests/deploy/serverprovider/providers/test_lxc.py b/tests/deploy/serverprovider/providers/test_lxc.py index 779f29fa0a..0c5bf54e5b 100644 --- a/tests/deploy/serverprovider/providers/test_lxc.py +++ b/tests/deploy/serverprovider/providers/test_lxc.py @@ -254,7 +254,7 @@ class LxcProviderTestCase(test.BaseTestCase): 'tunnel_to': ['10.10.10.10', '20.20.20.20'], 'container_name_prefix': 'rally-lxc', 'host_provider': { - 'name': 'DummyProvider', + 'name': 'ExistingServers', 'credentials': [{'user': 'root', 'host': 'host1.net'}, {'user': 'root', 'host': 'host2.net'}]} }