~ltrager/maas/remove_di_from_kernel

~ltrager/maas/remove_di_from_kernel_opts

« back to all changes in this revision

Viewing changes to src/provisioningserver/dhcp/config.py

Committer: Lee Trager
Date: 2016-10-22 06:06:12 UTC
mfrom: (5457.1.44 maas)
Revision ID: lee.trager@canonical.com-20161022060612-ukar20f6ffs45nas

Merge trunk

files added:
src/maasserver/static/js/angular/directives/ipranges.js

src/maasserver/static/js/angular/directives/tests/test_ipranges.js

src/maasserver/static/partials/ipranges.html

src/provisioningserver/logger/testing

src/provisioningserver/logger/testing/__init__.py

src/provisioningserver/logger/testing/logsomething.py

src/provisioningserver/utils/snappy.py

src/provisioningserver/utils/tests/test_snappy.py

utilities/find-early-imports

files removed:
src/provisioningserver/testing/testcase.py

files modified:
.idea/maas.iml

Makefile

buildout.cfg

contrib/preseeds_v2/curtin_userdata

docs/sstreams-mirror.rst

setup.py

src/maas/__init__.py

src/maas/development.py

src/maas/settings.py

src/maasserver/__init__.py

src/maasserver/api/account.py

src/maasserver/api/blockdevices.py

src/maasserver/api/devices.py

src/maasserver/api/interfaces.py

src/maasserver/api/ip_addresses.py

src/maasserver/api/ipranges.py

src/maasserver/api/machines.py

src/maasserver/api/rackcontrollers.py

src/maasserver/api/regioncontrollers.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_blockdevice.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_machine.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_rackcontroller.py

src/maasserver/api/tests/test_subnets.py

src/maasserver/api/tests/test_utils.py

src/maasserver/api/utils.py

src/maasserver/clusterrpc/power_parameters.py

src/maasserver/clusterrpc/tests/test_power_parameters.py

src/maasserver/config_forms.py

src/maasserver/dhcp.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/dns/zonegenerator.py

src/maasserver/forms.py

src/maasserver/forms_interface.py

src/maasserver/forms_iprange.py

src/maasserver/management/commands/apikey.py

src/maasserver/models/discovery.py

src/maasserver/models/iprange.py

src/maasserver/models/migrations/create_default_storage_layout.py

src/maasserver/models/node.py

src/maasserver/models/partition.py

src/maasserver/models/partitiontable.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/subnet.py

src/maasserver/models/tests/test_blockdevice.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_iprange.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_partition.py

src/maasserver/models/tests/test_partitiontable.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_subnet.py

src/maasserver/models/tests/test_template.py

src/maasserver/models/tests/test_vlan.py

src/maasserver/models/user.py

src/maasserver/models/userprofile.py

src/maasserver/models/vlan.py

src/maasserver/plugin.py

src/maasserver/populate_tags.py

src/maasserver/preseed.py

src/maasserver/preseed_storage.py

src/maasserver/rpc/nodes.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_nodes.py

src/maasserver/rpc/tests/test_rackcontrollers.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/service_monitor.py

src/maasserver/static/js/angular/controllers/node_details_networking.js

src/maasserver/static/js/angular/controllers/node_details_storage.js

src/maasserver/static/js/angular/controllers/nodes_list.js

src/maasserver/static/js/angular/controllers/subnet_details.js

src/maasserver/static/js/angular/controllers/tests/test_node_details_networking.js

src/maasserver/static/js/angular/controllers/tests/test_node_details_storage.js

src/maasserver/static/js/angular/controllers/tests/test_nodes_list.js

src/maasserver/static/js/angular/controllers/tests/test_subnet_details.js

src/maasserver/static/js/angular/controllers/tests/test_vlan_details.js

src/maasserver/static/js/angular/controllers/vlan_details.js

src/maasserver/static/js/angular/directives/boot_images.js

src/maasserver/static/js/angular/directives/tests/test_boot_images.js

src/maasserver/static/js/angular/factories/nodes.js

src/maasserver/static/js/angular/factories/subnets.js

src/maasserver/static/js/angular/factories/tests/test_nodes.js

src/maasserver/static/js/angular/factories/tests/test_subnets.js

src/maasserver/static/js/angular/maas.js

src/maasserver/static/partials/boot-images.html

src/maasserver/static/partials/dashboard.html

src/maasserver/static/partials/node-details.html

src/maasserver/static/partials/nodes-list.html

src/maasserver/static/partials/subnet-details.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/testing/factory.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_config_forms.py

src/maasserver/tests/test_forms_blockdevice.py

src/maasserver/tests/test_forms_controller.py

src/maasserver/tests/test_forms_interface.py

src/maasserver/tests/test_forms_interface_link.py

src/maasserver/tests/test_forms_machine.py

src/maasserver/tests/test_plugin.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_preseed_storage.py

src/maasserver/triggers/system.py

src/maasserver/triggers/tests/test_system_listener.py

src/maasserver/triggers/tests/test_websocket.py

src/maasserver/triggers/tests/test_websocket_listener.py

src/maasserver/triggers/websocket.py

src/maasserver/urls_api.py

src/maasserver/utils/dns.py

src/maasserver/utils/keys.py

src/maasserver/utils/tests/test_dns.py

src/maasserver/utils/tests/test_keys.py

src/maasserver/utils/tests/test_views.py

src/maasserver/utils/threads.py

src/maasserver/utils/views.py

src/maasserver/views/combo.py

src/maasserver/websockets/handlers/bootresource.py

