diff options
| author | Joe Gordon <jogo@cloudscaling.com> | 2013-01-22 13:21:57 -0500 |
|---|---|---|
| committer | Joe Gordon <jogo@cloudscaling.com> | 2013-01-28 13:40:42 -0800 |
| commit | 9983d07d056f064da96fe46790573be7ff90677f (patch) | |
| tree | 4d32f01f7fc0582a6c9d858927cdd65207ab423c /nova/tests | |
| parent | f5a5ba84757a85836d78cc3d8a4f62f5ada2ac65 (diff) | |
Stop including full service catalog in each RPC msg
The service catalog is included in the context to get the cinder API
endpoints. Instead of passing entire service catalog just for cinder
endpoint, just include cinder endpoint in context.service_catalog
Change-Id: Ic39173f0a2f330dbd78daa786b269f29ac4abf33
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/test_context.py | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/nova/tests/test_context.py b/nova/tests/test_context.py index 0915bf157..527534fd5 100644 --- a/nova/tests/test_context.py +++ b/nova/tests/test_context.py @@ -74,3 +74,22 @@ class ContextTestCase(test.TestCase): self.assertTrue(c) self.assertIn("'extra_arg1': 'meow'", info['log_msg']) self.assertIn("'extra_arg2': 'wuff'", info['log_msg']) + + def test_service_catalog_default(self): + ctxt = context.RequestContext('111', '222') + self.assertEquals(ctxt.service_catalog, []) + + def test_service_catalog_cinder_only(self): + service_catalog = [ + {u'type': u'compute', u'name': u'nova'}, + {u'type': u's3', u'name': u's3'}, + {u'type': u'image', u'name': u'glance'}, + {u'type': u'volume', u'name': u'cinder'}, + {u'type': u'ec2', u'name': u'ec2'}, + {u'type': u'object-store', u'name': u'swift'}, + {u'type': u'identity', u'name': u'keystone'}] + + volume_catalog = [{u'type': u'volume', u'name': u'cinder'}] + ctxt = context.RequestContext('111', '222', + service_catalog=service_catalog) + self.assertEquals(ctxt.service_catalog, volume_catalog) |