diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-02-19 23:48:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-02-19 23:48:17 +0000 |
| commit | ee663ae196326bf90b3cdf678b4ec417f102d3db (patch) | |
| tree | fc8f261f7225524f58cd52105e78ed93c12ef65e | |
| parent | 0edbc6bdc195da9db51d26e5f6cd2ab1bf630cba (diff) | |
| parent | bb6a4da3169d63ff25c9106d4cd50d40b88e1823 (diff) | |
| download | python-troveclient-ee663ae196326bf90b3cdf678b4ec417f102d3db.tar.gz | |
Merge "Change defaults for Service name + type"
| -rw-r--r-- | reddwarfclient/common.py | 4 | ||||
| -rw-r--r-- | tests/test_common.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/reddwarfclient/common.py b/reddwarfclient/common.py index f12aa7c..cd5cf5b 100644 --- a/reddwarfclient/common.py +++ b/reddwarfclient/common.py @@ -80,8 +80,8 @@ class CliOptions(object): 'tenant_id': None, 'auth_url': None, 'auth_type': 'keystone', - 'service_type': 'reddwarf', - 'service_name': 'Reddwarf', + 'service_type': 'database', + 'service_name': 'reddwarf', 'region': 'RegionOne', 'service_url': None, 'insecure': False, diff --git a/tests/test_common.py b/tests/test_common.py index d090f97..b038a05 100644 --- a/tests/test_common.py +++ b/tests/test_common.py @@ -81,8 +81,8 @@ class CliOptionsTest(TestCase): self.assertEqual(None, co.tenant_id) self.assertEqual(None, co.auth_url) self.assertEqual('keystone', co.auth_type) - self.assertEqual('reddwarf', co.service_type) - self.assertEqual('Reddwarf', co.service_name) + self.assertEqual('database', co.service_type) + self.assertEqual('reddwarf', co.service_name) self.assertEqual('RegionOne', co.region) self.assertEqual(None, co.service_url) self.assertFalse(co.insecure) |