← Back to branch summary

~ubuntu-branches/ubuntu/utopic/maas/utopic-security

~ubuntu-branches/ubuntu/utopic/maas/utopic-security

« back to all changes in this revision

Viewing changes to src/maasserver/utils/network.py

Committer: Package Import Robot
Author(s): Julian Edwards, Julian Edwards, Andres Rodriguez
Date: 2014-08-21 18:38:27 UTC
mfrom: (1.2.34)
Revision ID: package-import@ubuntu.com-20140821183827-9xyb5u2o4l8g3zxj

Tags: 1.6.1+bzr2550-0ubuntu1

https://launchpad.net/bugs/1341619

* New upstream bugfix release:
  - Auto-link node MACs to Networks (LP: #1341619)

[ Julian Edwards ]
* debian/maas-region-controller.postinst: Don't restart RabbitMQ on
  upgrades, just ensure it's running.  Should prevent a race with the
  cluster celery restarting.
* debian/rules: Pull upstream branch from the right place.

[ Andres Rodriguez ]
* debian/maas-region-controller.postinst: Ensure cluster celery is
  started if it also runs on the region.

files added:
contrib/preseeds_v2/curtin_userdata_centos

contrib/preseeds_v2/curtin_userdata_suse

contrib/preseeds_v2/curtin_userdata_windows

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012hv

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012hvr2

contrib/preseeds_v2/preseed_master_windows_amd64_generic_win2012r2

docs/_static/versions.js

docs/bootsources.rst

docs/versions.py

etc/maas/templates/power/mscm.template

etc/maas/templates/pxe/config.commissioning.arm64.template

etc/maas/templates/pxe/config.commissioning.ppc64el.template

etc/maas/templates/pxe/config.install.arm64.template

etc/maas/templates/pxe/config.install.ppc64el.template

etc/maas/templates/pxe/config.xinstall.arm64.template

etc/maas/templates/pxe/config.xinstall.ppc64el.template

etc/maas/templates/windows

src/maasserver/migrations/0075_add_boot_resource_models.py

src/maasserver/migrations/0076_add_osystem_to_bootimage.py

src/maasserver/migrations/0077_remove_null_for_bootsourceselection_release.py

src/maasserver/migrations/0078_add_osystem_to_node.py

src/maasserver/migrations/0079_supported_subarches_for_bootimage.py

src/maasserver/migrations/0080_binary_to_editablebinary_in_bootsource.py

src/maasserver/migrations/0081_ipaddress_table_and_static_dhcp_ranges.py

src/maasserver/migrations/0082_cluster_interface_for_macaddress.py

src/maasserver/migrations/0083_add_license_key_to_node.py

src/maasserver/migrations/0084_add_ssl_key_model.py

src/maasserver/migrations/0085_add_user_to_staticipaddress.py

src/maasserver/migrations/0086_add_xinstall_path_and_type_to_bootimage.py

src/maasserver/migrations/0087_add_licensekey_model.py

src/maasserver/migrations/0088_ip_to_custom_field.py

src/maasserver/migrations/0088_z_backport_trunk_0099.py

src/maasserver/models/bootsource.py

src/maasserver/models/bootsourceselection.py

src/maasserver/models/licensekey.py

src/maasserver/models/macipaddresslink.py

src/maasserver/models/sslkey.py

src/maasserver/models/staticipaddress.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_bootsourceselection.py

src/maasserver/models/tests/test_licensekey.py

src/maasserver/models/tests/test_sslkey.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/rpc/bootsources.py

src/maasserver/rpc/configuration.py

src/maasserver/rpc/tests/test_bootsources.py

src/maasserver/rpc/tests/test_configuration.py

src/maasserver/static/js/license_key.js

src/maasserver/static/js/os_distro_select.js

src/maasserver/static/js/tests/test_license_key.html

src/maasserver/static/js/tests/test_license_key.js

src/maasserver/static/js/tests/test_os_distro_select.html

src/maasserver/static/js/tests/test_os_distro_select.js

src/maasserver/templates/maasserver/prefs_add_sslkey.html

src/maasserver/templates/maasserver/prefs_confirm_delete_sslkey.html

src/maasserver/testing/eventloop.py

src/maasserver/testing/osystems.py

src/maasserver/tests/data/test_x509_0.pem

src/maasserver/tests/data/test_x509_1.pem

src/maasserver/tests/data/test_x509_2.pem

src/maasserver/tests/data/test_x509_3.pem

src/maasserver/tests/data/test_x509_4.pem

src/maasserver/tests/test_api_boot_source_selections.py

src/maasserver/tests/test_api_boot_sources.py

src/maasserver/tests/test_api_ipaddresses.py

src/maasserver/tests/test_api_licensekey.py

src/maasserver/tests/test_api_ssl_key.py

src/maasserver/utils/osystems.py

src/maasserver/utils/tests/test_osystems.py

src/provisioningserver/boot/powernv.py

src/provisioningserver/boot/tests/test_powernv.py

src/provisioningserver/boot/tests/test_windows.py

src/provisioningserver/boot/windows.py

src/provisioningserver/drivers

src/provisioningserver/drivers/__init__.py

src/provisioningserver/drivers/hardware

src/provisioningserver/drivers/hardware/__init__.py

src/provisioningserver/drivers/hardware/mscm.py

src/provisioningserver/drivers/hardware/seamicro.py

src/provisioningserver/drivers/hardware/tests

src/provisioningserver/drivers/hardware/tests/__init__.py

src/provisioningserver/drivers/hardware/tests/test_mscm.py

src/provisioningserver/drivers/hardware/tests/test_seamicro.py

src/provisioningserver/drivers/hardware/tests/test_ucsm.py

src/provisioningserver/drivers/hardware/tests/test_umg.py

src/provisioningserver/drivers/hardware/tests/test_virsh.py

src/provisioningserver/drivers/hardware/ucsm.py

src/provisioningserver/drivers/hardware/umg.py

src/provisioningserver/drivers/hardware/virsh.py

src/provisioningserver/drivers/osystem

src/provisioningserver/drivers/osystem/__init__.py

src/provisioningserver/drivers/osystem/centos.py

src/provisioningserver/drivers/osystem/suse.py

src/provisioningserver/drivers/osystem/tests

src/provisioningserver/drivers/osystem/tests/__init__.py

src/provisioningserver/drivers/osystem/tests/test_centos.py

src/provisioningserver/drivers/osystem/tests/test_registries.py

src/provisioningserver/drivers/osystem/tests/test_suse.py

src/provisioningserver/drivers/osystem/tests/test_ubuntu.py

src/provisioningserver/drivers/osystem/tests/test_windows.py

src/provisioningserver/drivers/osystem/ubuntu.py

src/provisioningserver/drivers/osystem/windows.py

src/provisioningserver/import_images/boot_image_mapping.py

src/provisioningserver/import_images/download_descriptions.py

src/provisioningserver/import_images/download_resources.py

src/provisioningserver/import_images/helpers.py

src/provisioningserver/import_images/keyrings.py

src/provisioningserver/import_images/product_mapping.py

src/provisioningserver/import_images/testing

src/provisioningserver/import_images/testing/__init__.py

src/provisioningserver/import_images/testing/factory.py

src/provisioningserver/import_images/tests/test_boot_image_mapping.py

src/provisioningserver/import_images/tests/test_download_descriptions.py

src/provisioningserver/import_images/tests/test_download_resources.py

src/provisioningserver/import_images/tests/test_helpers.py

src/provisioningserver/import_images/tests/test_keyrings.py

src/provisioningserver/import_images/tests/test_product_mapping.py

src/provisioningserver/import_images/tests/test_uec2roottar.py

src/provisioningserver/import_images/uec2roottar.py

src/provisioningserver/rpc/tests/test_docs.py

src/provisioningserver/testing/os.py

src/provisioningserver/utils/env.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/tests/test_env.py

src/provisioningserver/utils/tests/test_network.py

files removed:
etc/maas/bootresources.yaml

etc/maas/import_pxe_files

src/maasserver/utils/network.py

src/maasserver/utils/tests/test_network.py

src/provisioningserver/custom_hardware

src/provisioningserver/custom_hardware/__init__.py

src/provisioningserver/custom_hardware/seamicro.py

src/provisioningserver/custom_hardware/tests

src/provisioningserver/custom_hardware/tests/__init__.py

src/provisioningserver/custom_hardware/tests/test_seamicro.py

src/provisioningserver/custom_hardware/tests/test_ucsm.py

src/provisioningserver/custom_hardware/tests/test_virsh.py

src/provisioningserver/custom_hardware/ucsm.py

src/provisioningserver/custom_hardware/utils.py

src/provisioningserver/custom_hardware/virsh.py

src/provisioningserver/dns/tests/test_utils.py

src/provisioningserver/dns/utils.py

src/provisioningserver/driver

src/provisioningserver/driver/__init__.py

src/provisioningserver/driver/tests

src/provisioningserver/driver/tests/test_registries.py

files modified:
HACKING.txt

INSTALL.txt

LICENSE

Makefile

contrib/preseeds_v2/enlist_userdata

contrib/preseeds_v2/generic

debian/changelog

debian/control

debian/extras/99-maas-sudoers

debian/maas-cluster-controller.install

debian/maas-cluster-controller.postinst

debian/maas-region-controller.postinst

debian/rules

docs/_templates/maas/layout.html

docs/_templates/maas/static/css/main.css

docs/_templates/maas/static/flasky.css_t

docs/changelog.rst

docs/cluster-configuration.rst

docs/conf.py

docs/configure.rst

docs/enum.rst

docs/hardware-enablement-kernels.rst

docs/installing-ubuntu.rst

docs/man/maas-import-pxe-files.8.rst

docs/man/maas-region-admin.8.rst

docs/media/cluster-interface-edit.png

docs/media/install_web-init.png

docs/orientation.rst

etc/apache.conf

etc/apache.saucy.conf

etc/celeryconfig.py

etc/maas/templates/commissioning-user-data/snippets/maas_api_helper.py

etc/maas/templates/commissioning-user-data/snippets/maas_enlist.sh

etc/maas/templates/commissioning-user-data/snippets/maas_ipmi_autodetect.py

etc/maas/templates/commissioning-user-data/snippets/tests/test_maas_ipmi_autodetect.py

etc/maas/templates/dhcp/dhcpd.conf.template

etc/maas/templates/power/amt.template

etc/maas/templates/power/sm15k.template

etc/maas/templates/power/ucsm.template

etc/maas/templates/power/virsh.template

man/maas-import-pxe-files.8

man/maas-region-admin.8

man/maas.8

required-packages/base

scripts/uec2roottar *

setup.py

src/apiclient/maas_client.py

src/apiclient/tests/test_maas_client.py

src/maas/development.py

src/maas/settings.py

src/maascli/api.py

src/maasserver/api.py

src/maasserver/apidoc.py

src/maasserver/compose_preseed.py

src/maasserver/context_processors.py

src/maasserver/dns.py

src/maasserver/dns_connect.py

src/maasserver/enum.py

src/maasserver/eventloop.py

src/maasserver/exceptions.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/forms_settings.py

src/maasserver/migrations/0048_add_key_to_filestorage.py

src/maasserver/migrations/0072_remove_ipmi_autodetect.py

src/maasserver/models/__init__.py

src/maasserver/models/bootimage.py

src/maasserver/models/config.py

src/maasserver/models/dhcplease.py

src/maasserver/models/macaddress.py

src/maasserver/models/network.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/nodegroupinterface.py

src/maasserver/models/tests/test_bootimage.py

src/maasserver/models/tests/test_dhcplease.py

src/maasserver/models/tests/test_macaddress.py

src/maasserver/models/tests/test_network.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodegroup.py

src/maasserver/models/tests/test_nodegroupinterface.py

src/maasserver/node_action.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/nonces_cleanup.py

src/maasserver/preseed.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/tests/test_regionservice.py

src/maasserver/start_up.py

src/maasserver/static/js/node_add.js

src/maasserver/support/pertenant/tests/test_migration.py

src/maasserver/tasks.py

src/maasserver/templates/maasserver/base.html

src/maasserver/templates/maasserver/bootimage-list.html

src/maasserver/templates/maasserver/no-bootimages-warning.html

src/maasserver/templates/maasserver/node_edit.html

src/maasserver/templates/maasserver/node_preseed.html

src/maasserver/templates/maasserver/prefs.html

src/maasserver/templates/maasserver/settings.html

src/maasserver/templates/maasserver/snippets.html

src/maasserver/templates/registration/login.html

src/maasserver/testing/factory.py

src/maasserver/testing/tests/test_rabbit.py

src/maasserver/tests/models.py

src/maasserver/tests/test_api.py

src/maasserver/tests/test_api_boot_images.py

src/maasserver/tests/test_api_commissioning.py

src/maasserver/tests/test_api_enlistment.py

src/maasserver/tests/test_api_macaddress.py

src/maasserver/tests/test_api_node.py

src/maasserver/tests/test_api_nodegroup.py

src/maasserver/tests/test_api_nodes.py

src/maasserver/tests/test_api_pxeconfig.py

src/maasserver/tests/test_api_register.py

src/maasserver/tests/test_apidoc.py

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_dns.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_migrations.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_nonces_cleanup.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_tasks.py

src/maasserver/urls.py

src/maasserver/urls_api.py

src/maasserver/utils/__init__.py

src/maasserver/utils/async.py

src/maasserver/utils/dblocks.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_dblocks.py

src/maasserver/utils/tests/test_utils.py

src/maasserver/views/clusters.py

src/maasserver/views/nodes.py

src/maasserver/views/prefs.py

src/maasserver/views/settings.py

src/maasserver/views/tests/test_account.py

src/maasserver/views/tests/test_boot_image_list.py

src/maasserver/views/tests/test_clusters.py

src/maasserver/views/tests/test_general.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_rpc.py

src/maasserver/views/tests/test_settings.py

src/maastesting/factory.py

src/maastesting/tests/test_factory.py

src/metadataserver/address.py

src/metadataserver/api.py

src/metadataserver/tests/test_address.py

src/metadataserver/tests/test_api.py

src/provisioningserver/auth.py

src/provisioningserver/boot/__init__.py

src/provisioningserver/boot/pxe.py

src/provisioningserver/boot/tests/test_boot.py

src/provisioningserver/boot/tests/test_pxe.py

src/provisioningserver/boot/tests/test_tftppath.py

src/provisioningserver/boot/tests/test_uefi.py

src/provisioningserver/boot/tftppath.py

src/provisioningserver/boot/utils.py

src/provisioningserver/boot_images.py

src/provisioningserver/config.py

src/provisioningserver/dhcp/config.py

src/provisioningserver/dhcp/leases_parser.py

src/provisioningserver/dhcp/tests/test_config.py

src/provisioningserver/dhcp/tests/test_leases_parser.py

src/provisioningserver/dns/config.py

src/provisioningserver/dns/tests/test_config.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/kernel_opts.py

src/provisioningserver/network.py

src/provisioningserver/omshell.py

src/provisioningserver/power/tests/test_poweraction.py

src/provisioningserver/power_schema.py

src/provisioningserver/rpc/arguments.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/common.py

src/provisioningserver/rpc/region.py

src/provisioningserver/rpc/tests/test_arguments.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/tasks.py

src/provisioningserver/testing/bindfixture.py

src/provisioningserver/testing/boot_images.py

src/provisioningserver/testing/config.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_network.py

src/provisioningserver/tests/test_omshell.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/tests/test_tftp.py

src/provisioningserver/tests/test_upgrade_cluster.py

src/provisioningserver/tftp.py

src/provisioningserver/upgrade_cluster.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/tests/test_registry.py

src/provisioningserver/utils/tests/test_utils.py

versions.cfg

Show diffs side-by-side

added added

removed removed

src/maasserver/utils/network.py

1

# Copyright 2014 Canonical Ltd. This software is licensed under the

2

# GNU Affero General Public License version 3 (see the file LICENSE).

3

4

"""Generic helpers for `netaddr` and network-related types."""

5

6

from __future__ import (

7

absolute_import,

8

print_function,

9

unicode_literals,

10

)

11

12

str = None

13

14

__metaclass__ = type

15

__all__ = [

16

'make_network',

17

]

18

19

20

from netaddr import IPNetwork

21

22

23

def make_network(ip_address, netmask_or_bits, **kwargs):

24

"""Construct an `IPNetwork` with the given address and netmask or width.

25

26

This is a thin wrapper for the `IPNetwork` constructor. It's here because

27

the constructor for `IPNetwork` is easy to get wrong. If you pass it an

28

IP address and a netmask, or an IP address and a bit size, it will seem to

29

work... but it will pick a default netmask, not the one you specified.

30

31

:param ip_address:

32

:param netmask_or_bits:

33

:param kwargs: Any other (keyword) arguments you want to pass to the

34

`IPNetwork` constructor.

35

:raise netaddr.core.AddrFormatError: If the network specification is

36

malformed.

37

:return: An `IPNetwork` of the given base address and netmask or bit width.

38

"""

39

return IPNetwork("%s/%s" % (ip_address, netmask_or_bits), **kwargs)

Older »