x/quark
Code Issues Proposed changes

enable_dhcp should be explicitly set to False in create_subnet

Browse Source 
Change-Id: I900cd9417c9b21e336ac39db89aefc8b5cdf5fbb
JIRA:NCP-1997
Closes-Bug: #1618173
This commit is contained in:
Alexander Medvedev 2016-08-29 13:51:20 -05:00
parent 01516fd828
commit 6a56ce2e60
3 changed files with 49 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
quark/plugin_views.py
View File

@ -97,7 +97,7 @@ def _make_subnet_dict(subnet, fields=None):
"dns_nameservers": dns_nameservers or [], "dns_nameservers": dns_nameservers or [],
"cidr": subnet.get("cidr"), "cidr": subnet.get("cidr"),
"shared": STRATEGY.is_provider_network(net_id), "shared": STRATEGY.is_provider_network(net_id),
"enable_dhcp": None} "enable_dhcp": subnet.get("enable_dhcp") or False}
if CONF.QUARK.show_subnet_ip_policy_id: if CONF.QUARK.show_subnet_ip_policy_id:
res['ip_policy_id'] = subnet.get("ip_policy_id") res['ip_policy_id'] = subnet.get("ip_policy_id")

2
quark/tests/plugin_modules/test_floating_ips.py
View File

