~rvb/maas/transaction-1.7-bug-1409852

« back to all changes in this revision

Viewing changes to src/maasserver/bootresources.py

Committer: Jason Hobbs
Date: 2014-09-10 16:20:31 UTC
mfrom: (2945 maas)
mto: (2900.1.7 get-archive-url-from-rpc)
mto: This revision was merged to the branch mainline in revision 2993.
Revision ID: jason.hobbs@canonical.com-20140910162031-t2g711on2yvf3wpu

merged upstream

files added:
src/maasserver/migrations/0109_networks_dns_servers.py

src/maasserver/rpc/tests/test_nodegroupinterface.py

src/maasserver/rpc/tests/test_nodes.py

files renamed:
src/provisioningserver/omshell.py => src/provisioningserver/dhcp/omshell.py

src/provisioningserver/tests/test_omshell.py => src/provisioningserver/dhcp/tests/test_omshell.py

files modified:
docs/maascli.rst

docs/troubleshooting.rst

setup.py

src/maasserver/api/networks.py

src/maasserver/api/node_group_interfaces.py

src/maasserver/api/node_groups.py

src/maasserver/api/nodes.py

src/maasserver/api/tests/test_api.py

src/maasserver/api/tests/test_boot_images.py

src/maasserver/api/tests/test_boot_resources.py

src/maasserver/api/tests/test_boot_source_selections.py

src/maasserver/api/tests/test_boot_sources.py

src/maasserver/api/tests/test_commissioning.py

src/maasserver/api/tests/test_enlistment.py

src/maasserver/api/tests/test_filestorage.py

src/maasserver/api/tests/test_ipaddresses.py

src/maasserver/api/tests/test_licensekey.py

src/maasserver/api/tests/test_macaddress.py

src/maasserver/api/tests/test_network.py

src/maasserver/api/tests/test_networks.py

src/maasserver/api/tests/test_node.py

src/maasserver/api/tests/test_nodegroup.py

src/maasserver/api/tests/test_nodes.py

src/maasserver/api/tests/test_pxeconfig.py

src/maasserver/api/tests/test_register.py

src/maasserver/api/tests/test_support.py

src/maasserver/api/tests/test_tag.py

src/maasserver/api/tests/test_user.py

src/maasserver/api/tests/test_utils.py

src/maasserver/api/tests/test_zone.py

src/maasserver/api/tests/test_zones.py

src/maasserver/bootresources.py

src/maasserver/clusterrpc/dhcp.py

src/maasserver/clusterrpc/tests/test_boot_images.py

src/maasserver/clusterrpc/tests/test_dhcp.py

src/maasserver/clusterrpc/tests/test_osystems.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/dhcp.py

src/maasserver/dns/tests/test_config.py

src/maasserver/dns/tests/test_zonegenerator.py

src/maasserver/fields.py

src/maasserver/forms.py

src/maasserver/models/macaddress.py

src/maasserver/models/network.py

src/maasserver/models/node.py

src/maasserver/models/nodegroup.py

src/maasserver/models/tests/test_bootimage.py

src/maasserver/models/tests/test_bootresource.py

src/maasserver/models/tests/test_bootresourceset.py

src/maasserver/models/tests/test_bootsource.py

src/maasserver/models/tests/test_bootsourceselection.py

src/maasserver/models/tests/test_dhcplease.py

src/maasserver/models/tests/test_downloadprogress.py

src/maasserver/models/tests/test_event.py

src/maasserver/models/tests/test_eventtype.py

src/maasserver/models/tests/test_filestorage.py

src/maasserver/models/tests/test_largefile.py

src/maasserver/models/tests/test_licensekey.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/models/tests/test_nodeprobeddetails.py

src/maasserver/models/tests/test_sshkey.py

src/maasserver/models/tests/test_sslkey.py

src/maasserver/models/tests/test_staticipaddress.py

src/maasserver/models/tests/test_tag.py

src/maasserver/models/tests/test_timestampedmodel.py

src/maasserver/models/tests/test_user.py

src/maasserver/models/tests/test_userprofile.py

src/maasserver/models/tests/test_zone.py

src/maasserver/rpc/leases.py

src/maasserver/rpc/nodegroupinterface.py

src/maasserver/rpc/nodes.py

src/maasserver/rpc/regionservice.py

src/maasserver/rpc/testing/fixtures.py

src/maasserver/rpc/testing/mixins.py

src/maasserver/rpc/tests/test_bootsources.py

src/maasserver/rpc/tests/test_regionservice.py

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

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

src/maasserver/templates/maasserver/network_detail.html

src/maasserver/templates/maasserver/network_list.html

src/maasserver/templates/maasserver/node_view.html

src/maasserver/templates/metadataserver/nodecommissionresult_list.html

src/maasserver/testing/api.py

src/maasserver/testing/factory.py

src/maasserver/testing/testcase.py

src/maasserver/testing/tests/test_factory.py

src/maasserver/tests/test_auth.py

src/maasserver/tests/test_bootresources.py

src/maasserver/tests/test_commands.py

src/maasserver/tests/test_commands_write_dns_config.py

src/maasserver/tests/test_compose_preseed.py

src/maasserver/tests/test_dhcp.py

src/maasserver/tests/test_fields.py

src/maasserver/tests/test_forms_bootsource.py

