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

[Edward Hope-Morley]

[Edward Hope-Morley (hopem)]

Needs testing but pushing for pre-review by ivoks.

[Ante Karamatić (ivoks)]

Looks good to me.

review: Approve

[James Page (james-page)]

LGTM

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2014-02-25 09:53:03 +0000
+++ charmhelpers/contrib/openstack/context.py	2014-02-26 14:11:30 +0000
@@ -29,6 +29,7 @@
     determine_apache_port,
     determine_api_port,
     https,
+    is_clustered
 )
 
 from charmhelpers.contrib.hahelpers.apache import (
@@ -395,7 +396,7 @@
         return ctxt
 
 
-class NeutronContext(object):
+class NeutronContext(OSContextGenerator):
     interfaces = []
 
     @property
@@ -456,6 +457,22 @@
 
         return nvp_ctxt
 
+    def neutron_ctxt(self):
+        if https():
+            proto = 'https'
+        else:
+            proto = 'http'
+        if is_clustered():
+            host = config('vip')
+        else:
+            host = unit_get('private-address')
+        url = '%s://%s:%s' % (proto, host, '9292')
+        ctxt = {
+            'network_manager': self.network_manager,
+            'neutron_url': url,
+        }
+        return ctxt
+
     def __call__(self):
         self._ensure_packages()
 
@@ -465,7 +482,7 @@
         if not self.plugin:
             return {}
 
-        ctxt = {'network_manager': self.network_manager}
+        ctxt = self.neutron_ctxt()
 
         if self.plugin == 'ovs':
             ctxt.update(self.ovs_ctxt())

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2014-02-20 14:27:02 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2014-02-26 14:11:30 +0000
@@ -1,15 +1,16 @@
+import charmhelpers.contrib.openstack.context as context
 import yaml
 import json
 import unittest
-
+from copy import copy
+from mock import (
+    patch,
+    Mock,
+    MagicMock,
+    call
+)
 from tests.helpers import patch_open
 
-from mock import patch, MagicMock, call
-
-from copy import copy
-
-import charmhelpers.contrib.openstack.context as context
-
 
 class FakeRelation(object):
     '''
@@ -613,26 +614,70 @@
             'neutron_security_groups': True,
             'local_ip': '10.0.0.1'}, neutron.ovs_ctxt())
 
+    @patch('charmhelpers.contrib.openstack.context.unit_get')
+    @patch('charmhelpers.contrib.openstack.context.is_clustered')
+    @patch.object(context.NeutronContext, 'network_manager')
+    def test_neutron_neutron_ctxt(self, mock_network_manager,
+                                  mock_is_clustered, mock_unit_get):
+        vip = '88.11.22.33'
+        priv_addr = '10.0.0.1'
+        mock_unit_get.return_value = priv_addr
+        neutron = context.NeutronContext()
+
+        config = {'vip': vip}
+        self.config.side_effect = lambda key: config[key]
+        mock_network_manager.__get__ = Mock(return_value='neutron')
+
+        mock_is_clustered.return_value = False
+        self.assertEquals(
+            {'network_manager': 'neutron',
+             'neutron_url': 'https://%s:9292' % (priv_addr)},
+            neutron.neutron_ctxt()
+        )
+
+        mock_is_clustered.return_value = True
+        self.assertEquals(
+            {'network_manager': 'neutron',
+             'neutron_url': 'https://%s:9292' % (vip)},
+            neutron.neutron_ctxt()
+        )
+
+    @patch.object(context.NeutronContext, 'neutron_ctxt')
     @patch.object(context.NeutronContext, '_save_flag_file')
     @patch.object(context.NeutronContext, 'ovs_ctxt')
     @patch.object(context.NeutronContext, 'plugin')
     @patch.object(context.NeutronContext, '_ensure_packages')
     @patch.object(context.NeutronContext, 'network_manager')
-    def test_neutron_main_context_generation(self, nm, pkgs, plugin, ovs, ff):
-        self.config.return_value = None
+    def test_neutron_main_context_generation(self, mock_network_manager,
+                                             mock_ensure_packages,
+                                             mock_plugin, mock_ovs_ctxt,
+                                             mock_save_flag_file,
+                                             mock_neutron_ctxt):
+
+        mock_neutron_ctxt.return_value = {'network_manager': 'neutron',
+                                          'neutron_url': 'https://foo:9292'}
+        config = {'neutron-alchemy-flags': None}
+        self.config.side_effect = lambda key: config[key]
         neutron = context.NeutronContext()
-        nm.__get__ = MagicMock(return_value='flatdhcpmanager')
-        self.assertEquals({}, neutron())
-
-        nm.__get__ = MagicMock(return_value='neutron')
-        plugin.__get__ = MagicMock(return_value=None)
-        self.assertEquals({}, neutron())
-
-        nm.__get__ = MagicMock(return_value='neutron')
-        ovs.return_value = {'ovs': 'ovs_context'}
-        plugin.__get__ = MagicMock(return_value='ovs')
+
+        mock_network_manager.__get__ = Mock(return_value='flatdhcpmanager')
+        mock_plugin.__get__ = Mock()
+
+        self.assertEquals({}, neutron())
+        self.assertTrue(mock_network_manager.__get__.called)
+        self.assertFalse(mock_plugin.__get__.called)
+
+        mock_network_manager.__get__.return_value = 'neutron'
+        mock_plugin.__get__ = Mock(return_value=None)
+        self.assertEquals({}, neutron())
+        self.assertTrue(mock_plugin.__get__.called)
+
+        mock_ovs_ctxt.return_value = {'ovs': 'ovs_context'}
+        mock_plugin.__get__.return_value = 'ovs'
         self.assertEquals(
-            {'network_manager': 'neutron', 'ovs': 'ovs_context'},
+            {'network_manager': 'neutron',
+             'ovs': 'ovs_context',
+             'neutron_url': 'https://foo:9292'},
             neutron()
         )