@ -610,7 +610,7 @@ class TestUpdateFloatingIPs(test_quark_plugin.TestQuarkPlugin):
gateway='192.168.0.1')], gateway='192.168.0.1')],
cidr="192.168.0.0/24", cidr="192.168.0.0/24",
dns_nameservers=[], dns_nameservers=[],
enable_dhcp=None) enable_dhcp=False)
fixed_ip_addr = netaddr.IPAddress("192.168.0.1") fixed_ip_addr = netaddr.IPAddress("192.168.0.1")
fixed_ips = [dict(address_type="fixed", address=int(fixed_ip_addr), fixed_ips = [dict(address_type="fixed", address=int(fixed_ip_addr),

69
quark/tests/plugin_modules/test_subnets.py
View File

@ -79,7 +79,7 @@ class TestQuarkGetSubnets(test_quark_plugin.TestQuarkPlugin):
tenant_id=self.context.tenant_id, ip_version=4, tenant_id=self.context.tenant_id, ip_version=4,
cidr="192.168.0.0/24", gateway_ip="192.168.0.1", cidr="192.168.0.0/24", gateway_ip="192.168.0.1",
dns_nameservers=[], dns_nameservers=[],
enable_dhcp=None) enable_dhcp=False)
with self._stubs(subnets=[subnet], routes=[route]): with self._stubs(subnets=[subnet], routes=[route]):
res = self.plugin.get_subnets(self.context, None, None, None, {}, res = self.plugin.get_subnets(self.context, None, None, None, {},
@ -99,7 +99,7 @@ class TestQuarkGetSubnets(test_quark_plugin.TestQuarkPlugin):
tenant_id=self.context.tenant_id, ip_version=4, tenant_id=self.context.tenant_id, ip_version=4,
cidr="192.168.0.0/24", gateway_ip="192.168.0.1", cidr="192.168.0.0/24", gateway_ip="192.168.0.1",
dns_nameservers=[], dns_nameservers=[],
enable_dhcp=None) enable_dhcp=False)
with self._stubs(subnets=[subnet], routes=[route, route2]): with self._stubs(subnets=[subnet], routes=[route, route2]):
res = self.plugin.get_subnets(self.context, None, None, None, {}, res = self.plugin.get_subnets(self.context, None, None, None, {},
@ -125,7 +125,7 @@ class TestQuarkGetSubnets(test_quark_plugin.TestQuarkPlugin):
tenant_id=self.context.tenant_id, ip_version=4, tenant_id=self.context.tenant_id, ip_version=4,
cidr="192.168.0.0/24", gateway_ip="192.168.0.1", cidr="192.168.0.0/24", gateway_ip="192.168.0.1",
dns_nameservers=[], dns_nameservers=[],
enable_dhcp=None) enable_dhcp=False)
with self._stubs(subnets=subnet, routes=[route]): with self._stubs(subnets=subnet, routes=[route]):
res = self.plugin.get_subnet(self.context, subnet_id) res = self.plugin.get_subnet(self.context, subnet_id)
@ -161,7 +161,7 @@ class TestQuarkGetSubnetsHideAllocPools(test_quark_plugin.TestQuarkPlugin):
tenant_id=self.context.tenant_id, ip_version=4, tenant_id=self.context.tenant_id, ip_version=4,
cidr="192.168.0.0/24", gateway_ip="192.168.0.1", cidr="192.168.0.0/24", gateway_ip="192.168.0.1",
dns_nameservers=[], dns_nameservers=[],
enable_dhcp=None) enable_dhcp=False)
with self._stubs(subnets=[subnet]): with self._stubs(subnets=[subnet]):
res = self.plugin.get_subnets(self.context, None, None, None, {}, res = self.plugin.get_subnets(self.context, None, None, None, {},
@ -431,7 +431,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
cidr="172.16.0.0/24", gateway_ip="0.0.0.0", cidr="172.16.0.0/24", gateway_ip="0.0.0.0",
dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED, dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED,
host_routes=neutron_attrs.ATTR_NOT_SPECIFIED, host_routes=neutron_attrs.ATTR_NOT_SPECIFIED,
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -464,7 +464,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
cidr="1234::/80", gateway_ip="0.0.0.0", cidr="1234::/80", gateway_ip="0.0.0.0",
dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED, dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED,
host_routes=neutron_attrs.ATTR_NOT_SPECIFIED, host_routes=neutron_attrs.ATTR_NOT_SPECIFIED,
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -485,7 +485,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
cidr="192.168.0.0/31", gateway_ip="0.0.0.0", cidr="192.168.0.0/31", gateway_ip="0.0.0.0",
dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED, dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED,
host_routes=neutron_attrs.ATTR_NOT_SPECIFIED, host_routes=neutron_attrs.ATTR_NOT_SPECIFIED,
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -506,7 +506,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
cidr="172.16.0.0/24", gateway_ip="0.0.0.0", cidr="172.16.0.0/24", gateway_ip="0.0.0.0",
dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED, dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED,
host_routes=neutron_attrs.ATTR_NOT_SPECIFIED, host_routes=neutron_attrs.ATTR_NOT_SPECIFIED,
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -544,7 +544,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
cidr="172.16.0.0/24", cidr="172.16.0.0/24",
gateway_ip=neutron_attrs.ATTR_NOT_SPECIFIED, gateway_ip=neutron_attrs.ATTR_NOT_SPECIFIED,
dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED, dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED,
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=[] routes=[]
@ -573,7 +573,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
subnet=dict(network_id=1, subnet=dict(network_id=1,
tenant_id=self.context.tenant_id, ip_version=4, tenant_id=self.context.tenant_id, ip_version=4,
cidr="172.16.0.0/24", gateway_ip="0.0.0.0", cidr="172.16.0.0/24", gateway_ip="0.0.0.0",
dns_nameservers=dns_ns, enable_dhcp=None)) dns_nameservers=dns_ns, enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes, routes=routes,
@ -602,7 +602,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
"nexthop": "172.16.0.4"}], "nexthop": "172.16.0.4"}],
allocation_pools=[{"start": "172.16.0.5", allocation_pools=[{"start": "172.16.0.5",
"end": "172.16.0.254"}], "end": "172.16.0.254"}],
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -635,7 +635,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
"nexthop": "172.16.0.4"}], "nexthop": "172.16.0.4"}],
allocation_pools=[{"start": "172.16.0.5", allocation_pools=[{"start": "172.16.0.5",
"end": "172.16.0.254"}], "end": "172.16.0.254"}],
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -673,7 +673,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
"nexthop": "172.16.0.4"}], "nexthop": "172.16.0.4"}],
allocation_pools=[{"start": "172.16.0.5", allocation_pools=[{"start": "172.16.0.5",
"end": "172.16.0.254"}], "end": "172.16.0.254"}],
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -704,7 +704,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
"nexthop": "172.16.0.4"}], "nexthop": "172.16.0.4"}],
allocation_pools=[{"start": "172.16.0.5", allocation_pools=[{"start": "172.16.0.5",
"end": "172.16.0.254"}], "end": "172.16.0.254"}],
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -735,7 +735,7 @@ class TestQuarkCreateSubnet(test_quark_plugin.TestQuarkPlugin):
cidr="172.16.0.0/24", cidr="172.16.0.0/24",
gateway_ip=None, gateway_ip=None,
dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED, dns_nameservers=neutron_attrs.ATTR_NOT_SPECIFIED,
enable_dhcp=None)) enable_dhcp=False))
with self._stubs( with self._stubs(
subnet=subnet["subnet"], subnet=subnet["subnet"],
routes=routes routes=routes
@ -838,7 +838,7 @@ class TestQuarkAllocationPoolCache(test_quark_plugin.TestQuarkPlugin):
cidr=cidr, cidr=cidr,
host_routes=host_routes, host_routes=host_routes,
dns_nameservers=["4.2.2.1", "4.2.2.2"], dns_nameservers=["4.2.2.1", "4.2.2.2"],
enable_dhcp=None, enable_dhcp=False,
_allocation_pool_cache=None) _allocation_pool_cache=None)
dns_ips = subnet.pop("dns_nameservers", []) dns_ips = subnet.pop("dns_nameservers", [])
@ -945,7 +945,7 @@ class TestQuarkUpdateSubnet(test_quark_plugin.TestQuarkPlugin):
cidr=cidr, cidr=cidr,
host_routes=host_routes, host_routes=host_routes,
dns_nameservers=["4.2.2.1", "4.2.2.2"], dns_nameservers=["4.2.2.1", "4.2.2.2"],
enable_dhcp=None) enable_dhcp=False)
dns_ips = subnet.pop("dns_nameservers", []) dns_ips = subnet.pop("dns_nameservers", [])
host_routes = subnet.pop("host_routes", []) host_routes = subnet.pop("host_routes", [])
@ -1446,7 +1446,7 @@ class TestQuarkDiagnoseSubnets(test_quark_plugin.TestQuarkPlugin):
tenant_id=self.context.tenant_id, ip_version=4, tenant_id=self.context.tenant_id, ip_version=4,
cidr="192.168.0.0/24", gateway_ip="192.168.0.1", cidr="192.168.0.0/24", gateway_ip="192.168.0.1",
dns_nameservers=[], dns_nameservers=[],
enable_dhcp=None) enable_dhcp=False)
with self._stubs(subnets=[subnet], routes=[route]): with self._stubs(subnets=[subnet], routes=[route]):
actual = self.plugin.diagnose_subnet(self.context.elevated(), "*", actual = self.plugin.diagnose_subnet(self.context.elevated(), "*",
@ -1462,7 +1462,7 @@ class TestQuarkDiagnoseSubnets(test_quark_plugin.TestQuarkPlugin):
tenant_id=self.context.tenant_id, ip_version=4, tenant_id=self.context.tenant_id, ip_version=4,
cidr="192.168.0.0/24", gateway_ip="192.168.0.1", cidr="192.168.0.0/24", gateway_ip="192.168.0.1",
dns_nameservers=[], dns_nameservers=[],
enable_dhcp=None) enable_dhcp=False)
with self._stubs(subnets=subnet, routes=[route]): with self._stubs(subnets=subnet, routes=[route]):
actual = self.plugin.diagnose_subnet(self.context.elevated(), actual = self.plugin.diagnose_subnet(self.context.elevated(),
@ -1494,7 +1494,7 @@ class TestQuarkCreateSubnetAttrFilters(test_quark_plugin.TestQuarkPlugin):
"gateway_ip": "0.0.0.0", "gateway_ip": "0.0.0.0",
"dns_nameservers": neutron_attrs.ATTR_NOT_SPECIFIED, "dns_nameservers": neutron_attrs.ATTR_NOT_SPECIFIED,
"host_routes": neutron_attrs.ATTR_NOT_SPECIFIED, "host_routes": neutron_attrs.ATTR_NOT_SPECIFIED,
"enable_dhcp": None, "first_ip": 0, "last_ip": 1, "enable_dhcp": False, "first_ip": 0, "last_ip": 1,
"next_auto_assign_ip": 10}} "next_auto_assign_ip": 10}}
with self._stubs() as (subnet_create, net_find): with self._stubs() as (subnet_create, net_find):
@ -1514,7 +1514,7 @@ class TestQuarkCreateSubnetAttrFilters(test_quark_plugin.TestQuarkPlugin):
"gateway_ip": "0.0.0.0", "gateway_ip": "0.0.0.0",
"dns_nameservers": neutron_attrs.ATTR_NOT_SPECIFIED, "dns_nameservers": neutron_attrs.ATTR_NOT_SPECIFIED,
"host_routes": neutron_attrs.ATTR_NOT_SPECIFIED, "host_routes": neutron_attrs.ATTR_NOT_SPECIFIED,
"enable_dhcp": None, "first_ip": 0, "last_ip": 1, "enable_dhcp": False, "first_ip": 0, "last_ip": 1,
"next_auto_assign_ip": 10}} "next_auto_assign_ip": 10}}
admin_ctx = self.context.elevated() admin_ctx = self.context.elevated()
@ -1554,7 +1554,7 @@ class TestQuarkUpdateSubnetAttrFilters(test_quark_plugin.TestQuarkPlugin):
"gateway_ip": "0.0.0.0", "gateway_ip": "0.0.0.0",
"dns_nameservers": neutron_attrs.ATTR_NOT_SPECIFIED, "dns_nameservers": neutron_attrs.ATTR_NOT_SPECIFIED,
"host_routes": neutron_attrs.ATTR_NOT_SPECIFIED, "host_routes": neutron_attrs.ATTR_NOT_SPECIFIED,
"enable_dhcp": None, "first_ip": 0, "last_ip": 1, "enable_dhcp": False, "first_ip": 0, "last_ip": 1,
"next_auto_assign_ip": 10, "do_not_use": False}} "next_auto_assign_ip": 10, "do_not_use": False}}
with self._stubs() as (subnet_update, subnet_find): with self._stubs() as (subnet_update, subnet_find):
@ -1678,3 +1678,28 @@ class TestQuarkGetSubnetsShared(test_quark_plugin.TestQuarkPlugin):
provider_query=False, provider_query=False,
join_routes=True, join_dns=True, join_routes=True, join_dns=True,
join_pool=True) join_pool=True)
class TestQuarkMakeSubnetDict(test_quark_plugin.TestQuarkPlugin):
def test_make_subnet_enable_dhcp_true_dict(self):
"""enable_dhcp is explicitly set, expect True"""
subnet = dict(network_id=1,
tenant_id=self.context.tenant_id, ip_version=4,
cidr="172.16.0.0/24", gateway_ip="0.0.0.0",
dns_nameservers=[],
host_routes=neutron_attrs.ATTR_NOT_SPECIFIED,
enable_dhcp=True)
res = plugin_views._make_subnet_dict(subnet)
self.assertTrue(res['enable_dhcp'], "Expected true")
def test_make_subnet_enable_dhcp_default_dict(self):
"""enable_dhcp is not set, expect False"""
subnet = dict(network_id=1,
tenant_id=self.context.tenant_id, ip_version=4,
cidr="172.16.0.0/24", gateway_ip="0.0.0.0",
dns_nameservers=[],
host_routes=neutron_attrs.ATTR_NOT_SPECIFIED)
res = plugin_views._make_subnet_dict(subnet)
self.assertFalse(res['enable_dhcp'], "Expected false")