x/vmware-nsx
Code Issues Proposed changes

Merge "Use correct device_manager member in dhcp driver"

Browse Source
This commit is contained in:
Jenkins 2013-11-22 02:21:35 +00:00 committed by Gerrit Code Review
commit 8f5991fad8
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/plugins/midonet/agent/midonet_driver.py
View File

@ -47,7 +47,7 @@ class DhcpNoOpDriver(dhcp.DhcpLocalProcess):
def disable(self, retain_port=False): def disable(self, retain_port=False):
"""Disable DHCP for this network.""" """Disable DHCP for this network."""
if not retain_port: if not retain_port:
self.device_delegate.destroy(self.network, self.interface_name) self.device_manager.destroy(self.network, self.interface_name)
self._remove_config_files() self._remove_config_files()
def release_lease(self, mac_address, removed_ips): def release_lease(self, mac_address, removed_ips):

30
neutron/tests/unit/midonet/test_midonet_driver.py
View File

@ -24,8 +24,10 @@ import sys
sys.modules["midonetclient"] = mock.Mock() sys.modules["midonetclient"] = mock.Mock()
from neutron.agent.common import config from neutron.agent.common import config
from neutron.agent.linux import dhcp
from neutron.agent.linux import interface from neutron.agent.linux import interface
from neutron.agent.linux import ip_lib from neutron.agent.linux import ip_lib
from neutron.common import config as base_config
from neutron.openstack.common import uuidutils from neutron.openstack.common import uuidutils
import neutron.plugins.midonet.agent.midonet_driver as driver import neutron.plugins.midonet.agent.midonet_driver as driver
from neutron.tests import base from neutron.tests import base
@ -102,3 +104,31 @@ class MidoInterfaceDriverTestCase(base.BaseTestCase):
self.namespace), self.namespace),
mock.call().link.delete()]) mock.call().link.delete()])
self.ip.assert_has_calls(mock.call().garbage_collect_namespace()) self.ip.assert_has_calls(mock.call().garbage_collect_namespace())
class FakeNetwork:
id = 'aaaabbbb-cccc-dddd-eeee-ffff00001111'
namespace = 'qdhcp-ns'
class TestDhcpNoOpDriver(base.BaseTestCase):
def setUp(self):
super(TestDhcpNoOpDriver, self).setUp()
self.conf = config.setup_conf()
self.conf.register_opts(base_config.core_opts)
self.conf.register_opts(dhcp.OPTS)
self.conf.enable_isolated_metadata = True
self.conf.use_namespaces = True
instance = mock.patch("neutron.agent.linux.dhcp.DeviceManager")
self.mock_mgr = instance.start()
self.addCleanup(instance.stop)
def test_disable_no_retain_port(self):
dhcp_driver = driver.DhcpNoOpDriver(self.conf, FakeNetwork())
dhcp_driver.disable(retain_port=False)
self.assertTrue(self.mock_mgr.return_value.destroy.called)
def test_disable_retain_port(self):
dhcp_driver = driver.DhcpNoOpDriver(self.conf, FakeNetwork())
dhcp_driver.disable(retain_port=True)
self.assertFalse(self.mock_mgr.return_value.destroy.called)