~xianghui/charms/trusty/nova-compute/support-ipv6

« back to all changes in this revision

Viewing changes to unit_tests/test_nova_compute_utils.py

  • Committer: james.page at ubuntu
  • Date: 2014-06-24 13:44:41 UTC
  • mfrom: (63.2.10 nova-compute)
  • Revision ID: james.page@ubuntu.com-20140624134441-nce0hhf1rxhgp4ga
[gnuoy,r=james-page] Add support for separate management of neutron openvswitch configuration via subordinate.

Show diffs side-by-side

added added

removed removed

Lines of Context:
155
155
 
156
156
        self.assertEquals(ex, result)
157
157
 
 
158
    @patch.object(utils, 'neutron_plugin')
 
159
    @patch.object(utils, 'network_manager')
 
160
    def test_resource_map_neutron_ovs_plugin(self, net_man, _plugin):
 
161
        self.skipTest('skipped until contexts are properly mocked.')
 
162
        self.is_relation_made = True
 
163
        net_man.return_value = 'Neutron'
 
164
        _plugin.return_value = 'ovs'
 
165
        result = utils.resource_map()
 
166
        self.assertTrue('/etc/neutron/neutron.conf' not in result)
 
167
 
158
168
    def fake_user(self, username='foo'):
159
169
        user = MagicMock()
160
170
        user.pw_dir = '/home/' + username