src/maasserver/tests/test_forms_bootsourceselection.py

src/maasserver/tests/test_forms_bulknodeaction.py

src/maasserver/tests/test_forms_commissioning.py

src/maasserver/tests/test_forms_downloadprogress.py

src/maasserver/tests/test_forms_helpers.py

src/maasserver/tests/test_forms_instancelistfield.py

src/maasserver/tests/test_forms_licensekey.py

src/maasserver/tests/test_forms_macaddress.py

src/maasserver/tests/test_forms_network.py

src/maasserver/tests/test_forms_node.py

src/maasserver/tests/test_forms_nodeaction.py

src/maasserver/tests/test_forms_nodegroup.py

src/maasserver/tests/test_forms_nodegroupinterface.py

src/maasserver/tests/test_forms_nodewithmacaddresses.py

src/maasserver/tests/test_forms_user.py

src/maasserver/tests/test_forms_validate_new_static_ip_range.py

src/maasserver/tests/test_forms_zone.py

src/maasserver/tests/test_messages.py

src/maasserver/tests/test_node_action.py

src/maasserver/tests/test_node_constraint_filter_forms.py

src/maasserver/tests/test_populate_tags.py

src/maasserver/tests/test_preseed.py

src/maasserver/tests/test_refresh_worker.py

src/maasserver/tests/test_server_address.py

src/maasserver/tests/test_start_up.py

src/maasserver/tests/test_third_party_drivers.py

src/maasserver/utils/async.py

src/maasserver/utils/tests/test_async.py

src/maasserver/utils/tests/test_osystems.py

src/maasserver/utils/tests/test_utils.py

src/maasserver/views/noderesult.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_networks.py

src/maasserver/views/tests/test_noderesult.py

src/maasserver/views/tests/test_nodes.py

src/maasserver/views/tests/test_prefs.py

src/maasserver/views/tests/test_settings.py

src/maasserver/views/tests/test_settings_commissioning_scripts.py

src/maasserver/views/tests/test_tags.py

src/maasserver/views/tests/test_zones.py

src/maasserver/x509.py

src/maastesting/factory.py

src/maastesting/tests/test_factory.py

src/metadataserver/models/tests/test_nodecommissionresult.py

src/metadataserver/models/tests/test_nodekey.py

src/metadataserver/models/tests/test_noderesults.py

src/metadataserver/models/tests/test_nodeuserdata.py

src/metadataserver/tests/test_api.py

src/provisioningserver/boot/windows.py

src/provisioningserver/cache.py

src/provisioningserver/dhcp/detect.py

src/provisioningserver/dhcp/leases.py

src/provisioningserver/dhcp/tests/test_leases.py

src/provisioningserver/drivers/hardware/mscm.py

src/provisioningserver/drivers/hardware/seamicro.py

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

src/provisioningserver/drivers/hardware/ucsm.py

src/provisioningserver/drivers/hardware/virsh.py

src/provisioningserver/import_images/boot_resources.py

src/provisioningserver/import_images/keyrings.py

src/provisioningserver/import_images/tests/test_boot_resources.py

src/provisioningserver/import_images/tests/test_keyrings.py

src/provisioningserver/plugin.py

src/provisioningserver/pserv_services/dhcp_probe_service.py

src/provisioningserver/pserv_services/tests/test_dhcp_probe_service.py

src/provisioningserver/rpc/cluster.py

src/provisioningserver/rpc/clusterservice.py

src/provisioningserver/rpc/common.py

src/provisioningserver/rpc/dhcp.py

src/provisioningserver/rpc/exceptions.py

src/provisioningserver/rpc/region.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/tasks.py

src/provisioningserver/tests/test_tasks.py

src/provisioningserver/utils/__init__.py

src/provisioningserver/utils/network.py

src/provisioningserver/utils/shell.py

src/provisioningserver/utils/tests/test_network.py

src/provisioningserver/utils/tests/test_shell.py

src/provisioningserver/utils/tests/test_utils.py

Show diffs side-by-side

added added

removed removed

src/maasserver/bootresources.py

from provisioningserver.import_images.product_mapping import map_products

from provisioningserver.logger import get_maas_logger

from provisioningserver.utils.env import environment_variables

from provisioningserver.utils.fs import tempdir

from provisioningserver.utils.twisted import synchronous

from simplestreams import util as sutil

from simplestreams.mirrors import (

878

879

return

879

880

881

try:

881

variables = {

882

env = {

882

883

'GNUPGHOME': get_maas_user_gpghome(),

883

884

}

884

885

http_proxy = Config.objects.get_config('http_proxy')

885

886

if http_proxy is not None:

886

variables['http_proxy'] = http_proxy

887

variables['https_proxy'] = http_proxy

888

with environment_variables(variables):

887

env['http_proxy'] = http_proxy

888

env['https_proxy'] = http_proxy

889

with environment_variables(env), tempdir('keyrings') as keyrings_path:

889

890

maaslog.info("Started importing of boot resources.")

890

891

sources = [source.to_dict() for source in BootSource.objects.all()]

891

sources = write_all_keyrings(sources)

892

sources = write_all_keyrings(keyrings_path, sources)

892

893

894

image_descriptions = download_all_image_descriptions(sources)

894

895

if image_descriptions.is_empty():

Older »