← Back to branch summary

~lamont/maas/bug-1599223-2.0

~lamont/maas/bug-1599223-2.0

« back to all changes in this revision

Viewing changes to src/maasserver/models/vlan.py

Committer: LaMont Jones
Date: 2016-05-12 19:07:37 UTC
mfrom: (5017 maas)
mto: This revision was merged to the branch mainline in revision 5021.
Revision ID: lamont@canonical.com-20160512190737-00g34satnuo0tk8v

merge from trunk

files added:
src/maasserver/models/signals/blockdevices.py

src/maasserver/models/signals/bootresourcefiles.py

src/maasserver/models/signals/bootsources.py

src/maasserver/models/signals/largefiles.py

src/maasserver/models/signals/partitions.py

src/provisioningserver/drivers/power/nova.py

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

files modified:
buildout.cfg

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

required-packages/base

src/apiclient/tests/test_maas_client.py

src/maascli/actions/tests/test_boot_resources_create.py

src/maascli/tests/test_api.py

src/maascli/tests/test_auth.py

src/maascli/tests/test_utils.py

src/maasserver/api/devices.py

src/maasserver/api/interfaces.py

src/maasserver/api/machines.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_devices.py

src/maasserver/api/tests/test_doc.py

src/maasserver/api/tests/test_interfaces.py

src/maasserver/api/tests/test_machine.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_support.py

src/maasserver/api/tests/test_tag.py

src/maasserver/clusterrpc/testing/power_parameters.py

src/maasserver/clusterrpc/tests/test_boot_images.py

src/maasserver/clusterrpc/tests/test_power.py

src/maasserver/clusterrpc/tests/test_power_parameters.py

src/maasserver/clusterrpc/tests/test_utils.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/forms_iprange.py

src/maasserver/models/blockdevice.py

src/maasserver/models/bootresourcefile.py

src/maasserver/models/bootsource.py

src/maasserver/models/interface.py

src/maasserver/models/iprange.py

src/maasserver/models/largefile.py

src/maasserver/models/node.py

src/maasserver/models/partition.py

src/maasserver/models/signals/__init__.py

src/maasserver/models/signals/interfaces.py

src/maasserver/models/signals/tests/test_power.py

src/maasserver/models/signals/tests/test_services.py

src/maasserver/models/testing.py

src/maasserver/models/tests/test_blockdevice.py

src/maasserver/models/tests/test_bmc.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_interface.py

src/maasserver/models/tests/test_iprange.py

src/maasserver/models/tests/test_largefile.py

src/maasserver/models/tests/test_node.py

src/maasserver/models/tests/test_nodeprobeddetails.py

src/maasserver/models/tests/test_partition.py

src/maasserver/models/tests/test_sshkey.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_versionedtextfile.py

src/maasserver/models/tests/test_vlan.py

src/maasserver/models/vlan.py

src/maasserver/node_constraint_filter_forms.py

src/maasserver/preseed.py

src/maasserver/rpc/rackcontrollers.py

src/maasserver/rpc/tests/test_module.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/add_hardware.js

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

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

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

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

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

src/maasserver/static/js/angular/services/manager.js

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

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

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

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

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

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

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_bootsources.py

src/maasserver/tests/test_commands_dbshell.py

src/maasserver/tests/test_config_forms.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_eventloop.py

src/maasserver/tests/test_forms_iprange.py

src/maasserver/tests/test_listener.py

src/maasserver/tests/test_middleware.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_nonces_cleanup.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_rack_controller.py

src/maasserver/tests/test_region_controller.py

src/maasserver/tests/test_service_monitor.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_status_monitor.py

src/maasserver/tests/test_webapp.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_dbtasks.py

src/maasserver/utils/tests/test_mac.py

src/maasserver/utils/tests/test_orm.py

src/maasserver/utils/tests/test_signals.py

src/maasserver/utils/tests/test_threads.py

src/maasserver/utils/tests/test_utils.py

src/maasserver/utils/tests/test_version.py

src/maasserver/utils/tests/test_views.py

src/maasserver/websockets/handlers/iprange.py

src/maasserver/websockets/handlers/node.py

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

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

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

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

src/maasserver/websockets/tests/test_base.py

src/maasserver/websockets/tests/test_protocol.py

src/maastesting/__init__.py

src/maastesting/factory.py

src/maastesting/testcase.py

src/maastesting/tests/test_fixtures.py

src/maastesting/tests/test_matchers.py

src/maastesting/tests/test_noseplug.py

