Fix lint and unit tests

This commit is contained in:
Liam Young 2014-10-20 14:07:59 +00:00
parent 8d24448d22
commit c076fee522
3 changed files with 6 additions and 2 deletions

View File

@ -53,7 +53,7 @@ class OVSPluginContext(context.NeutronContext):
return 'neutron'
@property
def nutron_security_groups(self):
def neutron_security_groups(self):
napi_settings = neutron_api_settings()
return napi_settings['neutron_security_groups']

View File

@ -70,4 +70,3 @@ def get_topics():
if neutron_ovs_context.neutron_api_settings()['l2_population']:
topics.append('q-agent-notifier-l2population-update')
return topics

View File

@ -25,6 +25,7 @@ TO_PATCH = [
'CONFIGS',
'determine_packages',
'log',
'relation_ids',
'relation_set',
]
NEUTRON_CONF_DIR = "/etc/neutron"
@ -38,6 +39,7 @@ class NeutronOVSHooksTests(CharmTestCase):
super(NeutronOVSHooksTests, self).setUp(hooks, TO_PATCH)
self.config.side_effect = self.test_config.get
hooks.hooks._config_save = False
def _call_hook(self, hookname):
hooks.hooks.execute([
@ -53,8 +55,11 @@ class NeutronOVSHooksTests(CharmTestCase):
])
def test_config_changed(self):
self.relation_ids.return_value = ['relid']
_zmq_joined = self.patch('zeromq_configuration_relation_joined')
self._call_hook('config-changed')
self.assertTrue(self.CONFIGS.write_all.called)
self.assertTrue(_zmq_joined.called_with('relid'))
def test_amqp_joined(self):
self._call_hook('amqp-relation-joined')