← Back to branch summary

~openstack-charmers-next/charms/precise/neutron-openvswitch/trunk

« back to all changes in this revision

Viewing changes to unit_tests/test_neutron_ovs_utils.py

  • Committer: James Page
  • Date: 2016-02-26 22:07:38 UTC
  • mfrom: (108.1.3 trunk)
  • Revision ID: james.page@ubuntu.com-20160226220738-2bq1wtbs1g7fq0lb
Rework support for mitaka b2 milestone

Show diffs side-by-side

added added

removed removed

Lines of Context:
unit_tests/test_neutron_ovs_utils.py
111
111
        self.test_config.set('enable-local-dhcp-and-metadata', False)
112
112
        _git_requested.return_value = False
113
113
        _use_dvr.return_value = False
114
 
        _os_rel.return_value = 'trusty'
 
114
        _os_rel.return_value = 'icehouse'
 
115
        self.os_release.return_value = 'icehouse'
115
116
        _head_pkgs.return_value = head_pkg
116
117
        pkg_list = nutils.determine_packages()
117
118
        expect = ['neutron-plugin-openvswitch-agent', head_pkg]
121
122
    @patch.object(nutils, 'git_install_requested')
122
123
    @patch.object(charmhelpers.contrib.openstack.neutron, 'os_release')
123
124
    @patch.object(charmhelpers.contrib.openstack.neutron, 'headers_package')
 
125
    def test_determine_packages_mitaka(self, _head_pkgs, _os_rel,
 
126
                                       _git_requested, _use_dvr):
 
127
        self.test_config.set('enable-local-dhcp-and-metadata', False)
 
128
        _git_requested.return_value = False
 
129
        _use_dvr.return_value = False
 
130
        _os_rel.return_value = 'mitaka'
 
131
        self.os_release.return_value = 'mitaka'
 
132
        _head_pkgs.return_value = head_pkg
 
133
        pkg_list = nutils.determine_packages()
 
134
        expect = ['neutron-openvswitch-agent', head_pkg]
 
135
        self.assertItemsEqual(pkg_list, expect)
 
136
 
 
137
    @patch.object(nutils, 'use_dvr')
 
138
    @patch.object(nutils, 'git_install_requested')
 
139
    @patch.object(charmhelpers.contrib.openstack.neutron, 'os_release')
 
140
    @patch.object(charmhelpers.contrib.openstack.neutron, 'headers_package')
124
141
    def test_determine_packages_metadata(self, _head_pkgs, _os_rel,
125
142
                                         _git_requested, _use_dvr):
126
143
        self.test_config.set('enable-local-dhcp-and-metadata', True)
127
144
        _git_requested.return_value = False
128
145
        _use_dvr.return_value = False
129
 
        _os_rel.return_value = 'trusty'
 
146
        _os_rel.return_value = 'icehouse'
 
147
        self.os_release.return_value = 'icehouse'
130
148
        _head_pkgs.return_value = head_pkg
131
149
        pkg_list = nutils.determine_packages()
132
150
        expect = ['neutron-plugin-openvswitch-agent', head_pkg,
142
160
        self.test_config.set('enable-local-dhcp-and-metadata', False)
143
161
        _git_requested.return_value = True
144
162
        _use_dvr.return_value = True
145
 
        _os_rel.return_value = 'trusty'
 
163
        _os_rel.return_value = 'icehouse'
 
164
        self.os_release.return_value = 'icehouse'
146
165
        _head_pkgs.return_value = head_pkg
147
166
        pkg_list = nutils.determine_packages()
148
167
        self.assertFalse('neutron-l3-agent' in pkg_list)
159
178
                self.ctxts.append(ctxt)
160
179
 
161
180
        _use_dvr.return_value = False
162
 
        self.os_release.return_value = 'trusty'
 
181
        self.os_release.return_value = 'icehouse'
163
182
        templating.OSConfigRenderer.side_effect = _mock_OSConfigRenderer
164
183
        _regconfs = nutils.register_configs()
165
184
        confs = ['/etc/neutron/neutron.conf',
168
187
        self.assertItemsEqual(_regconfs.configs, confs)
169
188
 
170
189
    @patch.object(nutils, 'use_dvr')
 
190
    def test_register_configs_mitaka(self, _use_dvr):
 
191
        class _mock_OSConfigRenderer():
 
192
            def __init__(self, templates_dir=None, openstack_release=None):
 
193
                self.configs = []
 
194
                self.ctxts = []
 
195
 
 
196
            def register(self, config, ctxt):
 
197
                self.configs.append(config)
 
198
                self.ctxts.append(ctxt)
 
199
 
 
200
        _use_dvr.return_value = False
 
201
        self.os_release.return_value = 'mitaka'
 
202
        templating.OSConfigRenderer.side_effect = _mock_OSConfigRenderer
 
203
        _regconfs = nutils.register_configs()
 
204
        confs = ['/etc/neutron/neutron.conf',
 
205
                 '/etc/neutron/plugins/ml2/openvswitch_agent.ini',
 
206
                 '/etc/init/os-charm-phy-nic-mtu.conf']
 
207
        self.assertItemsEqual(_regconfs.configs, confs)
 
208
 
 
209
    @patch.object(nutils, 'use_dvr')
171
210
    def test_resource_map(self, _use_dvr):
172
211
        _use_dvr.return_value = False
 
212
        self.os_release.return_value = 'icehouse'
173
213
        _map = nutils.resource_map()
174
214
        svcs = ['neutron-plugin-openvswitch-agent']
175
215
        confs = [nutils.NEUTRON_CONF]
177
217
        self.assertEqual(_map[nutils.NEUTRON_CONF]['services'], svcs)
178
218
 
179
219
    @patch.object(nutils, 'use_dvr')
 
220
    def test_resource_map_mitaka(self, _use_dvr):
 
221
        _use_dvr.return_value = False
 
222
        self.os_release.return_value = 'mitaka'
 
223
        _map = nutils.resource_map()
 
224
        svcs = ['neutron-openvswitch-agent']
 
225
        confs = [nutils.NEUTRON_CONF]
 
226
        [self.assertIn(q_conf, _map.keys()) for q_conf in confs]
 
227
        self.assertEqual(_map[nutils.NEUTRON_CONF]['services'], svcs)
 
228
 
 
229
    @patch.object(nutils, 'use_dvr')
180
230
    def test_resource_map_dvr(self, _use_dvr):
181
231
        _use_dvr.return_value = True
 
232
        self.os_release.return_value = 'icehouse'
182
233
        _map = nutils.resource_map()
183
234
        svcs = ['neutron-plugin-openvswitch-agent', 'neutron-metadata-agent',
184
235
                'neutron-l3-agent']