src/maastesting/tests/test_testcase.py

src/maastesting/twisted.py

src/maastesting/typecheck.py

src/metadataserver/api.py

src/metadataserver/models/commissioningscript.py

src/metadataserver/models/tests/test_commissioningscript.py

src/metadataserver/tests/test_api.py

src/metadataserver/user_data/tests/test_commissioning.py

src/provisioningserver/boot/tests/test_boot.py

src/provisioningserver/boot/tests/test_powernv.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/tests/test_utils.py

src/provisioningserver/boot/tests/test_windows.py

src/provisioningserver/dhcp/tests/test_detect.py

src/provisioningserver/dhcp/tests/test_helper_notify.py

src/provisioningserver/dhcp/tests/test_omshell.py

src/provisioningserver/dns/tests/test_actions.py

src/provisioningserver/dns/tests/test_config.py

src/provisioningserver/drivers/diskless/tests/test_base.py

src/provisioningserver/drivers/hardware/seamicro.py

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

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

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

src/provisioningserver/drivers/hardware/ucsm.py

src/provisioningserver/drivers/hardware/virsh.py

src/provisioningserver/drivers/hardware/vmware.py

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

src/provisioningserver/drivers/power/__init__.py

src/provisioningserver/drivers/power/mscm.py

src/provisioningserver/drivers/power/msftocs.py

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

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

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

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

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

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

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

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

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

src/provisioningserver/drivers/tests/test_base.py

src/provisioningserver/import_images/tests/test_boot_resources.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_uec2roottar.py

src/provisioningserver/power/__init__.py

src/provisioningserver/power/change.py

src/provisioningserver/power/schema.py

src/provisioningserver/power/tests/test_change.py

src/provisioningserver/power/tests/test_power.py

src/provisioningserver/power/tests/test_query.py

src/provisioningserver/pserv_services/tests/test_dhcp_probe_service.py

src/provisioningserver/pserv_services/tests/test_image_download_service.py

src/provisioningserver/pserv_services/tests/test_lease_socket_service.py

src/provisioningserver/pserv_services/tests/test_networks_monitoring_service.py

src/provisioningserver/pserv_services/tests/test_node_power_monitor_service.py

src/provisioningserver/pserv_services/tests/test_service_monitor_service.py

src/provisioningserver/pserv_services/tests/test_tftp.py

src/provisioningserver/refresh/node_info_scripts.py

src/provisioningserver/refresh/tests/test_node_info_scripts.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/testing/__init__.py

src/provisioningserver/rpc/tests/test_boot_images.py

src/provisioningserver/rpc/tests/test_clusterservice.py

src/provisioningserver/rpc/tests/test_common.py

src/provisioningserver/rpc/tests/test_dhcp.py

src/provisioningserver/rpc/tests/test_osystems.py

src/provisioningserver/rpc/tests/test_tags.py

src/provisioningserver/tests/test_cluster_config_command.py

src/provisioningserver/tests/test_config.py

src/provisioningserver/tests/test_diskless.py

src/provisioningserver/tests/test_events.py

src/provisioningserver/tests/test_kernel_opts.py

src/provisioningserver/tests/test_monkey.py

src/provisioningserver/tests/test_networks.py

src/provisioningserver/tests/test_security.py

src/provisioningserver/tests/test_service_monitor.py

src/provisioningserver/tests/test_support_dump.py

src/provisioningserver/tests/test_tags.py

src/provisioningserver/tests/test_upgrade_cluster.py

src/provisioningserver/utils/tests/test_events.py

src/provisioningserver/utils/tests/test_fs.py

src/provisioningserver/utils/tests/test_ipaddr.py

src/provisioningserver/utils/tests/test_iproute.py

src/provisioningserver/utils/tests/test_network.py

src/provisioningserver/utils/tests/test_registry.py

src/provisioningserver/utils/tests/test_service_monitor.py

src/provisioningserver/utils/tests/test_twisted.py

src/provisioningserver/utils/tests/test_utils.py

src/provisioningserver/utils/tests/test_xpath.py

utilities/check-imports

versions.cfg

Show diffs side-by-side

added added

removed removed

src/maasserver/models/vlan.py

246

246

"""Return the name of the VLAN."""

247

247

if self.is_fabric_default():

248

248

return "untagged"

249

else:

249

elif self.name is not None:

250

250

return self.name

251

else:

252

return str(self.vid)

251

253

252

254

def manage_connected_interfaces(self):

253

255

"""Deal with connected interfaces:

Older »