rename DummyProvider to ExistingServers

fix one task:
https://trello.com/c/5w4pF7me/182-rename-dummyprovider-to-existingservers

Change-Id: Ic0ca93f00292e9d053a654c9bacf4c76922551ee
This commit is contained in:
Kun Huang
2014-03-27 09:51:23 +08:00
parent 72480aeaa9
commit 352f67b012
9 changed files with 15 additions and 15 deletions

View File

@@ -1,7 +1,7 @@
{
"name": "DevstackEngine",
"provider": {
"name": "DummyProvider",
"name": "ExistingServers",
"credentials": [{"user": "root", "host": "10.2.0.8"}]
}
}

View File

@@ -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"}]
}
}

View File

@@ -1,5 +1,5 @@
{
"name": "DummyEngine",
"name": "ExistingCloud",
"endpoint": {
"auth_url": "http://example.net:5000/v2.0/",
"username": "admin",

View File

@@ -52,7 +52,7 @@ class DevstackEngine(engine.EngineFactory):
"ADMIN_PASSWORD": "secret"
},
"provider": {
"name": "DummyProvider",
"name": "ExistingServers",
"credentials": [{'user': 'root', 'host': '10.2.0.8'}]
}
}

View File

@@ -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):

View File

@@ -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"}]
}
}

View File

@@ -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': {

View File

@@ -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)

View File

@@ -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'}]}
}