~james-page/charms/trusty/neutron-openvswitch/lp1531102

« back to all changes in this revision

Viewing changes to unit_tests/test_neutron_ovs_utils.py

  • Committer: james.page at ubuntu
  • Date: 2015-03-19 17:00:09 UTC
  • mfrom: (42.2.42 neutron-openvswitch)
  • Revision ID: james.page@ubuntu.com-20150319170009-p59jnhxs6mfyce9n
[dosaboy,r=james-page] Support mtu from neutron-api, add support for bridge mapping configuration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
71
71
        templating.OSConfigRenderer.side_effect = _mock_OSConfigRenderer
72
72
        _regconfs = nutils.register_configs()
73
73
        confs = ['/etc/neutron/neutron.conf',
74
 
                 '/etc/neutron/plugins/ml2/ml2_conf.ini']
 
74
                 '/etc/neutron/plugins/ml2/ml2_conf.ini',
 
75
                 '/etc/init/os-charm-phy-nic-mtu.conf']
75
76
        self.assertItemsEqual(_regconfs.configs, confs)
76
77
 
77
78
    def test_resource_map(self):
85
86
        expect = OrderedDict([
86
87
            (nutils.NEUTRON_CONF, ['neutron-plugin-openvswitch-agent']),
87
88
            (ML2CONF, ['neutron-plugin-openvswitch-agent']),
 
89
            (nutils.PHY_NIC_MTU_CONF, ['os-charm-phy-nic-mtu'])
88
90
        ])
89
 
        self.assertTrue(len(expect) == len(_restart_map))
 
91
        self.assertEqual(expect, _restart_map)
90
92
        for item in _restart_map:
91
93
            self.assertTrue(item in _restart_map)
92
94
            self.assertTrue(expect[item] == _restart_map[item])