Merge "Change defaults for Service name + type"

This commit is contained in:
Jenkins
2013-02-19 23:48:17 +00:00
committed by Gerrit Code Review
2 changed files with 4 additions and 4 deletions

View File

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

View File

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