x/vmware-nsx
Code Issues Proposed changes

Merge "Do not add DHCP info to subnet if DHCP is disabled"

Browse Source
This commit is contained in:
Jenkins 2013-11-28 20:01:14 +00:00 committed by Gerrit Code Review
commit 87d1c346c4
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
neutron/plugins/midonet/plugin.py
View File

@ -251,6 +251,9 @@ class MidonetPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
if subnet["ip_version"] == 6: if subnet["ip_version"] == 6:
# TODO(ryu) handle IPv6 # TODO(ryu) handle IPv6
continue continue
if not subnet["enable_dhcp"]:
# Skip if DHCP is disabled
continue
yield subnet['cidr'], fixed_ip["ip_address"], mac yield subnet['cidr'], fixed_ip["ip_address"], mac
def _metadata_subnets(self, context, fixed_ips): def _metadata_subnets(self, context, fixed_ips):
@ -406,17 +409,18 @@ class MidonetPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
gateway_ip = s['gateway_ip'] gateway_ip = s['gateway_ip']
cidr = s['cidr'] cidr = s['cidr']
dns_nameservers = None if s['enable_dhcp']:
host_routes = None dns_nameservers = None
if s['dns_nameservers'] is not attributes.ATTR_NOT_SPECIFIED: host_routes = None
dns_nameservers = s['dns_nameservers'] if s['dns_nameservers'] is not attributes.ATTR_NOT_SPECIFIED:
dns_nameservers = s['dns_nameservers']
if s['host_routes'] is not attributes.ATTR_NOT_SPECIFIED: if s['host_routes'] is not attributes.ATTR_NOT_SPECIFIED:
host_routes = s['host_routes'] host_routes = s['host_routes']
self.client.create_dhcp(bridge, gateway_ip, cidr, self.client.create_dhcp(bridge, gateway_ip, cidr,
host_rts=host_routes, host_rts=host_routes,
dns_servers=dns_nameservers) dns_servers=dns_nameservers)
# For external network, link the bridge to the provider router. # For external network, link the bridge to the provider router.
if net['router:external']: if net['router:external']:
@ -443,7 +447,8 @@ class MidonetPluginV2(db_base_plugin_v2.NeutronDbPluginV2,
super(MidonetPluginV2, self).delete_subnet(context, id) super(MidonetPluginV2, self).delete_subnet(context, id)
bridge = self.client.get_bridge(subnet['network_id']) bridge = self.client.get_bridge(subnet['network_id'])
self.client.delete_dhcp(bridge, subnet['cidr']) if subnet['enable_dhcp']:
self.client.delete_dhcp(bridge, subnet['cidr'])
# If the network is external, clean up routes, links, ports # If the network is external, clean up routes, links, ports
if net[ext_net.EXTERNAL]: if net[ext_net.EXTERNAL]:

5
neutron/tests/unit/midonet/test_midonet_plugin.py
View File

@ -131,6 +131,11 @@ class TestMidonetSubnetsV2(test_plugin.TestSubnetsV2,
def test_create_subnet_inconsistent_ipv6_gatewayv4(self): def test_create_subnet_inconsistent_ipv6_gatewayv4(self):
pass pass
def test_create_subnet_dhcp_disabled(self):
super(TestMidonetSubnetsV2, self)._test_create_subnet(
enable_dhcp=False)
self.assertFalse(self.instance.return_value.create_dhcp.called)
class TestMidonetPortsV2(test_plugin.TestPortsV2, class TestMidonetPortsV2(test_plugin.TestPortsV2,
MidonetPluginV2TestCase): MidonetPluginV2TestCase):