« back to all changes in this revision
Viewing changes to src/maasserver/api/fannetworks.py
- Committer: LaMont Jones
- Date: 2017-02-17 14:23:04 UTC
- mfrom: (5747 maas)
- mto: This revision was merged to the branch mainline in revision 5748.
- Revision ID: lamont@canonical.com-20170217142304-djxqtuvefc1sdfnb
Merge trunk
- files added:
- docs/development/notifications.rst
- src/maasserver/forms
- src/maasserver/forms/tests
- src/metadataserver/builtin_scripts
- src/metadataserver/builtin_scripts/tests
- src/metadataserver/user_data/templates/snippets/maas_api_helper.py
- files removed:
- docs/about.rst
- docs/install.rst
- src/maasserver/static/assets/images/backgrounds
- src/maasserver/static/assets/images/forms
- src/maasserver/static/assets/images/logos
- src/provisioningserver/templates/commissioning-user-data/snippets/maas_api_helper.py
- files renamed:
- src/maasserver/forms.py => src/maasserver/forms/__init__.py
- src/maasserver/forms_dhcpsnippet.py => src/maasserver/forms/dhcpsnippet.py
- src/maasserver/forms_dnsdata.py => src/maasserver/forms/dnsdata.py
- src/maasserver/forms_dnsresource.py => src/maasserver/forms/dnsresource.py
- src/maasserver/forms_domain.py => src/maasserver/forms/domain.py
- src/maasserver/forms_commission.py => src/maasserver/forms/ephemeral.py
- src/maasserver/forms_fabric.py => src/maasserver/forms/fabric.py
- src/maasserver/forms_fannetwork.py => src/maasserver/forms/fannetwork.py
- src/maasserver/forms_filesystem.py => src/maasserver/forms/filesystem.py
- src/maasserver/forms_interface.py => src/maasserver/forms/interface.py
- src/maasserver/forms_interface_link.py => src/maasserver/forms/interface_link.py
- src/maasserver/forms_iprange.py => src/maasserver/forms/iprange.py
- src/maasserver/forms_packagerepository.py => src/maasserver/forms/packagerepository.py
- src/maasserver/forms_settings.py => src/maasserver/forms/settings.py
- src/maasserver/forms_space.py => src/maasserver/forms/space.py
- src/maasserver/forms_staticroute.py => src/maasserver/forms/staticroute.py
- src/maasserver/forms_subnet.py => src/maasserver/forms/subnet.py
- src/maasserver/tests/test_forms_bcache.py => src/maasserver/forms/tests/test_bcache.py
- src/maasserver/tests/test_forms_blockdevice.py => src/maasserver/forms/tests/test_blockdevice.py
- src/maasserver/tests/test_forms_bootresource.py => src/maasserver/forms/tests/test_bootresource.py
- src/maasserver/tests/test_forms_bootsource.py => src/maasserver/forms/tests/test_bootsource.py
- src/maasserver/tests/test_forms_bootsourceselection.py => src/maasserver/forms/tests/test_bootsourceselection.py
- src/maasserver/tests/test_forms_bulknodeaction.py => src/maasserver/forms/tests/test_bulknodeaction.py
- src/maasserver/tests/test_forms_cacheset.py => src/maasserver/forms/tests/test_cacheset.py
- src/maasserver/tests/test_forms_commissioning.py => src/maasserver/forms/tests/test_commissioning.py
- src/maasserver/tests/test_forms_config.py => src/maasserver/forms/tests/test_config.py
- src/maasserver/tests/test_forms_controller.py => src/maasserver/forms/tests/test_controller.py
- src/maasserver/tests/test_forms_deploy.py => src/maasserver/forms/tests/test_deploy.py
- src/maasserver/tests/test_forms_device.py => src/maasserver/forms/tests/test_device.py
- src/maasserver/tests/test_forms_dhcpsnippet.py => src/maasserver/forms/tests/test_dhcpsnippet.py
- src/maasserver/tests/test_forms_dnsdata.py => src/maasserver/forms/tests/test_dnsdata.py
- src/maasserver/tests/test_forms_dnsresource.py => src/maasserver/forms/tests/test_dnsresource.py
- src/maasserver/tests/test_forms_domain.py => src/maasserver/forms/tests/test_domain.py
- src/maasserver/tests/test_forms_commission.py => src/maasserver/forms/tests/test_ephemeral.py
- src/maasserver/tests/test_forms_fabric.py => src/maasserver/forms/tests/test_fabric.py
- src/maasserver/tests/test_forms_fannetwork.py => src/maasserver/forms/tests/test_fannetwork.py
- src/maasserver/tests/test_forms_filesystem.py => src/maasserver/forms/tests/test_filesystem.py
- src/maasserver/tests/test_forms_helpers.py => src/maasserver/forms/tests/test_helpers.py
- src/maasserver/tests/test_forms_instancelistfield.py => src/maasserver/forms/tests/test_instancelistfield.py
- src/maasserver/tests/test_forms_interface.py => src/maasserver/forms/tests/test_interface.py
- src/maasserver/tests/test_forms_interface_link.py => src/maasserver/forms/tests/test_interface_link.py
- src/maasserver/tests/test_forms_iprange.py => src/maasserver/forms/tests/test_iprange.py
- src/maasserver/tests/test_forms_licensekey.py => src/maasserver/forms/tests/test_licensekey.py
- src/maasserver/tests/test_forms_machine.py => src/maasserver/forms/tests/test_machine.py
- src/maasserver/tests/test_forms_machinewithmacaddresses.py => src/maasserver/forms/tests/test_machinewithmacaddresses.py
- src/maasserver/tests/test_forms_merge_error_messages.py => src/maasserver/forms/tests/test_merge_error_messages.py
- src/maasserver/tests/test_forms_multiplechoicefield.py => src/maasserver/forms/tests/test_multiplechoicefield.py
- src/maasserver/tests/test_forms_node.py => src/maasserver/forms/tests/test_node.py
- src/maasserver/tests/test_forms_packagerepository.py => src/maasserver/forms/tests/test_packagerepository.py
- src/maasserver/tests/test_forms_partition.py => src/maasserver/forms/tests/test_partition.py
- src/maasserver/tests/test_forms_pods.py => src/maasserver/forms/tests/test_pods.py
- src/maasserver/tests/test_forms_raid.py => src/maasserver/forms/tests/test_raid.py
- src/maasserver/tests/test_forms_settings.py => src/maasserver/forms/tests/test_settings.py
- src/maasserver/tests/test_forms_space.py => src/maasserver/forms/tests/test_space.py
- src/maasserver/tests/test_forms_staticroute.py => src/maasserver/forms/tests/test_staticroute.py
- src/maasserver/tests/test_forms_subnet.py => src/maasserver/forms/tests/test_subnet.py
- src/maasserver/tests/test_forms_ubuntu.py => src/maasserver/forms/tests/test_ubuntu.py
- src/maasserver/tests/test_forms_user.py => src/maasserver/forms/tests/test_user.py
- src/maasserver/tests/test_forms_vlan.py => src/maasserver/forms/tests/test_vlan.py
- src/maasserver/tests/test_forms_volume_group.py => src/maasserver/forms/tests/test_volume_group.py
- src/maasserver/tests/test_forms_zone.py => src/maasserver/forms/tests/test_zone.py
- src/maasserver/forms_vlan.py => src/maasserver/forms/vlan.py
- src/maasserver/models/tests/test_components.py => src/maasserver/tests/test_components.py
- src/metadataserver/user_data/utils.py => src/metadataserver/user_data/__init__.py
- src/provisioningserver/templates/commissioning-user-data/ => src/metadataserver/user_data/templates/
- src/provisioningserver/templates/commissioning-user-data/user_data.template => src/metadataserver/user_data/templates/commissioning.template
- src/provisioningserver/templates/commissioning-user-data/user_data_disk_erasing.template => src/metadataserver/user_data/templates/disk_erasing.template
- src/provisioningserver/templates/commissioning-user-data/user_data_poweroff.template => src/metadataserver/user_data/templates/poweroff.template
- src/provisioningserver/templates/commissioning-user-data/user_data_rescue_mode.template => src/metadataserver/user_data/templates/rescue_mode.template
- files modified:
- .bzrignore
added
removed
src/maasserver/api/fannetworks.py
