Merge lp:~hopem/charm-helpers/lp1456876 into lp:charm-helpers

[Edward Hope-Morley]

[lp:~hopem/charm-helpers/lp1456876]

558. By Edward Hope-Morley on 2016-04-01

add unit test

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2016-01-29 10:20:29 +0000
+++ charmhelpers/contrib/openstack/context.py	2016-04-01 10:18:26 +0000
@@ -1479,3 +1479,15 @@
                 if self.context_complete(ctxt):
                     return ctxt
         return {}
+
+
+class InternalEndpointContext(OSContextGenerator):
+    """Internal endpoint context.
+
+    This context provides the endpoint type used for communication between
+    services e.g. between Nova and Cinder internally. Openstack uses Public
+    endpoints by default so this allows admins to optionally use internal
+    endpoints.
+    """
+    def __call__(self):
+        return {'use_internal_endpoints': config('use-internal-endpoints')}

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2016-01-29 10:20:29 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2016-04-01 10:18:26 +0000
@@ -2883,3 +2883,12 @@
         relation = FakeRelation(relation_data=QUANTUM_NETWORK_SERVICE_RELATION_VERSIONED)
         self.relation_get.side_effect = relation.get
         self.assertEquals(context.NetworkServiceContext()(), data_result)
+
+    def test_internal_endpoint_context(self):
+        config = {'use-internal-endpoints': False}
+        self.config.side_effect = fake_config(config)
+        ctxt = context.InternalEndpointContext()
+        self.assertFalse(ctxt()['use_internal_endpoints'])
+        config = {'use-internal-endpoints': True}
+        self.config.side_effect = fake_config(config)
+        self.assertTrue(ctxt()['use_internal_endpoints'])