openstack/charm-neutron-api
Code Issues Proposed changes

unit tests and lint fixes for haproxy update

Browse Source
This commit is contained in:
Liam Young 2014-07-08 13:01:12 +01:00
parent cfc40bd660
commit fae1892504
3 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hooks/neutron_api_context.py
View File

@ -74,6 +74,7 @@ class NeutronCCContext(context.NeutronContext):
return ctxt
return ctxt
class HAProxyContext(context.HAProxyContext):
interfaces = ['ceph']
@ -95,7 +96,7 @@ class HAProxyContext(context.HAProxyContext):
}
ctxt['neutron_bind_port'] = determine_api_port(
api_port('neutron-server'))
api_port('neutron-server'))
# for haproxy.conf
ctxt['service_ports'] = port_mapping

51
unit_tests/test_neutron_api_context.py
View File

@ -1,5 +1,6 @@
from test_utils import CharmTestCase
from mock import patch
from test_utils import patch_open
from mock import patch, MagicMock
import neutron_api_context as context
import charmhelpers
TO_PATCH = [
@ -8,6 +9,7 @@ TO_PATCH = [
'related_units',
'config',
'determine_api_port',
'determine_apache_port',
]
@ -48,6 +50,53 @@ class IdentityServiceContext(CharmTestCase):
self.assertEquals(ids_ctxt(), None)
class HAProxyContextTest(CharmTestCase):
def setUp(self):
super(HAProxyContextTest, self).setUp(context, TO_PATCH)
self.determine_api_port.return_value = 9686
self.determine_apache_port.return_value = 9686
def tearDown(self):
super(HAProxyContextTest, self).tearDown()
@patch.object(charmhelpers.contrib.openstack.context, 'relation_ids')
@patch.object(charmhelpers.contrib.openstack.context, 'log')
def test_context_No_peers(self, _log, _rids):
_rids.return_value = []
hap_ctxt = context.HAProxyContext()
self.assertTrue('units' not in hap_ctxt())
@patch.object(charmhelpers.contrib.openstack.context, 'local_unit')
@patch.object(charmhelpers.contrib.openstack.context, 'unit_get')
@patch.object(charmhelpers.contrib.openstack.context, 'relation_get')
@patch.object(charmhelpers.contrib.openstack.context, 'related_units')
@patch.object(charmhelpers.contrib.openstack.context, 'relation_ids')
@patch.object(charmhelpers.contrib.openstack.context, 'log')
def test_context_peers(self, _log, _rids, _runits, _rget, _uget, _lunit):
unit_addresses = {
'neutron-api-0': '10.10.10.10',
'neutron-api-1': '10.10.10.11',
}
_rids.return_value = ['rid1']
_runits.return_value = ['neutron-api/0']
_rget.return_value = unit_addresses['neutron-api-0']
_lunit.return_value = "neutron-api/1"
_uget.return_value = unit_addresses['neutron-api-1']
service_ports = {'neutron-server': [9696, 9686]}
ctxt_data = {
'units': unit_addresses,
'service_ports': service_ports,
'neutron_bind_port': 9686,
}
with patch_open() as (_open, _file):
_file.write = MagicMock()
hap_ctxt = context.HAProxyContext()
self.assertEquals(hap_ctxt(), ctxt_data)
_file.write.assert_called_with('ENABLED=1\n')
class NeutronAPIContextsTest(CharmTestCase):
def setUp(self):

6
unit_tests/test_neutron_api_utils.py
View File

@ -119,6 +119,9 @@ class TestNeutronAPIUtils(CharmTestCase):
(nutils.APACHE_24_CONF, {
'services': ['apache2'],
}),
(nutils.HAPROXY_CONF, {
'services': ['haproxy'],
}),
])
self.assertItemsEqual(_restart_map, expect)
@ -137,7 +140,8 @@ class TestNeutronAPIUtils(CharmTestCase):
confs = ['/etc/neutron/neutron.conf',
'/etc/default/neutron-server',
'/etc/neutron/plugins/ml2/ml2_conf.ini',
'/etc/apache2/sites-available/openstack_https_frontend.conf']
'/etc/apache2/sites-available/openstack_https_frontend.conf',
'/etc/haproxy/haproxy.cfg']
self.assertItemsEqual(_regconfs.configs, confs)
@patch('os.path.isfile')