src/maasserver/websockets/handlers/config.py

src/maasserver/websockets/handlers/device.py

src/maasserver/websockets/handlers/dhcpsnippet.py

src/maasserver/websockets/handlers/general.py

src/maasserver/websockets/handlers/machine.py

src/maasserver/websockets/handlers/node.py

src/maasserver/websockets/handlers/packagerepository.py

src/maasserver/websockets/handlers/staticroute.py

src/maasserver/websockets/handlers/tests/test_bootresource.py

src/maasserver/websockets/handlers/tests/test_device.py

src/maasserver/websockets/handlers/tests/test_machine.py

src/maasserver/websockets/handlers/tests/test_vlan.py

src/maasserver/websockets/handlers/user.py

src/maasserver/websockets/handlers/vlan.py

src/maasserver/websockets/tests/test_base.py

src/provisioningserver/__init__.py

src/provisioningserver/config.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/testing/config.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/dhcp/tests/test_helper_notify.py

src/provisioningserver/diskless.py

src/provisioningserver/dns/tests/test_actions.py

src/provisioningserver/drivers/power/tests/test_amt.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/logger/__init__.py

src/provisioningserver/logger/log.py

src/provisioningserver/logger/tests/test_logger.py

src/provisioningserver/monkey.py

src/provisioningserver/plugin.py

src/provisioningserver/power/schema.py

src/provisioningserver/rackdservices/tests/test_dhcp_probe_service.py

src/provisioningserver/rackdservices/tests/test_image_download_service.py

src/provisioningserver/rackdservices/tests/test_lease_socket_service.py

src/provisioningserver/rackdservices/tests/test_service_monitor_service.py

src/provisioningserver/refresh/node_info_scripts.py

src/provisioningserver/rpc/tests/test_boot_images.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/rpc/tests/test_utils.py

src/provisioningserver/service_monitor.py

src/provisioningserver/templates/commissioning-user-data/snippets/maas_api_helper.py

src/provisioningserver/templates/dhcp/dhcpd.conf.template

src/provisioningserver/templates/dhcp/dhcpd6.conf.template

src/provisioningserver/tests/test_diskless.py

src/provisioningserver/tests/test_monkey.py

src/provisioningserver/tests/test_plugin.py

src/provisioningserver/tests/test_service_monitor.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/utils/fs.py

src/provisioningserver/utils/isc.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/service_monitor.py

src/provisioningserver/utils/tests/test_fs.py

src/provisioningserver/utils/tests/test_network.py

src/provisioningserver/utils/tests/test_service_monitor.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/twisted.py

utilities/check-imports

versions.cfg

Show diffs side-by-side

added added

removed removed

src/provisioningserver/dhcp/config.py

from netaddr import (

IPAddress,

IPNetwork,

IPRange,

)

from provisioningserver.boot import BootMethodRegistry

from provisioningserver.utils import (

296

297

IPAddress(addr)

297

298

for addr in net_utils.get_all_interface_addresses()]

298

299

300

shared_networks = _process_network_parameters_v6(

301

rack_addrs, failover_peers, shared_networks)

302

303

try:

304

return template.substitute(

305

global_dhcp_snippets=global_dhcp_snippets, hosts=hosts,

306

failover_peers=failover_peers, shared_networks=shared_networks,

307

platform_codename=platform_codename,

308

omapi_key=omapi_key, **helpers)

309

except (KeyError, NameError) as error:

310

raise DHCPConfigError(

311

"Failed to render DHCP configuration.") from error

312

313

314

def _process_network_parameters_v6(

315

rack_addrs, failover_peers, shared_networks):

316

"""Preprocess shared_networks prior to rendering the template.

317

318

This is a separate function, partly for readability, and partly for ease

319

of testing.

320

321

:param rack_addrs: a list of IPAddress values for the interfaces on this

322

rack controller.

323

:param failover_peers: failover_peers from get_config_v6.

324

:param shared_networks: shared_networks from get_config_v6.

325

:return: an updated shared_networks, suitable for rendering the template.

326

"""

327

peers = {x["name"]: x for x in failover_peers}

328

299

329

for shared_network in shared_networks:

300

330

for subnet in shared_network["subnets"]:

301

331

cidr = IPNetwork(subnet['subnet_cidr'])

312

342

ntp_servers_ipv4, ntp_servers_ipv6 = _get_addresses(*ntp_servers)

313

343

subnet["ntp_servers_ipv4"] = ", ".join(ntp_servers_ipv4)

314

344

subnet["ntp_servers_ipv6"] = ", ".join(ntp_servers_ipv6)

315

316

try:

317

return template.substitute(

318

global_dhcp_snippets=global_dhcp_snippets, hosts=hosts,

319

failover_peers=failover_peers, shared_networks=shared_networks,

320

platform_codename=platform_codename,

321

omapi_key=omapi_key, **helpers)

322

except (KeyError, NameError) as error:

323

raise DHCPConfigError(

324

"Failed to render DHCP configuration.") from error

345

for pool in subnet["pools"]:

346

peer = pool.get("failover_peer", None)

347

if peer is not None:

348

ip_range = IPRange(

349

pool["ip_range_low"],

350

pool["ip_range_high"])

351

if peers[peer]["mode"] == "primary":

352

pool["ip_range_high"] = str(

353

IPAddress(

354

ip_range.first + int(ip_range.size / 2) - 1))

355

else:

356

pool["ip_range_low"] = str(

357

IPAddress(

358

ip_range.first + int(ip_range.size / 2)))

359

return shared_networks

Older »