From bb6a4da3169d63ff25c9106d4cd50d40b88e1823 Mon Sep 17 00:00:00 2001 From: Vipul Sabhaya Date: Mon, 11 Feb 2013 15:44:15 -0800 Subject: [PATCH] Change defaults for Service name + type * Corresponds to change made in reddwarf-integration that changes the service name + type in keystone. fixes bug# 1122515 Change-Id: I28a366662bfe9816a926708fc376afdf29f00de1 --- reddwarfclient/common.py | 4 ++-- tests/test_common.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/reddwarfclient/common.py b/reddwarfclient/common.py index f12aa7cb..cd5cf5bf 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 d090f97c..b038a051 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)