From 011b1f0f5e330cd3febab517334aba601eeccb5c Mon Sep 17 00:00:00 2001 From: Xing Wu Date: Tue, 28 Aug 2018 13:11:22 -0700 Subject: [PATCH] Update Batch SDK to new API version 2018-08-01.7.0. (#3194) --- azure-batch/HISTORY.rst | 22 +- azure-batch/azure/batch/batch_auth.py | 2 - .../azure/batch/batch_service_client.py | 10 +- azure-batch/azure/batch/models/__init__.py | 607 ++++++---- .../account_list_node_agent_skus_options.py | 25 +- ...ccount_list_node_agent_skus_options_py3.py | 57 + .../account_list_pool_node_counts_options.py | 29 +- ...count_list_pool_node_counts_options_py3.py | 57 + .../batch/models/affinity_information.py | 12 +- .../batch/models/affinity_information_py3.py | 40 + .../batch/models/application_get_options.py | 19 +- .../models/application_get_options_py3.py | 46 + .../batch/models/application_list_options.py | 22 +- .../models/application_list_options_py3.py | 51 + .../models/application_package_reference.py | 12 +- .../application_package_reference_py3.py | 43 + .../azure/batch/models/application_summary.py | 21 +- .../batch/models/application_summary_py3.py | 46 + .../models/authentication_token_settings.py | 6 +- .../authentication_token_settings_py3.py | 33 + .../batch/models/auto_pool_specification.py | 20 +- .../models/auto_pool_specification_py3.py | 58 + .../azure/batch/models/auto_scale_run.py | 16 +- .../batch/models/auto_scale_run_error.py | 10 +- .../batch/models/auto_scale_run_error_py3.py | 40 + .../azure/batch/models/auto_scale_run_py3.py | 46 + .../batch/models/auto_user_specification.py | 8 +- .../models/auto_user_specification_py3.py | 35 + azure-batch/azure/batch/models/batch_error.py | 10 +- .../azure/batch/models/batch_error_detail.py | 8 +- .../batch/models/batch_error_detail_py3.py | 33 + .../azure/batch/models/batch_error_py3.py | 52 + .../models/batch_service_client_enums.py | 82 +- azure-batch/azure/batch/models/certificate.py | 22 +- .../batch/models/certificate_add_options.py | 19 +- .../models/certificate_add_options_py3.py | 46 + .../batch/models/certificate_add_parameter.py | 28 +- .../models/certificate_add_parameter_py3.py | 60 + .../certificate_cancel_deletion_options.py | 19 +- ...certificate_cancel_deletion_options_py3.py | 46 + .../models/certificate_delete_options.py | 19 +- .../models/certificate_delete_options_py3.py | 46 + .../batch/models/certificate_get_options.py | 22 +- .../models/certificate_get_options_py3.py | 50 + .../batch/models/certificate_list_options.py | 28 +- .../models/certificate_list_options_py3.py | 61 + .../azure/batch/models/certificate_py3.py | 71 ++ .../batch/models/certificate_reference.py | 22 +- .../batch/models/certificate_reference_py3.py | 70 ++ azure-batch/azure/batch/models/cloud_job.py | 50 +- .../azure/batch/models/cloud_job_py3.py | 158 +++ .../azure/batch/models/cloud_job_schedule.py | 34 +- .../batch/models/cloud_job_schedule_py3.py | 107 ++ azure-batch/azure/batch/models/cloud_pool.py | 87 +- .../azure/batch/models/cloud_pool_py3.py | 237 ++++ .../models/cloud_service_configuration.py | 23 +- .../models/cloud_service_configuration_py3.py | 61 + azure-batch/azure/batch/models/cloud_task.py | 63 +- .../models/cloud_task_list_subtasks_result.py | 6 +- .../cloud_task_list_subtasks_result_py3.py | 28 + .../azure/batch/models/cloud_task_py3.py | 208 ++++ .../azure/batch/models/compute_node.py | 65 +- .../models/compute_node_add_user_options.py | 19 +- .../compute_node_add_user_options_py3.py | 46 + .../compute_node_delete_user_options.py | 19 +- .../compute_node_delete_user_options_py3.py | 46 + ...compute_node_disable_scheduling_options.py | 19 +- ...ute_node_disable_scheduling_options_py3.py | 46 + .../compute_node_enable_scheduling_options.py | 19 +- ...pute_node_enable_scheduling_options_py3.py | 46 + .../compute_node_endpoint_configuration.py | 10 +- ...compute_node_endpoint_configuration_py3.py | 35 + .../azure/batch/models/compute_node_error.py | 10 +- .../batch/models/compute_node_error_py3.py | 39 + .../batch/models/compute_node_get_options.py | 22 +- .../models/compute_node_get_options_py3.py | 50 + ...compute_node_get_remote_desktop_options.py | 19 +- ...ute_node_get_remote_desktop_options_py3.py | 46 + ..._node_get_remote_login_settings_options.py | 19 +- ...e_get_remote_login_settings_options_py3.py | 46 + ...e_node_get_remote_login_settings_result.py | 18 +- ...de_get_remote_login_settings_result_py3.py | 41 + .../batch/models/compute_node_information.py | 16 +- .../models/compute_node_information_py3.py | 52 + .../batch/models/compute_node_list_options.py | 28 +- .../models/compute_node_list_options_py3.py | 61 + .../azure/batch/models/compute_node_py3.py | 155 +++ .../models/compute_node_reboot_options.py | 19 +- .../models/compute_node_reboot_options_py3.py | 46 + .../models/compute_node_reimage_options.py | 19 +- .../compute_node_reimage_options_py3.py | 46 + .../compute_node_update_user_options.py | 19 +- .../compute_node_update_user_options_py3.py | 46 + ..._node_upload_batch_service_logs_options.py | 19 +- ...e_upload_batch_service_logs_options_py3.py | 46 + .../azure/batch/models/compute_node_user.py | 18 +- .../batch/models/compute_node_user_py3.py | 62 + .../batch/models/container_configuration.py | 16 +- .../models/container_configuration_py3.py | 53 + .../azure/batch/models/container_registry.py | 16 +- .../batch/models/container_registry_py3.py | 44 + azure-batch/azure/batch/models/data_disk.py | 24 +- .../azure/batch/models/data_disk_py3.py | 56 + .../batch/models/delete_certificate_error.py | 10 +- .../models/delete_certificate_error_py3.py | 42 + .../azure/batch/models/environment_setting.py | 12 +- .../batch/models/environment_setting_py3.py | 38 + .../azure/batch/models/error_message.py | 8 +- .../azure/batch/models/error_message_py3.py | 32 + .../azure/batch/models/exit_code_mapping.py | 16 +- .../batch/models/exit_code_mapping_py3.py | 41 + .../batch/models/exit_code_range_mapping.py | 20 +- .../models/exit_code_range_mapping_py3.py | 46 + .../azure/batch/models/exit_conditions.py | 14 +- .../azure/batch/models/exit_conditions_py3.py | 57 + .../azure/batch/models/exit_options.py | 8 +- .../azure/batch/models/exit_options_py3.py | 47 + .../file_delete_from_compute_node_options.py | 19 +- ...le_delete_from_compute_node_options_py3.py | 46 + .../models/file_delete_from_task_options.py | 19 +- .../file_delete_from_task_options_py3.py | 46 + .../file_get_from_compute_node_options.py | 28 +- .../file_get_from_compute_node_options_py3.py | 64 + .../models/file_get_from_task_options.py | 28 +- .../models/file_get_from_task_options_py3.py | 64 + ...et_properties_from_compute_node_options.py | 25 +- ...roperties_from_compute_node_options_py3.py | 59 + .../file_get_properties_from_task_options.py | 25 +- ...le_get_properties_from_task_options_py3.py | 59 + .../file_list_from_compute_node_options.py | 25 +- ...file_list_from_compute_node_options_py3.py | 57 + .../models/file_list_from_task_options.py | 25 +- .../models/file_list_from_task_options_py3.py | 57 + .../azure/batch/models/file_properties.py | 21 +- .../azure/batch/models/file_properties_py3.py | 54 + .../azure/batch/models/image_reference.py | 14 +- .../azure/batch/models/image_reference_py3.py | 60 + .../azure/batch/models/inbound_endpoint.py | 35 +- .../batch/models/inbound_endpoint_py3.py | 62 + .../azure/batch/models/inbound_nat_pool.py | 46 +- .../batch/models/inbound_nat_pool_py3.py | 86 ++ .../azure/batch/models/job_add_options.py | 19 +- .../azure/batch/models/job_add_options_py3.py | 46 + .../azure/batch/models/job_add_parameter.py | 46 +- .../batch/models/job_add_parameter_py3.py | 134 +++ .../azure/batch/models/job_constraints.py | 8 +- .../azure/batch/models/job_constraints_py3.py | 45 + .../azure/batch/models/job_delete_options.py | 31 +- .../batch/models/job_delete_options_py3.py | 73 ++ .../azure/batch/models/job_disable_options.py | 31 +- .../batch/models/job_disable_options_py3.py | 73 ++ .../batch/models/job_disable_parameter.py | 12 +- .../batch/models/job_disable_parameter_py3.py | 35 + .../azure/batch/models/job_enable_options.py | 31 +- .../batch/models/job_enable_options_py3.py | 73 ++ .../batch/models/job_execution_information.py | 20 +- .../models/job_execution_information_py3.py | 73 ++ ...job_get_all_lifetime_statistics_options.py | 19 +- ...get_all_lifetime_statistics_options_py3.py | 46 + .../azure/batch/models/job_get_options.py | 37 +- .../azure/batch/models/job_get_options_py3.py | 81 ++ .../models/job_get_task_counts_options.py | 19 +- .../models/job_get_task_counts_options_py3.py | 46 + .../job_list_from_job_schedule_options.py | 31 +- .../job_list_from_job_schedule_options_py3.py | 65 + .../azure/batch/models/job_list_options.py | 31 +- .../batch/models/job_list_options_py3.py | 65 + ...aration_and_release_task_status_options.py | 28 +- ...ion_and_release_task_status_options_py3.py | 62 + .../azure/batch/models/job_manager_task.py | 65 +- .../batch/models/job_manager_task_py3.py | 182 +++ .../azure/batch/models/job_patch_options.py | 31 +- .../batch/models/job_patch_options_py3.py | 73 ++ .../azure/batch/models/job_patch_parameter.py | 14 +- .../batch/models/job_patch_parameter_py3.py | 61 + ..._and_release_task_execution_information.py | 14 +- ..._release_task_execution_information_py3.py | 50 + .../batch/models/job_preparation_task.py | 47 +- ..._preparation_task_execution_information.py | 50 +- ...paration_task_execution_information_py3.py | 111 ++ .../batch/models/job_preparation_task_py3.py | 146 +++ .../azure/batch/models/job_release_task.py | 47 +- .../job_release_task_execution_information.py | 34 +- ..._release_task_execution_information_py3.py | 89 ++ .../batch/models/job_release_task_py3.py | 121 ++ .../batch/models/job_schedule_add_options.py | 19 +- .../models/job_schedule_add_options_py3.py | 46 + .../models/job_schedule_add_parameter.py | 27 +- .../models/job_schedule_add_parameter_py3.py | 63 + .../models/job_schedule_delete_options.py | 31 +- .../models/job_schedule_delete_options_py3.py | 73 ++ .../models/job_schedule_disable_options.py | 31 +- .../job_schedule_disable_options_py3.py | 73 ++ .../models/job_schedule_enable_options.py | 31 +- .../models/job_schedule_enable_options_py3.py | 73 ++ .../job_schedule_execution_information.py | 10 +- .../job_schedule_execution_information_py3.py | 44 + .../models/job_schedule_exists_options.py | 31 +- .../models/job_schedule_exists_options_py3.py | 73 ++ .../batch/models/job_schedule_get_options.py | 37 +- .../models/job_schedule_get_options_py3.py | 81 ++ .../batch/models/job_schedule_list_options.py | 31 +- .../models/job_schedule_list_options_py3.py | 65 + .../models/job_schedule_patch_options.py | 31 +- .../models/job_schedule_patch_options_py3.py | 73 ++ .../models/job_schedule_patch_parameter.py | 10 +- .../job_schedule_patch_parameter_py3.py | 42 + .../batch/models/job_schedule_statistics.py | 115 +- .../models/job_schedule_statistics_py3.py | 126 ++ .../models/job_schedule_terminate_options.py | 31 +- .../job_schedule_terminate_options_py3.py | 73 ++ .../models/job_schedule_update_options.py | 31 +- .../models/job_schedule_update_options_py3.py | 73 ++ .../models/job_schedule_update_parameter.py | 24 +- .../job_schedule_update_parameter_py3.py | 51 + .../batch/models/job_scheduling_error.py | 18 +- .../batch/models/job_scheduling_error_py3.py | 50 + .../azure/batch/models/job_specification.py | 34 +- .../batch/models/job_specification_py3.py | 125 ++ .../azure/batch/models/job_statistics.py | 109 +- .../azure/batch/models/job_statistics_py3.py | 123 ++ .../batch/models/job_terminate_options.py | 31 +- .../batch/models/job_terminate_options_py3.py | 73 ++ .../batch/models/job_terminate_parameter.py | 6 +- .../models/job_terminate_parameter_py3.py | 29 + .../azure/batch/models/job_update_options.py | 31 +- .../batch/models/job_update_options_py3.py | 73 ++ .../batch/models/job_update_parameter.py | 29 +- .../batch/models/job_update_parameter_py3.py | 72 ++ .../batch/models/linux_user_configuration.py | 10 +- .../models/linux_user_configuration_py3.py | 47 + .../azure/batch/models/metadata_item.py | 14 +- .../azure/batch/models/metadata_item_py3.py | 42 + .../batch/models/multi_instance_settings.py | 28 +- .../models/multi_instance_settings_py3.py | 60 + .../azure/batch/models/name_value_pair.py | 8 +- .../azure/batch/models/name_value_pair_py3.py | 32 + .../batch/models/network_configuration.py | 8 +- .../batch/models/network_configuration_py3.py | 60 + .../models/network_security_group_rule.py | 39 +- .../models/network_security_group_rule_py3.py | 55 + .../batch/models/node_agent_information.py | 47 + .../models/node_agent_information_py3.py | 47 + .../azure/batch/models/node_agent_sku.py | 10 +- .../azure/batch/models/node_agent_sku_py3.py | 45 + azure-batch/azure/batch/models/node_counts.py | 65 +- .../azure/batch/models/node_counts_py3.py | 102 ++ .../node_disable_scheduling_parameter.py | 6 +- .../node_disable_scheduling_parameter_py3.py | 32 + azure-batch/azure/batch/models/node_file.py | 12 +- .../azure/batch/models/node_file_py3.py | 40 + .../batch/models/node_reboot_parameter.py | 6 +- .../batch/models/node_reboot_parameter_py3.py | 31 + .../batch/models/node_reimage_parameter.py | 6 +- .../models/node_reimage_parameter_py3.py | 31 + .../batch/models/node_remove_parameter.py | 16 +- .../batch/models/node_remove_parameter_py3.py | 51 + .../models/node_update_user_parameter.py | 10 +- .../models/node_update_user_parameter_py3.py | 48 + azure-batch/azure/batch/models/os_disk.py | 9 +- azure-batch/azure/batch/models/os_disk_py3.py | 32 + azure-batch/azure/batch/models/output_file.py | 53 +- .../output_file_blob_container_destination.py | 16 +- ...put_file_blob_container_destination_py3.py | 47 + .../batch/models/output_file_destination.py | 6 +- .../models/output_file_destination_py3.py | 29 + .../azure/batch/models/output_file_py3.py | 63 + .../models/output_file_upload_options.py | 15 +- .../models/output_file_upload_options_py3.py | 39 + .../azure/batch/models/pool_add_options.py | 19 +- .../batch/models/pool_add_options_py3.py | 46 + .../azure/batch/models/pool_add_parameter.py | 66 +- .../batch/models/pool_add_parameter_py3.py | 197 ++++ .../azure/batch/models/pool_delete_options.py | 31 +- .../batch/models/pool_delete_options_py3.py | 73 ++ .../models/pool_disable_auto_scale_options.py | 19 +- .../pool_disable_auto_scale_options_py3.py | 46 + .../models/pool_enable_auto_scale_options.py | 31 +- .../pool_enable_auto_scale_options_py3.py | 73 ++ .../pool_enable_auto_scale_parameter.py | 8 +- .../pool_enable_auto_scale_parameter_py3.py | 47 + .../models/pool_endpoint_configuration.py | 18 +- .../models/pool_endpoint_configuration_py3.py | 38 + .../pool_evaluate_auto_scale_options.py | 19 +- .../pool_evaluate_auto_scale_options_py3.py | 46 + .../pool_evaluate_auto_scale_parameter.py | 16 +- .../pool_evaluate_auto_scale_parameter_py3.py | 40 + .../azure/batch/models/pool_exists_options.py | 31 +- .../batch/models/pool_exists_options_py3.py | 73 ++ ...ool_get_all_lifetime_statistics_options.py | 19 +- ...get_all_lifetime_statistics_options_py3.py | 46 + .../azure/batch/models/pool_get_options.py | 37 +- .../batch/models/pool_get_options_py3.py | 81 ++ .../azure/batch/models/pool_information.py | 8 +- .../batch/models/pool_information_py3.py | 47 + .../azure/batch/models/pool_list_options.py | 31 +- .../batch/models/pool_list_options_py3.py | 65 + .../models/pool_list_usage_metrics_options.py | 31 +- .../pool_list_usage_metrics_options_py3.py | 71 ++ .../azure/batch/models/pool_node_counts.py | 14 +- .../batch/models/pool_node_counts_py3.py | 42 + .../azure/batch/models/pool_patch_options.py | 31 +- .../batch/models/pool_patch_options_py3.py | 73 ++ .../batch/models/pool_patch_parameter.py | 12 +- .../batch/models/pool_patch_parameter_py3.py | 66 ++ .../batch/models/pool_remove_nodes_options.py | 31 +- .../models/pool_remove_nodes_options_py3.py | 73 ++ .../azure/batch/models/pool_resize_options.py | 31 +- .../batch/models/pool_resize_options_py3.py | 73 ++ .../batch/models/pool_resize_parameter.py | 12 +- .../batch/models/pool_resize_parameter_py3.py | 50 + .../azure/batch/models/pool_specification.py | 69 +- .../batch/models/pool_specification_py3.py | 186 +++ .../azure/batch/models/pool_statistics.py | 28 +- .../azure/batch/models/pool_statistics_py3.py | 58 + .../batch/models/pool_stop_resize_options.py | 31 +- .../models/pool_stop_resize_options_py3.py | 73 ++ .../models/pool_update_properties_options.py | 19 +- .../pool_update_properties_options_py3.py | 46 + .../pool_update_properties_parameter.py | 54 +- .../pool_update_properties_parameter_py3.py | 74 ++ .../batch/models/pool_upgrade_os_options.py | 31 +- .../models/pool_upgrade_os_options_py3.py | 73 ++ .../batch/models/pool_upgrade_os_parameter.py | 12 +- .../models/pool_upgrade_os_parameter_py3.py | 35 + .../azure/batch/models/pool_usage_metrics.py | 63 +- .../batch/models/pool_usage_metrics_py3.py | 74 ++ azure-batch/azure/batch/models/recent_job.py | 8 +- .../azure/batch/models/recent_job_py3.py | 32 + .../azure/batch/models/resize_error.py | 10 +- .../azure/batch/models/resize_error_py3.py | 39 + .../azure/batch/models/resource_file.py | 28 +- .../azure/batch/models/resource_file_py3.py | 53 + .../azure/batch/models/resource_statistics.py | 86 +- .../batch/models/resource_statistics_py3.py | 108 ++ azure-batch/azure/batch/models/schedule.py | 12 +- .../azure/batch/models/schedule_py3.py | 74 ++ azure-batch/azure/batch/models/start_task.py | 45 +- .../batch/models/start_task_information.py | 45 +- .../models/start_task_information_py3.py | 99 ++ .../azure/batch/models/start_task_py3.py | 110 ++ .../azure/batch/models/subtask_information.py | 28 +- .../batch/models/subtask_information_py3.py | 97 ++ .../models/task_add_collection_options.py | 19 +- .../models/task_add_collection_options_py3.py | 46 + .../models/task_add_collection_parameter.py | 18 +- .../task_add_collection_parameter_py3.py | 38 + .../models/task_add_collection_result.py | 6 +- .../models/task_add_collection_result_py3.py | 28 + .../azure/batch/models/task_add_options.py | 19 +- .../batch/models/task_add_options_py3.py | 46 + .../azure/batch/models/task_add_parameter.py | 73 +- .../batch/models/task_add_parameter_py3.py | 167 +++ .../azure/batch/models/task_add_result.py | 24 +- .../azure/batch/models/task_add_result_py3.py | 60 + .../azure/batch/models/task_constraints.py | 10 +- .../batch/models/task_constraints_py3.py | 53 + .../task_container_execution_information.py | 10 +- ...ask_container_execution_information_py3.py | 40 + .../batch/models/task_container_settings.py | 20 +- .../models/task_container_settings_py3.py | 48 + azure-batch/azure/batch/models/task_counts.py | 38 +- .../azure/batch/models/task_counts_py3.py | 57 + .../azure/batch/models/task_delete_options.py | 31 +- .../batch/models/task_delete_options_py3.py | 73 ++ .../azure/batch/models/task_dependencies.py | 8 +- .../batch/models/task_dependencies_py3.py | 42 + .../models/task_execution_information.py | 48 +- .../models/task_execution_information_py3.py | 109 ++ .../batch/models/task_failure_information.py | 18 +- .../models/task_failure_information_py3.py | 49 + .../azure/batch/models/task_get_options.py | 37 +- .../batch/models/task_get_options_py3.py | 81 ++ .../azure/batch/models/task_id_range.py | 14 +- .../azure/batch/models/task_id_range_py3.py | 44 + .../azure/batch/models/task_information.py | 22 +- .../batch/models/task_information_py3.py | 56 + .../azure/batch/models/task_list_options.py | 31 +- .../batch/models/task_list_options_py3.py | 65 + .../models/task_list_subtasks_options.py | 22 +- .../models/task_list_subtasks_options_py3.py | 50 + .../batch/models/task_reactivate_options.py | 31 +- .../models/task_reactivate_options_py3.py | 73 ++ .../batch/models/task_scheduling_policy.py | 12 +- .../models/task_scheduling_policy_py3.py | 35 + .../azure/batch/models/task_statistics.py | 80 +- .../azure/batch/models/task_statistics_py3.py | 100 ++ .../batch/models/task_terminate_options.py | 31 +- .../models/task_terminate_options_py3.py | 73 ++ .../azure/batch/models/task_update_options.py | 31 +- .../batch/models/task_update_options_py3.py | 73 ++ .../batch/models/task_update_parameter.py | 6 +- .../batch/models/task_update_parameter_py3.py | 30 + ...upload_batch_service_logs_configuration.py | 35 +- ...ad_batch_service_logs_configuration_py3.py | 59 + .../upload_batch_service_logs_result.py | 23 +- .../upload_batch_service_logs_result_py3.py | 45 + .../azure/batch/models/usage_statistics.py | 26 +- .../batch/models/usage_statistics_py3.py | 48 + .../azure/batch/models/user_account.py | 25 +- .../azure/batch/models/user_account_py3.py | 51 + .../azure/batch/models/user_identity.py | 8 +- .../azure/batch/models/user_identity_py3.py | 41 + .../models/virtual_machine_configuration.py | 26 +- .../virtual_machine_configuration_py3.py | 92 ++ .../batch/models/windows_configuration.py | 6 +- .../batch/models/windows_configuration_py3.py | 29 + .../batch/operations/account_operations.py | 18 +- .../operations/application_operations.py | 17 +- .../operations/certificate_operations.py | 32 +- .../operations/compute_node_operations.py | 100 +- .../azure/batch/operations/file_operations.py | 50 +- .../azure/batch/operations/job_operations.py | 90 +- .../operations/job_schedule_operations.py | 57 +- .../azure/batch/operations/pool_operations.py | 101 +- .../azure/batch/operations/task_operations.py | 71 +- azure-batch/azure/batch/version.py | 2 +- azure-batch/setup.py | 2 +- azure-batch/tests/batch_preparers.py | 6 +- .../test_batch.test_batch_applications.yaml | 75 +- .../test_batch.test_batch_certificates.yaml | 85 +- ...st_batch.test_batch_compute_node_user.yaml | 1049 ++++++++--------- .../test_batch.test_batch_compute_nodes.yaml | 383 +++--- .../test_batch.test_batch_create_pools.yaml | 330 +++--- .../test_batch.test_batch_files.yaml | 549 +++------ .../test_batch.test_batch_job_schedules.yaml | 214 ++-- .../test_batch.test_batch_jobs.yaml | 260 ++-- ...atch.test_batch_network_configuration.yaml | 294 ++--- .../test_batch.test_batch_scale_pools.yaml | 232 ++-- .../test_batch.test_batch_tasks.yaml | 455 ++++--- .../test_batch.test_batch_update_pools.yaml | 158 ++- azure-batch/tests/test_batch.py | 75 +- 432 files changed, 18445 insertions(+), 4929 deletions(-) create mode 100644 azure-batch/azure/batch/models/account_list_node_agent_skus_options_py3.py create mode 100644 azure-batch/azure/batch/models/account_list_pool_node_counts_options_py3.py create mode 100644 azure-batch/azure/batch/models/affinity_information_py3.py create mode 100644 azure-batch/azure/batch/models/application_get_options_py3.py create mode 100644 azure-batch/azure/batch/models/application_list_options_py3.py create mode 100644 azure-batch/azure/batch/models/application_package_reference_py3.py create mode 100644 azure-batch/azure/batch/models/application_summary_py3.py create mode 100644 azure-batch/azure/batch/models/authentication_token_settings_py3.py create mode 100644 azure-batch/azure/batch/models/auto_pool_specification_py3.py create mode 100644 azure-batch/azure/batch/models/auto_scale_run_error_py3.py create mode 100644 azure-batch/azure/batch/models/auto_scale_run_py3.py create mode 100644 azure-batch/azure/batch/models/auto_user_specification_py3.py create mode 100644 azure-batch/azure/batch/models/batch_error_detail_py3.py create mode 100644 azure-batch/azure/batch/models/batch_error_py3.py create mode 100644 azure-batch/azure/batch/models/certificate_add_options_py3.py create mode 100644 azure-batch/azure/batch/models/certificate_add_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/certificate_cancel_deletion_options_py3.py create mode 100644 azure-batch/azure/batch/models/certificate_delete_options_py3.py create mode 100644 azure-batch/azure/batch/models/certificate_get_options_py3.py create mode 100644 azure-batch/azure/batch/models/certificate_list_options_py3.py create mode 100644 azure-batch/azure/batch/models/certificate_py3.py create mode 100644 azure-batch/azure/batch/models/certificate_reference_py3.py create mode 100644 azure-batch/azure/batch/models/cloud_job_py3.py create mode 100644 azure-batch/azure/batch/models/cloud_job_schedule_py3.py create mode 100644 azure-batch/azure/batch/models/cloud_pool_py3.py create mode 100644 azure-batch/azure/batch/models/cloud_service_configuration_py3.py create mode 100644 azure-batch/azure/batch/models/cloud_task_list_subtasks_result_py3.py create mode 100644 azure-batch/azure/batch/models/cloud_task_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_add_user_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_delete_user_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_disable_scheduling_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_enable_scheduling_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_endpoint_configuration_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_error_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_get_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_get_remote_desktop_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_get_remote_login_settings_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_get_remote_login_settings_result_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_information_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_list_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_reboot_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_reimage_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_update_user_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_upload_batch_service_logs_options_py3.py create mode 100644 azure-batch/azure/batch/models/compute_node_user_py3.py create mode 100644 azure-batch/azure/batch/models/container_configuration_py3.py create mode 100644 azure-batch/azure/batch/models/container_registry_py3.py create mode 100644 azure-batch/azure/batch/models/data_disk_py3.py create mode 100644 azure-batch/azure/batch/models/delete_certificate_error_py3.py create mode 100644 azure-batch/azure/batch/models/environment_setting_py3.py create mode 100644 azure-batch/azure/batch/models/error_message_py3.py create mode 100644 azure-batch/azure/batch/models/exit_code_mapping_py3.py create mode 100644 azure-batch/azure/batch/models/exit_code_range_mapping_py3.py create mode 100644 azure-batch/azure/batch/models/exit_conditions_py3.py create mode 100644 azure-batch/azure/batch/models/exit_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_delete_from_compute_node_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_delete_from_task_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_get_from_compute_node_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_get_from_task_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_get_properties_from_compute_node_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_get_properties_from_task_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_list_from_compute_node_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_list_from_task_options_py3.py create mode 100644 azure-batch/azure/batch/models/file_properties_py3.py create mode 100644 azure-batch/azure/batch/models/image_reference_py3.py create mode 100644 azure-batch/azure/batch/models/inbound_endpoint_py3.py create mode 100644 azure-batch/azure/batch/models/inbound_nat_pool_py3.py create mode 100644 azure-batch/azure/batch/models/job_add_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_add_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/job_constraints_py3.py create mode 100644 azure-batch/azure/batch/models/job_delete_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_disable_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_disable_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/job_enable_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_execution_information_py3.py create mode 100644 azure-batch/azure/batch/models/job_get_all_lifetime_statistics_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_get_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_get_task_counts_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_list_from_job_schedule_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_list_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_list_preparation_and_release_task_status_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_manager_task_py3.py create mode 100644 azure-batch/azure/batch/models/job_patch_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_patch_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/job_preparation_and_release_task_execution_information_py3.py create mode 100644 azure-batch/azure/batch/models/job_preparation_task_execution_information_py3.py create mode 100644 azure-batch/azure/batch/models/job_preparation_task_py3.py create mode 100644 azure-batch/azure/batch/models/job_release_task_execution_information_py3.py create mode 100644 azure-batch/azure/batch/models/job_release_task_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_add_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_add_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_delete_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_disable_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_enable_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_execution_information_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_exists_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_get_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_list_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_patch_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_patch_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_statistics_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_terminate_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_update_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_schedule_update_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/job_scheduling_error_py3.py create mode 100644 azure-batch/azure/batch/models/job_specification_py3.py create mode 100644 azure-batch/azure/batch/models/job_statistics_py3.py create mode 100644 azure-batch/azure/batch/models/job_terminate_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_terminate_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/job_update_options_py3.py create mode 100644 azure-batch/azure/batch/models/job_update_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/linux_user_configuration_py3.py create mode 100644 azure-batch/azure/batch/models/metadata_item_py3.py create mode 100644 azure-batch/azure/batch/models/multi_instance_settings_py3.py create mode 100644 azure-batch/azure/batch/models/name_value_pair_py3.py create mode 100644 azure-batch/azure/batch/models/network_configuration_py3.py create mode 100644 azure-batch/azure/batch/models/network_security_group_rule_py3.py create mode 100644 azure-batch/azure/batch/models/node_agent_information.py create mode 100644 azure-batch/azure/batch/models/node_agent_information_py3.py create mode 100644 azure-batch/azure/batch/models/node_agent_sku_py3.py create mode 100644 azure-batch/azure/batch/models/node_counts_py3.py create mode 100644 azure-batch/azure/batch/models/node_disable_scheduling_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/node_file_py3.py create mode 100644 azure-batch/azure/batch/models/node_reboot_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/node_reimage_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/node_remove_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/node_update_user_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/os_disk_py3.py create mode 100644 azure-batch/azure/batch/models/output_file_blob_container_destination_py3.py create mode 100644 azure-batch/azure/batch/models/output_file_destination_py3.py create mode 100644 azure-batch/azure/batch/models/output_file_py3.py create mode 100644 azure-batch/azure/batch/models/output_file_upload_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_add_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_add_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/pool_delete_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_disable_auto_scale_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_enable_auto_scale_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_enable_auto_scale_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/pool_endpoint_configuration_py3.py create mode 100644 azure-batch/azure/batch/models/pool_evaluate_auto_scale_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_evaluate_auto_scale_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/pool_exists_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_get_all_lifetime_statistics_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_get_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_information_py3.py create mode 100644 azure-batch/azure/batch/models/pool_list_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_list_usage_metrics_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_node_counts_py3.py create mode 100644 azure-batch/azure/batch/models/pool_patch_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_patch_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/pool_remove_nodes_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_resize_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_resize_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/pool_specification_py3.py create mode 100644 azure-batch/azure/batch/models/pool_statistics_py3.py create mode 100644 azure-batch/azure/batch/models/pool_stop_resize_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_update_properties_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_update_properties_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/pool_upgrade_os_options_py3.py create mode 100644 azure-batch/azure/batch/models/pool_upgrade_os_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/pool_usage_metrics_py3.py create mode 100644 azure-batch/azure/batch/models/recent_job_py3.py create mode 100644 azure-batch/azure/batch/models/resize_error_py3.py create mode 100644 azure-batch/azure/batch/models/resource_file_py3.py create mode 100644 azure-batch/azure/batch/models/resource_statistics_py3.py create mode 100644 azure-batch/azure/batch/models/schedule_py3.py create mode 100644 azure-batch/azure/batch/models/start_task_information_py3.py create mode 100644 azure-batch/azure/batch/models/start_task_py3.py create mode 100644 azure-batch/azure/batch/models/subtask_information_py3.py create mode 100644 azure-batch/azure/batch/models/task_add_collection_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_add_collection_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/task_add_collection_result_py3.py create mode 100644 azure-batch/azure/batch/models/task_add_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_add_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/task_add_result_py3.py create mode 100644 azure-batch/azure/batch/models/task_constraints_py3.py create mode 100644 azure-batch/azure/batch/models/task_container_execution_information_py3.py create mode 100644 azure-batch/azure/batch/models/task_container_settings_py3.py create mode 100644 azure-batch/azure/batch/models/task_counts_py3.py create mode 100644 azure-batch/azure/batch/models/task_delete_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_dependencies_py3.py create mode 100644 azure-batch/azure/batch/models/task_execution_information_py3.py create mode 100644 azure-batch/azure/batch/models/task_failure_information_py3.py create mode 100644 azure-batch/azure/batch/models/task_get_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_id_range_py3.py create mode 100644 azure-batch/azure/batch/models/task_information_py3.py create mode 100644 azure-batch/azure/batch/models/task_list_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_list_subtasks_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_reactivate_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_scheduling_policy_py3.py create mode 100644 azure-batch/azure/batch/models/task_statistics_py3.py create mode 100644 azure-batch/azure/batch/models/task_terminate_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_update_options_py3.py create mode 100644 azure-batch/azure/batch/models/task_update_parameter_py3.py create mode 100644 azure-batch/azure/batch/models/upload_batch_service_logs_configuration_py3.py create mode 100644 azure-batch/azure/batch/models/upload_batch_service_logs_result_py3.py create mode 100644 azure-batch/azure/batch/models/usage_statistics_py3.py create mode 100644 azure-batch/azure/batch/models/user_account_py3.py create mode 100644 azure-batch/azure/batch/models/user_identity_py3.py create mode 100644 azure-batch/azure/batch/models/virtual_machine_configuration_py3.py create mode 100644 azure-batch/azure/batch/models/windows_configuration_py3.py diff --git a/azure-batch/HISTORY.rst b/azure-batch/HISTORY.rst index 37d849dc4c0e..7569d686b5e9 100644 --- a/azure-batch/HISTORY.rst +++ b/azure-batch/HISTORY.rst @@ -3,6 +3,24 @@ Release History =============== +5.0.0 (2018-08-24) +++++++++++++++++++ + +- Using REST API version 2018-08-01.7.0. + - Added `node_agent_info` in ComputeNode to return the node agent information + - **Breaking** Removed the `validation_status` property from `TaskCounts`. + - **Breaking** The default caching type for `DataDisk` and `OSDisk` is now `read_write` instead of `none`. +- `BatchServiceClient` can be used as a context manager to keep the underlying HTTP session open for performance. +- **Breaking** Model signatures are now using only keywords-arguments syntax. Each positional argument must be rewritten as a keyword argument. +- **Breaking** The following operations signatures are changed: + - Operation PoolOperations.enable_auto_scale + - Operation TaskOperations.update + - Operation ComputeNodeOperations.reimage + - Operation ComputeNodeOperations.disable_scheduling + - Operation ComputeNodeOperations.reboot + - Operation JobOperations.terminate +- Enum types now use the "str" mixin (class AzureEnum(str, Enum)) to improve the behavior when unrecognized enum values are encountered. + 4.1.3 (2018-04-24) ++++++++++++++++++ @@ -36,10 +54,10 @@ Release History - Using REST API version 2017-09-01.6.0. - Added the ability to get a discount on Windows VM pricing if you have on-premises licenses for the OS SKUs you are deploying, via `license_type` on `VirtualMachineConfiguration`. - Added support for attaching empty data drives to `VirtualMachineConfiguration` based pools, via the new `data_disks` attribute on `VirtualMachineConfiguration`. -- [Breaking] Custom images must now be deployed using a reference to an ARM Image, instead of pointing to .vhd files in blobs directly. +- **Breaking** Custom images must now be deployed using a reference to an ARM Image, instead of pointing to .vhd files in blobs directly. - The new `virtual_machine_image_id` property on `ImageReference` contains the reference to the ARM Image, and `OSDisk.image_uris` no longer exists. - Because of this, `image_reference` is now a required attribute of `VirtualMachineConfiguration`. -- [Breaking] Multi-instance tasks (created using `MultiInstanceSettings`) must now specify a `coordination_commandLine`, and `number_of_instances` is now optional and defaults to 1. +- **Breaking** Multi-instance tasks (created using `MultiInstanceSettings`) must now specify a `coordination_commandLine`, and `number_of_instances` is now optional and defaults to 1. - Added support for tasks run using Docker containers. To run a task using a Docker container you must specify a `container_configuration` on the `VirtualMachineConfiguration` for a pool, and then add `container_settings` on the Task. 3.1.0 (2017-07-24) diff --git a/azure-batch/azure/batch/batch_auth.py b/azure-batch/azure/batch/batch_auth.py index 088ae905cc47..7e5dc803fb1f 100644 --- a/azure-batch/azure/batch/batch_auth.py +++ b/azure-batch/azure/batch/batch_auth.py @@ -53,8 +53,6 @@ def __call__(self, request): url = urlparse(request.url) uri_path = url.path - uri_path = uri_path.replace('%5C', '/') - uri_path = uri_path.replace('%2F', '/') # method to sign string_to_sign = request.method + '\n' diff --git a/azure-batch/azure/batch/batch_service_client.py b/azure-batch/azure/batch/batch_service_client.py index 4a632937d3d2..80c19929f9cb 100644 --- a/azure-batch/azure/batch/batch_service_client.py +++ b/azure-batch/azure/batch/batch_service_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -46,13 +46,13 @@ def __init__( super(BatchServiceClientConfiguration, self).__init__(base_url) - self.add_user_agent('batchserviceclient/{}'.format(VERSION)) + self.add_user_agent('azure-batch/{}'.format(VERSION)) self.add_user_agent('Azure-SDK-For-Python') self.credentials = credentials -class BatchServiceClient(object): +class BatchServiceClient(SDKClient): """A client for issuing REST requests to the Azure Batch service. :ivar config: Configuration for client. @@ -87,10 +87,10 @@ def __init__( self, credentials, base_url=None): self.config = BatchServiceClientConfiguration(credentials, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + super(BatchServiceClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - self.api_version = '2018-03-01.6.1' + self.api_version = '2018-08-01.7.0' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) diff --git a/azure-batch/azure/batch/models/__init__.py b/azure-batch/azure/batch/models/__init__.py index 5aa5587c2ab9..5ffc99a73460 100644 --- a/azure-batch/azure/batch/models/__init__.py +++ b/azure-batch/azure/batch/models/__init__.py @@ -9,206 +9,410 @@ # regenerated. # -------------------------------------------------------------------------- -from .pool_usage_metrics import PoolUsageMetrics -from .image_reference import ImageReference -from .node_agent_sku import NodeAgentSku -from .authentication_token_settings import AuthenticationTokenSettings -from .usage_statistics import UsageStatistics -from .resource_statistics import ResourceStatistics -from .pool_statistics import PoolStatistics -from .job_statistics import JobStatistics -from .name_value_pair import NameValuePair -from .delete_certificate_error import DeleteCertificateError -from .certificate import Certificate -from .application_package_reference import ApplicationPackageReference -from .application_summary import ApplicationSummary -from .certificate_add_parameter import CertificateAddParameter -from .file_properties import FileProperties -from .node_file import NodeFile -from .schedule import Schedule -from .job_constraints import JobConstraints -from .container_registry import ContainerRegistry -from .task_container_settings import TaskContainerSettings -from .resource_file import ResourceFile -from .environment_setting import EnvironmentSetting -from .exit_options import ExitOptions -from .exit_code_mapping import ExitCodeMapping -from .exit_code_range_mapping import ExitCodeRangeMapping -from .exit_conditions import ExitConditions -from .auto_user_specification import AutoUserSpecification -from .user_identity import UserIdentity -from .linux_user_configuration import LinuxUserConfiguration -from .user_account import UserAccount -from .task_constraints import TaskConstraints -from .output_file_blob_container_destination import OutputFileBlobContainerDestination -from .output_file_destination import OutputFileDestination -from .output_file_upload_options import OutputFileUploadOptions -from .output_file import OutputFile -from .job_manager_task import JobManagerTask -from .job_preparation_task import JobPreparationTask -from .job_release_task import JobReleaseTask -from .task_scheduling_policy import TaskSchedulingPolicy -from .start_task import StartTask -from .certificate_reference import CertificateReference -from .metadata_item import MetadataItem -from .cloud_service_configuration import CloudServiceConfiguration -from .os_disk import OSDisk -from .windows_configuration import WindowsConfiguration -from .data_disk import DataDisk -from .container_configuration import ContainerConfiguration -from .virtual_machine_configuration import VirtualMachineConfiguration -from .network_security_group_rule import NetworkSecurityGroupRule -from .inbound_nat_pool import InboundNATPool -from .pool_endpoint_configuration import PoolEndpointConfiguration -from .network_configuration import NetworkConfiguration -from .pool_specification import PoolSpecification -from .auto_pool_specification import AutoPoolSpecification -from .pool_information import PoolInformation -from .job_specification import JobSpecification -from .recent_job import RecentJob -from .job_schedule_execution_information import JobScheduleExecutionInformation -from .job_schedule_statistics import JobScheduleStatistics -from .cloud_job_schedule import CloudJobSchedule -from .job_schedule_add_parameter import JobScheduleAddParameter -from .job_scheduling_error import JobSchedulingError -from .job_execution_information import JobExecutionInformation -from .cloud_job import CloudJob -from .job_add_parameter import JobAddParameter -from .task_container_execution_information import TaskContainerExecutionInformation -from .task_failure_information import TaskFailureInformation -from .job_preparation_task_execution_information import JobPreparationTaskExecutionInformation -from .job_release_task_execution_information import JobReleaseTaskExecutionInformation -from .job_preparation_and_release_task_execution_information import JobPreparationAndReleaseTaskExecutionInformation -from .task_counts import TaskCounts -from .auto_scale_run_error import AutoScaleRunError -from .auto_scale_run import AutoScaleRun -from .resize_error import ResizeError -from .cloud_pool import CloudPool -from .pool_add_parameter import PoolAddParameter -from .affinity_information import AffinityInformation -from .task_execution_information import TaskExecutionInformation -from .compute_node_information import ComputeNodeInformation -from .multi_instance_settings import MultiInstanceSettings -from .task_statistics import TaskStatistics -from .task_id_range import TaskIdRange -from .task_dependencies import TaskDependencies -from .cloud_task import CloudTask -from .task_add_parameter import TaskAddParameter -from .task_add_collection_parameter import TaskAddCollectionParameter -from .error_message import ErrorMessage -from .batch_error_detail import BatchErrorDetail -from .batch_error import BatchError, BatchErrorException -from .task_add_result import TaskAddResult -from .task_add_collection_result import TaskAddCollectionResult -from .subtask_information import SubtaskInformation -from .cloud_task_list_subtasks_result import CloudTaskListSubtasksResult -from .task_information import TaskInformation -from .start_task_information import StartTaskInformation -from .compute_node_error import ComputeNodeError -from .inbound_endpoint import InboundEndpoint -from .compute_node_endpoint_configuration import ComputeNodeEndpointConfiguration -from .compute_node import ComputeNode -from .compute_node_user import ComputeNodeUser -from .compute_node_get_remote_login_settings_result import ComputeNodeGetRemoteLoginSettingsResult -from .job_schedule_patch_parameter import JobSchedulePatchParameter -from .job_schedule_update_parameter import JobScheduleUpdateParameter -from .job_disable_parameter import JobDisableParameter -from .job_terminate_parameter import JobTerminateParameter -from .job_patch_parameter import JobPatchParameter -from .job_update_parameter import JobUpdateParameter -from .pool_enable_auto_scale_parameter import PoolEnableAutoScaleParameter -from .pool_evaluate_auto_scale_parameter import PoolEvaluateAutoScaleParameter -from .pool_resize_parameter import PoolResizeParameter -from .pool_update_properties_parameter import PoolUpdatePropertiesParameter -from .pool_upgrade_os_parameter import PoolUpgradeOSParameter -from .pool_patch_parameter import PoolPatchParameter -from .task_update_parameter import TaskUpdateParameter -from .node_update_user_parameter import NodeUpdateUserParameter -from .node_reboot_parameter import NodeRebootParameter -from .node_reimage_parameter import NodeReimageParameter -from .node_disable_scheduling_parameter import NodeDisableSchedulingParameter -from .node_remove_parameter import NodeRemoveParameter -from .upload_batch_service_logs_configuration import UploadBatchServiceLogsConfiguration -from .upload_batch_service_logs_result import UploadBatchServiceLogsResult -from .node_counts import NodeCounts -from .pool_node_counts import PoolNodeCounts -from .application_list_options import ApplicationListOptions -from .application_get_options import ApplicationGetOptions -from .pool_list_usage_metrics_options import PoolListUsageMetricsOptions -from .pool_get_all_lifetime_statistics_options import PoolGetAllLifetimeStatisticsOptions -from .pool_add_options import PoolAddOptions -from .pool_list_options import PoolListOptions -from .pool_delete_options import PoolDeleteOptions -from .pool_exists_options import PoolExistsOptions -from .pool_get_options import PoolGetOptions -from .pool_patch_options import PoolPatchOptions -from .pool_disable_auto_scale_options import PoolDisableAutoScaleOptions -from .pool_enable_auto_scale_options import PoolEnableAutoScaleOptions -from .pool_evaluate_auto_scale_options import PoolEvaluateAutoScaleOptions -from .pool_resize_options import PoolResizeOptions -from .pool_stop_resize_options import PoolStopResizeOptions -from .pool_update_properties_options import PoolUpdatePropertiesOptions -from .pool_upgrade_os_options import PoolUpgradeOsOptions -from .pool_remove_nodes_options import PoolRemoveNodesOptions -from .account_list_node_agent_skus_options import AccountListNodeAgentSkusOptions -from .account_list_pool_node_counts_options import AccountListPoolNodeCountsOptions -from .job_get_all_lifetime_statistics_options import JobGetAllLifetimeStatisticsOptions -from .job_delete_options import JobDeleteOptions -from .job_get_options import JobGetOptions -from .job_patch_options import JobPatchOptions -from .job_update_options import JobUpdateOptions -from .job_disable_options import JobDisableOptions -from .job_enable_options import JobEnableOptions -from .job_terminate_options import JobTerminateOptions -from .job_add_options import JobAddOptions -from .job_list_options import JobListOptions -from .job_list_from_job_schedule_options import JobListFromJobScheduleOptions -from .job_list_preparation_and_release_task_status_options import JobListPreparationAndReleaseTaskStatusOptions -from .job_get_task_counts_options import JobGetTaskCountsOptions -from .certificate_add_options import CertificateAddOptions -from .certificate_list_options import CertificateListOptions -from .certificate_cancel_deletion_options import CertificateCancelDeletionOptions -from .certificate_delete_options import CertificateDeleteOptions -from .certificate_get_options import CertificateGetOptions -from .file_delete_from_task_options import FileDeleteFromTaskOptions -from .file_get_from_task_options import FileGetFromTaskOptions -from .file_get_properties_from_task_options import FileGetPropertiesFromTaskOptions -from .file_delete_from_compute_node_options import FileDeleteFromComputeNodeOptions -from .file_get_from_compute_node_options import FileGetFromComputeNodeOptions -from .file_get_properties_from_compute_node_options import FileGetPropertiesFromComputeNodeOptions -from .file_list_from_task_options import FileListFromTaskOptions -from .file_list_from_compute_node_options import FileListFromComputeNodeOptions -from .job_schedule_exists_options import JobScheduleExistsOptions -from .job_schedule_delete_options import JobScheduleDeleteOptions -from .job_schedule_get_options import JobScheduleGetOptions -from .job_schedule_patch_options import JobSchedulePatchOptions -from .job_schedule_update_options import JobScheduleUpdateOptions -from .job_schedule_disable_options import JobScheduleDisableOptions -from .job_schedule_enable_options import JobScheduleEnableOptions -from .job_schedule_terminate_options import JobScheduleTerminateOptions -from .job_schedule_add_options import JobScheduleAddOptions -from .job_schedule_list_options import JobScheduleListOptions -from .task_add_options import TaskAddOptions -from .task_list_options import TaskListOptions -from .task_add_collection_options import TaskAddCollectionOptions -from .task_delete_options import TaskDeleteOptions -from .task_get_options import TaskGetOptions -from .task_update_options import TaskUpdateOptions -from .task_list_subtasks_options import TaskListSubtasksOptions -from .task_terminate_options import TaskTerminateOptions -from .task_reactivate_options import TaskReactivateOptions -from .compute_node_add_user_options import ComputeNodeAddUserOptions -from .compute_node_delete_user_options import ComputeNodeDeleteUserOptions -from .compute_node_update_user_options import ComputeNodeUpdateUserOptions -from .compute_node_get_options import ComputeNodeGetOptions -from .compute_node_reboot_options import ComputeNodeRebootOptions -from .compute_node_reimage_options import ComputeNodeReimageOptions -from .compute_node_disable_scheduling_options import ComputeNodeDisableSchedulingOptions -from .compute_node_enable_scheduling_options import ComputeNodeEnableSchedulingOptions -from .compute_node_get_remote_login_settings_options import ComputeNodeGetRemoteLoginSettingsOptions -from .compute_node_get_remote_desktop_options import ComputeNodeGetRemoteDesktopOptions -from .compute_node_upload_batch_service_logs_options import ComputeNodeUploadBatchServiceLogsOptions -from .compute_node_list_options import ComputeNodeListOptions +try: + from .pool_usage_metrics_py3 import PoolUsageMetrics + from .image_reference_py3 import ImageReference + from .node_agent_sku_py3 import NodeAgentSku + from .authentication_token_settings_py3 import AuthenticationTokenSettings + from .usage_statistics_py3 import UsageStatistics + from .resource_statistics_py3 import ResourceStatistics + from .pool_statistics_py3 import PoolStatistics + from .job_statistics_py3 import JobStatistics + from .name_value_pair_py3 import NameValuePair + from .delete_certificate_error_py3 import DeleteCertificateError + from .certificate_py3 import Certificate + from .application_package_reference_py3 import ApplicationPackageReference + from .application_summary_py3 import ApplicationSummary + from .certificate_add_parameter_py3 import CertificateAddParameter + from .file_properties_py3 import FileProperties + from .node_file_py3 import NodeFile + from .schedule_py3 import Schedule + from .job_constraints_py3 import JobConstraints + from .container_registry_py3 import ContainerRegistry + from .task_container_settings_py3 import TaskContainerSettings + from .resource_file_py3 import ResourceFile + from .environment_setting_py3 import EnvironmentSetting + from .exit_options_py3 import ExitOptions + from .exit_code_mapping_py3 import ExitCodeMapping + from .exit_code_range_mapping_py3 import ExitCodeRangeMapping + from .exit_conditions_py3 import ExitConditions + from .auto_user_specification_py3 import AutoUserSpecification + from .user_identity_py3 import UserIdentity + from .linux_user_configuration_py3 import LinuxUserConfiguration + from .user_account_py3 import UserAccount + from .task_constraints_py3 import TaskConstraints + from .output_file_blob_container_destination_py3 import OutputFileBlobContainerDestination + from .output_file_destination_py3 import OutputFileDestination + from .output_file_upload_options_py3 import OutputFileUploadOptions + from .output_file_py3 import OutputFile + from .job_manager_task_py3 import JobManagerTask + from .job_preparation_task_py3 import JobPreparationTask + from .job_release_task_py3 import JobReleaseTask + from .task_scheduling_policy_py3 import TaskSchedulingPolicy + from .start_task_py3 import StartTask + from .certificate_reference_py3 import CertificateReference + from .metadata_item_py3 import MetadataItem + from .cloud_service_configuration_py3 import CloudServiceConfiguration + from .os_disk_py3 import OSDisk + from .windows_configuration_py3 import WindowsConfiguration + from .data_disk_py3 import DataDisk + from .container_configuration_py3 import ContainerConfiguration + from .virtual_machine_configuration_py3 import VirtualMachineConfiguration + from .network_security_group_rule_py3 import NetworkSecurityGroupRule + from .inbound_nat_pool_py3 import InboundNATPool + from .pool_endpoint_configuration_py3 import PoolEndpointConfiguration + from .network_configuration_py3 import NetworkConfiguration + from .pool_specification_py3 import PoolSpecification + from .auto_pool_specification_py3 import AutoPoolSpecification + from .pool_information_py3 import PoolInformation + from .job_specification_py3 import JobSpecification + from .recent_job_py3 import RecentJob + from .job_schedule_execution_information_py3 import JobScheduleExecutionInformation + from .job_schedule_statistics_py3 import JobScheduleStatistics + from .cloud_job_schedule_py3 import CloudJobSchedule + from .job_schedule_add_parameter_py3 import JobScheduleAddParameter + from .job_scheduling_error_py3 import JobSchedulingError + from .job_execution_information_py3 import JobExecutionInformation + from .cloud_job_py3 import CloudJob + from .job_add_parameter_py3 import JobAddParameter + from .task_container_execution_information_py3 import TaskContainerExecutionInformation + from .task_failure_information_py3 import TaskFailureInformation + from .job_preparation_task_execution_information_py3 import JobPreparationTaskExecutionInformation + from .job_release_task_execution_information_py3 import JobReleaseTaskExecutionInformation + from .job_preparation_and_release_task_execution_information_py3 import JobPreparationAndReleaseTaskExecutionInformation + from .task_counts_py3 import TaskCounts + from .auto_scale_run_error_py3 import AutoScaleRunError + from .auto_scale_run_py3 import AutoScaleRun + from .resize_error_py3 import ResizeError + from .cloud_pool_py3 import CloudPool + from .pool_add_parameter_py3 import PoolAddParameter + from .affinity_information_py3 import AffinityInformation + from .task_execution_information_py3 import TaskExecutionInformation + from .compute_node_information_py3 import ComputeNodeInformation + from .node_agent_information_py3 import NodeAgentInformation + from .multi_instance_settings_py3 import MultiInstanceSettings + from .task_statistics_py3 import TaskStatistics + from .task_id_range_py3 import TaskIdRange + from .task_dependencies_py3 import TaskDependencies + from .cloud_task_py3 import CloudTask + from .task_add_parameter_py3 import TaskAddParameter + from .task_add_collection_parameter_py3 import TaskAddCollectionParameter + from .error_message_py3 import ErrorMessage + from .batch_error_detail_py3 import BatchErrorDetail + from .batch_error_py3 import BatchError, BatchErrorException + from .task_add_result_py3 import TaskAddResult + from .task_add_collection_result_py3 import TaskAddCollectionResult + from .subtask_information_py3 import SubtaskInformation + from .cloud_task_list_subtasks_result_py3 import CloudTaskListSubtasksResult + from .task_information_py3 import TaskInformation + from .start_task_information_py3 import StartTaskInformation + from .compute_node_error_py3 import ComputeNodeError + from .inbound_endpoint_py3 import InboundEndpoint + from .compute_node_endpoint_configuration_py3 import ComputeNodeEndpointConfiguration + from .compute_node_py3 import ComputeNode + from .compute_node_user_py3 import ComputeNodeUser + from .compute_node_get_remote_login_settings_result_py3 import ComputeNodeGetRemoteLoginSettingsResult + from .job_schedule_patch_parameter_py3 import JobSchedulePatchParameter + from .job_schedule_update_parameter_py3 import JobScheduleUpdateParameter + from .job_disable_parameter_py3 import JobDisableParameter + from .job_terminate_parameter_py3 import JobTerminateParameter + from .job_patch_parameter_py3 import JobPatchParameter + from .job_update_parameter_py3 import JobUpdateParameter + from .pool_enable_auto_scale_parameter_py3 import PoolEnableAutoScaleParameter + from .pool_evaluate_auto_scale_parameter_py3 import PoolEvaluateAutoScaleParameter + from .pool_resize_parameter_py3 import PoolResizeParameter + from .pool_update_properties_parameter_py3 import PoolUpdatePropertiesParameter + from .pool_upgrade_os_parameter_py3 import PoolUpgradeOSParameter + from .pool_patch_parameter_py3 import PoolPatchParameter + from .task_update_parameter_py3 import TaskUpdateParameter + from .node_update_user_parameter_py3 import NodeUpdateUserParameter + from .node_reboot_parameter_py3 import NodeRebootParameter + from .node_reimage_parameter_py3 import NodeReimageParameter + from .node_disable_scheduling_parameter_py3 import NodeDisableSchedulingParameter + from .node_remove_parameter_py3 import NodeRemoveParameter + from .upload_batch_service_logs_configuration_py3 import UploadBatchServiceLogsConfiguration + from .upload_batch_service_logs_result_py3 import UploadBatchServiceLogsResult + from .node_counts_py3 import NodeCounts + from .pool_node_counts_py3 import PoolNodeCounts + from .application_list_options_py3 import ApplicationListOptions + from .application_get_options_py3 import ApplicationGetOptions + from .pool_list_usage_metrics_options_py3 import PoolListUsageMetricsOptions + from .pool_get_all_lifetime_statistics_options_py3 import PoolGetAllLifetimeStatisticsOptions + from .pool_add_options_py3 import PoolAddOptions + from .pool_list_options_py3 import PoolListOptions + from .pool_delete_options_py3 import PoolDeleteOptions + from .pool_exists_options_py3 import PoolExistsOptions + from .pool_get_options_py3 import PoolGetOptions + from .pool_patch_options_py3 import PoolPatchOptions + from .pool_disable_auto_scale_options_py3 import PoolDisableAutoScaleOptions + from .pool_enable_auto_scale_options_py3 import PoolEnableAutoScaleOptions + from .pool_evaluate_auto_scale_options_py3 import PoolEvaluateAutoScaleOptions + from .pool_resize_options_py3 import PoolResizeOptions + from .pool_stop_resize_options_py3 import PoolStopResizeOptions + from .pool_update_properties_options_py3 import PoolUpdatePropertiesOptions + from .pool_upgrade_os_options_py3 import PoolUpgradeOsOptions + from .pool_remove_nodes_options_py3 import PoolRemoveNodesOptions + from .account_list_node_agent_skus_options_py3 import AccountListNodeAgentSkusOptions + from .account_list_pool_node_counts_options_py3 import AccountListPoolNodeCountsOptions + from .job_get_all_lifetime_statistics_options_py3 import JobGetAllLifetimeStatisticsOptions + from .job_delete_options_py3 import JobDeleteOptions + from .job_get_options_py3 import JobGetOptions + from .job_patch_options_py3 import JobPatchOptions + from .job_update_options_py3 import JobUpdateOptions + from .job_disable_options_py3 import JobDisableOptions + from .job_enable_options_py3 import JobEnableOptions + from .job_terminate_options_py3 import JobTerminateOptions + from .job_add_options_py3 import JobAddOptions + from .job_list_options_py3 import JobListOptions + from .job_list_from_job_schedule_options_py3 import JobListFromJobScheduleOptions + from .job_list_preparation_and_release_task_status_options_py3 import JobListPreparationAndReleaseTaskStatusOptions + from .job_get_task_counts_options_py3 import JobGetTaskCountsOptions + from .certificate_add_options_py3 import CertificateAddOptions + from .certificate_list_options_py3 import CertificateListOptions + from .certificate_cancel_deletion_options_py3 import CertificateCancelDeletionOptions + from .certificate_delete_options_py3 import CertificateDeleteOptions + from .certificate_get_options_py3 import CertificateGetOptions + from .file_delete_from_task_options_py3 import FileDeleteFromTaskOptions + from .file_get_from_task_options_py3 import FileGetFromTaskOptions + from .file_get_properties_from_task_options_py3 import FileGetPropertiesFromTaskOptions + from .file_delete_from_compute_node_options_py3 import FileDeleteFromComputeNodeOptions + from .file_get_from_compute_node_options_py3 import FileGetFromComputeNodeOptions + from .file_get_properties_from_compute_node_options_py3 import FileGetPropertiesFromComputeNodeOptions + from .file_list_from_task_options_py3 import FileListFromTaskOptions + from .file_list_from_compute_node_options_py3 import FileListFromComputeNodeOptions + from .job_schedule_exists_options_py3 import JobScheduleExistsOptions + from .job_schedule_delete_options_py3 import JobScheduleDeleteOptions + from .job_schedule_get_options_py3 import JobScheduleGetOptions + from .job_schedule_patch_options_py3 import JobSchedulePatchOptions + from .job_schedule_update_options_py3 import JobScheduleUpdateOptions + from .job_schedule_disable_options_py3 import JobScheduleDisableOptions + from .job_schedule_enable_options_py3 import JobScheduleEnableOptions + from .job_schedule_terminate_options_py3 import JobScheduleTerminateOptions + from .job_schedule_add_options_py3 import JobScheduleAddOptions + from .job_schedule_list_options_py3 import JobScheduleListOptions + from .task_add_options_py3 import TaskAddOptions + from .task_list_options_py3 import TaskListOptions + from .task_add_collection_options_py3 import TaskAddCollectionOptions + from .task_delete_options_py3 import TaskDeleteOptions + from .task_get_options_py3 import TaskGetOptions + from .task_update_options_py3 import TaskUpdateOptions + from .task_list_subtasks_options_py3 import TaskListSubtasksOptions + from .task_terminate_options_py3 import TaskTerminateOptions + from .task_reactivate_options_py3 import TaskReactivateOptions + from .compute_node_add_user_options_py3 import ComputeNodeAddUserOptions + from .compute_node_delete_user_options_py3 import ComputeNodeDeleteUserOptions + from .compute_node_update_user_options_py3 import ComputeNodeUpdateUserOptions + from .compute_node_get_options_py3 import ComputeNodeGetOptions + from .compute_node_reboot_options_py3 import ComputeNodeRebootOptions + from .compute_node_reimage_options_py3 import ComputeNodeReimageOptions + from .compute_node_disable_scheduling_options_py3 import ComputeNodeDisableSchedulingOptions + from .compute_node_enable_scheduling_options_py3 import ComputeNodeEnableSchedulingOptions + from .compute_node_get_remote_login_settings_options_py3 import ComputeNodeGetRemoteLoginSettingsOptions + from .compute_node_get_remote_desktop_options_py3 import ComputeNodeGetRemoteDesktopOptions + from .compute_node_upload_batch_service_logs_options_py3 import ComputeNodeUploadBatchServiceLogsOptions + from .compute_node_list_options_py3 import ComputeNodeListOptions +except (SyntaxError, ImportError): + from .pool_usage_metrics import PoolUsageMetrics + from .image_reference import ImageReference + from .node_agent_sku import NodeAgentSku + from .authentication_token_settings import AuthenticationTokenSettings + from .usage_statistics import UsageStatistics + from .resource_statistics import ResourceStatistics + from .pool_statistics import PoolStatistics + from .job_statistics import JobStatistics + from .name_value_pair import NameValuePair + from .delete_certificate_error import DeleteCertificateError + from .certificate import Certificate + from .application_package_reference import ApplicationPackageReference + from .application_summary import ApplicationSummary + from .certificate_add_parameter import CertificateAddParameter + from .file_properties import FileProperties + from .node_file import NodeFile + from .schedule import Schedule + from .job_constraints import JobConstraints + from .container_registry import ContainerRegistry + from .task_container_settings import TaskContainerSettings + from .resource_file import ResourceFile + from .environment_setting import EnvironmentSetting + from .exit_options import ExitOptions + from .exit_code_mapping import ExitCodeMapping + from .exit_code_range_mapping import ExitCodeRangeMapping + from .exit_conditions import ExitConditions + from .auto_user_specification import AutoUserSpecification + from .user_identity import UserIdentity + from .linux_user_configuration import LinuxUserConfiguration + from .user_account import UserAccount + from .task_constraints import TaskConstraints + from .output_file_blob_container_destination import OutputFileBlobContainerDestination + from .output_file_destination import OutputFileDestination + from .output_file_upload_options import OutputFileUploadOptions + from .output_file import OutputFile + from .job_manager_task import JobManagerTask + from .job_preparation_task import JobPreparationTask + from .job_release_task import JobReleaseTask + from .task_scheduling_policy import TaskSchedulingPolicy + from .start_task import StartTask + from .certificate_reference import CertificateReference + from .metadata_item import MetadataItem + from .cloud_service_configuration import CloudServiceConfiguration + from .os_disk import OSDisk + from .windows_configuration import WindowsConfiguration + from .data_disk import DataDisk + from .container_configuration import ContainerConfiguration + from .virtual_machine_configuration import VirtualMachineConfiguration + from .network_security_group_rule import NetworkSecurityGroupRule + from .inbound_nat_pool import InboundNATPool + from .pool_endpoint_configuration import PoolEndpointConfiguration + from .network_configuration import NetworkConfiguration + from .pool_specification import PoolSpecification + from .auto_pool_specification import AutoPoolSpecification + from .pool_information import PoolInformation + from .job_specification import JobSpecification + from .recent_job import RecentJob + from .job_schedule_execution_information import JobScheduleExecutionInformation + from .job_schedule_statistics import JobScheduleStatistics + from .cloud_job_schedule import CloudJobSchedule + from .job_schedule_add_parameter import JobScheduleAddParameter + from .job_scheduling_error import JobSchedulingError + from .job_execution_information import JobExecutionInformation + from .cloud_job import CloudJob + from .job_add_parameter import JobAddParameter + from .task_container_execution_information import TaskContainerExecutionInformation + from .task_failure_information import TaskFailureInformation + from .job_preparation_task_execution_information import JobPreparationTaskExecutionInformation + from .job_release_task_execution_information import JobReleaseTaskExecutionInformation + from .job_preparation_and_release_task_execution_information import JobPreparationAndReleaseTaskExecutionInformation + from .task_counts import TaskCounts + from .auto_scale_run_error import AutoScaleRunError + from .auto_scale_run import AutoScaleRun + from .resize_error import ResizeError + from .cloud_pool import CloudPool + from .pool_add_parameter import PoolAddParameter + from .affinity_information import AffinityInformation + from .task_execution_information import TaskExecutionInformation + from .compute_node_information import ComputeNodeInformation + from .node_agent_information import NodeAgentInformation + from .multi_instance_settings import MultiInstanceSettings + from .task_statistics import TaskStatistics + from .task_id_range import TaskIdRange + from .task_dependencies import TaskDependencies + from .cloud_task import CloudTask + from .task_add_parameter import TaskAddParameter + from .task_add_collection_parameter import TaskAddCollectionParameter + from .error_message import ErrorMessage + from .batch_error_detail import BatchErrorDetail + from .batch_error import BatchError, BatchErrorException + from .task_add_result import TaskAddResult + from .task_add_collection_result import TaskAddCollectionResult + from .subtask_information import SubtaskInformation + from .cloud_task_list_subtasks_result import CloudTaskListSubtasksResult + from .task_information import TaskInformation + from .start_task_information import StartTaskInformation + from .compute_node_error import ComputeNodeError + from .inbound_endpoint import InboundEndpoint + from .compute_node_endpoint_configuration import ComputeNodeEndpointConfiguration + from .compute_node import ComputeNode + from .compute_node_user import ComputeNodeUser + from .compute_node_get_remote_login_settings_result import ComputeNodeGetRemoteLoginSettingsResult + from .job_schedule_patch_parameter import JobSchedulePatchParameter + from .job_schedule_update_parameter import JobScheduleUpdateParameter + from .job_disable_parameter import JobDisableParameter + from .job_terminate_parameter import JobTerminateParameter + from .job_patch_parameter import JobPatchParameter + from .job_update_parameter import JobUpdateParameter + from .pool_enable_auto_scale_parameter import PoolEnableAutoScaleParameter + from .pool_evaluate_auto_scale_parameter import PoolEvaluateAutoScaleParameter + from .pool_resize_parameter import PoolResizeParameter + from .pool_update_properties_parameter import PoolUpdatePropertiesParameter + from .pool_upgrade_os_parameter import PoolUpgradeOSParameter + from .pool_patch_parameter import PoolPatchParameter + from .task_update_parameter import TaskUpdateParameter + from .node_update_user_parameter import NodeUpdateUserParameter + from .node_reboot_parameter import NodeRebootParameter + from .node_reimage_parameter import NodeReimageParameter + from .node_disable_scheduling_parameter import NodeDisableSchedulingParameter + from .node_remove_parameter import NodeRemoveParameter + from .upload_batch_service_logs_configuration import UploadBatchServiceLogsConfiguration + from .upload_batch_service_logs_result import UploadBatchServiceLogsResult + from .node_counts import NodeCounts + from .pool_node_counts import PoolNodeCounts + from .application_list_options import ApplicationListOptions + from .application_get_options import ApplicationGetOptions + from .pool_list_usage_metrics_options import PoolListUsageMetricsOptions + from .pool_get_all_lifetime_statistics_options import PoolGetAllLifetimeStatisticsOptions + from .pool_add_options import PoolAddOptions + from .pool_list_options import PoolListOptions + from .pool_delete_options import PoolDeleteOptions + from .pool_exists_options import PoolExistsOptions + from .pool_get_options import PoolGetOptions + from .pool_patch_options import PoolPatchOptions + from .pool_disable_auto_scale_options import PoolDisableAutoScaleOptions + from .pool_enable_auto_scale_options import PoolEnableAutoScaleOptions + from .pool_evaluate_auto_scale_options import PoolEvaluateAutoScaleOptions + from .pool_resize_options import PoolResizeOptions + from .pool_stop_resize_options import PoolStopResizeOptions + from .pool_update_properties_options import PoolUpdatePropertiesOptions + from .pool_upgrade_os_options import PoolUpgradeOsOptions + from .pool_remove_nodes_options import PoolRemoveNodesOptions + from .account_list_node_agent_skus_options import AccountListNodeAgentSkusOptions + from .account_list_pool_node_counts_options import AccountListPoolNodeCountsOptions + from .job_get_all_lifetime_statistics_options import JobGetAllLifetimeStatisticsOptions + from .job_delete_options import JobDeleteOptions + from .job_get_options import JobGetOptions + from .job_patch_options import JobPatchOptions + from .job_update_options import JobUpdateOptions + from .job_disable_options import JobDisableOptions + from .job_enable_options import JobEnableOptions + from .job_terminate_options import JobTerminateOptions + from .job_add_options import JobAddOptions + from .job_list_options import JobListOptions + from .job_list_from_job_schedule_options import JobListFromJobScheduleOptions + from .job_list_preparation_and_release_task_status_options import JobListPreparationAndReleaseTaskStatusOptions + from .job_get_task_counts_options import JobGetTaskCountsOptions + from .certificate_add_options import CertificateAddOptions + from .certificate_list_options import CertificateListOptions + from .certificate_cancel_deletion_options import CertificateCancelDeletionOptions + from .certificate_delete_options import CertificateDeleteOptions + from .certificate_get_options import CertificateGetOptions + from .file_delete_from_task_options import FileDeleteFromTaskOptions + from .file_get_from_task_options import FileGetFromTaskOptions + from .file_get_properties_from_task_options import FileGetPropertiesFromTaskOptions + from .file_delete_from_compute_node_options import FileDeleteFromComputeNodeOptions + from .file_get_from_compute_node_options import FileGetFromComputeNodeOptions + from .file_get_properties_from_compute_node_options import FileGetPropertiesFromComputeNodeOptions + from .file_list_from_task_options import FileListFromTaskOptions + from .file_list_from_compute_node_options import FileListFromComputeNodeOptions + from .job_schedule_exists_options import JobScheduleExistsOptions + from .job_schedule_delete_options import JobScheduleDeleteOptions + from .job_schedule_get_options import JobScheduleGetOptions + from .job_schedule_patch_options import JobSchedulePatchOptions + from .job_schedule_update_options import JobScheduleUpdateOptions + from .job_schedule_disable_options import JobScheduleDisableOptions + from .job_schedule_enable_options import JobScheduleEnableOptions + from .job_schedule_terminate_options import JobScheduleTerminateOptions + from .job_schedule_add_options import JobScheduleAddOptions + from .job_schedule_list_options import JobScheduleListOptions + from .task_add_options import TaskAddOptions + from .task_list_options import TaskListOptions + from .task_add_collection_options import TaskAddCollectionOptions + from .task_delete_options import TaskDeleteOptions + from .task_get_options import TaskGetOptions + from .task_update_options import TaskUpdateOptions + from .task_list_subtasks_options import TaskListSubtasksOptions + from .task_terminate_options import TaskTerminateOptions + from .task_reactivate_options import TaskReactivateOptions + from .compute_node_add_user_options import ComputeNodeAddUserOptions + from .compute_node_delete_user_options import ComputeNodeDeleteUserOptions + from .compute_node_update_user_options import ComputeNodeUpdateUserOptions + from .compute_node_get_options import ComputeNodeGetOptions + from .compute_node_reboot_options import ComputeNodeRebootOptions + from .compute_node_reimage_options import ComputeNodeReimageOptions + from .compute_node_disable_scheduling_options import ComputeNodeDisableSchedulingOptions + from .compute_node_enable_scheduling_options import ComputeNodeEnableSchedulingOptions + from .compute_node_get_remote_login_settings_options import ComputeNodeGetRemoteLoginSettingsOptions + from .compute_node_get_remote_desktop_options import ComputeNodeGetRemoteDesktopOptions + from .compute_node_upload_batch_service_logs_options import ComputeNodeUploadBatchServiceLogsOptions + from .compute_node_list_options import ComputeNodeListOptions from .application_summary_paged import ApplicationSummaryPaged from .pool_usage_metrics_paged import PoolUsageMetricsPaged from .cloud_pool_paged import CloudPoolPaged @@ -247,7 +451,6 @@ JobPreparationTaskState, TaskExecutionResult, JobReleaseTaskState, - TaskCountValidationStatus, PoolState, AllocationState, TaskState, @@ -343,6 +546,7 @@ 'AffinityInformation', 'TaskExecutionInformation', 'ComputeNodeInformation', + 'NodeAgentInformation', 'MultiInstanceSettings', 'TaskStatistics', 'TaskIdRange', @@ -501,7 +705,6 @@ 'JobPreparationTaskState', 'TaskExecutionResult', 'JobReleaseTaskState', - 'TaskCountValidationStatus', 'PoolState', 'AllocationState', 'TaskState', diff --git a/azure-batch/azure/batch/models/account_list_node_agent_skus_options.py b/azure-batch/azure/batch/models/account_list_node_agent_skus_options.py index e0b13f9f29b3..6cc1c050b3fb 100644 --- a/azure-batch/azure/batch/models/account_list_node_agent_skus_options.py +++ b/azure-batch/azure/batch/models/account_list_node_agent_skus_options.py @@ -38,11 +38,20 @@ class AccountListNodeAgentSkusOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(AccountListNodeAgentSkusOptions, self).__init__() - self.filter = filter - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(AccountListNodeAgentSkusOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/account_list_node_agent_skus_options_py3.py b/azure-batch/azure/batch/models/account_list_node_agent_skus_options_py3.py new file mode 100644 index 000000000000..01d06fb1eecf --- /dev/null +++ b/azure-batch/azure/batch/models/account_list_node_agent_skus_options_py3.py @@ -0,0 +1,57 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AccountListNodeAgentSkusOptions(Model): + """Additional parameters for list_node_agent_skus operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-node-agent-skus. + :type filter: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 results will be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(AccountListNodeAgentSkusOptions, self).__init__(**kwargs) + self.filter = filter + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/account_list_pool_node_counts_options.py b/azure-batch/azure/batch/models/account_list_pool_node_counts_options.py index 3ee7f8744f45..4ad2da01f3b0 100644 --- a/azure-batch/azure/batch/models/account_list_pool_node_counts_options.py +++ b/azure-batch/azure/batch/models/account_list_pool_node_counts_options.py @@ -15,7 +15,9 @@ class AccountListPoolNodeCountsOptions(Model): """Additional parameters for list_pool_node_counts operation. - :param filter: An OData $filter clause. + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch. :type filter: str :param max_results: The maximum number of items to return in the response. Default value: 10 . @@ -36,11 +38,20 @@ class AccountListPoolNodeCountsOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, max_results=10, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(AccountListPoolNodeCountsOptions, self).__init__() - self.filter = filter - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(AccountListPoolNodeCountsOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.max_results = kwargs.get('max_results', 10) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/account_list_pool_node_counts_options_py3.py b/azure-batch/azure/batch/models/account_list_pool_node_counts_options_py3.py new file mode 100644 index 000000000000..e9f0d02bec64 --- /dev/null +++ b/azure-batch/azure/batch/models/account_list_pool_node_counts_options_py3.py @@ -0,0 +1,57 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AccountListPoolNodeCountsOptions(Model): + """Additional parameters for list_pool_node_counts operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch. + :type filter: str + :param max_results: The maximum number of items to return in the response. + Default value: 10 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, max_results: int=10, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(AccountListPoolNodeCountsOptions, self).__init__(**kwargs) + self.filter = filter + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/affinity_information.py b/azure-batch/azure/batch/models/affinity_information.py index 0745761d1343..206608f1f9f2 100644 --- a/azure-batch/azure/batch/models/affinity_information.py +++ b/azure-batch/azure/batch/models/affinity_information.py @@ -16,8 +16,10 @@ class AffinityInformation(Model): """A locality hint that can be used by the Batch service to select a compute node on which to start a task. - :param affinity_id: An opaque string representing the location of a - compute node or a task that has run previously. You can pass the + All required parameters must be populated in order to send to Azure. + + :param affinity_id: Required. An opaque string representing the location + of a compute node or a task that has run previously. You can pass the affinityId of a compute node to indicate that this task needs to run on that compute node. Note that this is just a soft affinity. If the target node is busy or unavailable at the time the task is scheduled, then the @@ -33,6 +35,6 @@ class AffinityInformation(Model): 'affinity_id': {'key': 'affinityId', 'type': 'str'}, } - def __init__(self, affinity_id): - super(AffinityInformation, self).__init__() - self.affinity_id = affinity_id + def __init__(self, **kwargs): + super(AffinityInformation, self).__init__(**kwargs) + self.affinity_id = kwargs.get('affinity_id', None) diff --git a/azure-batch/azure/batch/models/affinity_information_py3.py b/azure-batch/azure/batch/models/affinity_information_py3.py new file mode 100644 index 000000000000..fcf8d04b8010 --- /dev/null +++ b/azure-batch/azure/batch/models/affinity_information_py3.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AffinityInformation(Model): + """A locality hint that can be used by the Batch service to select a compute + node on which to start a task. + + All required parameters must be populated in order to send to Azure. + + :param affinity_id: Required. An opaque string representing the location + of a compute node or a task that has run previously. You can pass the + affinityId of a compute node to indicate that this task needs to run on + that compute node. Note that this is just a soft affinity. If the target + node is busy or unavailable at the time the task is scheduled, then the + task will be scheduled elsewhere. + :type affinity_id: str + """ + + _validation = { + 'affinity_id': {'required': True}, + } + + _attribute_map = { + 'affinity_id': {'key': 'affinityId', 'type': 'str'}, + } + + def __init__(self, *, affinity_id: str, **kwargs) -> None: + super(AffinityInformation, self).__init__(**kwargs) + self.affinity_id = affinity_id diff --git a/azure-batch/azure/batch/models/application_get_options.py b/azure-batch/azure/batch/models/application_get_options.py index 35498bc6a5b1..038c5421e4ee 100644 --- a/azure-batch/azure/batch/models/application_get_options.py +++ b/azure-batch/azure/batch/models/application_get_options.py @@ -31,9 +31,16 @@ class ApplicationGetOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ApplicationGetOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ApplicationGetOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/application_get_options_py3.py b/azure-batch/azure/batch/models/application_get_options_py3.py new file mode 100644 index 000000000000..3c9d5c0ad7b8 --- /dev/null +++ b/azure-batch/azure/batch/models/application_get_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ApplicationGetOptions(Model): + """Additional parameters for get operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ApplicationGetOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/application_list_options.py b/azure-batch/azure/batch/models/application_list_options.py index b1eb2c54642e..bc3ddb366801 100644 --- a/azure-batch/azure/batch/models/application_list_options.py +++ b/azure-batch/azure/batch/models/application_list_options.py @@ -34,10 +34,18 @@ class ApplicationListOptions(Model): :type ocp_date: datetime """ - def __init__(self, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ApplicationListOptions, self).__init__() - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ApplicationListOptions, self).__init__(**kwargs) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/application_list_options_py3.py b/azure-batch/azure/batch/models/application_list_options_py3.py new file mode 100644 index 000000000000..445de51eccb1 --- /dev/null +++ b/azure-batch/azure/batch/models/application_list_options_py3.py @@ -0,0 +1,51 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ApplicationListOptions(Model): + """Additional parameters for list operation. + + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 applications can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ApplicationListOptions, self).__init__(**kwargs) + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/application_package_reference.py b/azure-batch/azure/batch/models/application_package_reference.py index bea904d8bad3..0867361760c1 100644 --- a/azure-batch/azure/batch/models/application_package_reference.py +++ b/azure-batch/azure/batch/models/application_package_reference.py @@ -15,7 +15,9 @@ class ApplicationPackageReference(Model): """A reference to an application package to be deployed to compute nodes. - :param application_id: The ID of the application to deploy. + All required parameters must be populated in order to send to Azure. + + :param application_id: Required. The ID of the application to deploy. :type application_id: str :param version: The version of the application to deploy. If omitted, the default version is deployed. If this is omitted on a pool, and no default @@ -35,7 +37,7 @@ class ApplicationPackageReference(Model): 'version': {'key': 'version', 'type': 'str'}, } - def __init__(self, application_id, version=None): - super(ApplicationPackageReference, self).__init__() - self.application_id = application_id - self.version = version + def __init__(self, **kwargs): + super(ApplicationPackageReference, self).__init__(**kwargs) + self.application_id = kwargs.get('application_id', None) + self.version = kwargs.get('version', None) diff --git a/azure-batch/azure/batch/models/application_package_reference_py3.py b/azure-batch/azure/batch/models/application_package_reference_py3.py new file mode 100644 index 000000000000..dd81226b51e8 --- /dev/null +++ b/azure-batch/azure/batch/models/application_package_reference_py3.py @@ -0,0 +1,43 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ApplicationPackageReference(Model): + """A reference to an application package to be deployed to compute nodes. + + All required parameters must be populated in order to send to Azure. + + :param application_id: Required. The ID of the application to deploy. + :type application_id: str + :param version: The version of the application to deploy. If omitted, the + default version is deployed. If this is omitted on a pool, and no default + version is specified for this application, the request fails with the + error code InvalidApplicationPackageReferences and HTTP status code 409. + If this is omitted on a task, and no default version is specified for this + application, the task fails with a pre-processing error. + :type version: str + """ + + _validation = { + 'application_id': {'required': True}, + } + + _attribute_map = { + 'application_id': {'key': 'applicationId', 'type': 'str'}, + 'version': {'key': 'version', 'type': 'str'}, + } + + def __init__(self, *, application_id: str, version: str=None, **kwargs) -> None: + super(ApplicationPackageReference, self).__init__(**kwargs) + self.application_id = application_id + self.version = version diff --git a/azure-batch/azure/batch/models/application_summary.py b/azure-batch/azure/batch/models/application_summary.py index 5eba58b8ab31..4a65a11f24f8 100644 --- a/azure-batch/azure/batch/models/application_summary.py +++ b/azure-batch/azure/batch/models/application_summary.py @@ -15,12 +15,15 @@ class ApplicationSummary(Model): """Contains information about an application in an Azure Batch account. - :param id: A string that uniquely identifies the application within the - account. + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the application + within the account. :type id: str - :param display_name: The display name for the application. + :param display_name: Required. The display name for the application. :type display_name: str - :param versions: The list of available versions of the application. + :param versions: Required. The list of available versions of the + application. :type versions: list[str] """ @@ -36,8 +39,8 @@ class ApplicationSummary(Model): 'versions': {'key': 'versions', 'type': '[str]'}, } - def __init__(self, id, display_name, versions): - super(ApplicationSummary, self).__init__() - self.id = id - self.display_name = display_name - self.versions = versions + def __init__(self, **kwargs): + super(ApplicationSummary, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.versions = kwargs.get('versions', None) diff --git a/azure-batch/azure/batch/models/application_summary_py3.py b/azure-batch/azure/batch/models/application_summary_py3.py new file mode 100644 index 000000000000..68c838e88391 --- /dev/null +++ b/azure-batch/azure/batch/models/application_summary_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ApplicationSummary(Model): + """Contains information about an application in an Azure Batch account. + + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the application + within the account. + :type id: str + :param display_name: Required. The display name for the application. + :type display_name: str + :param versions: Required. The list of available versions of the + application. + :type versions: list[str] + """ + + _validation = { + 'id': {'required': True}, + 'display_name': {'required': True}, + 'versions': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'versions': {'key': 'versions', 'type': '[str]'}, + } + + def __init__(self, *, id: str, display_name: str, versions, **kwargs) -> None: + super(ApplicationSummary, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.versions = versions diff --git a/azure-batch/azure/batch/models/authentication_token_settings.py b/azure-batch/azure/batch/models/authentication_token_settings.py index 22d4bd0b0525..fd05e87bf82c 100644 --- a/azure-batch/azure/batch/models/authentication_token_settings.py +++ b/azure-batch/azure/batch/models/authentication_token_settings.py @@ -28,6 +28,6 @@ class AuthenticationTokenSettings(Model): 'access': {'key': 'access', 'type': '[AccessScope]'}, } - def __init__(self, access=None): - super(AuthenticationTokenSettings, self).__init__() - self.access = access + def __init__(self, **kwargs): + super(AuthenticationTokenSettings, self).__init__(**kwargs) + self.access = kwargs.get('access', None) diff --git a/azure-batch/azure/batch/models/authentication_token_settings_py3.py b/azure-batch/azure/batch/models/authentication_token_settings_py3.py new file mode 100644 index 000000000000..23dde60ca771 --- /dev/null +++ b/azure-batch/azure/batch/models/authentication_token_settings_py3.py @@ -0,0 +1,33 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AuthenticationTokenSettings(Model): + """The settings for an authentication token that the task can use to perform + Batch service operations. + + :param access: The Batch resources to which the token grants access. The + authentication token grants access to a limited set of Batch service + operations. Currently the only supported value for the access property is + 'job', which grants access to all operations related to the job which + contains the task. + :type access: list[str or ~azure.batch.models.AccessScope] + """ + + _attribute_map = { + 'access': {'key': 'access', 'type': '[AccessScope]'}, + } + + def __init__(self, *, access=None, **kwargs) -> None: + super(AuthenticationTokenSettings, self).__init__(**kwargs) + self.access = access diff --git a/azure-batch/azure/batch/models/auto_pool_specification.py b/azure-batch/azure/batch/models/auto_pool_specification.py index 2fde2b2e55d0..7383a65a5f78 100644 --- a/azure-batch/azure/batch/models/auto_pool_specification.py +++ b/azure-batch/azure/batch/models/auto_pool_specification.py @@ -16,15 +16,17 @@ class AutoPoolSpecification(Model): """Specifies characteristics for a temporary 'auto pool'. The Batch service will create this auto pool when the job is submitted. + All required parameters must be populated in order to send to Azure. + :param auto_pool_id_prefix: A prefix to be added to the unique identifier when a pool is automatically created. The Batch service assigns each auto pool a unique identifier on creation. To distinguish between pools created for different purposes, you can specify this element to add a prefix to the ID that is assigned. The prefix can be up to 20 characters long. :type auto_pool_id_prefix: str - :param pool_lifetime_option: The minimum lifetime of created auto pools, - and how multiple jobs on a schedule are assigned to pools. Possible values - include: 'jobSchedule', 'job' + :param pool_lifetime_option: Required. The minimum lifetime of created + auto pools, and how multiple jobs on a schedule are assigned to pools. + Possible values include: 'jobSchedule', 'job' :type pool_lifetime_option: str or ~azure.batch.models.PoolLifetimeOption :param keep_alive: Whether to keep an auto pool alive after its lifetime expires. If false, the Batch service deletes the pool once its lifetime @@ -48,9 +50,9 @@ class AutoPoolSpecification(Model): 'pool': {'key': 'pool', 'type': 'PoolSpecification'}, } - def __init__(self, pool_lifetime_option, auto_pool_id_prefix=None, keep_alive=None, pool=None): - super(AutoPoolSpecification, self).__init__() - self.auto_pool_id_prefix = auto_pool_id_prefix - self.pool_lifetime_option = pool_lifetime_option - self.keep_alive = keep_alive - self.pool = pool + def __init__(self, **kwargs): + super(AutoPoolSpecification, self).__init__(**kwargs) + self.auto_pool_id_prefix = kwargs.get('auto_pool_id_prefix', None) + self.pool_lifetime_option = kwargs.get('pool_lifetime_option', None) + self.keep_alive = kwargs.get('keep_alive', None) + self.pool = kwargs.get('pool', None) diff --git a/azure-batch/azure/batch/models/auto_pool_specification_py3.py b/azure-batch/azure/batch/models/auto_pool_specification_py3.py new file mode 100644 index 000000000000..4b07e831afa1 --- /dev/null +++ b/azure-batch/azure/batch/models/auto_pool_specification_py3.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AutoPoolSpecification(Model): + """Specifies characteristics for a temporary 'auto pool'. The Batch service + will create this auto pool when the job is submitted. + + All required parameters must be populated in order to send to Azure. + + :param auto_pool_id_prefix: A prefix to be added to the unique identifier + when a pool is automatically created. The Batch service assigns each auto + pool a unique identifier on creation. To distinguish between pools created + for different purposes, you can specify this element to add a prefix to + the ID that is assigned. The prefix can be up to 20 characters long. + :type auto_pool_id_prefix: str + :param pool_lifetime_option: Required. The minimum lifetime of created + auto pools, and how multiple jobs on a schedule are assigned to pools. + Possible values include: 'jobSchedule', 'job' + :type pool_lifetime_option: str or ~azure.batch.models.PoolLifetimeOption + :param keep_alive: Whether to keep an auto pool alive after its lifetime + expires. If false, the Batch service deletes the pool once its lifetime + (as determined by the poolLifetimeOption setting) expires; that is, when + the job or job schedule completes. If true, the Batch service does not + delete the pool automatically. It is up to the user to delete auto pools + created with this option. + :type keep_alive: bool + :param pool: The pool specification for the auto pool. + :type pool: ~azure.batch.models.PoolSpecification + """ + + _validation = { + 'pool_lifetime_option': {'required': True}, + } + + _attribute_map = { + 'auto_pool_id_prefix': {'key': 'autoPoolIdPrefix', 'type': 'str'}, + 'pool_lifetime_option': {'key': 'poolLifetimeOption', 'type': 'PoolLifetimeOption'}, + 'keep_alive': {'key': 'keepAlive', 'type': 'bool'}, + 'pool': {'key': 'pool', 'type': 'PoolSpecification'}, + } + + def __init__(self, *, pool_lifetime_option, auto_pool_id_prefix: str=None, keep_alive: bool=None, pool=None, **kwargs) -> None: + super(AutoPoolSpecification, self).__init__(**kwargs) + self.auto_pool_id_prefix = auto_pool_id_prefix + self.pool_lifetime_option = pool_lifetime_option + self.keep_alive = keep_alive + self.pool = pool diff --git a/azure-batch/azure/batch/models/auto_scale_run.py b/azure-batch/azure/batch/models/auto_scale_run.py index 49ab7487f00f..06b0d4fef216 100644 --- a/azure-batch/azure/batch/models/auto_scale_run.py +++ b/azure-batch/azure/batch/models/auto_scale_run.py @@ -15,8 +15,10 @@ class AutoScaleRun(Model): """The results and errors from an execution of a pool autoscale formula. - :param timestamp: The time at which the autoscale formula was last - evaluated. + All required parameters must be populated in order to send to Azure. + + :param timestamp: Required. The time at which the autoscale formula was + last evaluated. :type timestamp: datetime :param results: The final values of all variables used in the evaluation of the autoscale formula. Each variable value is returned in the form @@ -37,8 +39,8 @@ class AutoScaleRun(Model): 'error': {'key': 'error', 'type': 'AutoScaleRunError'}, } - def __init__(self, timestamp, results=None, error=None): - super(AutoScaleRun, self).__init__() - self.timestamp = timestamp - self.results = results - self.error = error + def __init__(self, **kwargs): + super(AutoScaleRun, self).__init__(**kwargs) + self.timestamp = kwargs.get('timestamp', None) + self.results = kwargs.get('results', None) + self.error = kwargs.get('error', None) diff --git a/azure-batch/azure/batch/models/auto_scale_run_error.py b/azure-batch/azure/batch/models/auto_scale_run_error.py index 92f766150652..d0d7b1631076 100644 --- a/azure-batch/azure/batch/models/auto_scale_run_error.py +++ b/azure-batch/azure/batch/models/auto_scale_run_error.py @@ -33,8 +33,8 @@ class AutoScaleRunError(Model): 'values': {'key': 'values', 'type': '[NameValuePair]'}, } - def __init__(self, code=None, message=None, values=None): - super(AutoScaleRunError, self).__init__() - self.code = code - self.message = message - self.values = values + def __init__(self, **kwargs): + super(AutoScaleRunError, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) + self.values = kwargs.get('values', None) diff --git a/azure-batch/azure/batch/models/auto_scale_run_error_py3.py b/azure-batch/azure/batch/models/auto_scale_run_error_py3.py new file mode 100644 index 000000000000..8ffa9805d52d --- /dev/null +++ b/azure-batch/azure/batch/models/auto_scale_run_error_py3.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AutoScaleRunError(Model): + """An error that occurred when executing or evaluating a pool autoscale + formula. + + :param code: An identifier for the autoscale error. Codes are invariant + and are intended to be consumed programmatically. + :type code: str + :param message: A message describing the autoscale error, intended to be + suitable for display in a user interface. + :type message: str + :param values: A list of additional error details related to the autoscale + error. + :type values: list[~azure.batch.models.NameValuePair] + """ + + _attribute_map = { + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + 'values': {'key': 'values', 'type': '[NameValuePair]'}, + } + + def __init__(self, *, code: str=None, message: str=None, values=None, **kwargs) -> None: + super(AutoScaleRunError, self).__init__(**kwargs) + self.code = code + self.message = message + self.values = values diff --git a/azure-batch/azure/batch/models/auto_scale_run_py3.py b/azure-batch/azure/batch/models/auto_scale_run_py3.py new file mode 100644 index 000000000000..9f58e936bacc --- /dev/null +++ b/azure-batch/azure/batch/models/auto_scale_run_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AutoScaleRun(Model): + """The results and errors from an execution of a pool autoscale formula. + + All required parameters must be populated in order to send to Azure. + + :param timestamp: Required. The time at which the autoscale formula was + last evaluated. + :type timestamp: datetime + :param results: The final values of all variables used in the evaluation + of the autoscale formula. Each variable value is returned in the form + $variable=value, and variables are separated by semicolons. + :type results: str + :param error: Details of the error encountered evaluating the autoscale + formula on the pool, if the evaluation was unsuccessful. + :type error: ~azure.batch.models.AutoScaleRunError + """ + + _validation = { + 'timestamp': {'required': True}, + } + + _attribute_map = { + 'timestamp': {'key': 'timestamp', 'type': 'iso-8601'}, + 'results': {'key': 'results', 'type': 'str'}, + 'error': {'key': 'error', 'type': 'AutoScaleRunError'}, + } + + def __init__(self, *, timestamp, results: str=None, error=None, **kwargs) -> None: + super(AutoScaleRun, self).__init__(**kwargs) + self.timestamp = timestamp + self.results = results + self.error = error diff --git a/azure-batch/azure/batch/models/auto_user_specification.py b/azure-batch/azure/batch/models/auto_user_specification.py index c211e5fd2d66..60127c74cafe 100644 --- a/azure-batch/azure/batch/models/auto_user_specification.py +++ b/azure-batch/azure/batch/models/auto_user_specification.py @@ -29,7 +29,7 @@ class AutoUserSpecification(Model): 'elevation_level': {'key': 'elevationLevel', 'type': 'ElevationLevel'}, } - def __init__(self, scope=None, elevation_level=None): - super(AutoUserSpecification, self).__init__() - self.scope = scope - self.elevation_level = elevation_level + def __init__(self, **kwargs): + super(AutoUserSpecification, self).__init__(**kwargs) + self.scope = kwargs.get('scope', None) + self.elevation_level = kwargs.get('elevation_level', None) diff --git a/azure-batch/azure/batch/models/auto_user_specification_py3.py b/azure-batch/azure/batch/models/auto_user_specification_py3.py new file mode 100644 index 000000000000..bc590d2cea96 --- /dev/null +++ b/azure-batch/azure/batch/models/auto_user_specification_py3.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class AutoUserSpecification(Model): + """Specifies the parameters for the auto user that runs a task on the Batch + service. + + :param scope: The scope for the auto user. The default value is task. + Possible values include: 'task', 'pool' + :type scope: str or ~azure.batch.models.AutoUserScope + :param elevation_level: The elevation level of the auto user. The default + value is nonAdmin. Possible values include: 'nonAdmin', 'admin' + :type elevation_level: str or ~azure.batch.models.ElevationLevel + """ + + _attribute_map = { + 'scope': {'key': 'scope', 'type': 'AutoUserScope'}, + 'elevation_level': {'key': 'elevationLevel', 'type': 'ElevationLevel'}, + } + + def __init__(self, *, scope=None, elevation_level=None, **kwargs) -> None: + super(AutoUserSpecification, self).__init__(**kwargs) + self.scope = scope + self.elevation_level = elevation_level diff --git a/azure-batch/azure/batch/models/batch_error.py b/azure-batch/azure/batch/models/batch_error.py index e96a5aaf91f9..3857ac960880 100644 --- a/azure-batch/azure/batch/models/batch_error.py +++ b/azure-batch/azure/batch/models/batch_error.py @@ -33,11 +33,11 @@ class BatchError(Model): 'values': {'key': 'values', 'type': '[BatchErrorDetail]'}, } - def __init__(self, code=None, message=None, values=None): - super(BatchError, self).__init__() - self.code = code - self.message = message - self.values = values + def __init__(self, **kwargs): + super(BatchError, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) + self.values = kwargs.get('values', None) class BatchErrorException(HttpOperationError): diff --git a/azure-batch/azure/batch/models/batch_error_detail.py b/azure-batch/azure/batch/models/batch_error_detail.py index 91f5ac2abe27..a892678ce2f7 100644 --- a/azure-batch/azure/batch/models/batch_error_detail.py +++ b/azure-batch/azure/batch/models/batch_error_detail.py @@ -27,7 +27,7 @@ class BatchErrorDetail(Model): 'value': {'key': 'value', 'type': 'str'}, } - def __init__(self, key=None, value=None): - super(BatchErrorDetail, self).__init__() - self.key = key - self.value = value + def __init__(self, **kwargs): + super(BatchErrorDetail, self).__init__(**kwargs) + self.key = kwargs.get('key', None) + self.value = kwargs.get('value', None) diff --git a/azure-batch/azure/batch/models/batch_error_detail_py3.py b/azure-batch/azure/batch/models/batch_error_detail_py3.py new file mode 100644 index 000000000000..8aa8a85bc0d6 --- /dev/null +++ b/azure-batch/azure/batch/models/batch_error_detail_py3.py @@ -0,0 +1,33 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class BatchErrorDetail(Model): + """An item of additional information included in an Azure Batch error + response. + + :param key: An identifier specifying the meaning of the Value property. + :type key: str + :param value: The additional information included with the error response. + :type value: str + """ + + _attribute_map = { + 'key': {'key': 'key', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, *, key: str=None, value: str=None, **kwargs) -> None: + super(BatchErrorDetail, self).__init__(**kwargs) + self.key = key + self.value = value diff --git a/azure-batch/azure/batch/models/batch_error_py3.py b/azure-batch/azure/batch/models/batch_error_py3.py new file mode 100644 index 000000000000..a6e49569fd10 --- /dev/null +++ b/azure-batch/azure/batch/models/batch_error_py3.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model +from msrest.exceptions import HttpOperationError + + +class BatchError(Model): + """An error response received from the Azure Batch service. + + :param code: An identifier for the error. Codes are invariant and are + intended to be consumed programmatically. + :type code: str + :param message: A message describing the error, intended to be suitable + for display in a user interface. + :type message: ~azure.batch.models.ErrorMessage + :param values: A collection of key-value pairs containing additional + details about the error. + :type values: list[~azure.batch.models.BatchErrorDetail] + """ + + _attribute_map = { + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'ErrorMessage'}, + 'values': {'key': 'values', 'type': '[BatchErrorDetail]'}, + } + + def __init__(self, *, code: str=None, message=None, values=None, **kwargs) -> None: + super(BatchError, self).__init__(**kwargs) + self.code = code + self.message = message + self.values = values + + +class BatchErrorException(HttpOperationError): + """Server responsed with exception of type: 'BatchError'. + + :param deserialize: A deserializer + :param response: Server response to be deserialized. + """ + + def __init__(self, deserialize, response, *args): + + super(BatchErrorException, self).__init__(deserialize, response, 'BatchError', *args) diff --git a/azure-batch/azure/batch/models/batch_service_client_enums.py b/azure-batch/azure/batch/models/batch_service_client_enums.py index 4a55803fa08c..c2775616ecb6 100644 --- a/azure-batch/azure/batch/models/batch_service_client_enums.py +++ b/azure-batch/azure/batch/models/batch_service_client_enums.py @@ -12,125 +12,125 @@ from enum import Enum -class OSType(Enum): +class OSType(str, Enum): linux = "linux" #: The Linux operating system. windows = "windows" #: The Windows operating system. -class AccessScope(Enum): +class AccessScope(str, Enum): job = "job" #: Grants access to perform all operations on the job containing the task. -class CertificateState(Enum): +class CertificateState(str, Enum): active = "active" #: The certificate is available for use in pools. deleting = "deleting" #: The user has requested that the certificate be deleted, but the delete operation has not yet completed. You may not reference the certificate when creating or updating pools. delete_failed = "deletefailed" #: The user requested that the certificate be deleted, but there are pools that still have references to the certificate, or it is still installed on one or more compute nodes. (The latter can occur if the certificate has been removed from the pool, but the node has not yet restarted. Nodes refresh their certificates only when they restart.) You may use the cancel certificate delete operation to cancel the delete, or the delete certificate operation to retry the delete. -class CertificateFormat(Enum): +class CertificateFormat(str, Enum): pfx = "pfx" #: The certificate is a PFX (PKCS#12) formatted certificate or certificate chain. cer = "cer" #: The certificate is a base64-encoded X.509 certificate. -class JobAction(Enum): +class JobAction(str, Enum): none = "none" #: Take no action. disable = "disable" #: Disable the job. This is equivalent to calling the disable job API, with a disableTasks value of requeue. terminate = "terminate" #: Terminate the job. The terminateReason in the job's executionInfo is set to "TaskFailed". -class DependencyAction(Enum): +class DependencyAction(str, Enum): satisfy = "satisfy" #: Satisfy the task's dependencies. block = "block" #: Block the task's dependencies. -class AutoUserScope(Enum): +class AutoUserScope(str, Enum): task = "task" #: Specifies that the service should create a new user for the task. pool = "pool" #: Specifies that the task runs as the common auto user account which is created on every node in a pool. -class ElevationLevel(Enum): +class ElevationLevel(str, Enum): non_admin = "nonadmin" #: The user is a standard user without elevated access. admin = "admin" #: The user is a user with elevated access and operates with full Administrator permissions. -class OutputFileUploadCondition(Enum): +class OutputFileUploadCondition(str, Enum): task_success = "tasksuccess" #: Upload the file(s) only after the task process exits with an exit code of 0. task_failure = "taskfailure" #: Upload the file(s) only after the task process exits with a nonzero exit code. task_completion = "taskcompletion" #: Upload the file(s) after the task process exits, no matter what the exit code was. -class ComputeNodeFillType(Enum): +class ComputeNodeFillType(str, Enum): spread = "spread" #: Tasks should be assigned evenly across all nodes in the pool. pack = "pack" #: As many tasks as possible (maxTasksPerNode) should be assigned to each node in the pool before any tasks are assigned to the next node in the pool. -class CertificateStoreLocation(Enum): +class CertificateStoreLocation(str, Enum): current_user = "currentuser" #: Certificates should be installed to the CurrentUser certificate store. local_machine = "localmachine" #: Certificates should be installed to the LocalMachine certificate store. -class CertificateVisibility(Enum): +class CertificateVisibility(str, Enum): start_task = "starttask" #: The certificate should be visible to the user account under which the start task is run. task = "task" #: The certificate should be visibile to the user accounts under which job tasks are run. remote_user = "remoteuser" #: The certificate should be visibile to the user accounts under which users remotely access the node. -class CachingType(Enum): +class CachingType(str, Enum): none = "none" #: The caching mode for the disk is not enabled. read_only = "readonly" #: The caching mode for the disk is read only. read_write = "readwrite" #: The caching mode for the disk is read and write. -class StorageAccountType(Enum): +class StorageAccountType(str, Enum): standard_lrs = "standard_lrs" #: The data disk should use standard locally redundant storage. premium_lrs = "premium_lrs" #: The data disk should use premium locally redundant storage. -class InboundEndpointProtocol(Enum): +class InboundEndpointProtocol(str, Enum): tcp = "tcp" #: Use TCP for the endpoint. udp = "udp" #: Use UDP for the endpoint. -class NetworkSecurityGroupRuleAccess(Enum): +class NetworkSecurityGroupRuleAccess(str, Enum): allow = "allow" #: Allow access. deny = "deny" #: Deny access. -class PoolLifetimeOption(Enum): +class PoolLifetimeOption(str, Enum): job_schedule = "jobschedule" #: The pool exists for the lifetime of the job schedule. The Batch Service creates the pool when it creates the first job on the schedule. You may apply this option only to job schedules, not to jobs. job = "job" #: The pool exists for the lifetime of the job to which it is dedicated. The Batch service creates the pool when it creates the job. If the 'job' option is applied to a job schedule, the Batch service creates a new auto pool for every job created on the schedule. -class OnAllTasksComplete(Enum): +class OnAllTasksComplete(str, Enum): no_action = "noaction" #: Do nothing. The job remains active unless terminated or disabled by some other means. terminate_job = "terminatejob" #: Terminate the job. The job's terminateReason is set to 'AllTasksComplete'. -class OnTaskFailure(Enum): +class OnTaskFailure(str, Enum): no_action = "noaction" #: Do nothing. The job remains active unless terminated or disabled by some other means. perform_exit_options_job_action = "performexitoptionsjobaction" #: Take the action associated with the task exit condition in the task's exitConditions collection. (This may still result in no action being taken, if that is what the task specifies.) -class JobScheduleState(Enum): +class JobScheduleState(str, Enum): active = "active" #: The job schedule is active and will create jobs as per its schedule. completed = "completed" #: The schedule has terminated, either by reaching its end time or by the user terminating it explicitly. @@ -139,13 +139,13 @@ class JobScheduleState(Enum): deleting = "deleting" #: The user has requested that the schedule be deleted, but the delete operation is still in progress. The scheduler will not initiate any new jobs for this schedule, and will delete any existing jobs and tasks under the schedule, including any active job. The schedule will be deleted when all jobs and tasks under the schedule have been deleted. -class ErrorCategory(Enum): +class ErrorCategory(str, Enum): user_error = "usererror" #: The error is due to a user issue, such as misconfiguration. server_error = "servererror" #: The error is due to an internal server issue. -class JobState(Enum): +class JobState(str, Enum): active = "active" #: The job is available to have tasks scheduled. disabling = "disabling" #: A user has requested that the job be disabled, but the disable operation is still in progress (for example, waiting for tasks to terminate). @@ -156,45 +156,39 @@ class JobState(Enum): deleting = "deleting" #: A user has requested that the job be deleted, but the delete operation is still in progress (for example, because the system is still terminating running tasks). -class JobPreparationTaskState(Enum): +class JobPreparationTaskState(str, Enum): running = "running" #: The task is currently running (including retrying). completed = "completed" #: The task has exited with exit code 0, or the task has exhausted its retry limit, or the Batch service was unable to start the task due to task preparation errors (such as resource file download failures). -class TaskExecutionResult(Enum): +class TaskExecutionResult(str, Enum): success = "success" #: The task ran successfully. failure = "failure" #: There was an error during processing of the task. The failure may have occurred before the task process was launched, while the task process was executing, or after the task process exited. -class JobReleaseTaskState(Enum): +class JobReleaseTaskState(str, Enum): running = "running" #: The task is currently running (including retrying). completed = "completed" #: The task has exited with exit code 0, or the task has exhausted its retry limit, or the Batch service was unable to start the task due to task preparation errors (such as resource file download failures). -class TaskCountValidationStatus(Enum): - - validated = "validated" #: The Batch service has validated the state counts against the task states as reported in the List Tasks API. - unvalidated = "unvalidated" #: The Batch service has not been able to check state counts against the task states as reported in the List Tasks API. The validationStatus may be unvalidated if the job contains more than 200,000 tasks. - - -class PoolState(Enum): +class PoolState(str, Enum): active = "active" #: The pool is available to run tasks subject to the availability of compute nodes. deleting = "deleting" #: The user has requested that the pool be deleted, but the delete operation has not yet completed. upgrading = "upgrading" #: The user has requested that the operating system of the pool's nodes be upgraded, but the upgrade operation has not yet completed (that is, some nodes in the pool have not yet been upgraded). While upgrading, the pool may be able to run tasks (with reduced capacity) but this is not guaranteed. -class AllocationState(Enum): +class AllocationState(str, Enum): steady = "steady" #: The pool is not resizing. There are no changes to the number of nodes in the pool in progress. A pool enters this state when it is created and when no operations are being performed on the pool to change the number of nodes. resizing = "resizing" #: The pool is resizing; that is, compute nodes are being added to or removed from the pool. stopping = "stopping" #: The pool was resizing, but the user has requested that the resize be stopped, but the stop request has not yet been completed. -class TaskState(Enum): +class TaskState(str, Enum): active = "active" #: The task is queued and able to run, but is not currently assigned to a compute node. A task enters this state when it is created, when it is enabled after being disabled, or when it is awaiting a retry after a failed run. preparing = "preparing" #: The task has been assigned to a compute node, but is waiting for a required Job Preparation task to complete on the node. If the Job Preparation task succeeds, the task will move to running. If the Job Preparation task fails, the task will return to active and will be eligible to be assigned to a different node. @@ -202,27 +196,27 @@ class TaskState(Enum): completed = "completed" #: The task is no longer eligible to run, usually because the task has finished successfully, or the task has finished unsuccessfully and has exhausted its retry limit. A task is also marked as completed if an error occurred launching the task, or when the task has been terminated. -class TaskAddStatus(Enum): +class TaskAddStatus(str, Enum): success = "success" #: The task was added successfully. client_error = "clienterror" #: The task failed to add due to a client error and should not be retried without modifying the request as appropriate. server_error = "servererror" #: Task failed to add due to a server error and can be retried without modification. -class SubtaskState(Enum): +class SubtaskState(str, Enum): preparing = "preparing" #: The task has been assigned to a compute node, but is waiting for a required Job Preparation task to complete on the node. If the Job Preparation task succeeds, the task will move to running. If the Job Preparation task fails, the task will return to active and will be eligible to be assigned to a different node. running = "running" #: The task is running on a compute node. This includes task-level preparation such as downloading resource files or deploying application packages specified on the task - it does not necessarily mean that the task command line has started executing. completed = "completed" #: The task is no longer eligible to run, usually because the task has finished successfully, or the task has finished unsuccessfully and has exhausted its retry limit. A task is also marked as completed if an error occurred launching the task, or when the task has been terminated. -class StartTaskState(Enum): +class StartTaskState(str, Enum): running = "running" #: The start task is currently running. completed = "completed" #: The start task has exited with exit code 0, or the start task has failed and the retry limit has reached, or the start task process did not run due to task preparation errors (such as resource file download failures). -class ComputeNodeState(Enum): +class ComputeNodeState(str, Enum): idle = "idle" #: The node is not currently running a task. rebooting = "rebooting" #: The node is rebooting. @@ -239,20 +233,20 @@ class ComputeNodeState(Enum): preempted = "preempted" #: The low-priority node has been preempted. Tasks which were running on the node when it was pre-empted will be rescheduled when another node becomes available. -class SchedulingState(Enum): +class SchedulingState(str, Enum): enabled = "enabled" #: Tasks can be scheduled on the node. disabled = "disabled" #: No new tasks will be scheduled on the node. Tasks already running on the node may still run to completion. All nodes start with scheduling enabled. -class DisableJobOption(Enum): +class DisableJobOption(str, Enum): requeue = "requeue" #: Terminate running tasks and requeue them. The tasks will run again when the job is enabled. terminate = "terminate" #: Terminate running tasks. The tasks will be completed with failureInfo indicating that they were terminated, and will not run again. wait = "wait" #: Allow currently running tasks to complete. -class ComputeNodeDeallocationOption(Enum): +class ComputeNodeDeallocationOption(str, Enum): requeue = "requeue" #: Terminate running task processes and requeue the tasks. The tasks will run again when a node is available. Remove nodes as soon as tasks have been terminated. terminate = "terminate" #: Terminate running tasks. The tasks will be completed with failureInfo indicating that they were terminated, and will not run again. Remove nodes as soon as tasks have been terminated. @@ -260,7 +254,7 @@ class ComputeNodeDeallocationOption(Enum): retained_data = "retaineddata" #: Allow currently running tasks to complete, then wait for all task data retention periods to expire. Schedule no new tasks while waiting. Remove nodes when all task retention periods have expired. -class ComputeNodeRebootOption(Enum): +class ComputeNodeRebootOption(str, Enum): requeue = "requeue" #: Terminate running task processes and requeue the tasks. The tasks will run again when a node is available. Restart the node as soon as tasks have been terminated. terminate = "terminate" #: Terminate running tasks. The tasks will be completed with failureInfo indicating that they were terminated, and will not run again. Restart the node as soon as tasks have been terminated. @@ -268,7 +262,7 @@ class ComputeNodeRebootOption(Enum): retained_data = "retaineddata" #: Allow currently running tasks to complete, then wait for all task data retention periods to expire. Schedule no new tasks while waiting. Restart the node when all task retention periods have expired. -class ComputeNodeReimageOption(Enum): +class ComputeNodeReimageOption(str, Enum): requeue = "requeue" #: Terminate running task processes and requeue the tasks. The tasks will run again when a node is available. Reimage the node as soon as tasks have been terminated. terminate = "terminate" #: Terminate running tasks. The tasks will be completed with failureInfo indicating that they were terminated, and will not run again. Reimage the node as soon as tasks have been terminated. @@ -276,7 +270,7 @@ class ComputeNodeReimageOption(Enum): retained_data = "retaineddata" #: Allow currently running tasks to complete, then wait for all task data retention periods to expire. Schedule no new tasks while waiting. Reimage the node when all task retention periods have expired. -class DisableComputeNodeSchedulingOption(Enum): +class DisableComputeNodeSchedulingOption(str, Enum): requeue = "requeue" #: Terminate running task processes and requeue the tasks. The tasks may run again on other compute nodes, or when task scheduling is re-enabled on this node. Enter offline state as soon as tasks have been terminated. terminate = "terminate" #: Terminate running tasks. The tasks will be completed with failureInfo indicating that they were terminated, and will not run again. Enter offline state as soon as tasks have been terminated. diff --git a/azure-batch/azure/batch/models/certificate.py b/azure-batch/azure/batch/models/certificate.py index bc846599f802..e44c3f85ac6a 100644 --- a/azure-batch/azure/batch/models/certificate.py +++ b/azure-batch/azure/batch/models/certificate.py @@ -58,14 +58,14 @@ class Certificate(Model): 'delete_certificate_error': {'key': 'deleteCertificateError', 'type': 'DeleteCertificateError'}, } - def __init__(self, thumbprint=None, thumbprint_algorithm=None, url=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, public_data=None, delete_certificate_error=None): - super(Certificate, self).__init__() - self.thumbprint = thumbprint - self.thumbprint_algorithm = thumbprint_algorithm - self.url = url - self.state = state - self.state_transition_time = state_transition_time - self.previous_state = previous_state - self.previous_state_transition_time = previous_state_transition_time - self.public_data = public_data - self.delete_certificate_error = delete_certificate_error + def __init__(self, **kwargs): + super(Certificate, self).__init__(**kwargs) + self.thumbprint = kwargs.get('thumbprint', None) + self.thumbprint_algorithm = kwargs.get('thumbprint_algorithm', None) + self.url = kwargs.get('url', None) + self.state = kwargs.get('state', None) + self.state_transition_time = kwargs.get('state_transition_time', None) + self.previous_state = kwargs.get('previous_state', None) + self.previous_state_transition_time = kwargs.get('previous_state_transition_time', None) + self.public_data = kwargs.get('public_data', None) + self.delete_certificate_error = kwargs.get('delete_certificate_error', None) diff --git a/azure-batch/azure/batch/models/certificate_add_options.py b/azure-batch/azure/batch/models/certificate_add_options.py index de7ad03c9480..f2c8d5bbe9af 100644 --- a/azure-batch/azure/batch/models/certificate_add_options.py +++ b/azure-batch/azure/batch/models/certificate_add_options.py @@ -31,9 +31,16 @@ class CertificateAddOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(CertificateAddOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(CertificateAddOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/certificate_add_options_py3.py b/azure-batch/azure/batch/models/certificate_add_options_py3.py new file mode 100644 index 000000000000..c7d61b365e8a --- /dev/null +++ b/azure-batch/azure/batch/models/certificate_add_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CertificateAddOptions(Model): + """Additional parameters for add operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(CertificateAddOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/certificate_add_parameter.py b/azure-batch/azure/batch/models/certificate_add_parameter.py index 305e32912e8f..809efd6602d1 100644 --- a/azure-batch/azure/batch/models/certificate_add_parameter.py +++ b/azure-batch/azure/batch/models/certificate_add_parameter.py @@ -16,15 +16,17 @@ class CertificateAddParameter(Model): """A certificate that can be installed on compute nodes and can be used to authenticate operations on the machine. - :param thumbprint: The X.509 thumbprint of the certificate. This is a - sequence of up to 40 hex digits (it may include spaces but these are + All required parameters must be populated in order to send to Azure. + + :param thumbprint: Required. The X.509 thumbprint of the certificate. This + is a sequence of up to 40 hex digits (it may include spaces but these are removed). :type thumbprint: str - :param thumbprint_algorithm: The algorithm used to derive the thumbprint. - This must be sha1. + :param thumbprint_algorithm: Required. The algorithm used to derive the + thumbprint. This must be sha1. :type thumbprint_algorithm: str - :param data: The base64-encoded contents of the certificate. The maximum - size is 10KB. + :param data: Required. The base64-encoded contents of the certificate. The + maximum size is 10KB. :type data: str :param certificate_format: The format of the certificate data. Possible values include: 'pfx', 'cer' @@ -49,10 +51,10 @@ class CertificateAddParameter(Model): 'password': {'key': 'password', 'type': 'str'}, } - def __init__(self, thumbprint, thumbprint_algorithm, data, certificate_format=None, password=None): - super(CertificateAddParameter, self).__init__() - self.thumbprint = thumbprint - self.thumbprint_algorithm = thumbprint_algorithm - self.data = data - self.certificate_format = certificate_format - self.password = password + def __init__(self, **kwargs): + super(CertificateAddParameter, self).__init__(**kwargs) + self.thumbprint = kwargs.get('thumbprint', None) + self.thumbprint_algorithm = kwargs.get('thumbprint_algorithm', None) + self.data = kwargs.get('data', None) + self.certificate_format = kwargs.get('certificate_format', None) + self.password = kwargs.get('password', None) diff --git a/azure-batch/azure/batch/models/certificate_add_parameter_py3.py b/azure-batch/azure/batch/models/certificate_add_parameter_py3.py new file mode 100644 index 000000000000..2a560b2b1810 --- /dev/null +++ b/azure-batch/azure/batch/models/certificate_add_parameter_py3.py @@ -0,0 +1,60 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CertificateAddParameter(Model): + """A certificate that can be installed on compute nodes and can be used to + authenticate operations on the machine. + + All required parameters must be populated in order to send to Azure. + + :param thumbprint: Required. The X.509 thumbprint of the certificate. This + is a sequence of up to 40 hex digits (it may include spaces but these are + removed). + :type thumbprint: str + :param thumbprint_algorithm: Required. The algorithm used to derive the + thumbprint. This must be sha1. + :type thumbprint_algorithm: str + :param data: Required. The base64-encoded contents of the certificate. The + maximum size is 10KB. + :type data: str + :param certificate_format: The format of the certificate data. Possible + values include: 'pfx', 'cer' + :type certificate_format: str or ~azure.batch.models.CertificateFormat + :param password: The password to access the certificate's private key. + This is required if the certificate format is pfx. It should be omitted if + the certificate format is cer. + :type password: str + """ + + _validation = { + 'thumbprint': {'required': True}, + 'thumbprint_algorithm': {'required': True}, + 'data': {'required': True}, + } + + _attribute_map = { + 'thumbprint': {'key': 'thumbprint', 'type': 'str'}, + 'thumbprint_algorithm': {'key': 'thumbprintAlgorithm', 'type': 'str'}, + 'data': {'key': 'data', 'type': 'str'}, + 'certificate_format': {'key': 'certificateFormat', 'type': 'CertificateFormat'}, + 'password': {'key': 'password', 'type': 'str'}, + } + + def __init__(self, *, thumbprint: str, thumbprint_algorithm: str, data: str, certificate_format=None, password: str=None, **kwargs) -> None: + super(CertificateAddParameter, self).__init__(**kwargs) + self.thumbprint = thumbprint + self.thumbprint_algorithm = thumbprint_algorithm + self.data = data + self.certificate_format = certificate_format + self.password = password diff --git a/azure-batch/azure/batch/models/certificate_cancel_deletion_options.py b/azure-batch/azure/batch/models/certificate_cancel_deletion_options.py index 9ae407b47fe3..5c7c936ca603 100644 --- a/azure-batch/azure/batch/models/certificate_cancel_deletion_options.py +++ b/azure-batch/azure/batch/models/certificate_cancel_deletion_options.py @@ -31,9 +31,16 @@ class CertificateCancelDeletionOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(CertificateCancelDeletionOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(CertificateCancelDeletionOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/certificate_cancel_deletion_options_py3.py b/azure-batch/azure/batch/models/certificate_cancel_deletion_options_py3.py new file mode 100644 index 000000000000..8afbcf2419d9 --- /dev/null +++ b/azure-batch/azure/batch/models/certificate_cancel_deletion_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CertificateCancelDeletionOptions(Model): + """Additional parameters for cancel_deletion operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(CertificateCancelDeletionOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/certificate_delete_options.py b/azure-batch/azure/batch/models/certificate_delete_options.py index 71247ccdd83f..5ff7ee832ac7 100644 --- a/azure-batch/azure/batch/models/certificate_delete_options.py +++ b/azure-batch/azure/batch/models/certificate_delete_options.py @@ -31,9 +31,16 @@ class CertificateDeleteOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(CertificateDeleteOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(CertificateDeleteOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/certificate_delete_options_py3.py b/azure-batch/azure/batch/models/certificate_delete_options_py3.py new file mode 100644 index 000000000000..47f91b10421a --- /dev/null +++ b/azure-batch/azure/batch/models/certificate_delete_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CertificateDeleteOptions(Model): + """Additional parameters for delete operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(CertificateDeleteOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/certificate_get_options.py b/azure-batch/azure/batch/models/certificate_get_options.py index fef7dee344c1..2b474c17c435 100644 --- a/azure-batch/azure/batch/models/certificate_get_options.py +++ b/azure-batch/azure/batch/models/certificate_get_options.py @@ -33,10 +33,18 @@ class CertificateGetOptions(Model): :type ocp_date: datetime """ - def __init__(self, select=None, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(CertificateGetOptions, self).__init__() - self.select = select - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(CertificateGetOptions, self).__init__(**kwargs) + self.select = kwargs.get('select', None) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/certificate_get_options_py3.py b/azure-batch/azure/batch/models/certificate_get_options_py3.py new file mode 100644 index 000000000000..4bd6bb7003ee --- /dev/null +++ b/azure-batch/azure/batch/models/certificate_get_options_py3.py @@ -0,0 +1,50 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CertificateGetOptions(Model): + """Additional parameters for get operation. + + :param select: An OData $select clause. + :type select: str + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, select: str=None, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(CertificateGetOptions, self).__init__(**kwargs) + self.select = select + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/certificate_list_options.py b/azure-batch/azure/batch/models/certificate_list_options.py index 77c102e12ca5..cb3134afdf8c 100644 --- a/azure-batch/azure/batch/models/certificate_list_options.py +++ b/azure-batch/azure/batch/models/certificate_list_options.py @@ -40,12 +40,22 @@ class CertificateListOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, select=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(CertificateListOptions, self).__init__() - self.filter = filter - self.select = select - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(CertificateListOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.select = kwargs.get('select', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/certificate_list_options_py3.py b/azure-batch/azure/batch/models/certificate_list_options_py3.py new file mode 100644 index 000000000000..461b80444208 --- /dev/null +++ b/azure-batch/azure/batch/models/certificate_list_options_py3.py @@ -0,0 +1,61 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CertificateListOptions(Model): + """Additional parameters for list operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-certificates. + :type filter: str + :param select: An OData $select clause. + :type select: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 certificates can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, select: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(CertificateListOptions, self).__init__(**kwargs) + self.filter = filter + self.select = select + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/certificate_py3.py b/azure-batch/azure/batch/models/certificate_py3.py new file mode 100644 index 000000000000..4e0b71c5f8f1 --- /dev/null +++ b/azure-batch/azure/batch/models/certificate_py3.py @@ -0,0 +1,71 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class Certificate(Model): + """A certificate that can be installed on compute nodes and can be used to + authenticate operations on the machine. + + :param thumbprint: The X.509 thumbprint of the certificate. This is a + sequence of up to 40 hex digits. + :type thumbprint: str + :param thumbprint_algorithm: The algorithm used to derive the thumbprint. + :type thumbprint_algorithm: str + :param url: The URL of the certificate. + :type url: str + :param state: The current state of the certificate. Possible values + include: 'active', 'deleting', 'deleteFailed' + :type state: str or ~azure.batch.models.CertificateState + :param state_transition_time: The time at which the certificate entered + its current state. + :type state_transition_time: datetime + :param previous_state: The previous state of the certificate. This + property is not set if the certificate is in its initial active state. + Possible values include: 'active', 'deleting', 'deleteFailed' + :type previous_state: str or ~azure.batch.models.CertificateState + :param previous_state_transition_time: The time at which the certificate + entered its previous state. This property is not set if the certificate is + in its initial Active state. + :type previous_state_transition_time: datetime + :param public_data: The public part of the certificate as a base-64 + encoded .cer file. + :type public_data: str + :param delete_certificate_error: The error that occurred on the last + attempt to delete this certificate. This property is set only if the + certificate is in the DeleteFailed state. + :type delete_certificate_error: ~azure.batch.models.DeleteCertificateError + """ + + _attribute_map = { + 'thumbprint': {'key': 'thumbprint', 'type': 'str'}, + 'thumbprint_algorithm': {'key': 'thumbprintAlgorithm', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'CertificateState'}, + 'state_transition_time': {'key': 'stateTransitionTime', 'type': 'iso-8601'}, + 'previous_state': {'key': 'previousState', 'type': 'CertificateState'}, + 'previous_state_transition_time': {'key': 'previousStateTransitionTime', 'type': 'iso-8601'}, + 'public_data': {'key': 'publicData', 'type': 'str'}, + 'delete_certificate_error': {'key': 'deleteCertificateError', 'type': 'DeleteCertificateError'}, + } + + def __init__(self, *, thumbprint: str=None, thumbprint_algorithm: str=None, url: str=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, public_data: str=None, delete_certificate_error=None, **kwargs) -> None: + super(Certificate, self).__init__(**kwargs) + self.thumbprint = thumbprint + self.thumbprint_algorithm = thumbprint_algorithm + self.url = url + self.state = state + self.state_transition_time = state_transition_time + self.previous_state = previous_state + self.previous_state_transition_time = previous_state_transition_time + self.public_data = public_data + self.delete_certificate_error = delete_certificate_error diff --git a/azure-batch/azure/batch/models/certificate_reference.py b/azure-batch/azure/batch/models/certificate_reference.py index 6d808a5d7b46..976c19086631 100644 --- a/azure-batch/azure/batch/models/certificate_reference.py +++ b/azure-batch/azure/batch/models/certificate_reference.py @@ -15,10 +15,12 @@ class CertificateReference(Model): """A reference to a certificate to be installed on compute nodes in a pool. - :param thumbprint: The thumbprint of the certificate. + All required parameters must be populated in order to send to Azure. + + :param thumbprint: Required. The thumbprint of the certificate. :type thumbprint: str - :param thumbprint_algorithm: The algorithm with which the thumbprint is - associated. This must be sha1. + :param thumbprint_algorithm: Required. The algorithm with which the + thumbprint is associated. This must be sha1. :type thumbprint_algorithm: str :param store_location: The location of the certificate store on the compute node into which to install the certificate. The default value is @@ -59,10 +61,10 @@ class CertificateReference(Model): 'visibility': {'key': 'visibility', 'type': '[CertificateVisibility]'}, } - def __init__(self, thumbprint, thumbprint_algorithm, store_location=None, store_name=None, visibility=None): - super(CertificateReference, self).__init__() - self.thumbprint = thumbprint - self.thumbprint_algorithm = thumbprint_algorithm - self.store_location = store_location - self.store_name = store_name - self.visibility = visibility + def __init__(self, **kwargs): + super(CertificateReference, self).__init__(**kwargs) + self.thumbprint = kwargs.get('thumbprint', None) + self.thumbprint_algorithm = kwargs.get('thumbprint_algorithm', None) + self.store_location = kwargs.get('store_location', None) + self.store_name = kwargs.get('store_name', None) + self.visibility = kwargs.get('visibility', None) diff --git a/azure-batch/azure/batch/models/certificate_reference_py3.py b/azure-batch/azure/batch/models/certificate_reference_py3.py new file mode 100644 index 000000000000..46e52e27581d --- /dev/null +++ b/azure-batch/azure/batch/models/certificate_reference_py3.py @@ -0,0 +1,70 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CertificateReference(Model): + """A reference to a certificate to be installed on compute nodes in a pool. + + All required parameters must be populated in order to send to Azure. + + :param thumbprint: Required. The thumbprint of the certificate. + :type thumbprint: str + :param thumbprint_algorithm: Required. The algorithm with which the + thumbprint is associated. This must be sha1. + :type thumbprint_algorithm: str + :param store_location: The location of the certificate store on the + compute node into which to install the certificate. The default value is + currentuser. This property is applicable only for pools configured with + Windows nodes (that is, created with cloudServiceConfiguration, or with + virtualMachineConfiguration using a Windows image reference). For Linux + compute nodes, the certificates are stored in a directory inside the task + working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is + supplied to the task to query for this location. For certificates with + visibility of 'remoteUser', a 'certs' directory is created in the user's + home directory (e.g., /home/{user-name}/certs) and certificates are placed + in that directory. Possible values include: 'currentUser', 'localMachine' + :type store_location: str or ~azure.batch.models.CertificateStoreLocation + :param store_name: The name of the certificate store on the compute node + into which to install the certificate. This property is applicable only + for pools configured with Windows nodes (that is, created with + cloudServiceConfiguration, or with virtualMachineConfiguration using a + Windows image reference). Common store names include: My, Root, CA, Trust, + Disallowed, TrustedPeople, TrustedPublisher, AuthRoot, AddressBook, but + any custom store name can also be used. The default value is My. + :type store_name: str + :param visibility: Which user accounts on the compute node should have + access to the private data of the certificate. You can specify more than + one visibility in this collection. The default is all accounts. + :type visibility: list[str or ~azure.batch.models.CertificateVisibility] + """ + + _validation = { + 'thumbprint': {'required': True}, + 'thumbprint_algorithm': {'required': True}, + } + + _attribute_map = { + 'thumbprint': {'key': 'thumbprint', 'type': 'str'}, + 'thumbprint_algorithm': {'key': 'thumbprintAlgorithm', 'type': 'str'}, + 'store_location': {'key': 'storeLocation', 'type': 'CertificateStoreLocation'}, + 'store_name': {'key': 'storeName', 'type': 'str'}, + 'visibility': {'key': 'visibility', 'type': '[CertificateVisibility]'}, + } + + def __init__(self, *, thumbprint: str, thumbprint_algorithm: str, store_location=None, store_name: str=None, visibility=None, **kwargs) -> None: + super(CertificateReference, self).__init__(**kwargs) + self.thumbprint = thumbprint + self.thumbprint_algorithm = thumbprint_algorithm + self.store_location = store_location + self.store_name = store_name + self.visibility = visibility diff --git a/azure-batch/azure/batch/models/cloud_job.py b/azure-batch/azure/batch/models/cloud_job.py index c65d96612358..4e6cafbf48d9 100644 --- a/azure-batch/azure/batch/models/cloud_job.py +++ b/azure-batch/azure/batch/models/cloud_job.py @@ -131,28 +131,28 @@ class CloudJob(Model): 'stats': {'key': 'stats', 'type': 'JobStatistics'}, } - def __init__(self, id=None, display_name=None, uses_task_dependencies=None, url=None, e_tag=None, last_modified=None, creation_time=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, priority=None, constraints=None, job_manager_task=None, job_preparation_task=None, job_release_task=None, common_environment_settings=None, pool_info=None, on_all_tasks_complete=None, on_task_failure=None, metadata=None, execution_info=None, stats=None): - super(CloudJob, self).__init__() - self.id = id - self.display_name = display_name - self.uses_task_dependencies = uses_task_dependencies - self.url = url - self.e_tag = e_tag - self.last_modified = last_modified - self.creation_time = creation_time - self.state = state - self.state_transition_time = state_transition_time - self.previous_state = previous_state - self.previous_state_transition_time = previous_state_transition_time - self.priority = priority - self.constraints = constraints - self.job_manager_task = job_manager_task - self.job_preparation_task = job_preparation_task - self.job_release_task = job_release_task - self.common_environment_settings = common_environment_settings - self.pool_info = pool_info - self.on_all_tasks_complete = on_all_tasks_complete - self.on_task_failure = on_task_failure - self.metadata = metadata - self.execution_info = execution_info - self.stats = stats + def __init__(self, **kwargs): + super(CloudJob, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.uses_task_dependencies = kwargs.get('uses_task_dependencies', None) + self.url = kwargs.get('url', None) + self.e_tag = kwargs.get('e_tag', None) + self.last_modified = kwargs.get('last_modified', None) + self.creation_time = kwargs.get('creation_time', None) + self.state = kwargs.get('state', None) + self.state_transition_time = kwargs.get('state_transition_time', None) + self.previous_state = kwargs.get('previous_state', None) + self.previous_state_transition_time = kwargs.get('previous_state_transition_time', None) + self.priority = kwargs.get('priority', None) + self.constraints = kwargs.get('constraints', None) + self.job_manager_task = kwargs.get('job_manager_task', None) + self.job_preparation_task = kwargs.get('job_preparation_task', None) + self.job_release_task = kwargs.get('job_release_task', None) + self.common_environment_settings = kwargs.get('common_environment_settings', None) + self.pool_info = kwargs.get('pool_info', None) + self.on_all_tasks_complete = kwargs.get('on_all_tasks_complete', None) + self.on_task_failure = kwargs.get('on_task_failure', None) + self.metadata = kwargs.get('metadata', None) + self.execution_info = kwargs.get('execution_info', None) + self.stats = kwargs.get('stats', None) diff --git a/azure-batch/azure/batch/models/cloud_job_py3.py b/azure-batch/azure/batch/models/cloud_job_py3.py new file mode 100644 index 000000000000..226cb3bb7cc3 --- /dev/null +++ b/azure-batch/azure/batch/models/cloud_job_py3.py @@ -0,0 +1,158 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CloudJob(Model): + """An Azure Batch job. + + :param id: A string that uniquely identifies the job within the account. + The ID is case-preserving and case-insensitive (that is, you may not have + two IDs within an account that differ only by case). + :type id: str + :param display_name: The display name for the job. + :type display_name: str + :param uses_task_dependencies: Whether tasks in the job can define + dependencies on each other. The default is false. + :type uses_task_dependencies: bool + :param url: The URL of the job. + :type url: str + :param e_tag: The ETag of the job. This is an opaque string. You can use + it to detect whether the job has changed between requests. In particular, + you can be pass the ETag when updating a job to specify that your changes + should take effect only if nobody else has modified the job in the + meantime. + :type e_tag: str + :param last_modified: The last modified time of the job. This is the last + time at which the job level data, such as the job state or priority, + changed. It does not factor in task-level changes such as adding new tasks + or tasks changing state. + :type last_modified: datetime + :param creation_time: The creation time of the job. + :type creation_time: datetime + :param state: The current state of the job. Possible values include: + 'active', 'disabling', 'disabled', 'enabling', 'terminating', 'completed', + 'deleting' + :type state: str or ~azure.batch.models.JobState + :param state_transition_time: The time at which the job entered its + current state. + :type state_transition_time: datetime + :param previous_state: The previous state of the job. This property is not + set if the job is in its initial Active state. Possible values include: + 'active', 'disabling', 'disabled', 'enabling', 'terminating', 'completed', + 'deleting' + :type previous_state: str or ~azure.batch.models.JobState + :param previous_state_transition_time: The time at which the job entered + its previous state. This property is not set if the job is in its initial + Active state. + :type previous_state_transition_time: datetime + :param priority: The priority of the job. Priority values can range from + -1000 to 1000, with -1000 being the lowest priority and 1000 being the + highest priority. The default value is 0. + :type priority: int + :param constraints: The execution constraints for the job. + :type constraints: ~azure.batch.models.JobConstraints + :param job_manager_task: Details of a Job Manager task to be launched when + the job is started. + :type job_manager_task: ~azure.batch.models.JobManagerTask + :param job_preparation_task: The Job Preparation task. The Job Preparation + task is a special task run on each node before any other task of the job. + :type job_preparation_task: ~azure.batch.models.JobPreparationTask + :param job_release_task: The Job Release task. The Job Release task is a + special task run at the end of the job on each node that has run any other + task of the job. + :type job_release_task: ~azure.batch.models.JobReleaseTask + :param common_environment_settings: The list of common environment + variable settings. These environment variables are set for all tasks in + the job (including the Job Manager, Job Preparation and Job Release + tasks). Individual tasks can override an environment setting specified + here by specifying the same setting name with a different value. + :type common_environment_settings: + list[~azure.batch.models.EnvironmentSetting] + :param pool_info: The pool settings associated with the job. + :type pool_info: ~azure.batch.models.PoolInformation + :param on_all_tasks_complete: The action the Batch service should take + when all tasks in the job are in the completed state. The default is + noaction. Possible values include: 'noAction', 'terminateJob' + :type on_all_tasks_complete: str or ~azure.batch.models.OnAllTasksComplete + :param on_task_failure: The action the Batch service should take when any + task in the job fails. A task is considered to have failed if has a + failureInfo. A failureInfo is set if the task completes with a non-zero + exit code after exhausting its retry count, or if there was an error + starting the task, for example due to a resource file download error. The + default is noaction. Possible values include: 'noAction', + 'performExitOptionsJobAction' + :type on_task_failure: str or ~azure.batch.models.OnTaskFailure + :param metadata: A list of name-value pairs associated with the job as + metadata. The Batch service does not assign any meaning to metadata; it is + solely for the use of user code. + :type metadata: list[~azure.batch.models.MetadataItem] + :param execution_info: The execution information for the job. + :type execution_info: ~azure.batch.models.JobExecutionInformation + :param stats: Resource usage statistics for the entire lifetime of the + job. The statistics may not be immediately available. The Batch service + performs periodic roll-up of statistics. The typical delay is about 30 + minutes. + :type stats: ~azure.batch.models.JobStatistics + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'uses_task_dependencies': {'key': 'usesTaskDependencies', 'type': 'bool'}, + 'url': {'key': 'url', 'type': 'str'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, + 'last_modified': {'key': 'lastModified', 'type': 'iso-8601'}, + 'creation_time': {'key': 'creationTime', 'type': 'iso-8601'}, + 'state': {'key': 'state', 'type': 'JobState'}, + 'state_transition_time': {'key': 'stateTransitionTime', 'type': 'iso-8601'}, + 'previous_state': {'key': 'previousState', 'type': 'JobState'}, + 'previous_state_transition_time': {'key': 'previousStateTransitionTime', 'type': 'iso-8601'}, + 'priority': {'key': 'priority', 'type': 'int'}, + 'constraints': {'key': 'constraints', 'type': 'JobConstraints'}, + 'job_manager_task': {'key': 'jobManagerTask', 'type': 'JobManagerTask'}, + 'job_preparation_task': {'key': 'jobPreparationTask', 'type': 'JobPreparationTask'}, + 'job_release_task': {'key': 'jobReleaseTask', 'type': 'JobReleaseTask'}, + 'common_environment_settings': {'key': 'commonEnvironmentSettings', 'type': '[EnvironmentSetting]'}, + 'pool_info': {'key': 'poolInfo', 'type': 'PoolInformation'}, + 'on_all_tasks_complete': {'key': 'onAllTasksComplete', 'type': 'OnAllTasksComplete'}, + 'on_task_failure': {'key': 'onTaskFailure', 'type': 'OnTaskFailure'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + 'execution_info': {'key': 'executionInfo', 'type': 'JobExecutionInformation'}, + 'stats': {'key': 'stats', 'type': 'JobStatistics'}, + } + + def __init__(self, *, id: str=None, display_name: str=None, uses_task_dependencies: bool=None, url: str=None, e_tag: str=None, last_modified=None, creation_time=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, priority: int=None, constraints=None, job_manager_task=None, job_preparation_task=None, job_release_task=None, common_environment_settings=None, pool_info=None, on_all_tasks_complete=None, on_task_failure=None, metadata=None, execution_info=None, stats=None, **kwargs) -> None: + super(CloudJob, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.uses_task_dependencies = uses_task_dependencies + self.url = url + self.e_tag = e_tag + self.last_modified = last_modified + self.creation_time = creation_time + self.state = state + self.state_transition_time = state_transition_time + self.previous_state = previous_state + self.previous_state_transition_time = previous_state_transition_time + self.priority = priority + self.constraints = constraints + self.job_manager_task = job_manager_task + self.job_preparation_task = job_preparation_task + self.job_release_task = job_release_task + self.common_environment_settings = common_environment_settings + self.pool_info = pool_info + self.on_all_tasks_complete = on_all_tasks_complete + self.on_task_failure = on_task_failure + self.metadata = metadata + self.execution_info = execution_info + self.stats = stats diff --git a/azure-batch/azure/batch/models/cloud_job_schedule.py b/azure-batch/azure/batch/models/cloud_job_schedule.py index f72555b7e4d8..1a2a33fda27d 100644 --- a/azure-batch/azure/batch/models/cloud_job_schedule.py +++ b/azure-batch/azure/batch/models/cloud_job_schedule.py @@ -88,20 +88,20 @@ class CloudJobSchedule(Model): 'stats': {'key': 'stats', 'type': 'JobScheduleStatistics'}, } - def __init__(self, id=None, display_name=None, url=None, e_tag=None, last_modified=None, creation_time=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, schedule=None, job_specification=None, execution_info=None, metadata=None, stats=None): - super(CloudJobSchedule, self).__init__() - self.id = id - self.display_name = display_name - self.url = url - self.e_tag = e_tag - self.last_modified = last_modified - self.creation_time = creation_time - self.state = state - self.state_transition_time = state_transition_time - self.previous_state = previous_state - self.previous_state_transition_time = previous_state_transition_time - self.schedule = schedule - self.job_specification = job_specification - self.execution_info = execution_info - self.metadata = metadata - self.stats = stats + def __init__(self, **kwargs): + super(CloudJobSchedule, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.url = kwargs.get('url', None) + self.e_tag = kwargs.get('e_tag', None) + self.last_modified = kwargs.get('last_modified', None) + self.creation_time = kwargs.get('creation_time', None) + self.state = kwargs.get('state', None) + self.state_transition_time = kwargs.get('state_transition_time', None) + self.previous_state = kwargs.get('previous_state', None) + self.previous_state_transition_time = kwargs.get('previous_state_transition_time', None) + self.schedule = kwargs.get('schedule', None) + self.job_specification = kwargs.get('job_specification', None) + self.execution_info = kwargs.get('execution_info', None) + self.metadata = kwargs.get('metadata', None) + self.stats = kwargs.get('stats', None) diff --git a/azure-batch/azure/batch/models/cloud_job_schedule_py3.py b/azure-batch/azure/batch/models/cloud_job_schedule_py3.py new file mode 100644 index 000000000000..1542fe56acbe --- /dev/null +++ b/azure-batch/azure/batch/models/cloud_job_schedule_py3.py @@ -0,0 +1,107 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CloudJobSchedule(Model): + """A job schedule that allows recurring jobs by specifying when to run jobs + and a specification used to create each job. + + :param id: A string that uniquely identifies the schedule within the + account. + :type id: str + :param display_name: The display name for the schedule. + :type display_name: str + :param url: The URL of the job schedule. + :type url: str + :param e_tag: The ETag of the job schedule. This is an opaque string. You + can use it to detect whether the job schedule has changed between + requests. In particular, you can be pass the ETag with an Update Job + Schedule request to specify that your changes should take effect only if + nobody else has modified the schedule in the meantime. + :type e_tag: str + :param last_modified: The last modified time of the job schedule. This is + the last time at which the schedule level data, such as the job + specification or recurrence information, changed. It does not factor in + job-level changes such as new jobs being created or jobs changing state. + :type last_modified: datetime + :param creation_time: The creation time of the job schedule. + :type creation_time: datetime + :param state: The current state of the job schedule. Possible values + include: 'active', 'completed', 'disabled', 'terminating', 'deleting' + :type state: str or ~azure.batch.models.JobScheduleState + :param state_transition_time: The time at which the job schedule entered + the current state. + :type state_transition_time: datetime + :param previous_state: The previous state of the job schedule. This + property is not present if the job schedule is in its initial active + state. Possible values include: 'active', 'completed', 'disabled', + 'terminating', 'deleting' + :type previous_state: str or ~azure.batch.models.JobScheduleState + :param previous_state_transition_time: The time at which the job schedule + entered its previous state. This property is not present if the job + schedule is in its initial active state. + :type previous_state_transition_time: datetime + :param schedule: The schedule according to which jobs will be created. + :type schedule: ~azure.batch.models.Schedule + :param job_specification: The details of the jobs to be created on this + schedule. + :type job_specification: ~azure.batch.models.JobSpecification + :param execution_info: Information about jobs that have been and will be + run under this schedule. + :type execution_info: ~azure.batch.models.JobScheduleExecutionInformation + :param metadata: A list of name-value pairs associated with the schedule + as metadata. The Batch service does not assign any meaning to metadata; it + is solely for the use of user code. + :type metadata: list[~azure.batch.models.MetadataItem] + :param stats: The lifetime resource usage statistics for the job schedule. + The statistics may not be immediately available. The Batch service + performs periodic roll-up of statistics. The typical delay is about 30 + minutes. + :type stats: ~azure.batch.models.JobScheduleStatistics + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, + 'last_modified': {'key': 'lastModified', 'type': 'iso-8601'}, + 'creation_time': {'key': 'creationTime', 'type': 'iso-8601'}, + 'state': {'key': 'state', 'type': 'JobScheduleState'}, + 'state_transition_time': {'key': 'stateTransitionTime', 'type': 'iso-8601'}, + 'previous_state': {'key': 'previousState', 'type': 'JobScheduleState'}, + 'previous_state_transition_time': {'key': 'previousStateTransitionTime', 'type': 'iso-8601'}, + 'schedule': {'key': 'schedule', 'type': 'Schedule'}, + 'job_specification': {'key': 'jobSpecification', 'type': 'JobSpecification'}, + 'execution_info': {'key': 'executionInfo', 'type': 'JobScheduleExecutionInformation'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + 'stats': {'key': 'stats', 'type': 'JobScheduleStatistics'}, + } + + def __init__(self, *, id: str=None, display_name: str=None, url: str=None, e_tag: str=None, last_modified=None, creation_time=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, schedule=None, job_specification=None, execution_info=None, metadata=None, stats=None, **kwargs) -> None: + super(CloudJobSchedule, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.url = url + self.e_tag = e_tag + self.last_modified = last_modified + self.creation_time = creation_time + self.state = state + self.state_transition_time = state_transition_time + self.previous_state = previous_state + self.previous_state_transition_time = previous_state_transition_time + self.schedule = schedule + self.job_specification = job_specification + self.execution_info = execution_info + self.metadata = metadata + self.stats = stats diff --git a/azure-batch/azure/batch/models/cloud_pool.py b/azure-batch/azure/batch/models/cloud_pool.py index 24076aaadd84..8d85502dba7f 100644 --- a/azure-batch/azure/batch/models/cloud_pool.py +++ b/azure-batch/azure/batch/models/cloud_pool.py @@ -54,18 +54,9 @@ class CloudPool(Model): :type allocation_state_transition_time: datetime :param vm_size: The size of virtual machines in the pool. All virtual machines in a pool are the same size. For information about available - sizes of virtual machines for Cloud Services pools (pools created with - cloudServiceConfiguration), see Sizes for Cloud Services - (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). - Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and - A2V2. For information about available VM sizes for pools using images from - the Virtual Machines Marketplace (pools created with - virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) - (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) - or Sizes for Virtual Machines (Windows) - (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). - Batch supports all Azure VM sizes except STANDARD_A0 and those with - premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series). + sizes of virtual machines in pools, see Choose a VM size for compute nodes + in an Azure Batch pool + (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). :type vm_size: str :param cloud_service_configuration: The cloud service configuration for the pool. This property and virtualMachineConfiguration are mutually @@ -208,39 +199,39 @@ class CloudPool(Model): 'stats': {'key': 'stats', 'type': 'PoolStatistics'}, } - def __init__(self, id=None, display_name=None, url=None, e_tag=None, last_modified=None, creation_time=None, state=None, state_transition_time=None, allocation_state=None, allocation_state_transition_time=None, vm_size=None, cloud_service_configuration=None, virtual_machine_configuration=None, resize_timeout=None, resize_errors=None, current_dedicated_nodes=None, current_low_priority_nodes=None, target_dedicated_nodes=None, target_low_priority_nodes=None, enable_auto_scale=None, auto_scale_formula=None, auto_scale_evaluation_interval=None, auto_scale_run=None, enable_inter_node_communication=None, network_configuration=None, start_task=None, certificate_references=None, application_package_references=None, application_licenses=None, max_tasks_per_node=None, task_scheduling_policy=None, user_accounts=None, metadata=None, stats=None): - super(CloudPool, self).__init__() - self.id = id - self.display_name = display_name - self.url = url - self.e_tag = e_tag - self.last_modified = last_modified - self.creation_time = creation_time - self.state = state - self.state_transition_time = state_transition_time - self.allocation_state = allocation_state - self.allocation_state_transition_time = allocation_state_transition_time - self.vm_size = vm_size - self.cloud_service_configuration = cloud_service_configuration - self.virtual_machine_configuration = virtual_machine_configuration - self.resize_timeout = resize_timeout - self.resize_errors = resize_errors - self.current_dedicated_nodes = current_dedicated_nodes - self.current_low_priority_nodes = current_low_priority_nodes - self.target_dedicated_nodes = target_dedicated_nodes - self.target_low_priority_nodes = target_low_priority_nodes - self.enable_auto_scale = enable_auto_scale - self.auto_scale_formula = auto_scale_formula - self.auto_scale_evaluation_interval = auto_scale_evaluation_interval - self.auto_scale_run = auto_scale_run - self.enable_inter_node_communication = enable_inter_node_communication - self.network_configuration = network_configuration - self.start_task = start_task - self.certificate_references = certificate_references - self.application_package_references = application_package_references - self.application_licenses = application_licenses - self.max_tasks_per_node = max_tasks_per_node - self.task_scheduling_policy = task_scheduling_policy - self.user_accounts = user_accounts - self.metadata = metadata - self.stats = stats + def __init__(self, **kwargs): + super(CloudPool, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.url = kwargs.get('url', None) + self.e_tag = kwargs.get('e_tag', None) + self.last_modified = kwargs.get('last_modified', None) + self.creation_time = kwargs.get('creation_time', None) + self.state = kwargs.get('state', None) + self.state_transition_time = kwargs.get('state_transition_time', None) + self.allocation_state = kwargs.get('allocation_state', None) + self.allocation_state_transition_time = kwargs.get('allocation_state_transition_time', None) + self.vm_size = kwargs.get('vm_size', None) + self.cloud_service_configuration = kwargs.get('cloud_service_configuration', None) + self.virtual_machine_configuration = kwargs.get('virtual_machine_configuration', None) + self.resize_timeout = kwargs.get('resize_timeout', None) + self.resize_errors = kwargs.get('resize_errors', None) + self.current_dedicated_nodes = kwargs.get('current_dedicated_nodes', None) + self.current_low_priority_nodes = kwargs.get('current_low_priority_nodes', None) + self.target_dedicated_nodes = kwargs.get('target_dedicated_nodes', None) + self.target_low_priority_nodes = kwargs.get('target_low_priority_nodes', None) + self.enable_auto_scale = kwargs.get('enable_auto_scale', None) + self.auto_scale_formula = kwargs.get('auto_scale_formula', None) + self.auto_scale_evaluation_interval = kwargs.get('auto_scale_evaluation_interval', None) + self.auto_scale_run = kwargs.get('auto_scale_run', None) + self.enable_inter_node_communication = kwargs.get('enable_inter_node_communication', None) + self.network_configuration = kwargs.get('network_configuration', None) + self.start_task = kwargs.get('start_task', None) + self.certificate_references = kwargs.get('certificate_references', None) + self.application_package_references = kwargs.get('application_package_references', None) + self.application_licenses = kwargs.get('application_licenses', None) + self.max_tasks_per_node = kwargs.get('max_tasks_per_node', None) + self.task_scheduling_policy = kwargs.get('task_scheduling_policy', None) + self.user_accounts = kwargs.get('user_accounts', None) + self.metadata = kwargs.get('metadata', None) + self.stats = kwargs.get('stats', None) diff --git a/azure-batch/azure/batch/models/cloud_pool_py3.py b/azure-batch/azure/batch/models/cloud_pool_py3.py new file mode 100644 index 000000000000..b1166d42dc01 --- /dev/null +++ b/azure-batch/azure/batch/models/cloud_pool_py3.py @@ -0,0 +1,237 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CloudPool(Model): + """A pool in the Azure Batch service. + + :param id: A string that uniquely identifies the pool within the account. + The ID can contain any combination of alphanumeric characters including + hyphens and underscores, and cannot contain more than 64 characters. The + ID is case-preserving and case-insensitive (that is, you may not have two + IDs within an account that differ only by case). + :type id: str + :param display_name: The display name for the pool. The display name need + not be unique and can contain any Unicode characters up to a maximum + length of 1024. + :type display_name: str + :param url: The URL of the pool. + :type url: str + :param e_tag: The ETag of the pool. This is an opaque string. You can use + it to detect whether the pool has changed between requests. In particular, + you can be pass the ETag when updating a pool to specify that your changes + should take effect only if nobody else has modified the pool in the + meantime. + :type e_tag: str + :param last_modified: The last modified time of the pool. This is the last + time at which the pool level data, such as the targetDedicatedNodes or + enableAutoscale settings, changed. It does not factor in node-level + changes such as a compute node changing state. + :type last_modified: datetime + :param creation_time: The creation time of the pool. + :type creation_time: datetime + :param state: The current state of the pool. Possible values include: + 'active', 'deleting', 'upgrading' + :type state: str or ~azure.batch.models.PoolState + :param state_transition_time: The time at which the pool entered its + current state. + :type state_transition_time: datetime + :param allocation_state: Whether the pool is resizing. Possible values + include: 'steady', 'resizing', 'stopping' + :type allocation_state: str or ~azure.batch.models.AllocationState + :param allocation_state_transition_time: The time at which the pool + entered its current allocation state. + :type allocation_state_transition_time: datetime + :param vm_size: The size of virtual machines in the pool. All virtual + machines in a pool are the same size. For information about available + sizes of virtual machines in pools, see Choose a VM size for compute nodes + in an Azure Batch pool + (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). + :type vm_size: str + :param cloud_service_configuration: The cloud service configuration for + the pool. This property and virtualMachineConfiguration are mutually + exclusive and one of the properties must be specified. This property + cannot be specified if the Batch account was created with its + poolAllocationMode property set to 'UserSubscription'. + :type cloud_service_configuration: + ~azure.batch.models.CloudServiceConfiguration + :param virtual_machine_configuration: The virtual machine configuration + for the pool. This property and cloudServiceConfiguration are mutually + exclusive and one of the properties must be specified. + :type virtual_machine_configuration: + ~azure.batch.models.VirtualMachineConfiguration + :param resize_timeout: The timeout for allocation of compute nodes to the + pool. This is the timeout for the most recent resize operation. (The + initial sizing when the pool is created counts as a resize.) The default + value is 15 minutes. + :type resize_timeout: timedelta + :param resize_errors: A list of errors encountered while performing the + last resize on the pool. This property is set only if one or more errors + occurred during the last pool resize, and only when the pool + allocationState is Steady. + :type resize_errors: list[~azure.batch.models.ResizeError] + :param current_dedicated_nodes: The number of dedicated compute nodes + currently in the pool. + :type current_dedicated_nodes: int + :param current_low_priority_nodes: The number of low-priority compute + nodes currently in the pool. Low-priority compute nodes which have been + preempted are included in this count. + :type current_low_priority_nodes: int + :param target_dedicated_nodes: The desired number of dedicated compute + nodes in the pool. + :type target_dedicated_nodes: int + :param target_low_priority_nodes: The desired number of low-priority + compute nodes in the pool. + :type target_low_priority_nodes: int + :param enable_auto_scale: Whether the pool size should automatically + adjust over time. If false, at least one of targetDedicateNodes and + targetLowPriorityNodes must be specified. If true, the autoScaleFormula + property is required and the pool automatically resizes according to the + formula. The default value is false. + :type enable_auto_scale: bool + :param auto_scale_formula: A formula for the desired number of compute + nodes in the pool. This property is set only if the pool automatically + scales, i.e. enableAutoScale is true. + :type auto_scale_formula: str + :param auto_scale_evaluation_interval: The time interval at which to + automatically adjust the pool size according to the autoscale formula. + This property is set only if the pool automatically scales, i.e. + enableAutoScale is true. + :type auto_scale_evaluation_interval: timedelta + :param auto_scale_run: The results and errors from the last execution of + the autoscale formula. This property is set only if the pool automatically + scales, i.e. enableAutoScale is true. + :type auto_scale_run: ~azure.batch.models.AutoScaleRun + :param enable_inter_node_communication: Whether the pool permits direct + communication between nodes. This imposes restrictions on which nodes can + be assigned to the pool. Specifying this value can reduce the chance of + the requested number of nodes to be allocated in the pool. + :type enable_inter_node_communication: bool + :param network_configuration: The network configuration for the pool. + :type network_configuration: ~azure.batch.models.NetworkConfiguration + :param start_task: A task specified to run on each compute node as it + joins the pool. + :type start_task: ~azure.batch.models.StartTask + :param certificate_references: The list of certificates to be installed on + each compute node in the pool. For Windows compute nodes, the Batch + service installs the certificates to the specified certificate store and + location. For Linux compute nodes, the certificates are stored in a + directory inside the task working directory and an environment variable + AZ_BATCH_CERTIFICATES_DIR is supplied to the task to query for this + location. For certificates with visibility of 'remoteUser', a 'certs' + directory is created in the user's home directory (e.g., + /home/{user-name}/certs) and certificates are placed in that directory. + :type certificate_references: + list[~azure.batch.models.CertificateReference] + :param application_package_references: The list of application packages to + be installed on each compute node in the pool. + :type application_package_references: + list[~azure.batch.models.ApplicationPackageReference] + :param application_licenses: The list of application licenses the Batch + service will make available on each compute node in the pool. The list of + application licenses must be a subset of available Batch service + application licenses. If a license is requested which is not supported, + pool creation will fail. + :type application_licenses: list[str] + :param max_tasks_per_node: The maximum number of tasks that can run + concurrently on a single compute node in the pool. + :type max_tasks_per_node: int + :param task_scheduling_policy: How tasks are distributed across compute + nodes in a pool. + :type task_scheduling_policy: ~azure.batch.models.TaskSchedulingPolicy + :param user_accounts: The list of user accounts to be created on each node + in the pool. + :type user_accounts: list[~azure.batch.models.UserAccount] + :param metadata: A list of name-value pairs associated with the pool as + metadata. + :type metadata: list[~azure.batch.models.MetadataItem] + :param stats: Utilization and resource usage statistics for the entire + lifetime of the pool. The statistics may not be immediately available. The + Batch service performs periodic roll-up of statistics. The typical delay + is about 30 minutes. + :type stats: ~azure.batch.models.PoolStatistics + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, + 'last_modified': {'key': 'lastModified', 'type': 'iso-8601'}, + 'creation_time': {'key': 'creationTime', 'type': 'iso-8601'}, + 'state': {'key': 'state', 'type': 'PoolState'}, + 'state_transition_time': {'key': 'stateTransitionTime', 'type': 'iso-8601'}, + 'allocation_state': {'key': 'allocationState', 'type': 'AllocationState'}, + 'allocation_state_transition_time': {'key': 'allocationStateTransitionTime', 'type': 'iso-8601'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'cloud_service_configuration': {'key': 'cloudServiceConfiguration', 'type': 'CloudServiceConfiguration'}, + 'virtual_machine_configuration': {'key': 'virtualMachineConfiguration', 'type': 'VirtualMachineConfiguration'}, + 'resize_timeout': {'key': 'resizeTimeout', 'type': 'duration'}, + 'resize_errors': {'key': 'resizeErrors', 'type': '[ResizeError]'}, + 'current_dedicated_nodes': {'key': 'currentDedicatedNodes', 'type': 'int'}, + 'current_low_priority_nodes': {'key': 'currentLowPriorityNodes', 'type': 'int'}, + 'target_dedicated_nodes': {'key': 'targetDedicatedNodes', 'type': 'int'}, + 'target_low_priority_nodes': {'key': 'targetLowPriorityNodes', 'type': 'int'}, + 'enable_auto_scale': {'key': 'enableAutoScale', 'type': 'bool'}, + 'auto_scale_formula': {'key': 'autoScaleFormula', 'type': 'str'}, + 'auto_scale_evaluation_interval': {'key': 'autoScaleEvaluationInterval', 'type': 'duration'}, + 'auto_scale_run': {'key': 'autoScaleRun', 'type': 'AutoScaleRun'}, + 'enable_inter_node_communication': {'key': 'enableInterNodeCommunication', 'type': 'bool'}, + 'network_configuration': {'key': 'networkConfiguration', 'type': 'NetworkConfiguration'}, + 'start_task': {'key': 'startTask', 'type': 'StartTask'}, + 'certificate_references': {'key': 'certificateReferences', 'type': '[CertificateReference]'}, + 'application_package_references': {'key': 'applicationPackageReferences', 'type': '[ApplicationPackageReference]'}, + 'application_licenses': {'key': 'applicationLicenses', 'type': '[str]'}, + 'max_tasks_per_node': {'key': 'maxTasksPerNode', 'type': 'int'}, + 'task_scheduling_policy': {'key': 'taskSchedulingPolicy', 'type': 'TaskSchedulingPolicy'}, + 'user_accounts': {'key': 'userAccounts', 'type': '[UserAccount]'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + 'stats': {'key': 'stats', 'type': 'PoolStatistics'}, + } + + def __init__(self, *, id: str=None, display_name: str=None, url: str=None, e_tag: str=None, last_modified=None, creation_time=None, state=None, state_transition_time=None, allocation_state=None, allocation_state_transition_time=None, vm_size: str=None, cloud_service_configuration=None, virtual_machine_configuration=None, resize_timeout=None, resize_errors=None, current_dedicated_nodes: int=None, current_low_priority_nodes: int=None, target_dedicated_nodes: int=None, target_low_priority_nodes: int=None, enable_auto_scale: bool=None, auto_scale_formula: str=None, auto_scale_evaluation_interval=None, auto_scale_run=None, enable_inter_node_communication: bool=None, network_configuration=None, start_task=None, certificate_references=None, application_package_references=None, application_licenses=None, max_tasks_per_node: int=None, task_scheduling_policy=None, user_accounts=None, metadata=None, stats=None, **kwargs) -> None: + super(CloudPool, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.url = url + self.e_tag = e_tag + self.last_modified = last_modified + self.creation_time = creation_time + self.state = state + self.state_transition_time = state_transition_time + self.allocation_state = allocation_state + self.allocation_state_transition_time = allocation_state_transition_time + self.vm_size = vm_size + self.cloud_service_configuration = cloud_service_configuration + self.virtual_machine_configuration = virtual_machine_configuration + self.resize_timeout = resize_timeout + self.resize_errors = resize_errors + self.current_dedicated_nodes = current_dedicated_nodes + self.current_low_priority_nodes = current_low_priority_nodes + self.target_dedicated_nodes = target_dedicated_nodes + self.target_low_priority_nodes = target_low_priority_nodes + self.enable_auto_scale = enable_auto_scale + self.auto_scale_formula = auto_scale_formula + self.auto_scale_evaluation_interval = auto_scale_evaluation_interval + self.auto_scale_run = auto_scale_run + self.enable_inter_node_communication = enable_inter_node_communication + self.network_configuration = network_configuration + self.start_task = start_task + self.certificate_references = certificate_references + self.application_package_references = application_package_references + self.application_licenses = application_licenses + self.max_tasks_per_node = max_tasks_per_node + self.task_scheduling_policy = task_scheduling_policy + self.user_accounts = user_accounts + self.metadata = metadata + self.stats = stats diff --git a/azure-batch/azure/batch/models/cloud_service_configuration.py b/azure-batch/azure/batch/models/cloud_service_configuration.py index bc2ed7e51205..d86bae4012d8 100644 --- a/azure-batch/azure/batch/models/cloud_service_configuration.py +++ b/azure-batch/azure/batch/models/cloud_service_configuration.py @@ -19,12 +19,15 @@ class CloudServiceConfiguration(Model): Variables are only populated by the server, and will be ignored when sending a request. - :param os_family: The Azure Guest OS family to be installed on the virtual - machines in the pool. Possible values are: 2 - OS Family 2, equivalent to - Windows Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server - 2012. 4 - OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family - 5, equivalent to Windows Server 2016. For more information, see Azure - Guest OS Releases + All required parameters must be populated in order to send to Azure. + + :param os_family: Required. The Azure Guest OS family to be installed on + the virtual machines in the pool. Possible values are: + 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. + 3 - OS Family 3, equivalent to Windows Server 2012. + 4 - OS Family 4, equivalent to Windows Server 2012 R2. + 5 - OS Family 5, equivalent to Windows Server 2016. For more information, + see Azure Guest OS Releases (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases). :type os_family: str :param target_os_version: The Azure Guest OS version to be installed on @@ -51,8 +54,8 @@ class CloudServiceConfiguration(Model): 'current_os_version': {'key': 'currentOSVersion', 'type': 'str'}, } - def __init__(self, os_family, target_os_version=None): - super(CloudServiceConfiguration, self).__init__() - self.os_family = os_family - self.target_os_version = target_os_version + def __init__(self, **kwargs): + super(CloudServiceConfiguration, self).__init__(**kwargs) + self.os_family = kwargs.get('os_family', None) + self.target_os_version = kwargs.get('target_os_version', None) self.current_os_version = None diff --git a/azure-batch/azure/batch/models/cloud_service_configuration_py3.py b/azure-batch/azure/batch/models/cloud_service_configuration_py3.py new file mode 100644 index 000000000000..eb53f78f23d2 --- /dev/null +++ b/azure-batch/azure/batch/models/cloud_service_configuration_py3.py @@ -0,0 +1,61 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CloudServiceConfiguration(Model): + """The configuration for nodes in a pool based on the Azure Cloud Services + platform. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param os_family: Required. The Azure Guest OS family to be installed on + the virtual machines in the pool. Possible values are: + 2 - OS Family 2, equivalent to Windows Server 2008 R2 SP1. + 3 - OS Family 3, equivalent to Windows Server 2012. + 4 - OS Family 4, equivalent to Windows Server 2012 R2. + 5 - OS Family 5, equivalent to Windows Server 2016. For more information, + see Azure Guest OS Releases + (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases). + :type os_family: str + :param target_os_version: The Azure Guest OS version to be installed on + the virtual machines in the pool. The default value is * which specifies + the latest operating system version for the specified OS family. + :type target_os_version: str + :ivar current_os_version: The Azure Guest OS Version currently installed + on the virtual machines in the pool. This may differ from targetOSVersion + if the pool state is Upgrading. In this case some virtual machines may be + on the targetOSVersion and some may be on the currentOSVersion during the + upgrade process. Once all virtual machines have upgraded, currentOSVersion + is updated to be the same as targetOSVersion. + :vartype current_os_version: str + """ + + _validation = { + 'os_family': {'required': True}, + 'current_os_version': {'readonly': True}, + } + + _attribute_map = { + 'os_family': {'key': 'osFamily', 'type': 'str'}, + 'target_os_version': {'key': 'targetOSVersion', 'type': 'str'}, + 'current_os_version': {'key': 'currentOSVersion', 'type': 'str'}, + } + + def __init__(self, *, os_family: str, target_os_version: str=None, **kwargs) -> None: + super(CloudServiceConfiguration, self).__init__(**kwargs) + self.os_family = os_family + self.target_os_version = target_os_version + self.current_os_version = None diff --git a/azure-batch/azure/batch/models/cloud_task.py b/azure-batch/azure/batch/models/cloud_task.py index 7948d2b02146..df9e36778267 100644 --- a/azure-batch/azure/batch/models/cloud_task.py +++ b/azure-batch/azure/batch/models/cloud_task.py @@ -87,7 +87,12 @@ class CloudTask(Model): :param resource_files: A list of files that the Batch service will download to the compute node before running the command line. For multi-instance tasks, the resource files will only be downloaded to the - compute node on which the primary task is executed. + compute node on which the primary task is executed. There is a maximum + size for the list of resource files. When the max size is exceeded, the + request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. :type resource_files: list[~azure.batch.models.ResourceFile] :param output_files: A list of files that the Batch service will upload from the compute node after running the command line. For multi-instance @@ -173,31 +178,31 @@ class CloudTask(Model): 'authentication_token_settings': {'key': 'authenticationTokenSettings', 'type': 'AuthenticationTokenSettings'}, } - def __init__(self, id=None, display_name=None, url=None, e_tag=None, last_modified=None, creation_time=None, exit_conditions=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, command_line=None, container_settings=None, resource_files=None, output_files=None, environment_settings=None, affinity_info=None, constraints=None, user_identity=None, execution_info=None, node_info=None, multi_instance_settings=None, stats=None, depends_on=None, application_package_references=None, authentication_token_settings=None): - super(CloudTask, self).__init__() - self.id = id - self.display_name = display_name - self.url = url - self.e_tag = e_tag - self.last_modified = last_modified - self.creation_time = creation_time - self.exit_conditions = exit_conditions - self.state = state - self.state_transition_time = state_transition_time - self.previous_state = previous_state - self.previous_state_transition_time = previous_state_transition_time - self.command_line = command_line - self.container_settings = container_settings - self.resource_files = resource_files - self.output_files = output_files - self.environment_settings = environment_settings - self.affinity_info = affinity_info - self.constraints = constraints - self.user_identity = user_identity - self.execution_info = execution_info - self.node_info = node_info - self.multi_instance_settings = multi_instance_settings - self.stats = stats - self.depends_on = depends_on - self.application_package_references = application_package_references - self.authentication_token_settings = authentication_token_settings + def __init__(self, **kwargs): + super(CloudTask, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.url = kwargs.get('url', None) + self.e_tag = kwargs.get('e_tag', None) + self.last_modified = kwargs.get('last_modified', None) + self.creation_time = kwargs.get('creation_time', None) + self.exit_conditions = kwargs.get('exit_conditions', None) + self.state = kwargs.get('state', None) + self.state_transition_time = kwargs.get('state_transition_time', None) + self.previous_state = kwargs.get('previous_state', None) + self.previous_state_transition_time = kwargs.get('previous_state_transition_time', None) + self.command_line = kwargs.get('command_line', None) + self.container_settings = kwargs.get('container_settings', None) + self.resource_files = kwargs.get('resource_files', None) + self.output_files = kwargs.get('output_files', None) + self.environment_settings = kwargs.get('environment_settings', None) + self.affinity_info = kwargs.get('affinity_info', None) + self.constraints = kwargs.get('constraints', None) + self.user_identity = kwargs.get('user_identity', None) + self.execution_info = kwargs.get('execution_info', None) + self.node_info = kwargs.get('node_info', None) + self.multi_instance_settings = kwargs.get('multi_instance_settings', None) + self.stats = kwargs.get('stats', None) + self.depends_on = kwargs.get('depends_on', None) + self.application_package_references = kwargs.get('application_package_references', None) + self.authentication_token_settings = kwargs.get('authentication_token_settings', None) diff --git a/azure-batch/azure/batch/models/cloud_task_list_subtasks_result.py b/azure-batch/azure/batch/models/cloud_task_list_subtasks_result.py index 5370b5047e2c..c592b3489bcf 100644 --- a/azure-batch/azure/batch/models/cloud_task_list_subtasks_result.py +++ b/azure-batch/azure/batch/models/cloud_task_list_subtasks_result.py @@ -23,6 +23,6 @@ class CloudTaskListSubtasksResult(Model): 'value': {'key': 'value', 'type': '[SubtaskInformation]'}, } - def __init__(self, value=None): - super(CloudTaskListSubtasksResult, self).__init__() - self.value = value + def __init__(self, **kwargs): + super(CloudTaskListSubtasksResult, self).__init__(**kwargs) + self.value = kwargs.get('value', None) diff --git a/azure-batch/azure/batch/models/cloud_task_list_subtasks_result_py3.py b/azure-batch/azure/batch/models/cloud_task_list_subtasks_result_py3.py new file mode 100644 index 000000000000..f21e726050a1 --- /dev/null +++ b/azure-batch/azure/batch/models/cloud_task_list_subtasks_result_py3.py @@ -0,0 +1,28 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CloudTaskListSubtasksResult(Model): + """The result of listing the subtasks of a task. + + :param value: The list of subtasks. + :type value: list[~azure.batch.models.SubtaskInformation] + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': '[SubtaskInformation]'}, + } + + def __init__(self, *, value=None, **kwargs) -> None: + super(CloudTaskListSubtasksResult, self).__init__(**kwargs) + self.value = value diff --git a/azure-batch/azure/batch/models/cloud_task_py3.py b/azure-batch/azure/batch/models/cloud_task_py3.py new file mode 100644 index 000000000000..9592854467ad --- /dev/null +++ b/azure-batch/azure/batch/models/cloud_task_py3.py @@ -0,0 +1,208 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class CloudTask(Model): + """An Azure Batch task. + + Batch will retry tasks when a recovery operation is triggered on a compute + node. Examples of recovery operations include (but are not limited to) when + an unhealthy compute node is rebooted or a compute node disappeared due to + host failure. Retries due to recovery operations are independent of and are + not counted against the maxTaskRetryCount. Even if the maxTaskRetryCount is + 0, an internal retry due to a recovery operation may occur. Because of + this, all tasks should be idempotent. This means tasks need to tolerate + being interrupted and restarted without causing any corruption or duplicate + data. The best practice for long running tasks is to use some form of + checkpointing. + + :param id: A string that uniquely identifies the task within the job. The + ID can contain any combination of alphanumeric characters including + hyphens and underscores, and cannot contain more than 64 characters. + :type id: str + :param display_name: A display name for the task. The display name need + not be unique and can contain any Unicode characters up to a maximum + length of 1024. + :type display_name: str + :param url: The URL of the task. + :type url: str + :param e_tag: The ETag of the task. This is an opaque string. You can use + it to detect whether the task has changed between requests. In particular, + you can be pass the ETag when updating a task to specify that your changes + should take effect only if nobody else has modified the task in the + meantime. + :type e_tag: str + :param last_modified: The last modified time of the task. + :type last_modified: datetime + :param creation_time: The creation time of the task. + :type creation_time: datetime + :param exit_conditions: How the Batch service should respond when the task + completes. + :type exit_conditions: ~azure.batch.models.ExitConditions + :param state: The current state of the task. Possible values include: + 'active', 'preparing', 'running', 'completed' + :type state: str or ~azure.batch.models.TaskState + :param state_transition_time: The time at which the task entered its + current state. + :type state_transition_time: datetime + :param previous_state: The previous state of the task. This property is + not set if the task is in its initial Active state. Possible values + include: 'active', 'preparing', 'running', 'completed' + :type previous_state: str or ~azure.batch.models.TaskState + :param previous_state_transition_time: The time at which the task entered + its previous state. This property is not set if the task is in its initial + Active state. + :type previous_state_transition_time: datetime + :param command_line: The command line of the task. For multi-instance + tasks, the command line is executed as the primary task, after the primary + task and all subtasks have finished executing the coordination command + line. The command line does not run under a shell, and therefore cannot + take advantage of shell features such as environment variable expansion. + If you want to take advantage of such features, you should invoke the + shell in the command line, for example using "cmd /c MyCommand" in Windows + or "/bin/sh -c MyCommand" in Linux. If the command line refers to file + paths, it should use a relative path (relative to the task working + directory), or use the Batch provided environment variable + (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). + :type command_line: str + :param container_settings: The settings for the container under which the + task runs. If the pool that will run this task has containerConfiguration + set, this must be set as well. If the pool that will run this task doesn't + have containerConfiguration set, this must not be set. When this is + specified, all directories recursively below the AZ_BATCH_NODE_ROOT_DIR + (the root of Azure Batch directories on the node) are mapped into the + container, all task environment variables are mapped into the container, + and the task command line is executed in the container. + :type container_settings: ~azure.batch.models.TaskContainerSettings + :param resource_files: A list of files that the Batch service will + download to the compute node before running the command line. For + multi-instance tasks, the resource files will only be downloaded to the + compute node on which the primary task is executed. There is a maximum + size for the list of resource files. When the max size is exceeded, the + request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. + :type resource_files: list[~azure.batch.models.ResourceFile] + :param output_files: A list of files that the Batch service will upload + from the compute node after running the command line. For multi-instance + tasks, the files will only be uploaded from the compute node on which the + primary task is executed. + :type output_files: list[~azure.batch.models.OutputFile] + :param environment_settings: A list of environment variable settings for + the task. + :type environment_settings: list[~azure.batch.models.EnvironmentSetting] + :param affinity_info: A locality hint that can be used by the Batch + service to select a compute node on which to start the new task. + :type affinity_info: ~azure.batch.models.AffinityInformation + :param constraints: The execution constraints that apply to this task. + :type constraints: ~azure.batch.models.TaskConstraints + :param user_identity: The user identity under which the task runs. If + omitted, the task runs as a non-administrative user unique to the task. + :type user_identity: ~azure.batch.models.UserIdentity + :param execution_info: Information about the execution of the task. + :type execution_info: ~azure.batch.models.TaskExecutionInformation + :param node_info: Information about the compute node on which the task + ran. + :type node_info: ~azure.batch.models.ComputeNodeInformation + :param multi_instance_settings: An object that indicates that the task is + a multi-instance task, and contains information about how to run the + multi-instance task. + :type multi_instance_settings: ~azure.batch.models.MultiInstanceSettings + :param stats: Resource usage statistics for the task. + :type stats: ~azure.batch.models.TaskStatistics + :param depends_on: The tasks that this task depends on. This task will not + be scheduled until all tasks that it depends on have completed + successfully. If any of those tasks fail and exhaust their retry counts, + this task will never be scheduled. + :type depends_on: ~azure.batch.models.TaskDependencies + :param application_package_references: A list of application packages that + the Batch service will deploy to the compute node before running the + command line. Application packages are downloaded and deployed to a shared + directory, not the task working directory. Therefore, if a referenced + package is already on the compute node, and is up to date, then it is not + re-downloaded; the existing copy on the compute node is used. If a + referenced application package cannot be installed, for example because + the package has been deleted or because download failed, the task fails. + :type application_package_references: + list[~azure.batch.models.ApplicationPackageReference] + :param authentication_token_settings: The settings for an authentication + token that the task can use to perform Batch service operations. If this + property is set, the Batch service provides the task with an + authentication token which can be used to authenticate Batch service + operations without requiring an account access key. The token is provided + via the AZ_BATCH_AUTHENTICATION_TOKEN environment variable. The operations + that the task can carry out using the token depend on the settings. For + example, a task can request job permissions in order to add other tasks to + the job, or check the status of the job or of other tasks under the job. + :type authentication_token_settings: + ~azure.batch.models.AuthenticationTokenSettings + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, + 'last_modified': {'key': 'lastModified', 'type': 'iso-8601'}, + 'creation_time': {'key': 'creationTime', 'type': 'iso-8601'}, + 'exit_conditions': {'key': 'exitConditions', 'type': 'ExitConditions'}, + 'state': {'key': 'state', 'type': 'TaskState'}, + 'state_transition_time': {'key': 'stateTransitionTime', 'type': 'iso-8601'}, + 'previous_state': {'key': 'previousState', 'type': 'TaskState'}, + 'previous_state_transition_time': {'key': 'previousStateTransitionTime', 'type': 'iso-8601'}, + 'command_line': {'key': 'commandLine', 'type': 'str'}, + 'container_settings': {'key': 'containerSettings', 'type': 'TaskContainerSettings'}, + 'resource_files': {'key': 'resourceFiles', 'type': '[ResourceFile]'}, + 'output_files': {'key': 'outputFiles', 'type': '[OutputFile]'}, + 'environment_settings': {'key': 'environmentSettings', 'type': '[EnvironmentSetting]'}, + 'affinity_info': {'key': 'affinityInfo', 'type': 'AffinityInformation'}, + 'constraints': {'key': 'constraints', 'type': 'TaskConstraints'}, + 'user_identity': {'key': 'userIdentity', 'type': 'UserIdentity'}, + 'execution_info': {'key': 'executionInfo', 'type': 'TaskExecutionInformation'}, + 'node_info': {'key': 'nodeInfo', 'type': 'ComputeNodeInformation'}, + 'multi_instance_settings': {'key': 'multiInstanceSettings', 'type': 'MultiInstanceSettings'}, + 'stats': {'key': 'stats', 'type': 'TaskStatistics'}, + 'depends_on': {'key': 'dependsOn', 'type': 'TaskDependencies'}, + 'application_package_references': {'key': 'applicationPackageReferences', 'type': '[ApplicationPackageReference]'}, + 'authentication_token_settings': {'key': 'authenticationTokenSettings', 'type': 'AuthenticationTokenSettings'}, + } + + def __init__(self, *, id: str=None, display_name: str=None, url: str=None, e_tag: str=None, last_modified=None, creation_time=None, exit_conditions=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, command_line: str=None, container_settings=None, resource_files=None, output_files=None, environment_settings=None, affinity_info=None, constraints=None, user_identity=None, execution_info=None, node_info=None, multi_instance_settings=None, stats=None, depends_on=None, application_package_references=None, authentication_token_settings=None, **kwargs) -> None: + super(CloudTask, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.url = url + self.e_tag = e_tag + self.last_modified = last_modified + self.creation_time = creation_time + self.exit_conditions = exit_conditions + self.state = state + self.state_transition_time = state_transition_time + self.previous_state = previous_state + self.previous_state_transition_time = previous_state_transition_time + self.command_line = command_line + self.container_settings = container_settings + self.resource_files = resource_files + self.output_files = output_files + self.environment_settings = environment_settings + self.affinity_info = affinity_info + self.constraints = constraints + self.user_identity = user_identity + self.execution_info = execution_info + self.node_info = node_info + self.multi_instance_settings = multi_instance_settings + self.stats = stats + self.depends_on = depends_on + self.application_package_references = application_package_references + self.authentication_token_settings = authentication_token_settings diff --git a/azure-batch/azure/batch/models/compute_node.py b/azure-batch/azure/batch/models/compute_node.py index b26cba8361a7..444598f9e5cd 100644 --- a/azure-batch/azure/batch/models/compute_node.py +++ b/azure-batch/azure/batch/models/compute_node.py @@ -53,19 +53,9 @@ class ComputeNode(Model): task is scheduled, then the task will be scheduled elsewhere. :type affinity_id: str :param vm_size: The size of the virtual machine hosting the compute node. - For information about available sizes of virtual machines for Cloud - Services pools (pools created with cloudServiceConfiguration), see Sizes - for Cloud Services - (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). - Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and - A2V2. For information about available VM sizes for pools using images from - the Virtual Machines Marketplace (pools created with - virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) - (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) - or Sizes for Virtual Machines (Windows) - (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). - Batch supports all Azure VM sizes except STANDARD_A0 and those with - premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series). + For information about available sizes of virtual machines in pools, see + Choose a VM size for compute nodes in an Azure Batch pool + (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). :type vm_size: str :param total_tasks_run: The total number of job tasks completed on the compute node. This includes Job Manager tasks and normal tasks, but not @@ -111,6 +101,9 @@ class ComputeNode(Model): node. :type endpoint_configuration: ~azure.batch.models.ComputeNodeEndpointConfiguration + :param node_agent_info: Information about the node agent version and the + time the node upgraded to a new version. + :type node_agent_info: ~azure.batch.models.NodeAgentInformation """ _attribute_map = { @@ -134,27 +127,29 @@ class ComputeNode(Model): 'errors': {'key': 'errors', 'type': '[ComputeNodeError]'}, 'is_dedicated': {'key': 'isDedicated', 'type': 'bool'}, 'endpoint_configuration': {'key': 'endpointConfiguration', 'type': 'ComputeNodeEndpointConfiguration'}, + 'node_agent_info': {'key': 'nodeAgentInfo', 'type': 'NodeAgentInformation'}, } - def __init__(self, id=None, url=None, state=None, scheduling_state=None, state_transition_time=None, last_boot_time=None, allocation_time=None, ip_address=None, affinity_id=None, vm_size=None, total_tasks_run=None, running_tasks_count=None, total_tasks_succeeded=None, recent_tasks=None, start_task=None, start_task_info=None, certificate_references=None, errors=None, is_dedicated=None, endpoint_configuration=None): - super(ComputeNode, self).__init__() - self.id = id - self.url = url - self.state = state - self.scheduling_state = scheduling_state - self.state_transition_time = state_transition_time - self.last_boot_time = last_boot_time - self.allocation_time = allocation_time - self.ip_address = ip_address - self.affinity_id = affinity_id - self.vm_size = vm_size - self.total_tasks_run = total_tasks_run - self.running_tasks_count = running_tasks_count - self.total_tasks_succeeded = total_tasks_succeeded - self.recent_tasks = recent_tasks - self.start_task = start_task - self.start_task_info = start_task_info - self.certificate_references = certificate_references - self.errors = errors - self.is_dedicated = is_dedicated - self.endpoint_configuration = endpoint_configuration + def __init__(self, **kwargs): + super(ComputeNode, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.url = kwargs.get('url', None) + self.state = kwargs.get('state', None) + self.scheduling_state = kwargs.get('scheduling_state', None) + self.state_transition_time = kwargs.get('state_transition_time', None) + self.last_boot_time = kwargs.get('last_boot_time', None) + self.allocation_time = kwargs.get('allocation_time', None) + self.ip_address = kwargs.get('ip_address', None) + self.affinity_id = kwargs.get('affinity_id', None) + self.vm_size = kwargs.get('vm_size', None) + self.total_tasks_run = kwargs.get('total_tasks_run', None) + self.running_tasks_count = kwargs.get('running_tasks_count', None) + self.total_tasks_succeeded = kwargs.get('total_tasks_succeeded', None) + self.recent_tasks = kwargs.get('recent_tasks', None) + self.start_task = kwargs.get('start_task', None) + self.start_task_info = kwargs.get('start_task_info', None) + self.certificate_references = kwargs.get('certificate_references', None) + self.errors = kwargs.get('errors', None) + self.is_dedicated = kwargs.get('is_dedicated', None) + self.endpoint_configuration = kwargs.get('endpoint_configuration', None) + self.node_agent_info = kwargs.get('node_agent_info', None) diff --git a/azure-batch/azure/batch/models/compute_node_add_user_options.py b/azure-batch/azure/batch/models/compute_node_add_user_options.py index f591d4ec6d56..89020475f3ef 100644 --- a/azure-batch/azure/batch/models/compute_node_add_user_options.py +++ b/azure-batch/azure/batch/models/compute_node_add_user_options.py @@ -31,9 +31,16 @@ class ComputeNodeAddUserOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeAddUserOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeAddUserOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_add_user_options_py3.py b/azure-batch/azure/batch/models/compute_node_add_user_options_py3.py new file mode 100644 index 000000000000..dab4040b9533 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_add_user_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeAddUserOptions(Model): + """Additional parameters for add_user operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeAddUserOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_delete_user_options.py b/azure-batch/azure/batch/models/compute_node_delete_user_options.py index b3c3aa016ec2..4874a98a9fb1 100644 --- a/azure-batch/azure/batch/models/compute_node_delete_user_options.py +++ b/azure-batch/azure/batch/models/compute_node_delete_user_options.py @@ -31,9 +31,16 @@ class ComputeNodeDeleteUserOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeDeleteUserOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeDeleteUserOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_delete_user_options_py3.py b/azure-batch/azure/batch/models/compute_node_delete_user_options_py3.py new file mode 100644 index 000000000000..88217b9392bd --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_delete_user_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeDeleteUserOptions(Model): + """Additional parameters for delete_user operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeDeleteUserOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_disable_scheduling_options.py b/azure-batch/azure/batch/models/compute_node_disable_scheduling_options.py index fe55e5fef1ca..92bf29119369 100644 --- a/azure-batch/azure/batch/models/compute_node_disable_scheduling_options.py +++ b/azure-batch/azure/batch/models/compute_node_disable_scheduling_options.py @@ -31,9 +31,16 @@ class ComputeNodeDisableSchedulingOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeDisableSchedulingOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeDisableSchedulingOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_disable_scheduling_options_py3.py b/azure-batch/azure/batch/models/compute_node_disable_scheduling_options_py3.py new file mode 100644 index 000000000000..0432c5dba480 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_disable_scheduling_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeDisableSchedulingOptions(Model): + """Additional parameters for disable_scheduling operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeDisableSchedulingOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_enable_scheduling_options.py b/azure-batch/azure/batch/models/compute_node_enable_scheduling_options.py index 713b13b1e2f5..905e3e343cee 100644 --- a/azure-batch/azure/batch/models/compute_node_enable_scheduling_options.py +++ b/azure-batch/azure/batch/models/compute_node_enable_scheduling_options.py @@ -31,9 +31,16 @@ class ComputeNodeEnableSchedulingOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeEnableSchedulingOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeEnableSchedulingOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_enable_scheduling_options_py3.py b/azure-batch/azure/batch/models/compute_node_enable_scheduling_options_py3.py new file mode 100644 index 000000000000..4ef5d9adef40 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_enable_scheduling_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeEnableSchedulingOptions(Model): + """Additional parameters for enable_scheduling operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeEnableSchedulingOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_endpoint_configuration.py b/azure-batch/azure/batch/models/compute_node_endpoint_configuration.py index 96231abc759f..922c5c104e4a 100644 --- a/azure-batch/azure/batch/models/compute_node_endpoint_configuration.py +++ b/azure-batch/azure/batch/models/compute_node_endpoint_configuration.py @@ -15,7 +15,9 @@ class ComputeNodeEndpointConfiguration(Model): """The endpoint configuration for the compute node. - :param inbound_endpoints: The list of inbound endpoints that are + All required parameters must be populated in order to send to Azure. + + :param inbound_endpoints: Required. The list of inbound endpoints that are accessible on the compute node. :type inbound_endpoints: list[~azure.batch.models.InboundEndpoint] """ @@ -28,6 +30,6 @@ class ComputeNodeEndpointConfiguration(Model): 'inbound_endpoints': {'key': 'inboundEndpoints', 'type': '[InboundEndpoint]'}, } - def __init__(self, inbound_endpoints): - super(ComputeNodeEndpointConfiguration, self).__init__() - self.inbound_endpoints = inbound_endpoints + def __init__(self, **kwargs): + super(ComputeNodeEndpointConfiguration, self).__init__(**kwargs) + self.inbound_endpoints = kwargs.get('inbound_endpoints', None) diff --git a/azure-batch/azure/batch/models/compute_node_endpoint_configuration_py3.py b/azure-batch/azure/batch/models/compute_node_endpoint_configuration_py3.py new file mode 100644 index 000000000000..72dc202e63f7 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_endpoint_configuration_py3.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeEndpointConfiguration(Model): + """The endpoint configuration for the compute node. + + All required parameters must be populated in order to send to Azure. + + :param inbound_endpoints: Required. The list of inbound endpoints that are + accessible on the compute node. + :type inbound_endpoints: list[~azure.batch.models.InboundEndpoint] + """ + + _validation = { + 'inbound_endpoints': {'required': True}, + } + + _attribute_map = { + 'inbound_endpoints': {'key': 'inboundEndpoints', 'type': '[InboundEndpoint]'}, + } + + def __init__(self, *, inbound_endpoints, **kwargs) -> None: + super(ComputeNodeEndpointConfiguration, self).__init__(**kwargs) + self.inbound_endpoints = inbound_endpoints diff --git a/azure-batch/azure/batch/models/compute_node_error.py b/azure-batch/azure/batch/models/compute_node_error.py index e374103b1e47..e02a668195a4 100644 --- a/azure-batch/azure/batch/models/compute_node_error.py +++ b/azure-batch/azure/batch/models/compute_node_error.py @@ -32,8 +32,8 @@ class ComputeNodeError(Model): 'error_details': {'key': 'errorDetails', 'type': '[NameValuePair]'}, } - def __init__(self, code=None, message=None, error_details=None): - super(ComputeNodeError, self).__init__() - self.code = code - self.message = message - self.error_details = error_details + def __init__(self, **kwargs): + super(ComputeNodeError, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) + self.error_details = kwargs.get('error_details', None) diff --git a/azure-batch/azure/batch/models/compute_node_error_py3.py b/azure-batch/azure/batch/models/compute_node_error_py3.py new file mode 100644 index 000000000000..53a6871bfbae --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_error_py3.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeError(Model): + """An error encountered by a compute node. + + :param code: An identifier for the compute node error. Codes are invariant + and are intended to be consumed programmatically. + :type code: str + :param message: A message describing the compute node error, intended to + be suitable for display in a user interface. + :type message: str + :param error_details: The list of additional error details related to the + compute node error. + :type error_details: list[~azure.batch.models.NameValuePair] + """ + + _attribute_map = { + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + 'error_details': {'key': 'errorDetails', 'type': '[NameValuePair]'}, + } + + def __init__(self, *, code: str=None, message: str=None, error_details=None, **kwargs) -> None: + super(ComputeNodeError, self).__init__(**kwargs) + self.code = code + self.message = message + self.error_details = error_details diff --git a/azure-batch/azure/batch/models/compute_node_get_options.py b/azure-batch/azure/batch/models/compute_node_get_options.py index e6e1d051a583..6218d444f803 100644 --- a/azure-batch/azure/batch/models/compute_node_get_options.py +++ b/azure-batch/azure/batch/models/compute_node_get_options.py @@ -33,10 +33,18 @@ class ComputeNodeGetOptions(Model): :type ocp_date: datetime """ - def __init__(self, select=None, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeGetOptions, self).__init__() - self.select = select - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeGetOptions, self).__init__(**kwargs) + self.select = kwargs.get('select', None) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_get_options_py3.py b/azure-batch/azure/batch/models/compute_node_get_options_py3.py new file mode 100644 index 000000000000..de6284b3ce29 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_get_options_py3.py @@ -0,0 +1,50 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeGetOptions(Model): + """Additional parameters for get operation. + + :param select: An OData $select clause. + :type select: str + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, select: str=None, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeGetOptions, self).__init__(**kwargs) + self.select = select + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_get_remote_desktop_options.py b/azure-batch/azure/batch/models/compute_node_get_remote_desktop_options.py index 02f3411ecf7b..20af5558734f 100644 --- a/azure-batch/azure/batch/models/compute_node_get_remote_desktop_options.py +++ b/azure-batch/azure/batch/models/compute_node_get_remote_desktop_options.py @@ -31,9 +31,16 @@ class ComputeNodeGetRemoteDesktopOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeGetRemoteDesktopOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeGetRemoteDesktopOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_get_remote_desktop_options_py3.py b/azure-batch/azure/batch/models/compute_node_get_remote_desktop_options_py3.py new file mode 100644 index 000000000000..d79ce622b6ff --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_get_remote_desktop_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeGetRemoteDesktopOptions(Model): + """Additional parameters for get_remote_desktop operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeGetRemoteDesktopOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_options.py b/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_options.py index fe2243b6b6d5..9c01ed5f1ba9 100644 --- a/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_options.py +++ b/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_options.py @@ -31,9 +31,16 @@ class ComputeNodeGetRemoteLoginSettingsOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeGetRemoteLoginSettingsOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeGetRemoteLoginSettingsOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_options_py3.py b/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_options_py3.py new file mode 100644 index 000000000000..2d7987ab9f30 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeGetRemoteLoginSettingsOptions(Model): + """Additional parameters for get_remote_login_settings operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeGetRemoteLoginSettingsOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_result.py b/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_result.py index 5aa87fcfb846..2d4e378c0c90 100644 --- a/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_result.py +++ b/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_result.py @@ -15,11 +15,13 @@ class ComputeNodeGetRemoteLoginSettingsResult(Model): """The remote login settings for a compute node. - :param remote_login_ip_address: The IP address used for remote login to - the compute node. + All required parameters must be populated in order to send to Azure. + + :param remote_login_ip_address: Required. The IP address used for remote + login to the compute node. :type remote_login_ip_address: str - :param remote_login_port: The port used for remote login to the compute - node. + :param remote_login_port: Required. The port used for remote login to the + compute node. :type remote_login_port: int """ @@ -33,7 +35,7 @@ class ComputeNodeGetRemoteLoginSettingsResult(Model): 'remote_login_port': {'key': 'remoteLoginPort', 'type': 'int'}, } - def __init__(self, remote_login_ip_address, remote_login_port): - super(ComputeNodeGetRemoteLoginSettingsResult, self).__init__() - self.remote_login_ip_address = remote_login_ip_address - self.remote_login_port = remote_login_port + def __init__(self, **kwargs): + super(ComputeNodeGetRemoteLoginSettingsResult, self).__init__(**kwargs) + self.remote_login_ip_address = kwargs.get('remote_login_ip_address', None) + self.remote_login_port = kwargs.get('remote_login_port', None) diff --git a/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_result_py3.py b/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_result_py3.py new file mode 100644 index 000000000000..c13ace1ccd87 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_get_remote_login_settings_result_py3.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeGetRemoteLoginSettingsResult(Model): + """The remote login settings for a compute node. + + All required parameters must be populated in order to send to Azure. + + :param remote_login_ip_address: Required. The IP address used for remote + login to the compute node. + :type remote_login_ip_address: str + :param remote_login_port: Required. The port used for remote login to the + compute node. + :type remote_login_port: int + """ + + _validation = { + 'remote_login_ip_address': {'required': True}, + 'remote_login_port': {'required': True}, + } + + _attribute_map = { + 'remote_login_ip_address': {'key': 'remoteLoginIPAddress', 'type': 'str'}, + 'remote_login_port': {'key': 'remoteLoginPort', 'type': 'int'}, + } + + def __init__(self, *, remote_login_ip_address: str, remote_login_port: int, **kwargs) -> None: + super(ComputeNodeGetRemoteLoginSettingsResult, self).__init__(**kwargs) + self.remote_login_ip_address = remote_login_ip_address + self.remote_login_port = remote_login_port diff --git a/azure-batch/azure/batch/models/compute_node_information.py b/azure-batch/azure/batch/models/compute_node_information.py index ce252eaaac93..9c6a342179b1 100644 --- a/azure-batch/azure/batch/models/compute_node_information.py +++ b/azure-batch/azure/batch/models/compute_node_information.py @@ -42,11 +42,11 @@ class ComputeNodeInformation(Model): 'task_root_directory_url': {'key': 'taskRootDirectoryUrl', 'type': 'str'}, } - def __init__(self, affinity_id=None, node_url=None, pool_id=None, node_id=None, task_root_directory=None, task_root_directory_url=None): - super(ComputeNodeInformation, self).__init__() - self.affinity_id = affinity_id - self.node_url = node_url - self.pool_id = pool_id - self.node_id = node_id - self.task_root_directory = task_root_directory - self.task_root_directory_url = task_root_directory_url + def __init__(self, **kwargs): + super(ComputeNodeInformation, self).__init__(**kwargs) + self.affinity_id = kwargs.get('affinity_id', None) + self.node_url = kwargs.get('node_url', None) + self.pool_id = kwargs.get('pool_id', None) + self.node_id = kwargs.get('node_id', None) + self.task_root_directory = kwargs.get('task_root_directory', None) + self.task_root_directory_url = kwargs.get('task_root_directory_url', None) diff --git a/azure-batch/azure/batch/models/compute_node_information_py3.py b/azure-batch/azure/batch/models/compute_node_information_py3.py new file mode 100644 index 000000000000..7c82bde1b755 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_information_py3.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeInformation(Model): + """Information about the compute node on which a task ran. + + :param affinity_id: An identifier for the compute node on which the task + ran, which can be passed when adding a task to request that the task be + scheduled on this compute node. + :type affinity_id: str + :param node_url: The URL of the node on which the task ran. . + :type node_url: str + :param pool_id: The ID of the pool on which the task ran. + :type pool_id: str + :param node_id: The ID of the node on which the task ran. + :type node_id: str + :param task_root_directory: The root directory of the task on the compute + node. + :type task_root_directory: str + :param task_root_directory_url: The URL to the root directory of the task + on the compute node. + :type task_root_directory_url: str + """ + + _attribute_map = { + 'affinity_id': {'key': 'affinityId', 'type': 'str'}, + 'node_url': {'key': 'nodeUrl', 'type': 'str'}, + 'pool_id': {'key': 'poolId', 'type': 'str'}, + 'node_id': {'key': 'nodeId', 'type': 'str'}, + 'task_root_directory': {'key': 'taskRootDirectory', 'type': 'str'}, + 'task_root_directory_url': {'key': 'taskRootDirectoryUrl', 'type': 'str'}, + } + + def __init__(self, *, affinity_id: str=None, node_url: str=None, pool_id: str=None, node_id: str=None, task_root_directory: str=None, task_root_directory_url: str=None, **kwargs) -> None: + super(ComputeNodeInformation, self).__init__(**kwargs) + self.affinity_id = affinity_id + self.node_url = node_url + self.pool_id = pool_id + self.node_id = node_id + self.task_root_directory = task_root_directory + self.task_root_directory_url = task_root_directory_url diff --git a/azure-batch/azure/batch/models/compute_node_list_options.py b/azure-batch/azure/batch/models/compute_node_list_options.py index a3cd62f3c6aa..b3cf782fbe5b 100644 --- a/azure-batch/azure/batch/models/compute_node_list_options.py +++ b/azure-batch/azure/batch/models/compute_node_list_options.py @@ -40,12 +40,22 @@ class ComputeNodeListOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, select=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeListOptions, self).__init__() - self.filter = filter - self.select = select - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeListOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.select = kwargs.get('select', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_list_options_py3.py b/azure-batch/azure/batch/models/compute_node_list_options_py3.py new file mode 100644 index 000000000000..e046429dcf15 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_list_options_py3.py @@ -0,0 +1,61 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeListOptions(Model): + """Additional parameters for list operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-nodes-in-a-pool. + :type filter: str + :param select: An OData $select clause. + :type select: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 nodes can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, select: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeListOptions, self).__init__(**kwargs) + self.filter = filter + self.select = select + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_py3.py b/azure-batch/azure/batch/models/compute_node_py3.py new file mode 100644 index 000000000000..1b5d7405a981 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_py3.py @@ -0,0 +1,155 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNode(Model): + """A compute node in the Batch service. + + :param id: The ID of the compute node. Every node that is added to a pool + is assigned a unique ID. Whenever a node is removed from a pool, all of + its local files are deleted, and the ID is reclaimed and could be reused + for new nodes. + :type id: str + :param url: The URL of the compute node. + :type url: str + :param state: The current state of the compute node. The low-priority node + has been preempted. Tasks which were running on the node when it was + pre-empted will be rescheduled when another node becomes available. + Possible values include: 'idle', 'rebooting', 'reimaging', 'running', + 'unusable', 'creating', 'starting', 'waitingForStartTask', + 'startTaskFailed', 'unknown', 'leavingPool', 'offline', 'preempted' + :type state: str or ~azure.batch.models.ComputeNodeState + :param scheduling_state: Whether the compute node is available for task + scheduling. Possible values include: 'enabled', 'disabled' + :type scheduling_state: str or ~azure.batch.models.SchedulingState + :param state_transition_time: The time at which the compute node entered + its current state. + :type state_transition_time: datetime + :param last_boot_time: The time at which the compute node was started. + This property may not be present if the node state is unusable. + :type last_boot_time: datetime + :param allocation_time: The time at which this compute node was allocated + to the pool. + :type allocation_time: datetime + :param ip_address: The IP address that other compute nodes can use to + communicate with this compute node. Every node that is added to a pool is + assigned a unique IP address. Whenever a node is removed from a pool, all + of its local files are deleted, and the IP address is reclaimed and could + be reused for new nodes. + :type ip_address: str + :param affinity_id: An identifier which can be passed when adding a task + to request that the task be scheduled on this node. Note that this is just + a soft affinity. If the target node is busy or unavailable at the time the + task is scheduled, then the task will be scheduled elsewhere. + :type affinity_id: str + :param vm_size: The size of the virtual machine hosting the compute node. + For information about available sizes of virtual machines in pools, see + Choose a VM size for compute nodes in an Azure Batch pool + (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). + :type vm_size: str + :param total_tasks_run: The total number of job tasks completed on the + compute node. This includes Job Manager tasks and normal tasks, but not + Job Preparation, Job Release or Start tasks. + :type total_tasks_run: int + :param running_tasks_count: The total number of currently running job + tasks on the compute node. This includes Job Manager tasks and normal + tasks, but not Job Preparation, Job Release or Start tasks. + :type running_tasks_count: int + :param total_tasks_succeeded: The total number of job tasks which + completed successfully (with exitCode 0) on the compute node. This + includes Job Manager tasks and normal tasks, but not Job Preparation, Job + Release or Start tasks. + :type total_tasks_succeeded: int + :param recent_tasks: A list of tasks whose state has recently changed. + This property is present only if at least one task has run on this node + since it was assigned to the pool. + :type recent_tasks: list[~azure.batch.models.TaskInformation] + :param start_task: The task specified to run on the compute node as it + joins the pool. + :type start_task: ~azure.batch.models.StartTask + :param start_task_info: Runtime information about the execution of the + start task on the compute node. + :type start_task_info: ~azure.batch.models.StartTaskInformation + :param certificate_references: The list of certificates installed on the + compute node. For Windows compute nodes, the Batch service installs the + certificates to the specified certificate store and location. For Linux + compute nodes, the certificates are stored in a directory inside the task + working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is + supplied to the task to query for this location. For certificates with + visibility of 'remoteUser', a 'certs' directory is created in the user's + home directory (e.g., /home/{user-name}/certs) and certificates are placed + in that directory. + :type certificate_references: + list[~azure.batch.models.CertificateReference] + :param errors: The list of errors that are currently being encountered by + the compute node. + :type errors: list[~azure.batch.models.ComputeNodeError] + :param is_dedicated: Whether this compute node is a dedicated node. If + false, the node is a low-priority node. + :type is_dedicated: bool + :param endpoint_configuration: The endpoint configuration for the compute + node. + :type endpoint_configuration: + ~azure.batch.models.ComputeNodeEndpointConfiguration + :param node_agent_info: Information about the node agent version and the + time the node upgraded to a new version. + :type node_agent_info: ~azure.batch.models.NodeAgentInformation + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'ComputeNodeState'}, + 'scheduling_state': {'key': 'schedulingState', 'type': 'SchedulingState'}, + 'state_transition_time': {'key': 'stateTransitionTime', 'type': 'iso-8601'}, + 'last_boot_time': {'key': 'lastBootTime', 'type': 'iso-8601'}, + 'allocation_time': {'key': 'allocationTime', 'type': 'iso-8601'}, + 'ip_address': {'key': 'ipAddress', 'type': 'str'}, + 'affinity_id': {'key': 'affinityId', 'type': 'str'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'total_tasks_run': {'key': 'totalTasksRun', 'type': 'int'}, + 'running_tasks_count': {'key': 'runningTasksCount', 'type': 'int'}, + 'total_tasks_succeeded': {'key': 'totalTasksSucceeded', 'type': 'int'}, + 'recent_tasks': {'key': 'recentTasks', 'type': '[TaskInformation]'}, + 'start_task': {'key': 'startTask', 'type': 'StartTask'}, + 'start_task_info': {'key': 'startTaskInfo', 'type': 'StartTaskInformation'}, + 'certificate_references': {'key': 'certificateReferences', 'type': '[CertificateReference]'}, + 'errors': {'key': 'errors', 'type': '[ComputeNodeError]'}, + 'is_dedicated': {'key': 'isDedicated', 'type': 'bool'}, + 'endpoint_configuration': {'key': 'endpointConfiguration', 'type': 'ComputeNodeEndpointConfiguration'}, + 'node_agent_info': {'key': 'nodeAgentInfo', 'type': 'NodeAgentInformation'}, + } + + def __init__(self, *, id: str=None, url: str=None, state=None, scheduling_state=None, state_transition_time=None, last_boot_time=None, allocation_time=None, ip_address: str=None, affinity_id: str=None, vm_size: str=None, total_tasks_run: int=None, running_tasks_count: int=None, total_tasks_succeeded: int=None, recent_tasks=None, start_task=None, start_task_info=None, certificate_references=None, errors=None, is_dedicated: bool=None, endpoint_configuration=None, node_agent_info=None, **kwargs) -> None: + super(ComputeNode, self).__init__(**kwargs) + self.id = id + self.url = url + self.state = state + self.scheduling_state = scheduling_state + self.state_transition_time = state_transition_time + self.last_boot_time = last_boot_time + self.allocation_time = allocation_time + self.ip_address = ip_address + self.affinity_id = affinity_id + self.vm_size = vm_size + self.total_tasks_run = total_tasks_run + self.running_tasks_count = running_tasks_count + self.total_tasks_succeeded = total_tasks_succeeded + self.recent_tasks = recent_tasks + self.start_task = start_task + self.start_task_info = start_task_info + self.certificate_references = certificate_references + self.errors = errors + self.is_dedicated = is_dedicated + self.endpoint_configuration = endpoint_configuration + self.node_agent_info = node_agent_info diff --git a/azure-batch/azure/batch/models/compute_node_reboot_options.py b/azure-batch/azure/batch/models/compute_node_reboot_options.py index e1e18dfd8644..182c563e08ea 100644 --- a/azure-batch/azure/batch/models/compute_node_reboot_options.py +++ b/azure-batch/azure/batch/models/compute_node_reboot_options.py @@ -31,9 +31,16 @@ class ComputeNodeRebootOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeRebootOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeRebootOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_reboot_options_py3.py b/azure-batch/azure/batch/models/compute_node_reboot_options_py3.py new file mode 100644 index 000000000000..97e8cb414166 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_reboot_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeRebootOptions(Model): + """Additional parameters for reboot operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeRebootOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_reimage_options.py b/azure-batch/azure/batch/models/compute_node_reimage_options.py index 8cfe73e5c026..8ec6e55ff6c0 100644 --- a/azure-batch/azure/batch/models/compute_node_reimage_options.py +++ b/azure-batch/azure/batch/models/compute_node_reimage_options.py @@ -31,9 +31,16 @@ class ComputeNodeReimageOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeReimageOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeReimageOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_reimage_options_py3.py b/azure-batch/azure/batch/models/compute_node_reimage_options_py3.py new file mode 100644 index 000000000000..dcff3ee86f32 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_reimage_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeReimageOptions(Model): + """Additional parameters for reimage operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeReimageOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_update_user_options.py b/azure-batch/azure/batch/models/compute_node_update_user_options.py index ac9d7cf9d4a2..ed1f9548c53c 100644 --- a/azure-batch/azure/batch/models/compute_node_update_user_options.py +++ b/azure-batch/azure/batch/models/compute_node_update_user_options.py @@ -31,9 +31,16 @@ class ComputeNodeUpdateUserOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeUpdateUserOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeUpdateUserOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_update_user_options_py3.py b/azure-batch/azure/batch/models/compute_node_update_user_options_py3.py new file mode 100644 index 000000000000..81e45b6cae69 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_update_user_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeUpdateUserOptions(Model): + """Additional parameters for update_user operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeUpdateUserOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_upload_batch_service_logs_options.py b/azure-batch/azure/batch/models/compute_node_upload_batch_service_logs_options.py index f2dd5e775e7e..071b712e9894 100644 --- a/azure-batch/azure/batch/models/compute_node_upload_batch_service_logs_options.py +++ b/azure-batch/azure/batch/models/compute_node_upload_batch_service_logs_options.py @@ -31,9 +31,16 @@ class ComputeNodeUploadBatchServiceLogsOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(ComputeNodeUploadBatchServiceLogsOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(ComputeNodeUploadBatchServiceLogsOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/compute_node_upload_batch_service_logs_options_py3.py b/azure-batch/azure/batch/models/compute_node_upload_batch_service_logs_options_py3.py new file mode 100644 index 000000000000..bac1dad58c36 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_upload_batch_service_logs_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeUploadBatchServiceLogsOptions(Model): + """Additional parameters for upload_batch_service_logs operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(ComputeNodeUploadBatchServiceLogsOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/compute_node_user.py b/azure-batch/azure/batch/models/compute_node_user.py index 453d46c32344..495b246e2988 100644 --- a/azure-batch/azure/batch/models/compute_node_user.py +++ b/azure-batch/azure/batch/models/compute_node_user.py @@ -15,7 +15,9 @@ class ComputeNodeUser(Model): """A user account for RDP or SSH access on a compute node. - :param name: The user name of the account. + All required parameters must be populated in order to send to Azure. + + :param name: Required. The user name of the account. :type name: str :param is_admin: Whether the account should be an administrator on the compute node. The default value is false. @@ -51,10 +53,10 @@ class ComputeNodeUser(Model): 'ssh_public_key': {'key': 'sshPublicKey', 'type': 'str'}, } - def __init__(self, name, is_admin=None, expiry_time=None, password=None, ssh_public_key=None): - super(ComputeNodeUser, self).__init__() - self.name = name - self.is_admin = is_admin - self.expiry_time = expiry_time - self.password = password - self.ssh_public_key = ssh_public_key + def __init__(self, **kwargs): + super(ComputeNodeUser, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.is_admin = kwargs.get('is_admin', None) + self.expiry_time = kwargs.get('expiry_time', None) + self.password = kwargs.get('password', None) + self.ssh_public_key = kwargs.get('ssh_public_key', None) diff --git a/azure-batch/azure/batch/models/compute_node_user_py3.py b/azure-batch/azure/batch/models/compute_node_user_py3.py new file mode 100644 index 000000000000..a88a6ab29950 --- /dev/null +++ b/azure-batch/azure/batch/models/compute_node_user_py3.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeNodeUser(Model): + """A user account for RDP or SSH access on a compute node. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. The user name of the account. + :type name: str + :param is_admin: Whether the account should be an administrator on the + compute node. The default value is false. + :type is_admin: bool + :param expiry_time: The time at which the account should expire. If + omitted, the default is 1 day from the current time. For Linux compute + nodes, the expiryTime has a precision up to a day. + :type expiry_time: datetime + :param password: The password of the account. The password is required for + Windows nodes (those created with 'cloudServiceConfiguration', or created + with 'virtualMachineConfiguration' using a Windows image reference). For + Linux compute nodes, the password can optionally be specified along with + the sshPublicKey property. + :type password: str + :param ssh_public_key: The SSH public key that can be used for remote + login to the compute node. The public key should be compatible with + OpenSSH encoding and should be base 64 encoded. This property can be + specified only for Linux nodes. If this is specified for a Windows node, + then the Batch service rejects the request; if you are calling the REST + API directly, the HTTP status code is 400 (Bad Request). + :type ssh_public_key: str + """ + + _validation = { + 'name': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'is_admin': {'key': 'isAdmin', 'type': 'bool'}, + 'expiry_time': {'key': 'expiryTime', 'type': 'iso-8601'}, + 'password': {'key': 'password', 'type': 'str'}, + 'ssh_public_key': {'key': 'sshPublicKey', 'type': 'str'}, + } + + def __init__(self, *, name: str, is_admin: bool=None, expiry_time=None, password: str=None, ssh_public_key: str=None, **kwargs) -> None: + super(ComputeNodeUser, self).__init__(**kwargs) + self.name = name + self.is_admin = is_admin + self.expiry_time = expiry_time + self.password = password + self.ssh_public_key = ssh_public_key diff --git a/azure-batch/azure/batch/models/container_configuration.py b/azure-batch/azure/batch/models/container_configuration.py index 5efa779fc582..f4b932c4a257 100644 --- a/azure-batch/azure/batch/models/container_configuration.py +++ b/azure-batch/azure/batch/models/container_configuration.py @@ -18,8 +18,10 @@ class ContainerConfiguration(Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar type: The container technology to be used. Default value: "docker" - . + All required parameters must be populated in order to send to Azure. + + :ivar type: Required. The container technology to be used. Default value: + "dockerCompatible" . :vartype type: str :param container_image_names: The collection of container image names. This is the full image reference, as would be specified to "docker pull". @@ -43,9 +45,9 @@ class ContainerConfiguration(Model): 'container_registries': {'key': 'containerRegistries', 'type': '[ContainerRegistry]'}, } - type = "docker" + type = "dockerCompatible" - def __init__(self, container_image_names=None, container_registries=None): - super(ContainerConfiguration, self).__init__() - self.container_image_names = container_image_names - self.container_registries = container_registries + def __init__(self, **kwargs): + super(ContainerConfiguration, self).__init__(**kwargs) + self.container_image_names = kwargs.get('container_image_names', None) + self.container_registries = kwargs.get('container_registries', None) diff --git a/azure-batch/azure/batch/models/container_configuration_py3.py b/azure-batch/azure/batch/models/container_configuration_py3.py new file mode 100644 index 000000000000..f65b047ea4dc --- /dev/null +++ b/azure-batch/azure/batch/models/container_configuration_py3.py @@ -0,0 +1,53 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ContainerConfiguration(Model): + """The configuration for container-enabled pools. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :ivar type: Required. The container technology to be used. Default value: + "dockerCompatible" . + :vartype type: str + :param container_image_names: The collection of container image names. + This is the full image reference, as would be specified to "docker pull". + An image will be sourced from the default Docker registry unless the image + is fully qualified with an alternative registry. + :type container_image_names: list[str] + :param container_registries: Additional private registries from which + containers can be pulled. If any images must be downloaded from a private + registry which requires credentials, then those credentials must be + provided here. + :type container_registries: list[~azure.batch.models.ContainerRegistry] + """ + + _validation = { + 'type': {'required': True, 'constant': True}, + } + + _attribute_map = { + 'type': {'key': 'type', 'type': 'str'}, + 'container_image_names': {'key': 'containerImageNames', 'type': '[str]'}, + 'container_registries': {'key': 'containerRegistries', 'type': '[ContainerRegistry]'}, + } + + type = "dockerCompatible" + + def __init__(self, *, container_image_names=None, container_registries=None, **kwargs) -> None: + super(ContainerConfiguration, self).__init__(**kwargs) + self.container_image_names = container_image_names + self.container_registries = container_registries diff --git a/azure-batch/azure/batch/models/container_registry.py b/azure-batch/azure/batch/models/container_registry.py index 235caef875b2..1820319652d0 100644 --- a/azure-batch/azure/batch/models/container_registry.py +++ b/azure-batch/azure/batch/models/container_registry.py @@ -15,12 +15,14 @@ class ContainerRegistry(Model): """A private container registry. + All required parameters must be populated in order to send to Azure. + :param registry_server: The registry URL. If omitted, the default is "docker.io". :type registry_server: str - :param user_name: The user name to log into the registry server. + :param user_name: Required. The user name to log into the registry server. :type user_name: str - :param password: The password to log into the registry server. + :param password: Required. The password to log into the registry server. :type password: str """ @@ -35,8 +37,8 @@ class ContainerRegistry(Model): 'password': {'key': 'password', 'type': 'str'}, } - def __init__(self, user_name, password, registry_server=None): - super(ContainerRegistry, self).__init__() - self.registry_server = registry_server - self.user_name = user_name - self.password = password + def __init__(self, **kwargs): + super(ContainerRegistry, self).__init__(**kwargs) + self.registry_server = kwargs.get('registry_server', None) + self.user_name = kwargs.get('user_name', None) + self.password = kwargs.get('password', None) diff --git a/azure-batch/azure/batch/models/container_registry_py3.py b/azure-batch/azure/batch/models/container_registry_py3.py new file mode 100644 index 000000000000..eb47f9e5dc4c --- /dev/null +++ b/azure-batch/azure/batch/models/container_registry_py3.py @@ -0,0 +1,44 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ContainerRegistry(Model): + """A private container registry. + + All required parameters must be populated in order to send to Azure. + + :param registry_server: The registry URL. If omitted, the default is + "docker.io". + :type registry_server: str + :param user_name: Required. The user name to log into the registry server. + :type user_name: str + :param password: Required. The password to log into the registry server. + :type password: str + """ + + _validation = { + 'user_name': {'required': True}, + 'password': {'required': True}, + } + + _attribute_map = { + 'registry_server': {'key': 'registryServer', 'type': 'str'}, + 'user_name': {'key': 'username', 'type': 'str'}, + 'password': {'key': 'password', 'type': 'str'}, + } + + def __init__(self, *, user_name: str, password: str, registry_server: str=None, **kwargs) -> None: + super(ContainerRegistry, self).__init__(**kwargs) + self.registry_server = registry_server + self.user_name = user_name + self.password = password diff --git a/azure-batch/azure/batch/models/data_disk.py b/azure-batch/azure/batch/models/data_disk.py index 46954f4cadbd..d2f80dadf964 100644 --- a/azure-batch/azure/batch/models/data_disk.py +++ b/azure-batch/azure/batch/models/data_disk.py @@ -16,17 +16,19 @@ class DataDisk(Model): """Settings which will be used by the data disks associated to compute nodes in the pool. - :param lun: The logical unit number. The lun is used to uniquely identify - each data disk. If attaching multiple disks, each should have a distinct - lun. + All required parameters must be populated in order to send to Azure. + + :param lun: Required. The logical unit number. The lun is used to uniquely + identify each data disk. If attaching multiple disks, each should have a + distinct lun. :type lun: int :param caching: The type of caching to be enabled for the data disks. The - default value for caching is none. For information about the caching + default value for caching is readwrite. For information about the caching options see: https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/. Possible values include: 'none', 'readOnly', 'readWrite' :type caching: str or ~azure.batch.models.CachingType - :param disk_size_gb: The initial disk size in gigabytes. + :param disk_size_gb: Required. The initial disk size in gigabytes. :type disk_size_gb: int :param storage_account_type: The storage account type to be used for the data disk. If omitted, the default is "standard_lrs". Possible values @@ -46,9 +48,9 @@ class DataDisk(Model): 'storage_account_type': {'key': 'storageAccountType', 'type': 'StorageAccountType'}, } - def __init__(self, lun, disk_size_gb, caching=None, storage_account_type=None): - super(DataDisk, self).__init__() - self.lun = lun - self.caching = caching - self.disk_size_gb = disk_size_gb - self.storage_account_type = storage_account_type + def __init__(self, **kwargs): + super(DataDisk, self).__init__(**kwargs) + self.lun = kwargs.get('lun', None) + self.caching = kwargs.get('caching', None) + self.disk_size_gb = kwargs.get('disk_size_gb', None) + self.storage_account_type = kwargs.get('storage_account_type', None) diff --git a/azure-batch/azure/batch/models/data_disk_py3.py b/azure-batch/azure/batch/models/data_disk_py3.py new file mode 100644 index 000000000000..2af0ce19fb72 --- /dev/null +++ b/azure-batch/azure/batch/models/data_disk_py3.py @@ -0,0 +1,56 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class DataDisk(Model): + """Settings which will be used by the data disks associated to compute nodes + in the pool. + + All required parameters must be populated in order to send to Azure. + + :param lun: Required. The logical unit number. The lun is used to uniquely + identify each data disk. If attaching multiple disks, each should have a + distinct lun. + :type lun: int + :param caching: The type of caching to be enabled for the data disks. The + default value for caching is readwrite. For information about the caching + options see: + https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/. + Possible values include: 'none', 'readOnly', 'readWrite' + :type caching: str or ~azure.batch.models.CachingType + :param disk_size_gb: Required. The initial disk size in gigabytes. + :type disk_size_gb: int + :param storage_account_type: The storage account type to be used for the + data disk. If omitted, the default is "standard_lrs". Possible values + include: 'StandardLRS', 'PremiumLRS' + :type storage_account_type: str or ~azure.batch.models.StorageAccountType + """ + + _validation = { + 'lun': {'required': True}, + 'disk_size_gb': {'required': True}, + } + + _attribute_map = { + 'lun': {'key': 'lun', 'type': 'int'}, + 'caching': {'key': 'caching', 'type': 'CachingType'}, + 'disk_size_gb': {'key': 'diskSizeGB', 'type': 'int'}, + 'storage_account_type': {'key': 'storageAccountType', 'type': 'StorageAccountType'}, + } + + def __init__(self, *, lun: int, disk_size_gb: int, caching=None, storage_account_type=None, **kwargs) -> None: + super(DataDisk, self).__init__(**kwargs) + self.lun = lun + self.caching = caching + self.disk_size_gb = disk_size_gb + self.storage_account_type = storage_account_type diff --git a/azure-batch/azure/batch/models/delete_certificate_error.py b/azure-batch/azure/batch/models/delete_certificate_error.py index 444daaea0e77..dbb14c3ca4a1 100644 --- a/azure-batch/azure/batch/models/delete_certificate_error.py +++ b/azure-batch/azure/batch/models/delete_certificate_error.py @@ -35,8 +35,8 @@ class DeleteCertificateError(Model): 'values': {'key': 'values', 'type': '[NameValuePair]'}, } - def __init__(self, code=None, message=None, values=None): - super(DeleteCertificateError, self).__init__() - self.code = code - self.message = message - self.values = values + def __init__(self, **kwargs): + super(DeleteCertificateError, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) + self.values = kwargs.get('values', None) diff --git a/azure-batch/azure/batch/models/delete_certificate_error_py3.py b/azure-batch/azure/batch/models/delete_certificate_error_py3.py new file mode 100644 index 000000000000..246a12a07edd --- /dev/null +++ b/azure-batch/azure/batch/models/delete_certificate_error_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class DeleteCertificateError(Model): + """An error encountered by the Batch service when deleting a certificate. + + :param code: An identifier for the certificate deletion error. Codes are + invariant and are intended to be consumed programmatically. + :type code: str + :param message: A message describing the certificate deletion error, + intended to be suitable for display in a user interface. + :type message: str + :param values: A list of additional error details related to the + certificate deletion error. This list includes details such as the active + pools and nodes referencing this certificate. However, if a large number + of resources reference the certificate, the list contains only about the + first hundred. + :type values: list[~azure.batch.models.NameValuePair] + """ + + _attribute_map = { + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + 'values': {'key': 'values', 'type': '[NameValuePair]'}, + } + + def __init__(self, *, code: str=None, message: str=None, values=None, **kwargs) -> None: + super(DeleteCertificateError, self).__init__(**kwargs) + self.code = code + self.message = message + self.values = values diff --git a/azure-batch/azure/batch/models/environment_setting.py b/azure-batch/azure/batch/models/environment_setting.py index e4c1489bd9e5..e46a6e5ec33e 100644 --- a/azure-batch/azure/batch/models/environment_setting.py +++ b/azure-batch/azure/batch/models/environment_setting.py @@ -15,7 +15,9 @@ class EnvironmentSetting(Model): """An environment variable to be set on a task process. - :param name: The name of the environment variable. + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the environment variable. :type name: str :param value: The value of the environment variable. :type value: str @@ -30,7 +32,7 @@ class EnvironmentSetting(Model): 'value': {'key': 'value', 'type': 'str'}, } - def __init__(self, name, value=None): - super(EnvironmentSetting, self).__init__() - self.name = name - self.value = value + def __init__(self, **kwargs): + super(EnvironmentSetting, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.value = kwargs.get('value', None) diff --git a/azure-batch/azure/batch/models/environment_setting_py3.py b/azure-batch/azure/batch/models/environment_setting_py3.py new file mode 100644 index 000000000000..facb8f442be2 --- /dev/null +++ b/azure-batch/azure/batch/models/environment_setting_py3.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class EnvironmentSetting(Model): + """An environment variable to be set on a task process. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the environment variable. + :type name: str + :param value: The value of the environment variable. + :type value: str + """ + + _validation = { + 'name': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, *, name: str, value: str=None, **kwargs) -> None: + super(EnvironmentSetting, self).__init__(**kwargs) + self.name = name + self.value = value diff --git a/azure-batch/azure/batch/models/error_message.py b/azure-batch/azure/batch/models/error_message.py index 18cc2136d4f9..bbdf64f1d551 100644 --- a/azure-batch/azure/batch/models/error_message.py +++ b/azure-batch/azure/batch/models/error_message.py @@ -26,7 +26,7 @@ class ErrorMessage(Model): 'value': {'key': 'value', 'type': 'str'}, } - def __init__(self, lang=None, value=None): - super(ErrorMessage, self).__init__() - self.lang = lang - self.value = value + def __init__(self, **kwargs): + super(ErrorMessage, self).__init__(**kwargs) + self.lang = kwargs.get('lang', None) + self.value = kwargs.get('value', None) diff --git a/azure-batch/azure/batch/models/error_message_py3.py b/azure-batch/azure/batch/models/error_message_py3.py new file mode 100644 index 000000000000..a84934fc27c3 --- /dev/null +++ b/azure-batch/azure/batch/models/error_message_py3.py @@ -0,0 +1,32 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ErrorMessage(Model): + """An error message received in an Azure Batch error response. + + :param lang: The language code of the error message. + :type lang: str + :param value: The text of the message. + :type value: str + """ + + _attribute_map = { + 'lang': {'key': 'lang', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, *, lang: str=None, value: str=None, **kwargs) -> None: + super(ErrorMessage, self).__init__(**kwargs) + self.lang = lang + self.value = value diff --git a/azure-batch/azure/batch/models/exit_code_mapping.py b/azure-batch/azure/batch/models/exit_code_mapping.py index 1ae0c1355218..57977e3db851 100644 --- a/azure-batch/azure/batch/models/exit_code_mapping.py +++ b/azure-batch/azure/batch/models/exit_code_mapping.py @@ -16,10 +16,12 @@ class ExitCodeMapping(Model): """How the Batch service should respond if a task exits with a particular exit code. - :param code: A process exit code. + All required parameters must be populated in order to send to Azure. + + :param code: Required. A process exit code. :type code: int - :param exit_options: How the Batch service should respond if the task - exits with this exit code. + :param exit_options: Required. How the Batch service should respond if the + task exits with this exit code. :type exit_options: ~azure.batch.models.ExitOptions """ @@ -33,7 +35,7 @@ class ExitCodeMapping(Model): 'exit_options': {'key': 'exitOptions', 'type': 'ExitOptions'}, } - def __init__(self, code, exit_options): - super(ExitCodeMapping, self).__init__() - self.code = code - self.exit_options = exit_options + def __init__(self, **kwargs): + super(ExitCodeMapping, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.exit_options = kwargs.get('exit_options', None) diff --git a/azure-batch/azure/batch/models/exit_code_mapping_py3.py b/azure-batch/azure/batch/models/exit_code_mapping_py3.py new file mode 100644 index 000000000000..5a5176bbe903 --- /dev/null +++ b/azure-batch/azure/batch/models/exit_code_mapping_py3.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ExitCodeMapping(Model): + """How the Batch service should respond if a task exits with a particular exit + code. + + All required parameters must be populated in order to send to Azure. + + :param code: Required. A process exit code. + :type code: int + :param exit_options: Required. How the Batch service should respond if the + task exits with this exit code. + :type exit_options: ~azure.batch.models.ExitOptions + """ + + _validation = { + 'code': {'required': True}, + 'exit_options': {'required': True}, + } + + _attribute_map = { + 'code': {'key': 'code', 'type': 'int'}, + 'exit_options': {'key': 'exitOptions', 'type': 'ExitOptions'}, + } + + def __init__(self, *, code: int, exit_options, **kwargs) -> None: + super(ExitCodeMapping, self).__init__(**kwargs) + self.code = code + self.exit_options = exit_options diff --git a/azure-batch/azure/batch/models/exit_code_range_mapping.py b/azure-batch/azure/batch/models/exit_code_range_mapping.py index a7485882980b..999272ae7c97 100644 --- a/azure-batch/azure/batch/models/exit_code_range_mapping.py +++ b/azure-batch/azure/batch/models/exit_code_range_mapping.py @@ -16,12 +16,14 @@ class ExitCodeRangeMapping(Model): """A range of exit codes and how the Batch service should respond to exit codes within that range. - :param start: The first exit code in the range. + All required parameters must be populated in order to send to Azure. + + :param start: Required. The first exit code in the range. :type start: int - :param end: The last exit code in the range. + :param end: Required. The last exit code in the range. :type end: int - :param exit_options: How the Batch service should respond if the task - exits with an exit code in the range start to end (inclusive). + :param exit_options: Required. How the Batch service should respond if the + task exits with an exit code in the range start to end (inclusive). :type exit_options: ~azure.batch.models.ExitOptions """ @@ -37,8 +39,8 @@ class ExitCodeRangeMapping(Model): 'exit_options': {'key': 'exitOptions', 'type': 'ExitOptions'}, } - def __init__(self, start, end, exit_options): - super(ExitCodeRangeMapping, self).__init__() - self.start = start - self.end = end - self.exit_options = exit_options + def __init__(self, **kwargs): + super(ExitCodeRangeMapping, self).__init__(**kwargs) + self.start = kwargs.get('start', None) + self.end = kwargs.get('end', None) + self.exit_options = kwargs.get('exit_options', None) diff --git a/azure-batch/azure/batch/models/exit_code_range_mapping_py3.py b/azure-batch/azure/batch/models/exit_code_range_mapping_py3.py new file mode 100644 index 000000000000..9a3da0bd9907 --- /dev/null +++ b/azure-batch/azure/batch/models/exit_code_range_mapping_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ExitCodeRangeMapping(Model): + """A range of exit codes and how the Batch service should respond to exit + codes within that range. + + All required parameters must be populated in order to send to Azure. + + :param start: Required. The first exit code in the range. + :type start: int + :param end: Required. The last exit code in the range. + :type end: int + :param exit_options: Required. How the Batch service should respond if the + task exits with an exit code in the range start to end (inclusive). + :type exit_options: ~azure.batch.models.ExitOptions + """ + + _validation = { + 'start': {'required': True}, + 'end': {'required': True}, + 'exit_options': {'required': True}, + } + + _attribute_map = { + 'start': {'key': 'start', 'type': 'int'}, + 'end': {'key': 'end', 'type': 'int'}, + 'exit_options': {'key': 'exitOptions', 'type': 'ExitOptions'}, + } + + def __init__(self, *, start: int, end: int, exit_options, **kwargs) -> None: + super(ExitCodeRangeMapping, self).__init__(**kwargs) + self.start = start + self.end = end + self.exit_options = exit_options diff --git a/azure-batch/azure/batch/models/exit_conditions.py b/azure-batch/azure/batch/models/exit_conditions.py index 8ad98d230ba8..c368f4a16f25 100644 --- a/azure-batch/azure/batch/models/exit_conditions.py +++ b/azure-batch/azure/batch/models/exit_conditions.py @@ -48,10 +48,10 @@ class ExitConditions(Model): 'default': {'key': 'default', 'type': 'ExitOptions'}, } - def __init__(self, exit_codes=None, exit_code_ranges=None, pre_processing_error=None, file_upload_error=None, default=None): - super(ExitConditions, self).__init__() - self.exit_codes = exit_codes - self.exit_code_ranges = exit_code_ranges - self.pre_processing_error = pre_processing_error - self.file_upload_error = file_upload_error - self.default = default + def __init__(self, **kwargs): + super(ExitConditions, self).__init__(**kwargs) + self.exit_codes = kwargs.get('exit_codes', None) + self.exit_code_ranges = kwargs.get('exit_code_ranges', None) + self.pre_processing_error = kwargs.get('pre_processing_error', None) + self.file_upload_error = kwargs.get('file_upload_error', None) + self.default = kwargs.get('default', None) diff --git a/azure-batch/azure/batch/models/exit_conditions_py3.py b/azure-batch/azure/batch/models/exit_conditions_py3.py new file mode 100644 index 000000000000..f0630c7fecc2 --- /dev/null +++ b/azure-batch/azure/batch/models/exit_conditions_py3.py @@ -0,0 +1,57 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ExitConditions(Model): + """Specifies how the Batch service should respond when the task completes. + + :param exit_codes: A list of individual task exit codes and how the Batch + service should respond to them. + :type exit_codes: list[~azure.batch.models.ExitCodeMapping] + :param exit_code_ranges: A list of task exit code ranges and how the Batch + service should respond to them. + :type exit_code_ranges: list[~azure.batch.models.ExitCodeRangeMapping] + :param pre_processing_error: How the Batch service should respond if the + task fails to start due to an error. + :type pre_processing_error: ~azure.batch.models.ExitOptions + :param file_upload_error: How the Batch service should respond if a file + upload error occurs. If the task exited with an exit code that was + specified via exitCodes or exitCodeRanges, and then encountered a file + upload error, then the action specified by the exit code takes precedence. + :type file_upload_error: ~azure.batch.models.ExitOptions + :param default: How the Batch service should respond if the task fails + with an exit condition not covered by any of the other properties. This + value is used if the task exits with any nonzero exit code not listed in + the exitCodes or exitCodeRanges collection, with a pre-processing error if + the preProcessingError property is not present, or with a file upload + error if the fileUploadError property is not present. If you want + non-default behaviour on exit code 0, you must list it explicitly using + the exitCodes or exitCodeRanges collection. + :type default: ~azure.batch.models.ExitOptions + """ + + _attribute_map = { + 'exit_codes': {'key': 'exitCodes', 'type': '[ExitCodeMapping]'}, + 'exit_code_ranges': {'key': 'exitCodeRanges', 'type': '[ExitCodeRangeMapping]'}, + 'pre_processing_error': {'key': 'preProcessingError', 'type': 'ExitOptions'}, + 'file_upload_error': {'key': 'fileUploadError', 'type': 'ExitOptions'}, + 'default': {'key': 'default', 'type': 'ExitOptions'}, + } + + def __init__(self, *, exit_codes=None, exit_code_ranges=None, pre_processing_error=None, file_upload_error=None, default=None, **kwargs) -> None: + super(ExitConditions, self).__init__(**kwargs) + self.exit_codes = exit_codes + self.exit_code_ranges = exit_code_ranges + self.pre_processing_error = pre_processing_error + self.file_upload_error = file_upload_error + self.default = default diff --git a/azure-batch/azure/batch/models/exit_options.py b/azure-batch/azure/batch/models/exit_options.py index 02ce3ab662bf..f7f5e7b10578 100644 --- a/azure-batch/azure/batch/models/exit_options.py +++ b/azure-batch/azure/batch/models/exit_options.py @@ -41,7 +41,7 @@ class ExitOptions(Model): 'dependency_action': {'key': 'dependencyAction', 'type': 'DependencyAction'}, } - def __init__(self, job_action=None, dependency_action=None): - super(ExitOptions, self).__init__() - self.job_action = job_action - self.dependency_action = dependency_action + def __init__(self, **kwargs): + super(ExitOptions, self).__init__(**kwargs) + self.job_action = kwargs.get('job_action', None) + self.dependency_action = kwargs.get('dependency_action', None) diff --git a/azure-batch/azure/batch/models/exit_options_py3.py b/azure-batch/azure/batch/models/exit_options_py3.py new file mode 100644 index 000000000000..0867bbea15a8 --- /dev/null +++ b/azure-batch/azure/batch/models/exit_options_py3.py @@ -0,0 +1,47 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ExitOptions(Model): + """Specifies how the Batch service responds to a particular exit condition. + + :param job_action: An action to take on the job containing the task, if + the task completes with the given exit condition and the job's + onTaskFailed property is 'performExitOptionsJobAction'. The default is + none for exit code 0 and terminate for all other exit conditions. If the + job's onTaskFailed property is noaction, then specifying this property + returns an error and the add task request fails with an invalid property + value error; if you are calling the REST API directly, the HTTP status + code is 400 (Bad Request). Possible values include: 'none', 'disable', + 'terminate' + :type job_action: str or ~azure.batch.models.JobAction + :param dependency_action: An action that the Batch service performs on + tasks that depend on this task. The default is 'satisfy' for exit code 0, + and 'block' for all other exit conditions. If the job's + usesTaskDependencies property is set to false, then specifying the + dependencyAction property returns an error and the add task request fails + with an invalid property value error; if you are calling the REST API + directly, the HTTP status code is 400 (Bad Request). Possible values + include: 'satisfy', 'block' + :type dependency_action: str or ~azure.batch.models.DependencyAction + """ + + _attribute_map = { + 'job_action': {'key': 'jobAction', 'type': 'JobAction'}, + 'dependency_action': {'key': 'dependencyAction', 'type': 'DependencyAction'}, + } + + def __init__(self, *, job_action=None, dependency_action=None, **kwargs) -> None: + super(ExitOptions, self).__init__(**kwargs) + self.job_action = job_action + self.dependency_action = dependency_action diff --git a/azure-batch/azure/batch/models/file_delete_from_compute_node_options.py b/azure-batch/azure/batch/models/file_delete_from_compute_node_options.py index 1e800b2e1c11..7522e8063b26 100644 --- a/azure-batch/azure/batch/models/file_delete_from_compute_node_options.py +++ b/azure-batch/azure/batch/models/file_delete_from_compute_node_options.py @@ -31,9 +31,16 @@ class FileDeleteFromComputeNodeOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(FileDeleteFromComputeNodeOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(FileDeleteFromComputeNodeOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/file_delete_from_compute_node_options_py3.py b/azure-batch/azure/batch/models/file_delete_from_compute_node_options_py3.py new file mode 100644 index 000000000000..62291d142fa7 --- /dev/null +++ b/azure-batch/azure/batch/models/file_delete_from_compute_node_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileDeleteFromComputeNodeOptions(Model): + """Additional parameters for delete_from_compute_node operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(FileDeleteFromComputeNodeOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/file_delete_from_task_options.py b/azure-batch/azure/batch/models/file_delete_from_task_options.py index 085e9168b773..054babe83ab2 100644 --- a/azure-batch/azure/batch/models/file_delete_from_task_options.py +++ b/azure-batch/azure/batch/models/file_delete_from_task_options.py @@ -31,9 +31,16 @@ class FileDeleteFromTaskOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(FileDeleteFromTaskOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(FileDeleteFromTaskOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/file_delete_from_task_options_py3.py b/azure-batch/azure/batch/models/file_delete_from_task_options_py3.py new file mode 100644 index 000000000000..7d783006c7c0 --- /dev/null +++ b/azure-batch/azure/batch/models/file_delete_from_task_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileDeleteFromTaskOptions(Model): + """Additional parameters for delete_from_task operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(FileDeleteFromTaskOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/file_get_from_compute_node_options.py b/azure-batch/azure/batch/models/file_get_from_compute_node_options.py index 343eff9c5932..9a6e3fb706cb 100644 --- a/azure-batch/azure/batch/models/file_get_from_compute_node_options.py +++ b/azure-batch/azure/batch/models/file_get_from_compute_node_options.py @@ -43,12 +43,22 @@ class FileGetFromComputeNodeOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, ocp_range=None, if_modified_since=None, if_unmodified_since=None): - super(FileGetFromComputeNodeOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.ocp_range = ocp_range - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'ocp_range': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(FileGetFromComputeNodeOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.ocp_range = kwargs.get('ocp_range', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/file_get_from_compute_node_options_py3.py b/azure-batch/azure/batch/models/file_get_from_compute_node_options_py3.py new file mode 100644 index 000000000000..ab3dc34f2ba4 --- /dev/null +++ b/azure-batch/azure/batch/models/file_get_from_compute_node_options_py3.py @@ -0,0 +1,64 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileGetFromComputeNodeOptions(Model): + """Additional parameters for get_from_compute_node operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param ocp_range: The byte range to be retrieved. The default is to + retrieve the entire file. The format is bytes=startRange-endRange. + :type ocp_range: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'ocp_range': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, ocp_range: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(FileGetFromComputeNodeOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.ocp_range = ocp_range + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/file_get_from_task_options.py b/azure-batch/azure/batch/models/file_get_from_task_options.py index 85bda95e8c55..19bd5cde36f7 100644 --- a/azure-batch/azure/batch/models/file_get_from_task_options.py +++ b/azure-batch/azure/batch/models/file_get_from_task_options.py @@ -43,12 +43,22 @@ class FileGetFromTaskOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, ocp_range=None, if_modified_since=None, if_unmodified_since=None): - super(FileGetFromTaskOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.ocp_range = ocp_range - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'ocp_range': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(FileGetFromTaskOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.ocp_range = kwargs.get('ocp_range', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/file_get_from_task_options_py3.py b/azure-batch/azure/batch/models/file_get_from_task_options_py3.py new file mode 100644 index 000000000000..30ec65839bcd --- /dev/null +++ b/azure-batch/azure/batch/models/file_get_from_task_options_py3.py @@ -0,0 +1,64 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileGetFromTaskOptions(Model): + """Additional parameters for get_from_task operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param ocp_range: The byte range to be retrieved. The default is to + retrieve the entire file. The format is bytes=startRange-endRange. + :type ocp_range: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'ocp_range': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, ocp_range: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(FileGetFromTaskOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.ocp_range = ocp_range + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/file_get_properties_from_compute_node_options.py b/azure-batch/azure/batch/models/file_get_properties_from_compute_node_options.py index d571bb08e2cb..bf283d1d08e0 100644 --- a/azure-batch/azure/batch/models/file_get_properties_from_compute_node_options.py +++ b/azure-batch/azure/batch/models/file_get_properties_from_compute_node_options.py @@ -40,11 +40,20 @@ class FileGetPropertiesFromComputeNodeOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_modified_since=None, if_unmodified_since=None): - super(FileGetPropertiesFromComputeNodeOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(FileGetPropertiesFromComputeNodeOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/file_get_properties_from_compute_node_options_py3.py b/azure-batch/azure/batch/models/file_get_properties_from_compute_node_options_py3.py new file mode 100644 index 000000000000..69a901845c5c --- /dev/null +++ b/azure-batch/azure/batch/models/file_get_properties_from_compute_node_options_py3.py @@ -0,0 +1,59 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileGetPropertiesFromComputeNodeOptions(Model): + """Additional parameters for get_properties_from_compute_node operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(FileGetPropertiesFromComputeNodeOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/file_get_properties_from_task_options.py b/azure-batch/azure/batch/models/file_get_properties_from_task_options.py index 8b4fea682d38..836387d32cca 100644 --- a/azure-batch/azure/batch/models/file_get_properties_from_task_options.py +++ b/azure-batch/azure/batch/models/file_get_properties_from_task_options.py @@ -40,11 +40,20 @@ class FileGetPropertiesFromTaskOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_modified_since=None, if_unmodified_since=None): - super(FileGetPropertiesFromTaskOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(FileGetPropertiesFromTaskOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/file_get_properties_from_task_options_py3.py b/azure-batch/azure/batch/models/file_get_properties_from_task_options_py3.py new file mode 100644 index 000000000000..739968950e4a --- /dev/null +++ b/azure-batch/azure/batch/models/file_get_properties_from_task_options_py3.py @@ -0,0 +1,59 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileGetPropertiesFromTaskOptions(Model): + """Additional parameters for get_properties_from_task operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(FileGetPropertiesFromTaskOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/file_list_from_compute_node_options.py b/azure-batch/azure/batch/models/file_list_from_compute_node_options.py index 743a4cbea4c3..dc32df46952e 100644 --- a/azure-batch/azure/batch/models/file_list_from_compute_node_options.py +++ b/azure-batch/azure/batch/models/file_list_from_compute_node_options.py @@ -38,11 +38,20 @@ class FileListFromComputeNodeOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(FileListFromComputeNodeOptions, self).__init__() - self.filter = filter - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(FileListFromComputeNodeOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/file_list_from_compute_node_options_py3.py b/azure-batch/azure/batch/models/file_list_from_compute_node_options_py3.py new file mode 100644 index 000000000000..e475dcde1242 --- /dev/null +++ b/azure-batch/azure/batch/models/file_list_from_compute_node_options_py3.py @@ -0,0 +1,57 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileListFromComputeNodeOptions(Model): + """Additional parameters for list_from_compute_node operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-compute-node-files. + :type filter: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 files can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(FileListFromComputeNodeOptions, self).__init__(**kwargs) + self.filter = filter + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/file_list_from_task_options.py b/azure-batch/azure/batch/models/file_list_from_task_options.py index f9dd62d25254..86728b259518 100644 --- a/azure-batch/azure/batch/models/file_list_from_task_options.py +++ b/azure-batch/azure/batch/models/file_list_from_task_options.py @@ -38,11 +38,20 @@ class FileListFromTaskOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(FileListFromTaskOptions, self).__init__() - self.filter = filter - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(FileListFromTaskOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/file_list_from_task_options_py3.py b/azure-batch/azure/batch/models/file_list_from_task_options_py3.py new file mode 100644 index 000000000000..354c48696129 --- /dev/null +++ b/azure-batch/azure/batch/models/file_list_from_task_options_py3.py @@ -0,0 +1,57 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileListFromTaskOptions(Model): + """Additional parameters for list_from_task operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-task-files. + :type filter: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 files can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(FileListFromTaskOptions, self).__init__(**kwargs) + self.filter = filter + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/file_properties.py b/azure-batch/azure/batch/models/file_properties.py index a2e73ec5bae1..3cef000070f1 100644 --- a/azure-batch/azure/batch/models/file_properties.py +++ b/azure-batch/azure/batch/models/file_properties.py @@ -15,12 +15,15 @@ class FileProperties(Model): """The properties of a file on a compute node. + All required parameters must be populated in order to send to Azure. + :param creation_time: The file creation time. The creation time is not returned for files on Linux compute nodes. :type creation_time: datetime - :param last_modified: The time at which the file was last modified. + :param last_modified: Required. The time at which the file was last + modified. :type last_modified: datetime - :param content_length: The length of the file. + :param content_length: Required. The length of the file. :type content_length: long :param content_type: The content type of the file. :type content_type: str @@ -42,10 +45,10 @@ class FileProperties(Model): 'file_mode': {'key': 'fileMode', 'type': 'str'}, } - def __init__(self, last_modified, content_length, creation_time=None, content_type=None, file_mode=None): - super(FileProperties, self).__init__() - self.creation_time = creation_time - self.last_modified = last_modified - self.content_length = content_length - self.content_type = content_type - self.file_mode = file_mode + def __init__(self, **kwargs): + super(FileProperties, self).__init__(**kwargs) + self.creation_time = kwargs.get('creation_time', None) + self.last_modified = kwargs.get('last_modified', None) + self.content_length = kwargs.get('content_length', None) + self.content_type = kwargs.get('content_type', None) + self.file_mode = kwargs.get('file_mode', None) diff --git a/azure-batch/azure/batch/models/file_properties_py3.py b/azure-batch/azure/batch/models/file_properties_py3.py new file mode 100644 index 000000000000..71c2a8e68290 --- /dev/null +++ b/azure-batch/azure/batch/models/file_properties_py3.py @@ -0,0 +1,54 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class FileProperties(Model): + """The properties of a file on a compute node. + + All required parameters must be populated in order to send to Azure. + + :param creation_time: The file creation time. The creation time is not + returned for files on Linux compute nodes. + :type creation_time: datetime + :param last_modified: Required. The time at which the file was last + modified. + :type last_modified: datetime + :param content_length: Required. The length of the file. + :type content_length: long + :param content_type: The content type of the file. + :type content_type: str + :param file_mode: The file mode attribute in octal format. The file mode + is returned only for files on Linux compute nodes. + :type file_mode: str + """ + + _validation = { + 'last_modified': {'required': True}, + 'content_length': {'required': True}, + } + + _attribute_map = { + 'creation_time': {'key': 'creationTime', 'type': 'iso-8601'}, + 'last_modified': {'key': 'lastModified', 'type': 'iso-8601'}, + 'content_length': {'key': 'contentLength', 'type': 'long'}, + 'content_type': {'key': 'contentType', 'type': 'str'}, + 'file_mode': {'key': 'fileMode', 'type': 'str'}, + } + + def __init__(self, *, last_modified, content_length: int, creation_time=None, content_type: str=None, file_mode: str=None, **kwargs) -> None: + super(FileProperties, self).__init__(**kwargs) + self.creation_time = creation_time + self.last_modified = last_modified + self.content_length = content_length + self.content_type = content_type + self.file_mode = file_mode diff --git a/azure-batch/azure/batch/models/image_reference.py b/azure-batch/azure/batch/models/image_reference.py index 67bdf1b8343c..41fb7fbcc9a8 100644 --- a/azure-batch/azure/batch/models/image_reference.py +++ b/azure-batch/azure/batch/models/image_reference.py @@ -51,10 +51,10 @@ class ImageReference(Model): 'virtual_machine_image_id': {'key': 'virtualMachineImageId', 'type': 'str'}, } - def __init__(self, publisher=None, offer=None, sku=None, version=None, virtual_machine_image_id=None): - super(ImageReference, self).__init__() - self.publisher = publisher - self.offer = offer - self.sku = sku - self.version = version - self.virtual_machine_image_id = virtual_machine_image_id + def __init__(self, **kwargs): + super(ImageReference, self).__init__(**kwargs) + self.publisher = kwargs.get('publisher', None) + self.offer = kwargs.get('offer', None) + self.sku = kwargs.get('sku', None) + self.version = kwargs.get('version', None) + self.virtual_machine_image_id = kwargs.get('virtual_machine_image_id', None) diff --git a/azure-batch/azure/batch/models/image_reference_py3.py b/azure-batch/azure/batch/models/image_reference_py3.py new file mode 100644 index 000000000000..7471294d297b --- /dev/null +++ b/azure-batch/azure/batch/models/image_reference_py3.py @@ -0,0 +1,60 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ImageReference(Model): + """A reference to an Azure Virtual Machines Marketplace image or a custom + Azure Virtual Machine image. To get the list of all Azure Marketplace image + references verified by Azure Batch, see the 'List node agent SKUs' + operation. + + :param publisher: The publisher of the Azure Virtual Machines Marketplace + image. For example, Canonical or MicrosoftWindowsServer. + :type publisher: str + :param offer: The offer type of the Azure Virtual Machines Marketplace + image. For example, UbuntuServer or WindowsServer. + :type offer: str + :param sku: The SKU of the Azure Virtual Machines Marketplace image. For + example, 14.04.0-LTS or 2012-R2-Datacenter. + :type sku: str + :param version: The version of the Azure Virtual Machines Marketplace + image. A value of 'latest' can be specified to select the latest version + of an image. If omitted, the default is 'latest'. + :type version: str + :param virtual_machine_image_id: The ARM resource identifier of the + virtual machine image. Computes nodes of the pool will be created using + this custom image. This is of the form + /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/images/{imageName}. + This property is mutually exclusive with other ImageReference properties. + The virtual machine image must be in the same region and subscription as + the Azure Batch account. For information about the firewall settings for + the Batch node agent to communicate with the Batch service see + https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration. + :type virtual_machine_image_id: str + """ + + _attribute_map = { + 'publisher': {'key': 'publisher', 'type': 'str'}, + 'offer': {'key': 'offer', 'type': 'str'}, + 'sku': {'key': 'sku', 'type': 'str'}, + 'version': {'key': 'version', 'type': 'str'}, + 'virtual_machine_image_id': {'key': 'virtualMachineImageId', 'type': 'str'}, + } + + def __init__(self, *, publisher: str=None, offer: str=None, sku: str=None, version: str=None, virtual_machine_image_id: str=None, **kwargs) -> None: + super(ImageReference, self).__init__(**kwargs) + self.publisher = publisher + self.offer = offer + self.sku = sku + self.version = version + self.virtual_machine_image_id = virtual_machine_image_id diff --git a/azure-batch/azure/batch/models/inbound_endpoint.py b/azure-batch/azure/batch/models/inbound_endpoint.py index f65d5d6fe771..8fd064a95724 100644 --- a/azure-batch/azure/batch/models/inbound_endpoint.py +++ b/azure-batch/azure/batch/models/inbound_endpoint.py @@ -15,19 +15,22 @@ class InboundEndpoint(Model): """An inbound endpoint on a compute node. - :param name: The name of the endpoint. + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the endpoint. :type name: str - :param protocol: The protocol of the endpoint. Possible values include: - 'tcp', 'udp' + :param protocol: Required. The protocol of the endpoint. Possible values + include: 'tcp', 'udp' :type protocol: str or ~azure.batch.models.InboundEndpointProtocol - :param public_ip_address: The public IP address of the compute node. - :type public_ip_address: str - :param public_fqdn: The public fully qualified domain name for the compute + :param public_ip_address: Required. The public IP address of the compute node. + :type public_ip_address: str + :param public_fqdn: Required. The public fully qualified domain name for + the compute node. :type public_fqdn: str - :param frontend_port: The public port number of the endpoint. + :param frontend_port: Required. The public port number of the endpoint. :type frontend_port: int - :param backend_port: The backend port number of the endpoint. + :param backend_port: Required. The backend port number of the endpoint. :type backend_port: int """ @@ -49,11 +52,11 @@ class InboundEndpoint(Model): 'backend_port': {'key': 'backendPort', 'type': 'int'}, } - def __init__(self, name, protocol, public_ip_address, public_fqdn, frontend_port, backend_port): - super(InboundEndpoint, self).__init__() - self.name = name - self.protocol = protocol - self.public_ip_address = public_ip_address - self.public_fqdn = public_fqdn - self.frontend_port = frontend_port - self.backend_port = backend_port + def __init__(self, **kwargs): + super(InboundEndpoint, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.protocol = kwargs.get('protocol', None) + self.public_ip_address = kwargs.get('public_ip_address', None) + self.public_fqdn = kwargs.get('public_fqdn', None) + self.frontend_port = kwargs.get('frontend_port', None) + self.backend_port = kwargs.get('backend_port', None) diff --git a/azure-batch/azure/batch/models/inbound_endpoint_py3.py b/azure-batch/azure/batch/models/inbound_endpoint_py3.py new file mode 100644 index 000000000000..004e15779741 --- /dev/null +++ b/azure-batch/azure/batch/models/inbound_endpoint_py3.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class InboundEndpoint(Model): + """An inbound endpoint on a compute node. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the endpoint. + :type name: str + :param protocol: Required. The protocol of the endpoint. Possible values + include: 'tcp', 'udp' + :type protocol: str or ~azure.batch.models.InboundEndpointProtocol + :param public_ip_address: Required. The public IP address of the compute + node. + :type public_ip_address: str + :param public_fqdn: Required. The public fully qualified domain name for + the compute node. + :type public_fqdn: str + :param frontend_port: Required. The public port number of the endpoint. + :type frontend_port: int + :param backend_port: Required. The backend port number of the endpoint. + :type backend_port: int + """ + + _validation = { + 'name': {'required': True}, + 'protocol': {'required': True}, + 'public_ip_address': {'required': True}, + 'public_fqdn': {'required': True}, + 'frontend_port': {'required': True}, + 'backend_port': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'protocol': {'key': 'protocol', 'type': 'InboundEndpointProtocol'}, + 'public_ip_address': {'key': 'publicIPAddress', 'type': 'str'}, + 'public_fqdn': {'key': 'publicFQDN', 'type': 'str'}, + 'frontend_port': {'key': 'frontendPort', 'type': 'int'}, + 'backend_port': {'key': 'backendPort', 'type': 'int'}, + } + + def __init__(self, *, name: str, protocol, public_ip_address: str, public_fqdn: str, frontend_port: int, backend_port: int, **kwargs) -> None: + super(InboundEndpoint, self).__init__(**kwargs) + self.name = name + self.protocol = protocol + self.public_ip_address = public_ip_address + self.public_fqdn = public_fqdn + self.frontend_port = frontend_port + self.backend_port = backend_port diff --git a/azure-batch/azure/batch/models/inbound_nat_pool.py b/azure-batch/azure/batch/models/inbound_nat_pool.py index 61e2f507de29..bf3209e992a0 100644 --- a/azure-batch/azure/batch/models/inbound_nat_pool.py +++ b/azure-batch/azure/batch/models/inbound_nat_pool.py @@ -16,30 +16,32 @@ class InboundNATPool(Model): """A inbound NAT pool that can be used to address specific ports on compute nodes in a Batch pool externally. - :param name: The name of the endpoint. The name must be unique within a - Batch pool, can contain letters, numbers, underscores, periods, and - hyphens. Names must start with a letter or number, must end with a letter, - number, or underscore, and cannot exceed 77 characters. If any invalid - values are provided the request fails with HTTP status code 400. + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the endpoint. The name must be unique + within a Batch pool, can contain letters, numbers, underscores, periods, + and hyphens. Names must start with a letter or number, must end with a + letter, number, or underscore, and cannot exceed 77 characters. If any + invalid values are provided the request fails with HTTP status code 400. :type name: str - :param protocol: The protocol of the endpoint. Possible values include: - 'tcp', 'udp' + :param protocol: Required. The protocol of the endpoint. Possible values + include: 'tcp', 'udp' :type protocol: str or ~azure.batch.models.InboundEndpointProtocol - :param backend_port: The port number on the compute node. This must be - unique within a Batch pool. Acceptable values are between 1 and 65535 - except for 22, 3389, 29876 and 29877 as these are reserved. If any + :param backend_port: Required. The port number on the compute node. This + must be unique within a Batch pool. Acceptable values are between 1 and + 65535 except for 22, 3389, 29876 and 29877 as these are reserved. If any reserved values are provided the request fails with HTTP status code 400. :type backend_port: int - :param frontend_port_range_start: The first port number in the range of - external ports that will be used to provide inbound access to the + :param frontend_port_range_start: Required. The first port number in the + range of external ports that will be used to provide inbound access to the backendPort on individual compute nodes. Acceptable values range between 1 and 65534 except ports from 50000 to 55000 which are reserved. All ranges within a pool must be distinct and cannot overlap. Each range must contain at least 40 ports. If any reserved or overlapping values are provided the request fails with HTTP status code 400. :type frontend_port_range_start: int - :param frontend_port_range_end: The last port number in the range of - external ports that will be used to provide inbound access to the + :param frontend_port_range_end: Required. The last port number in the + range of external ports that will be used to provide inbound access to the backendPort on individual compute nodes. Acceptable values range between 1 and 65534 except ports from 50000 to 55000 which are reserved by the Batch service. All ranges within a pool must be distinct and cannot overlap. @@ -74,11 +76,11 @@ class InboundNATPool(Model): 'network_security_group_rules': {'key': 'networkSecurityGroupRules', 'type': '[NetworkSecurityGroupRule]'}, } - def __init__(self, name, protocol, backend_port, frontend_port_range_start, frontend_port_range_end, network_security_group_rules=None): - super(InboundNATPool, self).__init__() - self.name = name - self.protocol = protocol - self.backend_port = backend_port - self.frontend_port_range_start = frontend_port_range_start - self.frontend_port_range_end = frontend_port_range_end - self.network_security_group_rules = network_security_group_rules + def __init__(self, **kwargs): + super(InboundNATPool, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.protocol = kwargs.get('protocol', None) + self.backend_port = kwargs.get('backend_port', None) + self.frontend_port_range_start = kwargs.get('frontend_port_range_start', None) + self.frontend_port_range_end = kwargs.get('frontend_port_range_end', None) + self.network_security_group_rules = kwargs.get('network_security_group_rules', None) diff --git a/azure-batch/azure/batch/models/inbound_nat_pool_py3.py b/azure-batch/azure/batch/models/inbound_nat_pool_py3.py new file mode 100644 index 000000000000..ed91e3733983 --- /dev/null +++ b/azure-batch/azure/batch/models/inbound_nat_pool_py3.py @@ -0,0 +1,86 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class InboundNATPool(Model): + """A inbound NAT pool that can be used to address specific ports on compute + nodes in a Batch pool externally. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the endpoint. The name must be unique + within a Batch pool, can contain letters, numbers, underscores, periods, + and hyphens. Names must start with a letter or number, must end with a + letter, number, or underscore, and cannot exceed 77 characters. If any + invalid values are provided the request fails with HTTP status code 400. + :type name: str + :param protocol: Required. The protocol of the endpoint. Possible values + include: 'tcp', 'udp' + :type protocol: str or ~azure.batch.models.InboundEndpointProtocol + :param backend_port: Required. The port number on the compute node. This + must be unique within a Batch pool. Acceptable values are between 1 and + 65535 except for 22, 3389, 29876 and 29877 as these are reserved. If any + reserved values are provided the request fails with HTTP status code 400. + :type backend_port: int + :param frontend_port_range_start: Required. The first port number in the + range of external ports that will be used to provide inbound access to the + backendPort on individual compute nodes. Acceptable values range between 1 + and 65534 except ports from 50000 to 55000 which are reserved. All ranges + within a pool must be distinct and cannot overlap. Each range must contain + at least 40 ports. If any reserved or overlapping values are provided the + request fails with HTTP status code 400. + :type frontend_port_range_start: int + :param frontend_port_range_end: Required. The last port number in the + range of external ports that will be used to provide inbound access to the + backendPort on individual compute nodes. Acceptable values range between 1 + and 65534 except ports from 50000 to 55000 which are reserved by the Batch + service. All ranges within a pool must be distinct and cannot overlap. + Each range must contain at least 40 ports. If any reserved or overlapping + values are provided the request fails with HTTP status code 400. + :type frontend_port_range_end: int + :param network_security_group_rules: A list of network security group + rules that will be applied to the endpoint. The maximum number of rules + that can be specified across all the endpoints on a Batch pool is 25. If + no network security group rules are specified, a default rule will be + created to allow inbound access to the specified backendPort. If the + maximum number of network security group rules is exceeded the request + fails with HTTP status code 400. + :type network_security_group_rules: + list[~azure.batch.models.NetworkSecurityGroupRule] + """ + + _validation = { + 'name': {'required': True}, + 'protocol': {'required': True}, + 'backend_port': {'required': True}, + 'frontend_port_range_start': {'required': True}, + 'frontend_port_range_end': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'protocol': {'key': 'protocol', 'type': 'InboundEndpointProtocol'}, + 'backend_port': {'key': 'backendPort', 'type': 'int'}, + 'frontend_port_range_start': {'key': 'frontendPortRangeStart', 'type': 'int'}, + 'frontend_port_range_end': {'key': 'frontendPortRangeEnd', 'type': 'int'}, + 'network_security_group_rules': {'key': 'networkSecurityGroupRules', 'type': '[NetworkSecurityGroupRule]'}, + } + + def __init__(self, *, name: str, protocol, backend_port: int, frontend_port_range_start: int, frontend_port_range_end: int, network_security_group_rules=None, **kwargs) -> None: + super(InboundNATPool, self).__init__(**kwargs) + self.name = name + self.protocol = protocol + self.backend_port = backend_port + self.frontend_port_range_start = frontend_port_range_start + self.frontend_port_range_end = frontend_port_range_end + self.network_security_group_rules = network_security_group_rules diff --git a/azure-batch/azure/batch/models/job_add_options.py b/azure-batch/azure/batch/models/job_add_options.py index 68e4a54ec20c..bdcf79691d86 100644 --- a/azure-batch/azure/batch/models/job_add_options.py +++ b/azure-batch/azure/batch/models/job_add_options.py @@ -31,9 +31,16 @@ class JobAddOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(JobAddOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobAddOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/job_add_options_py3.py b/azure-batch/azure/batch/models/job_add_options_py3.py new file mode 100644 index 000000000000..9633e748c18a --- /dev/null +++ b/azure-batch/azure/batch/models/job_add_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobAddOptions(Model): + """Additional parameters for add operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(JobAddOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/job_add_parameter.py b/azure-batch/azure/batch/models/job_add_parameter.py index 403155f951be..f79558f4fa6d 100644 --- a/azure-batch/azure/batch/models/job_add_parameter.py +++ b/azure-batch/azure/batch/models/job_add_parameter.py @@ -15,11 +15,13 @@ class JobAddParameter(Model): """An Azure Batch job to add. - :param id: A string that uniquely identifies the job within the account. - The ID can contain any combination of alphanumeric characters including - hyphens and underscores, and cannot contain more than 64 characters. The - ID is case-preserving and case-insensitive (that is, you may not have two - IDs within an account that differ only by case). + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the job within the + account. The ID can contain any combination of alphanumeric characters + including hyphens and underscores, and cannot contain more than 64 + characters. The ID is case-preserving and case-insensitive (that is, you + may not have two IDs within an account that differ only by case). :type id: str :param display_name: The display name for the job. The display name need not be unique and can contain any Unicode characters up to a maximum @@ -64,8 +66,8 @@ class JobAddParameter(Model): here by specifying the same setting name with a different value. :type common_environment_settings: list[~azure.batch.models.EnvironmentSetting] - :param pool_info: The pool on which the Batch service runs the job's - tasks. + :param pool_info: Required. The pool on which the Batch service runs the + job's tasks. :type pool_info: ~azure.batch.models.PoolInformation :param on_all_tasks_complete: The action the Batch service should take when all tasks in the job are in the completed state. Note that if a job @@ -115,18 +117,18 @@ class JobAddParameter(Model): 'uses_task_dependencies': {'key': 'usesTaskDependencies', 'type': 'bool'}, } - def __init__(self, id, pool_info, display_name=None, priority=None, constraints=None, job_manager_task=None, job_preparation_task=None, job_release_task=None, common_environment_settings=None, on_all_tasks_complete=None, on_task_failure=None, metadata=None, uses_task_dependencies=None): - super(JobAddParameter, self).__init__() - self.id = id - self.display_name = display_name - self.priority = priority - self.constraints = constraints - self.job_manager_task = job_manager_task - self.job_preparation_task = job_preparation_task - self.job_release_task = job_release_task - self.common_environment_settings = common_environment_settings - self.pool_info = pool_info - self.on_all_tasks_complete = on_all_tasks_complete - self.on_task_failure = on_task_failure - self.metadata = metadata - self.uses_task_dependencies = uses_task_dependencies + def __init__(self, **kwargs): + super(JobAddParameter, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.priority = kwargs.get('priority', None) + self.constraints = kwargs.get('constraints', None) + self.job_manager_task = kwargs.get('job_manager_task', None) + self.job_preparation_task = kwargs.get('job_preparation_task', None) + self.job_release_task = kwargs.get('job_release_task', None) + self.common_environment_settings = kwargs.get('common_environment_settings', None) + self.pool_info = kwargs.get('pool_info', None) + self.on_all_tasks_complete = kwargs.get('on_all_tasks_complete', None) + self.on_task_failure = kwargs.get('on_task_failure', None) + self.metadata = kwargs.get('metadata', None) + self.uses_task_dependencies = kwargs.get('uses_task_dependencies', None) diff --git a/azure-batch/azure/batch/models/job_add_parameter_py3.py b/azure-batch/azure/batch/models/job_add_parameter_py3.py new file mode 100644 index 000000000000..e09577550b8b --- /dev/null +++ b/azure-batch/azure/batch/models/job_add_parameter_py3.py @@ -0,0 +1,134 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobAddParameter(Model): + """An Azure Batch job to add. + + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the job within the + account. The ID can contain any combination of alphanumeric characters + including hyphens and underscores, and cannot contain more than 64 + characters. The ID is case-preserving and case-insensitive (that is, you + may not have two IDs within an account that differ only by case). + :type id: str + :param display_name: The display name for the job. The display name need + not be unique and can contain any Unicode characters up to a maximum + length of 1024. + :type display_name: str + :param priority: The priority of the job. Priority values can range from + -1000 to 1000, with -1000 being the lowest priority and 1000 being the + highest priority. The default value is 0. + :type priority: int + :param constraints: The execution constraints for the job. + :type constraints: ~azure.batch.models.JobConstraints + :param job_manager_task: Details of a Job Manager task to be launched when + the job is started. If the job does not specify a Job Manager task, the + user must explicitly add tasks to the job. If the job does specify a Job + Manager task, the Batch service creates the Job Manager task when the job + is created, and will try to schedule the Job Manager task before + scheduling other tasks in the job. The Job Manager task's typical purpose + is to control and/or monitor job execution, for example by deciding what + additional tasks to run, determining when the work is complete, etc. + (However, a Job Manager task is not restricted to these activities - it is + a fully-fledged task in the system and perform whatever actions are + required for the job.) For example, a Job Manager task might download a + file specified as a parameter, analyze the contents of that file and + submit additional tasks based on those contents. + :type job_manager_task: ~azure.batch.models.JobManagerTask + :param job_preparation_task: The Job Preparation task. If a job has a Job + Preparation task, the Batch service will run the Job Preparation task on a + compute node before starting any tasks of that job on that compute node. + :type job_preparation_task: ~azure.batch.models.JobPreparationTask + :param job_release_task: The Job Release task. A Job Release task cannot + be specified without also specifying a Job Preparation task for the job. + The Batch service runs the Job Release task on the compute nodes that have + run the Job Preparation task. The primary purpose of the Job Release task + is to undo changes to compute nodes made by the Job Preparation task. + Example activities include deleting local files, or shutting down services + that were started as part of job preparation. + :type job_release_task: ~azure.batch.models.JobReleaseTask + :param common_environment_settings: The list of common environment + variable settings. These environment variables are set for all tasks in + the job (including the Job Manager, Job Preparation and Job Release + tasks). Individual tasks can override an environment setting specified + here by specifying the same setting name with a different value. + :type common_environment_settings: + list[~azure.batch.models.EnvironmentSetting] + :param pool_info: Required. The pool on which the Batch service runs the + job's tasks. + :type pool_info: ~azure.batch.models.PoolInformation + :param on_all_tasks_complete: The action the Batch service should take + when all tasks in the job are in the completed state. Note that if a job + contains no tasks, then all tasks are considered complete. This option is + therefore most commonly used with a Job Manager task; if you want to use + automatic job termination without a Job Manager, you should initially set + onAllTasksComplete to noaction and update the job properties to set + onAllTasksComplete to terminatejob once you have finished adding tasks. + The default is noaction. Possible values include: 'noAction', + 'terminateJob' + :type on_all_tasks_complete: str or ~azure.batch.models.OnAllTasksComplete + :param on_task_failure: The action the Batch service should take when any + task in the job fails. A task is considered to have failed if has a + failureInfo. A failureInfo is set if the task completes with a non-zero + exit code after exhausting its retry count, or if there was an error + starting the task, for example due to a resource file download error. The + default is noaction. Possible values include: 'noAction', + 'performExitOptionsJobAction' + :type on_task_failure: str or ~azure.batch.models.OnTaskFailure + :param metadata: A list of name-value pairs associated with the job as + metadata. The Batch service does not assign any meaning to metadata; it is + solely for the use of user code. + :type metadata: list[~azure.batch.models.MetadataItem] + :param uses_task_dependencies: Whether tasks in the job can define + dependencies on each other. The default is false. + :type uses_task_dependencies: bool + """ + + _validation = { + 'id': {'required': True}, + 'pool_info': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'priority': {'key': 'priority', 'type': 'int'}, + 'constraints': {'key': 'constraints', 'type': 'JobConstraints'}, + 'job_manager_task': {'key': 'jobManagerTask', 'type': 'JobManagerTask'}, + 'job_preparation_task': {'key': 'jobPreparationTask', 'type': 'JobPreparationTask'}, + 'job_release_task': {'key': 'jobReleaseTask', 'type': 'JobReleaseTask'}, + 'common_environment_settings': {'key': 'commonEnvironmentSettings', 'type': '[EnvironmentSetting]'}, + 'pool_info': {'key': 'poolInfo', 'type': 'PoolInformation'}, + 'on_all_tasks_complete': {'key': 'onAllTasksComplete', 'type': 'OnAllTasksComplete'}, + 'on_task_failure': {'key': 'onTaskFailure', 'type': 'OnTaskFailure'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + 'uses_task_dependencies': {'key': 'usesTaskDependencies', 'type': 'bool'}, + } + + def __init__(self, *, id: str, pool_info, display_name: str=None, priority: int=None, constraints=None, job_manager_task=None, job_preparation_task=None, job_release_task=None, common_environment_settings=None, on_all_tasks_complete=None, on_task_failure=None, metadata=None, uses_task_dependencies: bool=None, **kwargs) -> None: + super(JobAddParameter, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.priority = priority + self.constraints = constraints + self.job_manager_task = job_manager_task + self.job_preparation_task = job_preparation_task + self.job_release_task = job_release_task + self.common_environment_settings = common_environment_settings + self.pool_info = pool_info + self.on_all_tasks_complete = on_all_tasks_complete + self.on_task_failure = on_task_failure + self.metadata = metadata + self.uses_task_dependencies = uses_task_dependencies diff --git a/azure-batch/azure/batch/models/job_constraints.py b/azure-batch/azure/batch/models/job_constraints.py index a3fc325384e2..070a37aefbfb 100644 --- a/azure-batch/azure/batch/models/job_constraints.py +++ b/azure-batch/azure/batch/models/job_constraints.py @@ -39,7 +39,7 @@ class JobConstraints(Model): 'max_task_retry_count': {'key': 'maxTaskRetryCount', 'type': 'int'}, } - def __init__(self, max_wall_clock_time=None, max_task_retry_count=None): - super(JobConstraints, self).__init__() - self.max_wall_clock_time = max_wall_clock_time - self.max_task_retry_count = max_task_retry_count + def __init__(self, **kwargs): + super(JobConstraints, self).__init__(**kwargs) + self.max_wall_clock_time = kwargs.get('max_wall_clock_time', None) + self.max_task_retry_count = kwargs.get('max_task_retry_count', None) diff --git a/azure-batch/azure/batch/models/job_constraints_py3.py b/azure-batch/azure/batch/models/job_constraints_py3.py new file mode 100644 index 000000000000..06340ebed94f --- /dev/null +++ b/azure-batch/azure/batch/models/job_constraints_py3.py @@ -0,0 +1,45 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobConstraints(Model): + """The execution constraints for a job. + + :param max_wall_clock_time: The maximum elapsed time that the job may run, + measured from the time the job is created. If the job does not complete + within the time limit, the Batch service terminates it and any tasks that + are still running. In this case, the termination reason will be + MaxWallClockTimeExpiry. If this property is not specified, there is no + time limit on how long the job may run. + :type max_wall_clock_time: timedelta + :param max_task_retry_count: The maximum number of times each task may be + retried. The Batch service retries a task if its exit code is nonzero. + Note that this value specifically controls the number of retries. The + Batch service will try each task once, and may then retry up to this + limit. For example, if the maximum retry count is 3, Batch tries a task up + to 4 times (one initial try and 3 retries). If the maximum retry count is + 0, the Batch service does not retry tasks. If the maximum retry count is + -1, the Batch service retries tasks without limit. The default value is 0 + (no retries). + :type max_task_retry_count: int + """ + + _attribute_map = { + 'max_wall_clock_time': {'key': 'maxWallClockTime', 'type': 'duration'}, + 'max_task_retry_count': {'key': 'maxTaskRetryCount', 'type': 'int'}, + } + + def __init__(self, *, max_wall_clock_time=None, max_task_retry_count: int=None, **kwargs) -> None: + super(JobConstraints, self).__init__(**kwargs) + self.max_wall_clock_time = max_wall_clock_time + self.max_task_retry_count = max_task_retry_count diff --git a/azure-batch/azure/batch/models/job_delete_options.py b/azure-batch/azure/batch/models/job_delete_options.py index 73e96fe91923..a537b55e907a 100644 --- a/azure-batch/azure/batch/models/job_delete_options.py +++ b/azure-batch/azure/batch/models/job_delete_options.py @@ -50,13 +50,24 @@ class JobDeleteOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobDeleteOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobDeleteOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_delete_options_py3.py b/azure-batch/azure/batch/models/job_delete_options_py3.py new file mode 100644 index 000000000000..821db0e8c2df --- /dev/null +++ b/azure-batch/azure/batch/models/job_delete_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobDeleteOptions(Model): + """Additional parameters for delete operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobDeleteOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_disable_options.py b/azure-batch/azure/batch/models/job_disable_options.py index b818e4e7692d..c669451674e5 100644 --- a/azure-batch/azure/batch/models/job_disable_options.py +++ b/azure-batch/azure/batch/models/job_disable_options.py @@ -50,13 +50,24 @@ class JobDisableOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobDisableOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobDisableOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_disable_options_py3.py b/azure-batch/azure/batch/models/job_disable_options_py3.py new file mode 100644 index 000000000000..4b077714d764 --- /dev/null +++ b/azure-batch/azure/batch/models/job_disable_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobDisableOptions(Model): + """Additional parameters for disable operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobDisableOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_disable_parameter.py b/azure-batch/azure/batch/models/job_disable_parameter.py index 6d5d488d520c..d86c965f3458 100644 --- a/azure-batch/azure/batch/models/job_disable_parameter.py +++ b/azure-batch/azure/batch/models/job_disable_parameter.py @@ -15,8 +15,10 @@ class JobDisableParameter(Model): """Options when disabling a job. - :param disable_tasks: What to do with active tasks associated with the - job. Possible values include: 'requeue', 'terminate', 'wait' + All required parameters must be populated in order to send to Azure. + + :param disable_tasks: Required. What to do with active tasks associated + with the job. Possible values include: 'requeue', 'terminate', 'wait' :type disable_tasks: str or ~azure.batch.models.DisableJobOption """ @@ -28,6 +30,6 @@ class JobDisableParameter(Model): 'disable_tasks': {'key': 'disableTasks', 'type': 'DisableJobOption'}, } - def __init__(self, disable_tasks): - super(JobDisableParameter, self).__init__() - self.disable_tasks = disable_tasks + def __init__(self, **kwargs): + super(JobDisableParameter, self).__init__(**kwargs) + self.disable_tasks = kwargs.get('disable_tasks', None) diff --git a/azure-batch/azure/batch/models/job_disable_parameter_py3.py b/azure-batch/azure/batch/models/job_disable_parameter_py3.py new file mode 100644 index 000000000000..fd99f78e1edf --- /dev/null +++ b/azure-batch/azure/batch/models/job_disable_parameter_py3.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobDisableParameter(Model): + """Options when disabling a job. + + All required parameters must be populated in order to send to Azure. + + :param disable_tasks: Required. What to do with active tasks associated + with the job. Possible values include: 'requeue', 'terminate', 'wait' + :type disable_tasks: str or ~azure.batch.models.DisableJobOption + """ + + _validation = { + 'disable_tasks': {'required': True}, + } + + _attribute_map = { + 'disable_tasks': {'key': 'disableTasks', 'type': 'DisableJobOption'}, + } + + def __init__(self, *, disable_tasks, **kwargs) -> None: + super(JobDisableParameter, self).__init__(**kwargs) + self.disable_tasks = disable_tasks diff --git a/azure-batch/azure/batch/models/job_enable_options.py b/azure-batch/azure/batch/models/job_enable_options.py index d8cb4a4a43db..182f2b040999 100644 --- a/azure-batch/azure/batch/models/job_enable_options.py +++ b/azure-batch/azure/batch/models/job_enable_options.py @@ -50,13 +50,24 @@ class JobEnableOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobEnableOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobEnableOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_enable_options_py3.py b/azure-batch/azure/batch/models/job_enable_options_py3.py new file mode 100644 index 000000000000..47695f3753a6 --- /dev/null +++ b/azure-batch/azure/batch/models/job_enable_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobEnableOptions(Model): + """Additional parameters for enable operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobEnableOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_execution_information.py b/azure-batch/azure/batch/models/job_execution_information.py index cf924ab798c3..28f5a31d2669 100644 --- a/azure-batch/azure/batch/models/job_execution_information.py +++ b/azure-batch/azure/batch/models/job_execution_information.py @@ -16,8 +16,10 @@ class JobExecutionInformation(Model): """Contains information about the execution of a job in the Azure Batch service. - :param start_time: The start time of the job. This is the time at which - the job was created. + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The start time of the job. This is the time + at which the job was created. :type start_time: datetime :param end_time: The completion time of the job. This property is set only if the job is in the completed state. @@ -62,10 +64,10 @@ class JobExecutionInformation(Model): 'terminate_reason': {'key': 'terminateReason', 'type': 'str'}, } - def __init__(self, start_time, end_time=None, pool_id=None, scheduling_error=None, terminate_reason=None): - super(JobExecutionInformation, self).__init__() - self.start_time = start_time - self.end_time = end_time - self.pool_id = pool_id - self.scheduling_error = scheduling_error - self.terminate_reason = terminate_reason + def __init__(self, **kwargs): + super(JobExecutionInformation, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.pool_id = kwargs.get('pool_id', None) + self.scheduling_error = kwargs.get('scheduling_error', None) + self.terminate_reason = kwargs.get('terminate_reason', None) diff --git a/azure-batch/azure/batch/models/job_execution_information_py3.py b/azure-batch/azure/batch/models/job_execution_information_py3.py new file mode 100644 index 000000000000..436d2990c247 --- /dev/null +++ b/azure-batch/azure/batch/models/job_execution_information_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobExecutionInformation(Model): + """Contains information about the execution of a job in the Azure Batch + service. + + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The start time of the job. This is the time + at which the job was created. + :type start_time: datetime + :param end_time: The completion time of the job. This property is set only + if the job is in the completed state. + :type end_time: datetime + :param pool_id: The ID of the pool to which this job is assigned. This + element contains the actual pool where the job is assigned. When you get + job details from the service, they also contain a poolInfo element, which + contains the pool configuration data from when the job was added or + updated. That poolInfo element may also contain a poolId element. If it + does, the two IDs are the same. If it does not, it means the job ran on an + auto pool, and this property contains the ID of that auto pool. + :type pool_id: str + :param scheduling_error: Details of any error encountered by the service + in starting the job. This property is not set if there was no error + starting the job. + :type scheduling_error: ~azure.batch.models.JobSchedulingError + :param terminate_reason: A string describing the reason the job ended. + This property is set only if the job is in the completed state. If the + Batch service terminates the job, it sets the reason as follows: + JMComplete - the Job Manager task completed, and killJobOnCompletion was + set to true. MaxWallClockTimeExpiry - the job reached its maxWallClockTime + constraint. TerminateJobSchedule - the job ran as part of a schedule, and + the schedule terminated. AllTasksComplete - the job's onAllTasksComplete + attribute is set to terminatejob, and all tasks in the job are complete. + TaskFailed - the job's onTaskFailure attribute is set to + performExitOptionsJobAction, and a task in the job failed with an exit + condition that specified a jobAction of terminatejob. Any other string is + a user-defined reason specified in a call to the 'Terminate a job' + operation. + :type terminate_reason: str + """ + + _validation = { + 'start_time': {'required': True}, + } + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'pool_id': {'key': 'poolId', 'type': 'str'}, + 'scheduling_error': {'key': 'schedulingError', 'type': 'JobSchedulingError'}, + 'terminate_reason': {'key': 'terminateReason', 'type': 'str'}, + } + + def __init__(self, *, start_time, end_time=None, pool_id: str=None, scheduling_error=None, terminate_reason: str=None, **kwargs) -> None: + super(JobExecutionInformation, self).__init__(**kwargs) + self.start_time = start_time + self.end_time = end_time + self.pool_id = pool_id + self.scheduling_error = scheduling_error + self.terminate_reason = terminate_reason diff --git a/azure-batch/azure/batch/models/job_get_all_lifetime_statistics_options.py b/azure-batch/azure/batch/models/job_get_all_lifetime_statistics_options.py index 25c7153d11a7..a8f7e8494ab8 100644 --- a/azure-batch/azure/batch/models/job_get_all_lifetime_statistics_options.py +++ b/azure-batch/azure/batch/models/job_get_all_lifetime_statistics_options.py @@ -31,9 +31,16 @@ class JobGetAllLifetimeStatisticsOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(JobGetAllLifetimeStatisticsOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobGetAllLifetimeStatisticsOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/job_get_all_lifetime_statistics_options_py3.py b/azure-batch/azure/batch/models/job_get_all_lifetime_statistics_options_py3.py new file mode 100644 index 000000000000..2092bbd8b6d8 --- /dev/null +++ b/azure-batch/azure/batch/models/job_get_all_lifetime_statistics_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobGetAllLifetimeStatisticsOptions(Model): + """Additional parameters for get_all_lifetime_statistics operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(JobGetAllLifetimeStatisticsOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/job_get_options.py b/azure-batch/azure/batch/models/job_get_options.py index 12a52bd4231a..62d479597094 100644 --- a/azure-batch/azure/batch/models/job_get_options.py +++ b/azure-batch/azure/batch/models/job_get_options.py @@ -54,15 +54,28 @@ class JobGetOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, select=None, expand=None, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobGetOptions, self).__init__() - self.select = select - self.expand = expand - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobGetOptions, self).__init__(**kwargs) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_get_options_py3.py b/azure-batch/azure/batch/models/job_get_options_py3.py new file mode 100644 index 000000000000..9ed21fc3ee3a --- /dev/null +++ b/azure-batch/azure/batch/models/job_get_options_py3.py @@ -0,0 +1,81 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobGetOptions(Model): + """Additional parameters for get operation. + + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, select: str=None, expand: str=None, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobGetOptions, self).__init__(**kwargs) + self.select = select + self.expand = expand + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_get_task_counts_options.py b/azure-batch/azure/batch/models/job_get_task_counts_options.py index 753f314a4a3a..603d79ce144e 100644 --- a/azure-batch/azure/batch/models/job_get_task_counts_options.py +++ b/azure-batch/azure/batch/models/job_get_task_counts_options.py @@ -31,9 +31,16 @@ class JobGetTaskCountsOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(JobGetTaskCountsOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobGetTaskCountsOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/job_get_task_counts_options_py3.py b/azure-batch/azure/batch/models/job_get_task_counts_options_py3.py new file mode 100644 index 000000000000..b109e59e8754 --- /dev/null +++ b/azure-batch/azure/batch/models/job_get_task_counts_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobGetTaskCountsOptions(Model): + """Additional parameters for get_task_counts operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(JobGetTaskCountsOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/job_list_from_job_schedule_options.py b/azure-batch/azure/batch/models/job_list_from_job_schedule_options.py index 0c1ba3f21b35..7f95aaf745cc 100644 --- a/azure-batch/azure/batch/models/job_list_from_job_schedule_options.py +++ b/azure-batch/azure/batch/models/job_list_from_job_schedule_options.py @@ -42,13 +42,24 @@ class JobListFromJobScheduleOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, select=None, expand=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(JobListFromJobScheduleOptions, self).__init__() - self.filter = filter - self.select = select - self.expand = expand - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobListFromJobScheduleOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/job_list_from_job_schedule_options_py3.py b/azure-batch/azure/batch/models/job_list_from_job_schedule_options_py3.py new file mode 100644 index 000000000000..eb60647820e1 --- /dev/null +++ b/azure-batch/azure/batch/models/job_list_from_job_schedule_options_py3.py @@ -0,0 +1,65 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobListFromJobScheduleOptions(Model): + """Additional parameters for list_from_job_schedule operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-jobs-in-a-job-schedule. + :type filter: str + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 jobs can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, select: str=None, expand: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(JobListFromJobScheduleOptions, self).__init__(**kwargs) + self.filter = filter + self.select = select + self.expand = expand + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/job_list_options.py b/azure-batch/azure/batch/models/job_list_options.py index 0f6fa7ba937d..b9d34191e43c 100644 --- a/azure-batch/azure/batch/models/job_list_options.py +++ b/azure-batch/azure/batch/models/job_list_options.py @@ -42,13 +42,24 @@ class JobListOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, select=None, expand=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(JobListOptions, self).__init__() - self.filter = filter - self.select = select - self.expand = expand - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobListOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/job_list_options_py3.py b/azure-batch/azure/batch/models/job_list_options_py3.py new file mode 100644 index 000000000000..f7787cd7e4bd --- /dev/null +++ b/azure-batch/azure/batch/models/job_list_options_py3.py @@ -0,0 +1,65 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobListOptions(Model): + """Additional parameters for list operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-jobs. + :type filter: str + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 jobs can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, select: str=None, expand: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(JobListOptions, self).__init__(**kwargs) + self.filter = filter + self.select = select + self.expand = expand + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/job_list_preparation_and_release_task_status_options.py b/azure-batch/azure/batch/models/job_list_preparation_and_release_task_status_options.py index 83f6e0cc92f3..443ebba59203 100644 --- a/azure-batch/azure/batch/models/job_list_preparation_and_release_task_status_options.py +++ b/azure-batch/azure/batch/models/job_list_preparation_and_release_task_status_options.py @@ -41,12 +41,22 @@ class JobListPreparationAndReleaseTaskStatusOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, select=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(JobListPreparationAndReleaseTaskStatusOptions, self).__init__() - self.filter = filter - self.select = select - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobListPreparationAndReleaseTaskStatusOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.select = kwargs.get('select', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/job_list_preparation_and_release_task_status_options_py3.py b/azure-batch/azure/batch/models/job_list_preparation_and_release_task_status_options_py3.py new file mode 100644 index 000000000000..a735362968b8 --- /dev/null +++ b/azure-batch/azure/batch/models/job_list_preparation_and_release_task_status_options_py3.py @@ -0,0 +1,62 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobListPreparationAndReleaseTaskStatusOptions(Model): + """Additional parameters for list_preparation_and_release_task_status + operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-job-preparation-and-release-status. + :type filter: str + :param select: An OData $select clause. + :type select: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 tasks can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, select: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(JobListPreparationAndReleaseTaskStatusOptions, self).__init__(**kwargs) + self.filter = filter + self.select = select + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/job_manager_task.py b/azure-batch/azure/batch/models/job_manager_task.py index 6315b17e8785..38d54ac0ee91 100644 --- a/azure-batch/azure/batch/models/job_manager_task.py +++ b/azure-batch/azure/batch/models/job_manager_task.py @@ -39,23 +39,25 @@ class JobManagerTask(Model): data. The best practice for long running tasks is to use some form of checkpointing. - :param id: A string that uniquely identifies the Job Manager task within - the job. The ID can contain any combination of alphanumeric characters - including hyphens and underscores and cannot contain more than 64 - characters. + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the Job Manager + task within the job. The ID can contain any combination of alphanumeric + characters including hyphens and underscores and cannot contain more than + 64 characters. :type id: str :param display_name: The display name of the Job Manager task. It need not be unique and can contain any Unicode characters up to a maximum length of 1024. :type display_name: str - :param command_line: The command line of the Job Manager task. The command - line does not run under a shell, and therefore cannot take advantage of - shell features such as environment variable expansion. If you want to take - advantage of such features, you should invoke the shell in the command - line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c - MyCommand" in Linux. If the command line refers to file paths, it should - use a relative path (relative to the task working directory), or use the - Batch provided environment variable + :param command_line: Required. The command line of the Job Manager task. + The command line does not run under a shell, and therefore cannot take + advantage of shell features such as environment variable expansion. If you + want to take advantage of such features, you should invoke the shell in + the command line, for example using "cmd /c MyCommand" in Windows or + "/bin/sh -c MyCommand" in Linux. If the command line refers to file paths, + it should use a relative path (relative to the task working directory), or + use the Batch provided environment variable (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). :type command_line: str :param container_settings: The settings for the container under which the @@ -70,7 +72,12 @@ class JobManagerTask(Model): :type container_settings: ~azure.batch.models.TaskContainerSettings :param resource_files: A list of files that the Batch service will download to the compute node before running the command line. Files listed - under this element are located in the task's working directory. + under this element are located in the task's working directory. There is a + maximum size for the list of resource files. When the max size is + exceeded, the request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. :type resource_files: list[~azure.batch.models.ResourceFile] :param output_files: A list of files that the Batch service will upload from the compute node after running the command line. For multi-instance @@ -157,19 +164,19 @@ class JobManagerTask(Model): 'allow_low_priority_node': {'key': 'allowLowPriorityNode', 'type': 'bool'}, } - def __init__(self, id, command_line, display_name=None, container_settings=None, resource_files=None, output_files=None, environment_settings=None, constraints=None, kill_job_on_completion=None, user_identity=None, run_exclusive=None, application_package_references=None, authentication_token_settings=None, allow_low_priority_node=None): - super(JobManagerTask, self).__init__() - self.id = id - self.display_name = display_name - self.command_line = command_line - self.container_settings = container_settings - self.resource_files = resource_files - self.output_files = output_files - self.environment_settings = environment_settings - self.constraints = constraints - self.kill_job_on_completion = kill_job_on_completion - self.user_identity = user_identity - self.run_exclusive = run_exclusive - self.application_package_references = application_package_references - self.authentication_token_settings = authentication_token_settings - self.allow_low_priority_node = allow_low_priority_node + def __init__(self, **kwargs): + super(JobManagerTask, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.command_line = kwargs.get('command_line', None) + self.container_settings = kwargs.get('container_settings', None) + self.resource_files = kwargs.get('resource_files', None) + self.output_files = kwargs.get('output_files', None) + self.environment_settings = kwargs.get('environment_settings', None) + self.constraints = kwargs.get('constraints', None) + self.kill_job_on_completion = kwargs.get('kill_job_on_completion', None) + self.user_identity = kwargs.get('user_identity', None) + self.run_exclusive = kwargs.get('run_exclusive', None) + self.application_package_references = kwargs.get('application_package_references', None) + self.authentication_token_settings = kwargs.get('authentication_token_settings', None) + self.allow_low_priority_node = kwargs.get('allow_low_priority_node', None) diff --git a/azure-batch/azure/batch/models/job_manager_task_py3.py b/azure-batch/azure/batch/models/job_manager_task_py3.py new file mode 100644 index 000000000000..668b182b3b55 --- /dev/null +++ b/azure-batch/azure/batch/models/job_manager_task_py3.py @@ -0,0 +1,182 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobManagerTask(Model): + """Specifies details of a Job Manager task. + + The Job Manager task is automatically started when the job is created. The + Batch service tries to schedule the Job Manager task before any other tasks + in the job. When shrinking a pool, the Batch service tries to preserve + compute nodes where Job Manager tasks are running for as long as possible + (that is, nodes running 'normal' tasks are removed before nodes running Job + Manager tasks). When a Job Manager task fails and needs to be restarted, + the system tries to schedule it at the highest priority. If there are no + idle nodes available, the system may terminate one of the running tasks in + the pool and return it to the queue in order to make room for the Job + Manager task to restart. Note that a Job Manager task in one job does not + have priority over tasks in other jobs. Across jobs, only job level + priorities are observed. For example, if a Job Manager in a priority 0 job + needs to be restarted, it will not displace tasks of a priority 1 job. + Batch will retry tasks when a recovery operation is triggered on a compute + node. Examples of recovery operations include (but are not limited to) when + an unhealthy compute node is rebooted or a compute node disappeared due to + host failure. Retries due to recovery operations are independent of and are + not counted against the maxTaskRetryCount. Even if the maxTaskRetryCount is + 0, an internal retry due to a recovery operation may occur. Because of + this, all tasks should be idempotent. This means tasks need to tolerate + being interrupted and restarted without causing any corruption or duplicate + data. The best practice for long running tasks is to use some form of + checkpointing. + + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the Job Manager + task within the job. The ID can contain any combination of alphanumeric + characters including hyphens and underscores and cannot contain more than + 64 characters. + :type id: str + :param display_name: The display name of the Job Manager task. It need not + be unique and can contain any Unicode characters up to a maximum length of + 1024. + :type display_name: str + :param command_line: Required. The command line of the Job Manager task. + The command line does not run under a shell, and therefore cannot take + advantage of shell features such as environment variable expansion. If you + want to take advantage of such features, you should invoke the shell in + the command line, for example using "cmd /c MyCommand" in Windows or + "/bin/sh -c MyCommand" in Linux. If the command line refers to file paths, + it should use a relative path (relative to the task working directory), or + use the Batch provided environment variable + (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). + :type command_line: str + :param container_settings: The settings for the container under which the + Job Manager task runs. If the pool that will run this task has + containerConfiguration set, this must be set as well. If the pool that + will run this task doesn't have containerConfiguration set, this must not + be set. When this is specified, all directories recursively below the + AZ_BATCH_NODE_ROOT_DIR (the root of Azure Batch directories on the node) + are mapped into the container, all task environment variables are mapped + into the container, and the task command line is executed in the + container. + :type container_settings: ~azure.batch.models.TaskContainerSettings + :param resource_files: A list of files that the Batch service will + download to the compute node before running the command line. Files listed + under this element are located in the task's working directory. There is a + maximum size for the list of resource files. When the max size is + exceeded, the request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. + :type resource_files: list[~azure.batch.models.ResourceFile] + :param output_files: A list of files that the Batch service will upload + from the compute node after running the command line. For multi-instance + tasks, the files will only be uploaded from the compute node on which the + primary task is executed. + :type output_files: list[~azure.batch.models.OutputFile] + :param environment_settings: A list of environment variable settings for + the Job Manager task. + :type environment_settings: list[~azure.batch.models.EnvironmentSetting] + :param constraints: Constraints that apply to the Job Manager task. + :type constraints: ~azure.batch.models.TaskConstraints + :param kill_job_on_completion: Whether completion of the Job Manager task + signifies completion of the entire job. If true, when the Job Manager task + completes, the Batch service marks the job as complete. If any tasks are + still running at this time (other than Job Release), those tasks are + terminated. If false, the completion of the Job Manager task does not + affect the job status. In this case, you should either use the + onAllTasksComplete attribute to terminate the job, or have a client or + user terminate the job explicitly. An example of this is if the Job + Manager creates a set of tasks but then takes no further role in their + execution. The default value is true. If you are using the + onAllTasksComplete and onTaskFailure attributes to control job lifetime, + and using the Job Manager task only to create the tasks for the job (not + to monitor progress), then it is important to set killJobOnCompletion to + false. + :type kill_job_on_completion: bool + :param user_identity: The user identity under which the Job Manager task + runs. If omitted, the task runs as a non-administrative user unique to the + task. + :type user_identity: ~azure.batch.models.UserIdentity + :param run_exclusive: Whether the Job Manager task requires exclusive use + of the compute node where it runs. If true, no other tasks will run on the + same compute node for as long as the Job Manager is running. If false, + other tasks can run simultaneously with the Job Manager on a compute node. + The Job Manager task counts normally against the node's concurrent task + limit, so this is only relevant if the node allows multiple concurrent + tasks. The default value is true. + :type run_exclusive: bool + :param application_package_references: A list of application packages that + the Batch service will deploy to the compute node before running the + command line. Application packages are downloaded and deployed to a shared + directory, not the task working directory. Therefore, if a referenced + package is already on the compute node, and is up to date, then it is not + re-downloaded; the existing copy on the compute node is used. If a + referenced application package cannot be installed, for example because + the package has been deleted or because download failed, the task fails. + :type application_package_references: + list[~azure.batch.models.ApplicationPackageReference] + :param authentication_token_settings: The settings for an authentication + token that the task can use to perform Batch service operations. If this + property is set, the Batch service provides the task with an + authentication token which can be used to authenticate Batch service + operations without requiring an account access key. The token is provided + via the AZ_BATCH_AUTHENTICATION_TOKEN environment variable. The operations + that the task can carry out using the token depend on the settings. For + example, a task can request job permissions in order to add other tasks to + the job, or check the status of the job or of other tasks under the job. + :type authentication_token_settings: + ~azure.batch.models.AuthenticationTokenSettings + :param allow_low_priority_node: Whether the Job Manager task may run on a + low-priority compute node. The default value is true. + :type allow_low_priority_node: bool + """ + + _validation = { + 'id': {'required': True}, + 'command_line': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'command_line': {'key': 'commandLine', 'type': 'str'}, + 'container_settings': {'key': 'containerSettings', 'type': 'TaskContainerSettings'}, + 'resource_files': {'key': 'resourceFiles', 'type': '[ResourceFile]'}, + 'output_files': {'key': 'outputFiles', 'type': '[OutputFile]'}, + 'environment_settings': {'key': 'environmentSettings', 'type': '[EnvironmentSetting]'}, + 'constraints': {'key': 'constraints', 'type': 'TaskConstraints'}, + 'kill_job_on_completion': {'key': 'killJobOnCompletion', 'type': 'bool'}, + 'user_identity': {'key': 'userIdentity', 'type': 'UserIdentity'}, + 'run_exclusive': {'key': 'runExclusive', 'type': 'bool'}, + 'application_package_references': {'key': 'applicationPackageReferences', 'type': '[ApplicationPackageReference]'}, + 'authentication_token_settings': {'key': 'authenticationTokenSettings', 'type': 'AuthenticationTokenSettings'}, + 'allow_low_priority_node': {'key': 'allowLowPriorityNode', 'type': 'bool'}, + } + + def __init__(self, *, id: str, command_line: str, display_name: str=None, container_settings=None, resource_files=None, output_files=None, environment_settings=None, constraints=None, kill_job_on_completion: bool=None, user_identity=None, run_exclusive: bool=None, application_package_references=None, authentication_token_settings=None, allow_low_priority_node: bool=None, **kwargs) -> None: + super(JobManagerTask, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.command_line = command_line + self.container_settings = container_settings + self.resource_files = resource_files + self.output_files = output_files + self.environment_settings = environment_settings + self.constraints = constraints + self.kill_job_on_completion = kill_job_on_completion + self.user_identity = user_identity + self.run_exclusive = run_exclusive + self.application_package_references = application_package_references + self.authentication_token_settings = authentication_token_settings + self.allow_low_priority_node = allow_low_priority_node diff --git a/azure-batch/azure/batch/models/job_patch_options.py b/azure-batch/azure/batch/models/job_patch_options.py index d51bac7a0df4..9fdbb4f3aa4e 100644 --- a/azure-batch/azure/batch/models/job_patch_options.py +++ b/azure-batch/azure/batch/models/job_patch_options.py @@ -50,13 +50,24 @@ class JobPatchOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobPatchOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobPatchOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_patch_options_py3.py b/azure-batch/azure/batch/models/job_patch_options_py3.py new file mode 100644 index 000000000000..586e381d316e --- /dev/null +++ b/azure-batch/azure/batch/models/job_patch_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobPatchOptions(Model): + """Additional parameters for patch operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobPatchOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_patch_parameter.py b/azure-batch/azure/batch/models/job_patch_parameter.py index 90c7a87813e8..2088a145c6e7 100644 --- a/azure-batch/azure/batch/models/job_patch_parameter.py +++ b/azure-batch/azure/batch/models/job_patch_parameter.py @@ -52,10 +52,10 @@ class JobPatchParameter(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, priority=None, on_all_tasks_complete=None, constraints=None, pool_info=None, metadata=None): - super(JobPatchParameter, self).__init__() - self.priority = priority - self.on_all_tasks_complete = on_all_tasks_complete - self.constraints = constraints - self.pool_info = pool_info - self.metadata = metadata + def __init__(self, **kwargs): + super(JobPatchParameter, self).__init__(**kwargs) + self.priority = kwargs.get('priority', None) + self.on_all_tasks_complete = kwargs.get('on_all_tasks_complete', None) + self.constraints = kwargs.get('constraints', None) + self.pool_info = kwargs.get('pool_info', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/job_patch_parameter_py3.py b/azure-batch/azure/batch/models/job_patch_parameter_py3.py new file mode 100644 index 000000000000..af6da2aaa60b --- /dev/null +++ b/azure-batch/azure/batch/models/job_patch_parameter_py3.py @@ -0,0 +1,61 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobPatchParameter(Model): + """The set of changes to be made to a job. + + :param priority: The priority of the job. Priority values can range from + -1000 to 1000, with -1000 being the lowest priority and 1000 being the + highest priority. If omitted, the priority of the job is left unchanged. + :type priority: int + :param on_all_tasks_complete: The action the Batch service should take + when all tasks in the job are in the completed state. If omitted, the + completion behavior is left unchanged. You may not change the value from + terminatejob to noaction - that is, once you have engaged automatic job + termination, you cannot turn it off again. If you try to do this, the + request fails with an 'invalid property value' error response; if you are + calling the REST API directly, the HTTP status code is 400 (Bad Request). + Possible values include: 'noAction', 'terminateJob' + :type on_all_tasks_complete: str or ~azure.batch.models.OnAllTasksComplete + :param constraints: The execution constraints for the job. If omitted, the + existing execution constraints are left unchanged. + :type constraints: ~azure.batch.models.JobConstraints + :param pool_info: The pool on which the Batch service runs the job's + tasks. You may change the pool for a job only when the job is disabled. + The Patch Job call will fail if you include the poolInfo element and the + job is not disabled. If you specify an autoPoolSpecification specification + in the poolInfo, only the keepAlive property can be updated, and then only + if the auto pool has a poolLifetimeOption of job. If omitted, the job + continues to run on its current pool. + :type pool_info: ~azure.batch.models.PoolInformation + :param metadata: A list of name-value pairs associated with the job as + metadata. If omitted, the existing job metadata is left unchanged. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _attribute_map = { + 'priority': {'key': 'priority', 'type': 'int'}, + 'on_all_tasks_complete': {'key': 'onAllTasksComplete', 'type': 'OnAllTasksComplete'}, + 'constraints': {'key': 'constraints', 'type': 'JobConstraints'}, + 'pool_info': {'key': 'poolInfo', 'type': 'PoolInformation'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, priority: int=None, on_all_tasks_complete=None, constraints=None, pool_info=None, metadata=None, **kwargs) -> None: + super(JobPatchParameter, self).__init__(**kwargs) + self.priority = priority + self.on_all_tasks_complete = on_all_tasks_complete + self.constraints = constraints + self.pool_info = pool_info + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/job_preparation_and_release_task_execution_information.py b/azure-batch/azure/batch/models/job_preparation_and_release_task_execution_information.py index 10d214c33812..443564605242 100644 --- a/azure-batch/azure/batch/models/job_preparation_and_release_task_execution_information.py +++ b/azure-batch/azure/batch/models/job_preparation_and_release_task_execution_information.py @@ -41,10 +41,10 @@ class JobPreparationAndReleaseTaskExecutionInformation(Model): 'job_release_task_execution_info': {'key': 'jobReleaseTaskExecutionInfo', 'type': 'JobReleaseTaskExecutionInformation'}, } - def __init__(self, pool_id=None, node_id=None, node_url=None, job_preparation_task_execution_info=None, job_release_task_execution_info=None): - super(JobPreparationAndReleaseTaskExecutionInformation, self).__init__() - self.pool_id = pool_id - self.node_id = node_id - self.node_url = node_url - self.job_preparation_task_execution_info = job_preparation_task_execution_info - self.job_release_task_execution_info = job_release_task_execution_info + def __init__(self, **kwargs): + super(JobPreparationAndReleaseTaskExecutionInformation, self).__init__(**kwargs) + self.pool_id = kwargs.get('pool_id', None) + self.node_id = kwargs.get('node_id', None) + self.node_url = kwargs.get('node_url', None) + self.job_preparation_task_execution_info = kwargs.get('job_preparation_task_execution_info', None) + self.job_release_task_execution_info = kwargs.get('job_release_task_execution_info', None) diff --git a/azure-batch/azure/batch/models/job_preparation_and_release_task_execution_information_py3.py b/azure-batch/azure/batch/models/job_preparation_and_release_task_execution_information_py3.py new file mode 100644 index 000000000000..3552070200aa --- /dev/null +++ b/azure-batch/azure/batch/models/job_preparation_and_release_task_execution_information_py3.py @@ -0,0 +1,50 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobPreparationAndReleaseTaskExecutionInformation(Model): + """The status of the Job Preparation and Job Release tasks on a compute node. + + :param pool_id: The ID of the pool containing the compute node to which + this entry refers. + :type pool_id: str + :param node_id: The ID of the compute node to which this entry refers. + :type node_id: str + :param node_url: The URL of the compute node to which this entry refers. + :type node_url: str + :param job_preparation_task_execution_info: Information about the + execution status of the Job Preparation task on this compute node. + :type job_preparation_task_execution_info: + ~azure.batch.models.JobPreparationTaskExecutionInformation + :param job_release_task_execution_info: Information about the execution + status of the Job Release task on this compute node. This property is set + only if the Job Release task has run on the node. + :type job_release_task_execution_info: + ~azure.batch.models.JobReleaseTaskExecutionInformation + """ + + _attribute_map = { + 'pool_id': {'key': 'poolId', 'type': 'str'}, + 'node_id': {'key': 'nodeId', 'type': 'str'}, + 'node_url': {'key': 'nodeUrl', 'type': 'str'}, + 'job_preparation_task_execution_info': {'key': 'jobPreparationTaskExecutionInfo', 'type': 'JobPreparationTaskExecutionInformation'}, + 'job_release_task_execution_info': {'key': 'jobReleaseTaskExecutionInfo', 'type': 'JobReleaseTaskExecutionInformation'}, + } + + def __init__(self, *, pool_id: str=None, node_id: str=None, node_url: str=None, job_preparation_task_execution_info=None, job_release_task_execution_info=None, **kwargs) -> None: + super(JobPreparationAndReleaseTaskExecutionInformation, self).__init__(**kwargs) + self.pool_id = pool_id + self.node_id = node_id + self.node_url = node_url + self.job_preparation_task_execution_info = job_preparation_task_execution_info + self.job_release_task_execution_info = job_release_task_execution_info diff --git a/azure-batch/azure/batch/models/job_preparation_task.py b/azure-batch/azure/batch/models/job_preparation_task.py index 751ebbcabaf8..1987aed378bc 100644 --- a/azure-batch/azure/batch/models/job_preparation_task.py +++ b/azure-batch/azure/batch/models/job_preparation_task.py @@ -44,6 +44,8 @@ class JobPreparationTask(Model): data. The best practice for long running tasks is to use some form of checkpointing. + All required parameters must be populated in order to send to Azure. + :param id: A string that uniquely identifies the Job Preparation task within the job. The ID can contain any combination of alphanumeric characters including hyphens and underscores and cannot contain more than @@ -54,14 +56,14 @@ class JobPreparationTask(Model): TaskIdSameAsJobPreparationTask; if you are calling the REST API directly, the HTTP status code is 409 (Conflict). :type id: str - :param command_line: The command line of the Job Preparation task. The - command line does not run under a shell, and therefore cannot take - advantage of shell features such as environment variable expansion. If you - want to take advantage of such features, you should invoke the shell in - the command line, for example using "cmd /c MyCommand" in Windows or - "/bin/sh -c MyCommand" in Linux. If the command line refers to file paths, - it should use a relative path (relative to the task working directory), or - use the Batch provided environment variable + :param command_line: Required. The command line of the Job Preparation + task. The command line does not run under a shell, and therefore cannot + take advantage of shell features such as environment variable expansion. + If you want to take advantage of such features, you should invoke the + shell in the command line, for example using "cmd /c MyCommand" in Windows + or "/bin/sh -c MyCommand" in Linux. If the command line refers to file + paths, it should use a relative path (relative to the task working + directory), or use the Batch provided environment variable (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). :type command_line: str :param container_settings: The settings for the container under which the @@ -73,7 +75,12 @@ class JobPreparationTask(Model): :type container_settings: ~azure.batch.models.TaskContainerSettings :param resource_files: A list of files that the Batch service will download to the compute node before running the command line. Files listed - under this element are located in the task's working directory. + under this element are located in the task's working directory. There is + a maximum size for the list of resource files. When the max size is + exceeded, the request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. :type resource_files: list[~azure.batch.models.ResourceFile] :param environment_settings: A list of environment variable settings for the Job Preparation task. @@ -126,14 +133,14 @@ class JobPreparationTask(Model): 'rerun_on_node_reboot_after_success': {'key': 'rerunOnNodeRebootAfterSuccess', 'type': 'bool'}, } - def __init__(self, command_line, id=None, container_settings=None, resource_files=None, environment_settings=None, constraints=None, wait_for_success=None, user_identity=None, rerun_on_node_reboot_after_success=None): - super(JobPreparationTask, self).__init__() - self.id = id - self.command_line = command_line - self.container_settings = container_settings - self.resource_files = resource_files - self.environment_settings = environment_settings - self.constraints = constraints - self.wait_for_success = wait_for_success - self.user_identity = user_identity - self.rerun_on_node_reboot_after_success = rerun_on_node_reboot_after_success + def __init__(self, **kwargs): + super(JobPreparationTask, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.command_line = kwargs.get('command_line', None) + self.container_settings = kwargs.get('container_settings', None) + self.resource_files = kwargs.get('resource_files', None) + self.environment_settings = kwargs.get('environment_settings', None) + self.constraints = kwargs.get('constraints', None) + self.wait_for_success = kwargs.get('wait_for_success', None) + self.user_identity = kwargs.get('user_identity', None) + self.rerun_on_node_reboot_after_success = kwargs.get('rerun_on_node_reboot_after_success', None) diff --git a/azure-batch/azure/batch/models/job_preparation_task_execution_information.py b/azure-batch/azure/batch/models/job_preparation_task_execution_information.py index 0cce4605e82d..f51b95a1301b 100644 --- a/azure-batch/azure/batch/models/job_preparation_task_execution_information.py +++ b/azure-batch/azure/batch/models/job_preparation_task_execution_information.py @@ -16,15 +16,17 @@ class JobPreparationTaskExecutionInformation(Model): """Contains information about the execution of a Job Preparation task on a compute node. - :param start_time: The time at which the task started running. If the task - has been restarted or retried, this is the most recent time at which the - task started running. + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The time at which the task started running. + If the task has been restarted or retried, this is the most recent time at + which the task started running. :type start_time: datetime :param end_time: The time at which the Job Preparation task completed. This property is set only if the task is in the Completed state. :type end_time: datetime - :param state: The current state of the Job Preparation task on the compute - node. Possible values include: 'running', 'completed' + :param state: Required. The current state of the Job Preparation task on + the compute node. Possible values include: 'running', 'completed' :type state: str or ~azure.batch.models.JobPreparationTaskState :param task_root_directory: The root directory of the Job Preparation task on the compute node. You can use this path to retrieve files created by @@ -51,14 +53,14 @@ class JobPreparationTaskExecutionInformation(Model): property is set only if the task is in the completed state and encountered a failure. :type failure_info: ~azure.batch.models.TaskFailureInformation - :param retry_count: The number of times the task has been retried by the - Batch service. Task application failures (non-zero exit code) are retried, - pre-processing errors (the task could not be run) and file upload errors - are not retried. The Batch service will retry the task up to the limit - specified by the constraints. Task application failures (non-zero exit + :param retry_count: Required. The number of times the task has been + retried by the Batch service. Task application failures (non-zero exit code) are retried, pre-processing errors (the task could not be run) and file upload errors are not retried. The Batch service will retry the task - up to the limit specified by the constraints. + up to the limit specified by the constraints. Task application failures + (non-zero exit code) are retried, pre-processing errors (the task could + not be run) and file upload errors are not retried. The Batch service will + retry the task up to the limit specified by the constraints. :type retry_count: int :param last_retry_time: The most recent time at which a retry of the Job Preparation task started running. This property is set only if the task @@ -94,16 +96,16 @@ class JobPreparationTaskExecutionInformation(Model): 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, } - def __init__(self, start_time, state, retry_count, end_time=None, task_root_directory=None, task_root_directory_url=None, exit_code=None, container_info=None, failure_info=None, last_retry_time=None, result=None): - super(JobPreparationTaskExecutionInformation, self).__init__() - self.start_time = start_time - self.end_time = end_time - self.state = state - self.task_root_directory = task_root_directory - self.task_root_directory_url = task_root_directory_url - self.exit_code = exit_code - self.container_info = container_info - self.failure_info = failure_info - self.retry_count = retry_count - self.last_retry_time = last_retry_time - self.result = result + def __init__(self, **kwargs): + super(JobPreparationTaskExecutionInformation, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.state = kwargs.get('state', None) + self.task_root_directory = kwargs.get('task_root_directory', None) + self.task_root_directory_url = kwargs.get('task_root_directory_url', None) + self.exit_code = kwargs.get('exit_code', None) + self.container_info = kwargs.get('container_info', None) + self.failure_info = kwargs.get('failure_info', None) + self.retry_count = kwargs.get('retry_count', None) + self.last_retry_time = kwargs.get('last_retry_time', None) + self.result = kwargs.get('result', None) diff --git a/azure-batch/azure/batch/models/job_preparation_task_execution_information_py3.py b/azure-batch/azure/batch/models/job_preparation_task_execution_information_py3.py new file mode 100644 index 000000000000..36bd33f7068b --- /dev/null +++ b/azure-batch/azure/batch/models/job_preparation_task_execution_information_py3.py @@ -0,0 +1,111 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobPreparationTaskExecutionInformation(Model): + """Contains information about the execution of a Job Preparation task on a + compute node. + + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The time at which the task started running. + If the task has been restarted or retried, this is the most recent time at + which the task started running. + :type start_time: datetime + :param end_time: The time at which the Job Preparation task completed. + This property is set only if the task is in the Completed state. + :type end_time: datetime + :param state: Required. The current state of the Job Preparation task on + the compute node. Possible values include: 'running', 'completed' + :type state: str or ~azure.batch.models.JobPreparationTaskState + :param task_root_directory: The root directory of the Job Preparation task + on the compute node. You can use this path to retrieve files created by + the task, such as log files. + :type task_root_directory: str + :param task_root_directory_url: The URL to the root directory of the Job + Preparation task on the compute node. + :type task_root_directory_url: str + :param exit_code: The exit code of the program specified on the task + command line. This parameter is returned only if the task is in the + completed state. The exit code for a process reflects the specific + convention implemented by the application developer for that process. If + you use the exit code value to make decisions in your code, be sure that + you know the exit code convention used by the application process. Note + that the exit code may also be generated by the compute node operating + system, such as when a process is forcibly terminated. + :type exit_code: int + :param container_info: Information about the container under which the + task is executing. This property is set only if the task runs in a + container context. + :type container_info: + ~azure.batch.models.TaskContainerExecutionInformation + :param failure_info: Information describing the task failure, if any. This + property is set only if the task is in the completed state and encountered + a failure. + :type failure_info: ~azure.batch.models.TaskFailureInformation + :param retry_count: Required. The number of times the task has been + retried by the Batch service. Task application failures (non-zero exit + code) are retried, pre-processing errors (the task could not be run) and + file upload errors are not retried. The Batch service will retry the task + up to the limit specified by the constraints. Task application failures + (non-zero exit code) are retried, pre-processing errors (the task could + not be run) and file upload errors are not retried. The Batch service will + retry the task up to the limit specified by the constraints. + :type retry_count: int + :param last_retry_time: The most recent time at which a retry of the Job + Preparation task started running. This property is set only if the task + was retried (i.e. retryCount is nonzero). If present, this is typically + the same as startTime, but may be different if the task has been restarted + for reasons other than retry; for example, if the compute node was + rebooted during a retry, then the startTime is updated but the + lastRetryTime is not. + :type last_retry_time: datetime + :param result: The result of the task execution. If the value is 'failed', + then the details of the failure can be found in the failureInfo property. + Possible values include: 'success', 'failure' + :type result: str or ~azure.batch.models.TaskExecutionResult + """ + + _validation = { + 'start_time': {'required': True}, + 'state': {'required': True}, + 'retry_count': {'required': True}, + } + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'state': {'key': 'state', 'type': 'JobPreparationTaskState'}, + 'task_root_directory': {'key': 'taskRootDirectory', 'type': 'str'}, + 'task_root_directory_url': {'key': 'taskRootDirectoryUrl', 'type': 'str'}, + 'exit_code': {'key': 'exitCode', 'type': 'int'}, + 'container_info': {'key': 'containerInfo', 'type': 'TaskContainerExecutionInformation'}, + 'failure_info': {'key': 'failureInfo', 'type': 'TaskFailureInformation'}, + 'retry_count': {'key': 'retryCount', 'type': 'int'}, + 'last_retry_time': {'key': 'lastRetryTime', 'type': 'iso-8601'}, + 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, + } + + def __init__(self, *, start_time, state, retry_count: int, end_time=None, task_root_directory: str=None, task_root_directory_url: str=None, exit_code: int=None, container_info=None, failure_info=None, last_retry_time=None, result=None, **kwargs) -> None: + super(JobPreparationTaskExecutionInformation, self).__init__(**kwargs) + self.start_time = start_time + self.end_time = end_time + self.state = state + self.task_root_directory = task_root_directory + self.task_root_directory_url = task_root_directory_url + self.exit_code = exit_code + self.container_info = container_info + self.failure_info = failure_info + self.retry_count = retry_count + self.last_retry_time = last_retry_time + self.result = result diff --git a/azure-batch/azure/batch/models/job_preparation_task_py3.py b/azure-batch/azure/batch/models/job_preparation_task_py3.py new file mode 100644 index 000000000000..d1bb21ed384c --- /dev/null +++ b/azure-batch/azure/batch/models/job_preparation_task_py3.py @@ -0,0 +1,146 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobPreparationTask(Model): + """A Job Preparation task to run before any tasks of the job on any given + compute node. + + You can use Job Preparation to prepare a compute node to run tasks for the + job. Activities commonly performed in Job Preparation include: Downloading + common resource files used by all the tasks in the job. The Job Preparation + task can download these common resource files to the shared location on the + compute node. (AZ_BATCH_NODE_ROOT_DIR\shared), or starting a local service + on the compute node so that all tasks of that job can communicate with it. + If the Job Preparation task fails (that is, exhausts its retry count before + exiting with exit code 0), Batch will not run tasks of this job on the + compute node. The node remains ineligible to run tasks of this job until it + is reimaged. The node remains active and can be used for other jobs. The + Job Preparation task can run multiple times on the same compute node. + Therefore, you should write the Job Preparation task to handle + re-execution. If the compute node is rebooted, the Job Preparation task is + run again on the node before scheduling any other task of the job, if + rerunOnNodeRebootAfterSuccess is true or if the Job Preparation task did + not previously complete. If the compute node is reimaged, the Job + Preparation task is run again before scheduling any task of the job. Batch + will retry tasks when a recovery operation is triggered on a compute node. + Examples of recovery operations include (but are not limited to) when an + unhealthy compute node is rebooted or a compute node disappeared due to + host failure. Retries due to recovery operations are independent of and are + not counted against the maxTaskRetryCount. Even if the maxTaskRetryCount is + 0, an internal retry due to a recovery operation may occur. Because of + this, all tasks should be idempotent. This means tasks need to tolerate + being interrupted and restarted without causing any corruption or duplicate + data. The best practice for long running tasks is to use some form of + checkpointing. + + All required parameters must be populated in order to send to Azure. + + :param id: A string that uniquely identifies the Job Preparation task + within the job. The ID can contain any combination of alphanumeric + characters including hyphens and underscores and cannot contain more than + 64 characters. If you do not specify this property, the Batch service + assigns a default value of 'jobpreparation'. No other task in the job can + have the same ID as the Job Preparation task. If you try to submit a task + with the same id, the Batch service rejects the request with error code + TaskIdSameAsJobPreparationTask; if you are calling the REST API directly, + the HTTP status code is 409 (Conflict). + :type id: str + :param command_line: Required. The command line of the Job Preparation + task. The command line does not run under a shell, and therefore cannot + take advantage of shell features such as environment variable expansion. + If you want to take advantage of such features, you should invoke the + shell in the command line, for example using "cmd /c MyCommand" in Windows + or "/bin/sh -c MyCommand" in Linux. If the command line refers to file + paths, it should use a relative path (relative to the task working + directory), or use the Batch provided environment variable + (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). + :type command_line: str + :param container_settings: The settings for the container under which the + Job Preparation task runs. When this is specified, all directories + recursively below the AZ_BATCH_NODE_ROOT_DIR (the root of Azure Batch + directories on the node) are mapped into the container, all task + environment variables are mapped into the container, and the task command + line is executed in the container. + :type container_settings: ~azure.batch.models.TaskContainerSettings + :param resource_files: A list of files that the Batch service will + download to the compute node before running the command line. Files listed + under this element are located in the task's working directory. There is + a maximum size for the list of resource files. When the max size is + exceeded, the request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. + :type resource_files: list[~azure.batch.models.ResourceFile] + :param environment_settings: A list of environment variable settings for + the Job Preparation task. + :type environment_settings: list[~azure.batch.models.EnvironmentSetting] + :param constraints: Constraints that apply to the Job Preparation task. + :type constraints: ~azure.batch.models.TaskConstraints + :param wait_for_success: Whether the Batch service should wait for the Job + Preparation task to complete successfully before scheduling any other + tasks of the job on the compute node. A Job Preparation task has completed + successfully if it exits with exit code 0. If true and the Job Preparation + task fails on a compute node, the Batch service retries the Job + Preparation task up to its maximum retry count (as specified in the + constraints element). If the task has still not completed successfully + after all retries, then the Batch service will not schedule tasks of the + job to the compute node. The compute node remains active and eligible to + run tasks of other jobs. If false, the Batch service will not wait for the + Job Preparation task to complete. In this case, other tasks of the job can + start executing on the compute node while the Job Preparation task is + still running; and even if the Job Preparation task fails, new tasks will + continue to be scheduled on the node. The default value is true. + :type wait_for_success: bool + :param user_identity: The user identity under which the Job Preparation + task runs. If omitted, the task runs as a non-administrative user unique + to the task on Windows nodes, or a a non-administrative user unique to the + pool on Linux nodes. + :type user_identity: ~azure.batch.models.UserIdentity + :param rerun_on_node_reboot_after_success: Whether the Batch service + should rerun the Job Preparation task after a compute node reboots. The + Job Preparation task is always rerun if a compute node is reimaged, or if + the Job Preparation task did not complete (e.g. because the reboot + occurred while the task was running). Therefore, you should always write a + Job Preparation task to be idempotent and to behave correctly if run + multiple times. The default value is true. + :type rerun_on_node_reboot_after_success: bool + """ + + _validation = { + 'command_line': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'command_line': {'key': 'commandLine', 'type': 'str'}, + 'container_settings': {'key': 'containerSettings', 'type': 'TaskContainerSettings'}, + 'resource_files': {'key': 'resourceFiles', 'type': '[ResourceFile]'}, + 'environment_settings': {'key': 'environmentSettings', 'type': '[EnvironmentSetting]'}, + 'constraints': {'key': 'constraints', 'type': 'TaskConstraints'}, + 'wait_for_success': {'key': 'waitForSuccess', 'type': 'bool'}, + 'user_identity': {'key': 'userIdentity', 'type': 'UserIdentity'}, + 'rerun_on_node_reboot_after_success': {'key': 'rerunOnNodeRebootAfterSuccess', 'type': 'bool'}, + } + + def __init__(self, *, command_line: str, id: str=None, container_settings=None, resource_files=None, environment_settings=None, constraints=None, wait_for_success: bool=None, user_identity=None, rerun_on_node_reboot_after_success: bool=None, **kwargs) -> None: + super(JobPreparationTask, self).__init__(**kwargs) + self.id = id + self.command_line = command_line + self.container_settings = container_settings + self.resource_files = resource_files + self.environment_settings = environment_settings + self.constraints = constraints + self.wait_for_success = wait_for_success + self.user_identity = user_identity + self.rerun_on_node_reboot_after_success = rerun_on_node_reboot_after_success diff --git a/azure-batch/azure/batch/models/job_release_task.py b/azure-batch/azure/batch/models/job_release_task.py index 964f6fc48b31..cb91dd91ebf8 100644 --- a/azure-batch/azure/batch/models/job_release_task.py +++ b/azure-batch/azure/batch/models/job_release_task.py @@ -33,6 +33,8 @@ class JobReleaseTask(Model): It does not occupy a scheduling slot; that is, it does not count towards the maxTasksPerNode limit specified on the pool. + All required parameters must be populated in order to send to Azure. + :param id: A string that uniquely identifies the Job Release task within the job. The ID can contain any combination of alphanumeric characters including hyphens and underscores and cannot contain more than 64 @@ -43,14 +45,14 @@ class JobReleaseTask(Model): TaskIdSameAsJobReleaseTask; if you are calling the REST API directly, the HTTP status code is 409 (Conflict). :type id: str - :param command_line: The command line of the Job Release task. The command - line does not run under a shell, and therefore cannot take advantage of - shell features such as environment variable expansion. If you want to take - advantage of such features, you should invoke the shell in the command - line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c - MyCommand" in Linux. If the command line refers to file paths, it should - use a relative path (relative to the task working directory), or use the - Batch provided environment variable + :param command_line: Required. The command line of the Job Release task. + The command line does not run under a shell, and therefore cannot take + advantage of shell features such as environment variable expansion. If you + want to take advantage of such features, you should invoke the shell in + the command line, for example using "cmd /c MyCommand" in Windows or + "/bin/sh -c MyCommand" in Linux. If the command line refers to file paths, + it should use a relative path (relative to the task working directory), or + use the Batch provided environment variable (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). :type command_line: str :param container_settings: The settings for the container under which the @@ -61,8 +63,13 @@ class JobReleaseTask(Model): the container. :type container_settings: ~azure.batch.models.TaskContainerSettings :param resource_files: A list of files that the Batch service will - download to the compute node before running the command line. Files listed - under this element are located in the task's working directory. + download to the compute node before running the command line. There is a + maximum size for the list of resource files. When the max size is + exceeded, the request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. Files listed under this + element are located in the task's working directory. :type resource_files: list[~azure.batch.models.ResourceFile] :param environment_settings: A list of environment variable settings for the Job Release task. @@ -102,13 +109,13 @@ class JobReleaseTask(Model): 'user_identity': {'key': 'userIdentity', 'type': 'UserIdentity'}, } - def __init__(self, command_line, id=None, container_settings=None, resource_files=None, environment_settings=None, max_wall_clock_time=None, retention_time=None, user_identity=None): - super(JobReleaseTask, self).__init__() - self.id = id - self.command_line = command_line - self.container_settings = container_settings - self.resource_files = resource_files - self.environment_settings = environment_settings - self.max_wall_clock_time = max_wall_clock_time - self.retention_time = retention_time - self.user_identity = user_identity + def __init__(self, **kwargs): + super(JobReleaseTask, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.command_line = kwargs.get('command_line', None) + self.container_settings = kwargs.get('container_settings', None) + self.resource_files = kwargs.get('resource_files', None) + self.environment_settings = kwargs.get('environment_settings', None) + self.max_wall_clock_time = kwargs.get('max_wall_clock_time', None) + self.retention_time = kwargs.get('retention_time', None) + self.user_identity = kwargs.get('user_identity', None) diff --git a/azure-batch/azure/batch/models/job_release_task_execution_information.py b/azure-batch/azure/batch/models/job_release_task_execution_information.py index 5867a1d33c09..0ccb4f64ff90 100644 --- a/azure-batch/azure/batch/models/job_release_task_execution_information.py +++ b/azure-batch/azure/batch/models/job_release_task_execution_information.py @@ -16,15 +16,17 @@ class JobReleaseTaskExecutionInformation(Model): """Contains information about the execution of a Job Release task on a compute node. - :param start_time: The time at which the task started running. If the task - has been restarted or retried, this is the most recent time at which the - task started running. + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The time at which the task started running. + If the task has been restarted or retried, this is the most recent time at + which the task started running. :type start_time: datetime :param end_time: The time at which the Job Release task completed. This property is set only if the task is in the Completed state. :type end_time: datetime - :param state: The current state of the Job Release task on the compute - node. Possible values include: 'running', 'completed' + :param state: Required. The current state of the Job Release task on the + compute node. Possible values include: 'running', 'completed' :type state: str or ~azure.batch.models.JobReleaseTaskState :param task_root_directory: The root directory of the Job Release task on the compute node. You can use this path to retrieve files created by the @@ -74,14 +76,14 @@ class JobReleaseTaskExecutionInformation(Model): 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, } - def __init__(self, start_time, state, end_time=None, task_root_directory=None, task_root_directory_url=None, exit_code=None, container_info=None, failure_info=None, result=None): - super(JobReleaseTaskExecutionInformation, self).__init__() - self.start_time = start_time - self.end_time = end_time - self.state = state - self.task_root_directory = task_root_directory - self.task_root_directory_url = task_root_directory_url - self.exit_code = exit_code - self.container_info = container_info - self.failure_info = failure_info - self.result = result + def __init__(self, **kwargs): + super(JobReleaseTaskExecutionInformation, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.state = kwargs.get('state', None) + self.task_root_directory = kwargs.get('task_root_directory', None) + self.task_root_directory_url = kwargs.get('task_root_directory_url', None) + self.exit_code = kwargs.get('exit_code', None) + self.container_info = kwargs.get('container_info', None) + self.failure_info = kwargs.get('failure_info', None) + self.result = kwargs.get('result', None) diff --git a/azure-batch/azure/batch/models/job_release_task_execution_information_py3.py b/azure-batch/azure/batch/models/job_release_task_execution_information_py3.py new file mode 100644 index 000000000000..ed08089b3cce --- /dev/null +++ b/azure-batch/azure/batch/models/job_release_task_execution_information_py3.py @@ -0,0 +1,89 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobReleaseTaskExecutionInformation(Model): + """Contains information about the execution of a Job Release task on a compute + node. + + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The time at which the task started running. + If the task has been restarted or retried, this is the most recent time at + which the task started running. + :type start_time: datetime + :param end_time: The time at which the Job Release task completed. This + property is set only if the task is in the Completed state. + :type end_time: datetime + :param state: Required. The current state of the Job Release task on the + compute node. Possible values include: 'running', 'completed' + :type state: str or ~azure.batch.models.JobReleaseTaskState + :param task_root_directory: The root directory of the Job Release task on + the compute node. You can use this path to retrieve files created by the + task, such as log files. + :type task_root_directory: str + :param task_root_directory_url: The URL to the root directory of the Job + Release task on the compute node. + :type task_root_directory_url: str + :param exit_code: The exit code of the program specified on the task + command line. This parameter is returned only if the task is in the + completed state. The exit code for a process reflects the specific + convention implemented by the application developer for that process. If + you use the exit code value to make decisions in your code, be sure that + you know the exit code convention used by the application process. Note + that the exit code may also be generated by the compute node operating + system, such as when a process is forcibly terminated. + :type exit_code: int + :param container_info: Information about the container under which the + task is executing. This property is set only if the task runs in a + container context. + :type container_info: + ~azure.batch.models.TaskContainerExecutionInformation + :param failure_info: Information describing the task failure, if any. This + property is set only if the task is in the completed state and encountered + a failure. + :type failure_info: ~azure.batch.models.TaskFailureInformation + :param result: The result of the task execution. If the value is 'failed', + then the details of the failure can be found in the failureInfo property. + Possible values include: 'success', 'failure' + :type result: str or ~azure.batch.models.TaskExecutionResult + """ + + _validation = { + 'start_time': {'required': True}, + 'state': {'required': True}, + } + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'state': {'key': 'state', 'type': 'JobReleaseTaskState'}, + 'task_root_directory': {'key': 'taskRootDirectory', 'type': 'str'}, + 'task_root_directory_url': {'key': 'taskRootDirectoryUrl', 'type': 'str'}, + 'exit_code': {'key': 'exitCode', 'type': 'int'}, + 'container_info': {'key': 'containerInfo', 'type': 'TaskContainerExecutionInformation'}, + 'failure_info': {'key': 'failureInfo', 'type': 'TaskFailureInformation'}, + 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, + } + + def __init__(self, *, start_time, state, end_time=None, task_root_directory: str=None, task_root_directory_url: str=None, exit_code: int=None, container_info=None, failure_info=None, result=None, **kwargs) -> None: + super(JobReleaseTaskExecutionInformation, self).__init__(**kwargs) + self.start_time = start_time + self.end_time = end_time + self.state = state + self.task_root_directory = task_root_directory + self.task_root_directory_url = task_root_directory_url + self.exit_code = exit_code + self.container_info = container_info + self.failure_info = failure_info + self.result = result diff --git a/azure-batch/azure/batch/models/job_release_task_py3.py b/azure-batch/azure/batch/models/job_release_task_py3.py new file mode 100644 index 000000000000..e8febe4c39eb --- /dev/null +++ b/azure-batch/azure/batch/models/job_release_task_py3.py @@ -0,0 +1,121 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobReleaseTask(Model): + """A Job Release task to run on job completion on any compute node where the + job has run. + + The Job Release task runs when the job ends, because of one of the + following: The user calls the Terminate Job API, or the Delete Job API + while the job is still active, the job's maximum wall clock time constraint + is reached, and the job is still active, or the job's Job Manager task + completed, and the job is configured to terminate when the Job Manager + completes. The Job Release task runs on each compute node where tasks of + the job have run and the Job Preparation task ran and completed. If you + reimage a compute node after it has run the Job Preparation task, and the + job ends without any further tasks of the job running on that compute node + (and hence the Job Preparation task does not re-run), then the Job Release + task does not run on that node. If a compute node reboots while the Job + Release task is still running, the Job Release task runs again when the + compute node starts up. The job is not marked as complete until all Job + Release tasks have completed. The Job Release task runs in the background. + It does not occupy a scheduling slot; that is, it does not count towards + the maxTasksPerNode limit specified on the pool. + + All required parameters must be populated in order to send to Azure. + + :param id: A string that uniquely identifies the Job Release task within + the job. The ID can contain any combination of alphanumeric characters + including hyphens and underscores and cannot contain more than 64 + characters. If you do not specify this property, the Batch service assigns + a default value of 'jobrelease'. No other task in the job can have the + same ID as the Job Release task. If you try to submit a task with the same + id, the Batch service rejects the request with error code + TaskIdSameAsJobReleaseTask; if you are calling the REST API directly, the + HTTP status code is 409 (Conflict). + :type id: str + :param command_line: Required. The command line of the Job Release task. + The command line does not run under a shell, and therefore cannot take + advantage of shell features such as environment variable expansion. If you + want to take advantage of such features, you should invoke the shell in + the command line, for example using "cmd /c MyCommand" in Windows or + "/bin/sh -c MyCommand" in Linux. If the command line refers to file paths, + it should use a relative path (relative to the task working directory), or + use the Batch provided environment variable + (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). + :type command_line: str + :param container_settings: The settings for the container under which the + Job Release task runs. When this is specified, all directories recursively + below the AZ_BATCH_NODE_ROOT_DIR (the root of Azure Batch directories on + the node) are mapped into the container, all task environment variables + are mapped into the container, and the task command line is executed in + the container. + :type container_settings: ~azure.batch.models.TaskContainerSettings + :param resource_files: A list of files that the Batch service will + download to the compute node before running the command line. There is a + maximum size for the list of resource files. When the max size is + exceeded, the request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. Files listed under this + element are located in the task's working directory. + :type resource_files: list[~azure.batch.models.ResourceFile] + :param environment_settings: A list of environment variable settings for + the Job Release task. + :type environment_settings: list[~azure.batch.models.EnvironmentSetting] + :param max_wall_clock_time: The maximum elapsed time that the Job Release + task may run on a given compute node, measured from the time the task + starts. If the task does not complete within the time limit, the Batch + service terminates it. The default value is 15 minutes. You may not + specify a timeout longer than 15 minutes. If you do, the Batch service + rejects it with an error; if you are calling the REST API directly, the + HTTP status code is 400 (Bad Request). + :type max_wall_clock_time: timedelta + :param retention_time: The minimum time to retain the task directory for + the Job Release task on the compute node. After this time, the Batch + service may delete the task directory and all its contents. The default is + infinite, i.e. the task directory will be retained until the compute node + is removed or reimaged. + :type retention_time: timedelta + :param user_identity: The user identity under which the Job Release task + runs. If omitted, the task runs as a non-administrative user unique to the + task. + :type user_identity: ~azure.batch.models.UserIdentity + """ + + _validation = { + 'command_line': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'command_line': {'key': 'commandLine', 'type': 'str'}, + 'container_settings': {'key': 'containerSettings', 'type': 'TaskContainerSettings'}, + 'resource_files': {'key': 'resourceFiles', 'type': '[ResourceFile]'}, + 'environment_settings': {'key': 'environmentSettings', 'type': '[EnvironmentSetting]'}, + 'max_wall_clock_time': {'key': 'maxWallClockTime', 'type': 'duration'}, + 'retention_time': {'key': 'retentionTime', 'type': 'duration'}, + 'user_identity': {'key': 'userIdentity', 'type': 'UserIdentity'}, + } + + def __init__(self, *, command_line: str, id: str=None, container_settings=None, resource_files=None, environment_settings=None, max_wall_clock_time=None, retention_time=None, user_identity=None, **kwargs) -> None: + super(JobReleaseTask, self).__init__(**kwargs) + self.id = id + self.command_line = command_line + self.container_settings = container_settings + self.resource_files = resource_files + self.environment_settings = environment_settings + self.max_wall_clock_time = max_wall_clock_time + self.retention_time = retention_time + self.user_identity = user_identity diff --git a/azure-batch/azure/batch/models/job_schedule_add_options.py b/azure-batch/azure/batch/models/job_schedule_add_options.py index cdaf8e0e0857..6c03aaff2373 100644 --- a/azure-batch/azure/batch/models/job_schedule_add_options.py +++ b/azure-batch/azure/batch/models/job_schedule_add_options.py @@ -31,9 +31,16 @@ class JobScheduleAddOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(JobScheduleAddOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleAddOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/job_schedule_add_options_py3.py b/azure-batch/azure/batch/models/job_schedule_add_options_py3.py new file mode 100644 index 000000000000..fe7b76cc4861 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_add_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleAddOptions(Model): + """Additional parameters for add operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(JobScheduleAddOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/job_schedule_add_parameter.py b/azure-batch/azure/batch/models/job_schedule_add_parameter.py index 985f3bc7248f..e0d8d724120f 100644 --- a/azure-batch/azure/batch/models/job_schedule_add_parameter.py +++ b/azure-batch/azure/batch/models/job_schedule_add_parameter.py @@ -16,8 +16,10 @@ class JobScheduleAddParameter(Model): """A job schedule that allows recurring jobs by specifying when to run jobs and a specification used to create each job. - :param id: A string that uniquely identifies the schedule within the - account. The ID can contain any combination of alphanumeric characters + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the schedule within + the account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an account that differ only by case). @@ -26,10 +28,11 @@ class JobScheduleAddParameter(Model): need not be unique and can contain any Unicode characters up to a maximum length of 1024. :type display_name: str - :param schedule: The schedule according to which jobs will be created. + :param schedule: Required. The schedule according to which jobs will be + created. :type schedule: ~azure.batch.models.Schedule - :param job_specification: The details of the jobs to be created on this - schedule. + :param job_specification: Required. The details of the jobs to be created + on this schedule. :type job_specification: ~azure.batch.models.JobSpecification :param metadata: A list of name-value pairs associated with the schedule as metadata. The Batch service does not assign any meaning to metadata; it @@ -51,10 +54,10 @@ class JobScheduleAddParameter(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, id, schedule, job_specification, display_name=None, metadata=None): - super(JobScheduleAddParameter, self).__init__() - self.id = id - self.display_name = display_name - self.schedule = schedule - self.job_specification = job_specification - self.metadata = metadata + def __init__(self, **kwargs): + super(JobScheduleAddParameter, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.schedule = kwargs.get('schedule', None) + self.job_specification = kwargs.get('job_specification', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/job_schedule_add_parameter_py3.py b/azure-batch/azure/batch/models/job_schedule_add_parameter_py3.py new file mode 100644 index 000000000000..9281c765682e --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_add_parameter_py3.py @@ -0,0 +1,63 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleAddParameter(Model): + """A job schedule that allows recurring jobs by specifying when to run jobs + and a specification used to create each job. + + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the schedule within + the account. The ID can contain any combination of alphanumeric characters + including hyphens and underscores, and cannot contain more than 64 + characters. The ID is case-preserving and case-insensitive (that is, you + may not have two IDs within an account that differ only by case). + :type id: str + :param display_name: The display name for the schedule. The display name + need not be unique and can contain any Unicode characters up to a maximum + length of 1024. + :type display_name: str + :param schedule: Required. The schedule according to which jobs will be + created. + :type schedule: ~azure.batch.models.Schedule + :param job_specification: Required. The details of the jobs to be created + on this schedule. + :type job_specification: ~azure.batch.models.JobSpecification + :param metadata: A list of name-value pairs associated with the schedule + as metadata. The Batch service does not assign any meaning to metadata; it + is solely for the use of user code. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _validation = { + 'id': {'required': True}, + 'schedule': {'required': True}, + 'job_specification': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'schedule': {'key': 'schedule', 'type': 'Schedule'}, + 'job_specification': {'key': 'jobSpecification', 'type': 'JobSpecification'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, id: str, schedule, job_specification, display_name: str=None, metadata=None, **kwargs) -> None: + super(JobScheduleAddParameter, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.schedule = schedule + self.job_specification = job_specification + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/job_schedule_delete_options.py b/azure-batch/azure/batch/models/job_schedule_delete_options.py index e4f274f50496..a7e01118576e 100644 --- a/azure-batch/azure/batch/models/job_schedule_delete_options.py +++ b/azure-batch/azure/batch/models/job_schedule_delete_options.py @@ -50,13 +50,24 @@ class JobScheduleDeleteOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobScheduleDeleteOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleDeleteOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_schedule_delete_options_py3.py b/azure-batch/azure/batch/models/job_schedule_delete_options_py3.py new file mode 100644 index 000000000000..89ae99869173 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_delete_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleDeleteOptions(Model): + """Additional parameters for delete operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobScheduleDeleteOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_schedule_disable_options.py b/azure-batch/azure/batch/models/job_schedule_disable_options.py index 27cc851f9f65..9384c1fbc154 100644 --- a/azure-batch/azure/batch/models/job_schedule_disable_options.py +++ b/azure-batch/azure/batch/models/job_schedule_disable_options.py @@ -50,13 +50,24 @@ class JobScheduleDisableOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobScheduleDisableOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleDisableOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_schedule_disable_options_py3.py b/azure-batch/azure/batch/models/job_schedule_disable_options_py3.py new file mode 100644 index 000000000000..83adbe53a6b2 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_disable_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleDisableOptions(Model): + """Additional parameters for disable operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobScheduleDisableOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_schedule_enable_options.py b/azure-batch/azure/batch/models/job_schedule_enable_options.py index 45cf182c0969..a296d5307ac5 100644 --- a/azure-batch/azure/batch/models/job_schedule_enable_options.py +++ b/azure-batch/azure/batch/models/job_schedule_enable_options.py @@ -50,13 +50,24 @@ class JobScheduleEnableOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobScheduleEnableOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleEnableOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_schedule_enable_options_py3.py b/azure-batch/azure/batch/models/job_schedule_enable_options_py3.py new file mode 100644 index 000000000000..daa4d0871468 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_enable_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleEnableOptions(Model): + """Additional parameters for enable operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobScheduleEnableOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_schedule_execution_information.py b/azure-batch/azure/batch/models/job_schedule_execution_information.py index fb2a297d2f27..b79a4e81abb6 100644 --- a/azure-batch/azure/batch/models/job_schedule_execution_information.py +++ b/azure-batch/azure/batch/models/job_schedule_execution_information.py @@ -37,8 +37,8 @@ class JobScheduleExecutionInformation(Model): 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, } - def __init__(self, next_run_time=None, recent_job=None, end_time=None): - super(JobScheduleExecutionInformation, self).__init__() - self.next_run_time = next_run_time - self.recent_job = recent_job - self.end_time = end_time + def __init__(self, **kwargs): + super(JobScheduleExecutionInformation, self).__init__(**kwargs) + self.next_run_time = kwargs.get('next_run_time', None) + self.recent_job = kwargs.get('recent_job', None) + self.end_time = kwargs.get('end_time', None) diff --git a/azure-batch/azure/batch/models/job_schedule_execution_information_py3.py b/azure-batch/azure/batch/models/job_schedule_execution_information_py3.py new file mode 100644 index 000000000000..6afcaa3853b4 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_execution_information_py3.py @@ -0,0 +1,44 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleExecutionInformation(Model): + """Contains information about jobs that have been and will be run under a job + schedule. + + :param next_run_time: The next time at which a job will be created under + this schedule. This property is meaningful only if the schedule is in the + active state when the time comes around. For example, if the schedule is + disabled, no job will be created at nextRunTime unless the job is enabled + before then. + :type next_run_time: datetime + :param recent_job: Information about the most recent job under the job + schedule. This property is present only if the at least one job has run + under the schedule. + :type recent_job: ~azure.batch.models.RecentJob + :param end_time: The time at which the schedule ended. This property is + set only if the job schedule is in the completed state. + :type end_time: datetime + """ + + _attribute_map = { + 'next_run_time': {'key': 'nextRunTime', 'type': 'iso-8601'}, + 'recent_job': {'key': 'recentJob', 'type': 'RecentJob'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + } + + def __init__(self, *, next_run_time=None, recent_job=None, end_time=None, **kwargs) -> None: + super(JobScheduleExecutionInformation, self).__init__(**kwargs) + self.next_run_time = next_run_time + self.recent_job = recent_job + self.end_time = end_time diff --git a/azure-batch/azure/batch/models/job_schedule_exists_options.py b/azure-batch/azure/batch/models/job_schedule_exists_options.py index 5596ab256886..c4f228d77b22 100644 --- a/azure-batch/azure/batch/models/job_schedule_exists_options.py +++ b/azure-batch/azure/batch/models/job_schedule_exists_options.py @@ -50,13 +50,24 @@ class JobScheduleExistsOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobScheduleExistsOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleExistsOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_schedule_exists_options_py3.py b/azure-batch/azure/batch/models/job_schedule_exists_options_py3.py new file mode 100644 index 000000000000..da8e15d205ee --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_exists_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleExistsOptions(Model): + """Additional parameters for exists operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobScheduleExistsOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_schedule_get_options.py b/azure-batch/azure/batch/models/job_schedule_get_options.py index 4bbdc741ca01..434b0ab1a1ea 100644 --- a/azure-batch/azure/batch/models/job_schedule_get_options.py +++ b/azure-batch/azure/batch/models/job_schedule_get_options.py @@ -54,15 +54,28 @@ class JobScheduleGetOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, select=None, expand=None, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobScheduleGetOptions, self).__init__() - self.select = select - self.expand = expand - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleGetOptions, self).__init__(**kwargs) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_schedule_get_options_py3.py b/azure-batch/azure/batch/models/job_schedule_get_options_py3.py new file mode 100644 index 000000000000..11ee540ffacd --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_get_options_py3.py @@ -0,0 +1,81 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleGetOptions(Model): + """Additional parameters for get operation. + + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, select: str=None, expand: str=None, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobScheduleGetOptions, self).__init__(**kwargs) + self.select = select + self.expand = expand + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_schedule_list_options.py b/azure-batch/azure/batch/models/job_schedule_list_options.py index f48fa4957d19..28af39456b6d 100644 --- a/azure-batch/azure/batch/models/job_schedule_list_options.py +++ b/azure-batch/azure/batch/models/job_schedule_list_options.py @@ -42,13 +42,24 @@ class JobScheduleListOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, select=None, expand=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(JobScheduleListOptions, self).__init__() - self.filter = filter - self.select = select - self.expand = expand - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleListOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/job_schedule_list_options_py3.py b/azure-batch/azure/batch/models/job_schedule_list_options_py3.py new file mode 100644 index 000000000000..017cdb10d98b --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_list_options_py3.py @@ -0,0 +1,65 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleListOptions(Model): + """Additional parameters for list operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-job-schedules. + :type filter: str + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 job schedules can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, select: str=None, expand: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(JobScheduleListOptions, self).__init__(**kwargs) + self.filter = filter + self.select = select + self.expand = expand + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/job_schedule_patch_options.py b/azure-batch/azure/batch/models/job_schedule_patch_options.py index c0a154fca53e..841e56e91bf1 100644 --- a/azure-batch/azure/batch/models/job_schedule_patch_options.py +++ b/azure-batch/azure/batch/models/job_schedule_patch_options.py @@ -50,13 +50,24 @@ class JobSchedulePatchOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobSchedulePatchOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobSchedulePatchOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_schedule_patch_options_py3.py b/azure-batch/azure/batch/models/job_schedule_patch_options_py3.py new file mode 100644 index 000000000000..06e4f626c614 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_patch_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobSchedulePatchOptions(Model): + """Additional parameters for patch operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobSchedulePatchOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_schedule_patch_parameter.py b/azure-batch/azure/batch/models/job_schedule_patch_parameter.py index 10c1ec9a3889..24a074bf667a 100644 --- a/azure-batch/azure/batch/models/job_schedule_patch_parameter.py +++ b/azure-batch/azure/batch/models/job_schedule_patch_parameter.py @@ -35,8 +35,8 @@ class JobSchedulePatchParameter(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, schedule=None, job_specification=None, metadata=None): - super(JobSchedulePatchParameter, self).__init__() - self.schedule = schedule - self.job_specification = job_specification - self.metadata = metadata + def __init__(self, **kwargs): + super(JobSchedulePatchParameter, self).__init__(**kwargs) + self.schedule = kwargs.get('schedule', None) + self.job_specification = kwargs.get('job_specification', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/job_schedule_patch_parameter_py3.py b/azure-batch/azure/batch/models/job_schedule_patch_parameter_py3.py new file mode 100644 index 000000000000..4102022b19d3 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_patch_parameter_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobSchedulePatchParameter(Model): + """The set of changes to be made to a job schedule. + + :param schedule: The schedule according to which jobs will be created. If + you do not specify this element, the existing schedule is left unchanged. + :type schedule: ~azure.batch.models.Schedule + :param job_specification: The details of the jobs to be created on this + schedule. Updates affect only jobs that are started after the update has + taken place. Any currently active job continues with the older + specification. + :type job_specification: ~azure.batch.models.JobSpecification + :param metadata: A list of name-value pairs associated with the job + schedule as metadata. If you do not specify this element, existing + metadata is left unchanged. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _attribute_map = { + 'schedule': {'key': 'schedule', 'type': 'Schedule'}, + 'job_specification': {'key': 'jobSpecification', 'type': 'JobSpecification'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, schedule=None, job_specification=None, metadata=None, **kwargs) -> None: + super(JobSchedulePatchParameter, self).__init__(**kwargs) + self.schedule = schedule + self.job_specification = job_specification + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/job_schedule_statistics.py b/azure-batch/azure/batch/models/job_schedule_statistics.py index 85ed5e2ad63b..ebf2e3e2058e 100644 --- a/azure-batch/azure/batch/models/job_schedule_statistics.py +++ b/azure-batch/azure/batch/models/job_schedule_statistics.py @@ -15,59 +15,62 @@ class JobScheduleStatistics(Model): """Resource usage statistics for a job schedule. - :param url: The URL of the statistics. + All required parameters must be populated in order to send to Azure. + + :param url: Required. The URL of the statistics. :type url: str - :param start_time: The start time of the time range covered by the - statistics. + :param start_time: Required. The start time of the time range covered by + the statistics. :type start_time: datetime - :param last_update_time: The time at which the statistics were last - updated. All statistics are limited to the range between startTime and - lastUpdateTime. + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. :type last_update_time: datetime - :param user_cpu_time: The total user mode CPU time (summed across all - cores and all compute nodes) consumed by all tasks in all jobs created - under the schedule. + :param user_cpu_time: Required. The total user mode CPU time (summed + across all cores and all compute nodes) consumed by all tasks in all jobs + created under the schedule. :type user_cpu_time: timedelta - :param kernel_cpu_time: The total kernel mode CPU time (summed across all - cores and all compute nodes) consumed by all tasks in all jobs created - under the schedule. + :param kernel_cpu_time: Required. The total kernel mode CPU time (summed + across all cores and all compute nodes) consumed by all tasks in all jobs + created under the schedule. :type kernel_cpu_time: timedelta - :param wall_clock_time: The total wall clock time of all the tasks in all - the jobs created under the schedule. The wall clock time is the elapsed - time from when the task started running on a compute node to when it - finished (or to the last time the statistics were updated, if the task had - not finished by then). If a task was retried, this includes the wall clock - time of all the task retries. + :param wall_clock_time: Required. The total wall clock time of all the + tasks in all the jobs created under the schedule. The wall clock time is + the elapsed time from when the task started running on a compute node to + when it finished (or to the last time the statistics were updated, if the + task had not finished by then). If a task was retried, this includes the + wall clock time of all the task retries. :type wall_clock_time: timedelta - :param read_iops: The total number of disk read operations made by all - tasks in all jobs created under the schedule. + :param read_iops: Required. The total number of disk read operations made + by all tasks in all jobs created under the schedule. :type read_iops: long - :param write_iops: The total number of disk write operations made by all - tasks in all jobs created under the schedule. + :param write_iops: Required. The total number of disk write operations + made by all tasks in all jobs created under the schedule. :type write_iops: long - :param read_io_gi_b: The total gibibytes read from disk by all tasks in - all jobs created under the schedule. + :param read_io_gi_b: Required. The total gibibytes read from disk by all + tasks in all jobs created under the schedule. :type read_io_gi_b: float - :param write_io_gi_b: The total gibibytes written to disk by all tasks in - all jobs created under the schedule. + :param write_io_gi_b: Required. The total gibibytes written to disk by all + tasks in all jobs created under the schedule. :type write_io_gi_b: float - :param num_succeeded_tasks: The total number of tasks successfully - completed during the given time range in jobs created under the schedule. - A task completes successfully if it returns exit code 0. + :param num_succeeded_tasks: Required. The total number of tasks + successfully completed during the given time range in jobs created under + the schedule. A task completes successfully if it returns exit code 0. :type num_succeeded_tasks: long - :param num_failed_tasks: The total number of tasks that failed during the - given time range in jobs created under the schedule. A task fails if it - exhausts its maximum retry count without returning exit code 0. + :param num_failed_tasks: Required. The total number of tasks that failed + during the given time range in jobs created under the schedule. A task + fails if it exhausts its maximum retry count without returning exit code + 0. :type num_failed_tasks: long - :param num_task_retries: The total number of retries during the given time - range on all tasks in all jobs created under the schedule. + :param num_task_retries: Required. The total number of retries during the + given time range on all tasks in all jobs created under the schedule. :type num_task_retries: long - :param wait_time: The total wait time of all tasks in all jobs created - under the schedule. The wait time for a task is defined as the elapsed - time between the creation of the task and the start of task execution. (If - the task is retried due to failures, the wait time is the time to the most - recent task execution.). This value is only reported in the account - lifetime statistics; it is not included in the job statistics. + :param wait_time: Required. The total wait time of all tasks in all jobs + created under the schedule. The wait time for a task is defined as the + elapsed time between the creation of the task and the start of task + execution. (If the task is retried due to failures, the wait time is the + time to the most recent task execution.). This value is only reported in + the account lifetime statistics; it is not included in the job statistics. :type wait_time: timedelta """ @@ -105,19 +108,19 @@ class JobScheduleStatistics(Model): 'wait_time': {'key': 'waitTime', 'type': 'duration'}, } - def __init__(self, url, start_time, last_update_time, user_cpu_time, kernel_cpu_time, wall_clock_time, read_iops, write_iops, read_io_gi_b, write_io_gi_b, num_succeeded_tasks, num_failed_tasks, num_task_retries, wait_time): - super(JobScheduleStatistics, self).__init__() - self.url = url - self.start_time = start_time - self.last_update_time = last_update_time - self.user_cpu_time = user_cpu_time - self.kernel_cpu_time = kernel_cpu_time - self.wall_clock_time = wall_clock_time - self.read_iops = read_iops - self.write_iops = write_iops - self.read_io_gi_b = read_io_gi_b - self.write_io_gi_b = write_io_gi_b - self.num_succeeded_tasks = num_succeeded_tasks - self.num_failed_tasks = num_failed_tasks - self.num_task_retries = num_task_retries - self.wait_time = wait_time + def __init__(self, **kwargs): + super(JobScheduleStatistics, self).__init__(**kwargs) + self.url = kwargs.get('url', None) + self.start_time = kwargs.get('start_time', None) + self.last_update_time = kwargs.get('last_update_time', None) + self.user_cpu_time = kwargs.get('user_cpu_time', None) + self.kernel_cpu_time = kwargs.get('kernel_cpu_time', None) + self.wall_clock_time = kwargs.get('wall_clock_time', None) + self.read_iops = kwargs.get('read_iops', None) + self.write_iops = kwargs.get('write_iops', None) + self.read_io_gi_b = kwargs.get('read_io_gi_b', None) + self.write_io_gi_b = kwargs.get('write_io_gi_b', None) + self.num_succeeded_tasks = kwargs.get('num_succeeded_tasks', None) + self.num_failed_tasks = kwargs.get('num_failed_tasks', None) + self.num_task_retries = kwargs.get('num_task_retries', None) + self.wait_time = kwargs.get('wait_time', None) diff --git a/azure-batch/azure/batch/models/job_schedule_statistics_py3.py b/azure-batch/azure/batch/models/job_schedule_statistics_py3.py new file mode 100644 index 000000000000..d335aa94c675 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_statistics_py3.py @@ -0,0 +1,126 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleStatistics(Model): + """Resource usage statistics for a job schedule. + + All required parameters must be populated in order to send to Azure. + + :param url: Required. The URL of the statistics. + :type url: str + :param start_time: Required. The start time of the time range covered by + the statistics. + :type start_time: datetime + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. + :type last_update_time: datetime + :param user_cpu_time: Required. The total user mode CPU time (summed + across all cores and all compute nodes) consumed by all tasks in all jobs + created under the schedule. + :type user_cpu_time: timedelta + :param kernel_cpu_time: Required. The total kernel mode CPU time (summed + across all cores and all compute nodes) consumed by all tasks in all jobs + created under the schedule. + :type kernel_cpu_time: timedelta + :param wall_clock_time: Required. The total wall clock time of all the + tasks in all the jobs created under the schedule. The wall clock time is + the elapsed time from when the task started running on a compute node to + when it finished (or to the last time the statistics were updated, if the + task had not finished by then). If a task was retried, this includes the + wall clock time of all the task retries. + :type wall_clock_time: timedelta + :param read_iops: Required. The total number of disk read operations made + by all tasks in all jobs created under the schedule. + :type read_iops: long + :param write_iops: Required. The total number of disk write operations + made by all tasks in all jobs created under the schedule. + :type write_iops: long + :param read_io_gi_b: Required. The total gibibytes read from disk by all + tasks in all jobs created under the schedule. + :type read_io_gi_b: float + :param write_io_gi_b: Required. The total gibibytes written to disk by all + tasks in all jobs created under the schedule. + :type write_io_gi_b: float + :param num_succeeded_tasks: Required. The total number of tasks + successfully completed during the given time range in jobs created under + the schedule. A task completes successfully if it returns exit code 0. + :type num_succeeded_tasks: long + :param num_failed_tasks: Required. The total number of tasks that failed + during the given time range in jobs created under the schedule. A task + fails if it exhausts its maximum retry count without returning exit code + 0. + :type num_failed_tasks: long + :param num_task_retries: Required. The total number of retries during the + given time range on all tasks in all jobs created under the schedule. + :type num_task_retries: long + :param wait_time: Required. The total wait time of all tasks in all jobs + created under the schedule. The wait time for a task is defined as the + elapsed time between the creation of the task and the start of task + execution. (If the task is retried due to failures, the wait time is the + time to the most recent task execution.). This value is only reported in + the account lifetime statistics; it is not included in the job statistics. + :type wait_time: timedelta + """ + + _validation = { + 'url': {'required': True}, + 'start_time': {'required': True}, + 'last_update_time': {'required': True}, + 'user_cpu_time': {'required': True}, + 'kernel_cpu_time': {'required': True}, + 'wall_clock_time': {'required': True}, + 'read_iops': {'required': True}, + 'write_iops': {'required': True}, + 'read_io_gi_b': {'required': True}, + 'write_io_gi_b': {'required': True}, + 'num_succeeded_tasks': {'required': True}, + 'num_failed_tasks': {'required': True}, + 'num_task_retries': {'required': True}, + 'wait_time': {'required': True}, + } + + _attribute_map = { + 'url': {'key': 'url', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'}, + 'user_cpu_time': {'key': 'userCPUTime', 'type': 'duration'}, + 'kernel_cpu_time': {'key': 'kernelCPUTime', 'type': 'duration'}, + 'wall_clock_time': {'key': 'wallClockTime', 'type': 'duration'}, + 'read_iops': {'key': 'readIOps', 'type': 'long'}, + 'write_iops': {'key': 'writeIOps', 'type': 'long'}, + 'read_io_gi_b': {'key': 'readIOGiB', 'type': 'float'}, + 'write_io_gi_b': {'key': 'writeIOGiB', 'type': 'float'}, + 'num_succeeded_tasks': {'key': 'numSucceededTasks', 'type': 'long'}, + 'num_failed_tasks': {'key': 'numFailedTasks', 'type': 'long'}, + 'num_task_retries': {'key': 'numTaskRetries', 'type': 'long'}, + 'wait_time': {'key': 'waitTime', 'type': 'duration'}, + } + + def __init__(self, *, url: str, start_time, last_update_time, user_cpu_time, kernel_cpu_time, wall_clock_time, read_iops: int, write_iops: int, read_io_gi_b: float, write_io_gi_b: float, num_succeeded_tasks: int, num_failed_tasks: int, num_task_retries: int, wait_time, **kwargs) -> None: + super(JobScheduleStatistics, self).__init__(**kwargs) + self.url = url + self.start_time = start_time + self.last_update_time = last_update_time + self.user_cpu_time = user_cpu_time + self.kernel_cpu_time = kernel_cpu_time + self.wall_clock_time = wall_clock_time + self.read_iops = read_iops + self.write_iops = write_iops + self.read_io_gi_b = read_io_gi_b + self.write_io_gi_b = write_io_gi_b + self.num_succeeded_tasks = num_succeeded_tasks + self.num_failed_tasks = num_failed_tasks + self.num_task_retries = num_task_retries + self.wait_time = wait_time diff --git a/azure-batch/azure/batch/models/job_schedule_terminate_options.py b/azure-batch/azure/batch/models/job_schedule_terminate_options.py index 29d20b98fd0b..32a6f0d78912 100644 --- a/azure-batch/azure/batch/models/job_schedule_terminate_options.py +++ b/azure-batch/azure/batch/models/job_schedule_terminate_options.py @@ -50,13 +50,24 @@ class JobScheduleTerminateOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobScheduleTerminateOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleTerminateOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_schedule_terminate_options_py3.py b/azure-batch/azure/batch/models/job_schedule_terminate_options_py3.py new file mode 100644 index 000000000000..547898763101 --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_terminate_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleTerminateOptions(Model): + """Additional parameters for terminate operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobScheduleTerminateOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_schedule_update_options.py b/azure-batch/azure/batch/models/job_schedule_update_options.py index 092d42c581da..ca3de8988302 100644 --- a/azure-batch/azure/batch/models/job_schedule_update_options.py +++ b/azure-batch/azure/batch/models/job_schedule_update_options.py @@ -50,13 +50,24 @@ class JobScheduleUpdateOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobScheduleUpdateOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobScheduleUpdateOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_schedule_update_options_py3.py b/azure-batch/azure/batch/models/job_schedule_update_options_py3.py new file mode 100644 index 000000000000..aee92988fa4d --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_update_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleUpdateOptions(Model): + """Additional parameters for update operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobScheduleUpdateOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_schedule_update_parameter.py b/azure-batch/azure/batch/models/job_schedule_update_parameter.py index 14afe643aacd..757ef299ac9c 100644 --- a/azure-batch/azure/batch/models/job_schedule_update_parameter.py +++ b/azure-batch/azure/batch/models/job_schedule_update_parameter.py @@ -15,13 +15,15 @@ class JobScheduleUpdateParameter(Model): """The set of changes to be made to a job schedule. - :param schedule: The schedule according to which jobs will be created. If - you do not specify this element, it is equivalent to passing the default - schedule: that is, a single job scheduled to run immediately. + All required parameters must be populated in order to send to Azure. + + :param schedule: Required. The schedule according to which jobs will be + created. If you do not specify this element, it is equivalent to passing + the default schedule: that is, a single job scheduled to run immediately. :type schedule: ~azure.batch.models.Schedule - :param job_specification: Details of the jobs to be created on this - schedule. Updates affect only jobs that are started after the update has - taken place. Any currently active job continues with the older + :param job_specification: Required. Details of the jobs to be created on + this schedule. Updates affect only jobs that are started after the update + has taken place. Any currently active job continues with the older specification. :type job_specification: ~azure.batch.models.JobSpecification :param metadata: A list of name-value pairs associated with the job @@ -42,8 +44,8 @@ class JobScheduleUpdateParameter(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, schedule, job_specification, metadata=None): - super(JobScheduleUpdateParameter, self).__init__() - self.schedule = schedule - self.job_specification = job_specification - self.metadata = metadata + def __init__(self, **kwargs): + super(JobScheduleUpdateParameter, self).__init__(**kwargs) + self.schedule = kwargs.get('schedule', None) + self.job_specification = kwargs.get('job_specification', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/job_schedule_update_parameter_py3.py b/azure-batch/azure/batch/models/job_schedule_update_parameter_py3.py new file mode 100644 index 000000000000..b3b216ee873f --- /dev/null +++ b/azure-batch/azure/batch/models/job_schedule_update_parameter_py3.py @@ -0,0 +1,51 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobScheduleUpdateParameter(Model): + """The set of changes to be made to a job schedule. + + All required parameters must be populated in order to send to Azure. + + :param schedule: Required. The schedule according to which jobs will be + created. If you do not specify this element, it is equivalent to passing + the default schedule: that is, a single job scheduled to run immediately. + :type schedule: ~azure.batch.models.Schedule + :param job_specification: Required. Details of the jobs to be created on + this schedule. Updates affect only jobs that are started after the update + has taken place. Any currently active job continues with the older + specification. + :type job_specification: ~azure.batch.models.JobSpecification + :param metadata: A list of name-value pairs associated with the job + schedule as metadata. If you do not specify this element, it takes the + default value of an empty list; in effect, any existing metadata is + deleted. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _validation = { + 'schedule': {'required': True}, + 'job_specification': {'required': True}, + } + + _attribute_map = { + 'schedule': {'key': 'schedule', 'type': 'Schedule'}, + 'job_specification': {'key': 'jobSpecification', 'type': 'JobSpecification'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, schedule, job_specification, metadata=None, **kwargs) -> None: + super(JobScheduleUpdateParameter, self).__init__(**kwargs) + self.schedule = schedule + self.job_specification = job_specification + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/job_scheduling_error.py b/azure-batch/azure/batch/models/job_scheduling_error.py index 246950dea272..1869114d5321 100644 --- a/azure-batch/azure/batch/models/job_scheduling_error.py +++ b/azure-batch/azure/batch/models/job_scheduling_error.py @@ -15,8 +15,10 @@ class JobSchedulingError(Model): """An error encountered by the Batch service when scheduling a job. - :param category: The category of the job scheduling error. Possible values - include: 'userError', 'serverError' + All required parameters must be populated in order to send to Azure. + + :param category: Required. The category of the job scheduling error. + Possible values include: 'userError', 'serverError' :type category: str or ~azure.batch.models.ErrorCategory :param code: An identifier for the job scheduling error. Codes are invariant and are intended to be consumed programmatically. @@ -40,9 +42,9 @@ class JobSchedulingError(Model): 'details': {'key': 'details', 'type': '[NameValuePair]'}, } - def __init__(self, category, code=None, message=None, details=None): - super(JobSchedulingError, self).__init__() - self.category = category - self.code = code - self.message = message - self.details = details + def __init__(self, **kwargs): + super(JobSchedulingError, self).__init__(**kwargs) + self.category = kwargs.get('category', None) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) + self.details = kwargs.get('details', None) diff --git a/azure-batch/azure/batch/models/job_scheduling_error_py3.py b/azure-batch/azure/batch/models/job_scheduling_error_py3.py new file mode 100644 index 000000000000..c12cb3393c81 --- /dev/null +++ b/azure-batch/azure/batch/models/job_scheduling_error_py3.py @@ -0,0 +1,50 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobSchedulingError(Model): + """An error encountered by the Batch service when scheduling a job. + + All required parameters must be populated in order to send to Azure. + + :param category: Required. The category of the job scheduling error. + Possible values include: 'userError', 'serverError' + :type category: str or ~azure.batch.models.ErrorCategory + :param code: An identifier for the job scheduling error. Codes are + invariant and are intended to be consumed programmatically. + :type code: str + :param message: A message describing the job scheduling error, intended to + be suitable for display in a user interface. + :type message: str + :param details: A list of additional error details related to the + scheduling error. + :type details: list[~azure.batch.models.NameValuePair] + """ + + _validation = { + 'category': {'required': True}, + } + + _attribute_map = { + 'category': {'key': 'category', 'type': 'ErrorCategory'}, + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + 'details': {'key': 'details', 'type': '[NameValuePair]'}, + } + + def __init__(self, *, category, code: str=None, message: str=None, details=None, **kwargs) -> None: + super(JobSchedulingError, self).__init__(**kwargs) + self.category = category + self.code = code + self.message = message + self.details = details diff --git a/azure-batch/azure/batch/models/job_specification.py b/azure-batch/azure/batch/models/job_specification.py index b6a8af098e91..5ff5a6b0c937 100644 --- a/azure-batch/azure/batch/models/job_specification.py +++ b/azure-batch/azure/batch/models/job_specification.py @@ -15,6 +15,8 @@ class JobSpecification(Model): """Specifies details of the jobs to be created on a schedule. + All required parameters must be populated in order to send to Azure. + :param priority: The priority of jobs created under this schedule. Priority values can range from -1000 to 1000, with -1000 being the lowest priority and 1000 being the highest priority. The default value is 0. This @@ -79,8 +81,8 @@ class JobSpecification(Model): different value. :type common_environment_settings: list[~azure.batch.models.EnvironmentSetting] - :param pool_info: The pool on which the Batch service runs the tasks of - jobs created under this schedule. + :param pool_info: Required. The pool on which the Batch service runs the + tasks of jobs created under this schedule. :type pool_info: ~azure.batch.models.PoolInformation :param metadata: A list of name-value pairs associated with each job created under this schedule as metadata. The Batch service does not assign @@ -107,17 +109,17 @@ class JobSpecification(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, pool_info, priority=None, display_name=None, uses_task_dependencies=None, on_all_tasks_complete=None, on_task_failure=None, constraints=None, job_manager_task=None, job_preparation_task=None, job_release_task=None, common_environment_settings=None, metadata=None): - super(JobSpecification, self).__init__() - self.priority = priority - self.display_name = display_name - self.uses_task_dependencies = uses_task_dependencies - self.on_all_tasks_complete = on_all_tasks_complete - self.on_task_failure = on_task_failure - self.constraints = constraints - self.job_manager_task = job_manager_task - self.job_preparation_task = job_preparation_task - self.job_release_task = job_release_task - self.common_environment_settings = common_environment_settings - self.pool_info = pool_info - self.metadata = metadata + def __init__(self, **kwargs): + super(JobSpecification, self).__init__(**kwargs) + self.priority = kwargs.get('priority', None) + self.display_name = kwargs.get('display_name', None) + self.uses_task_dependencies = kwargs.get('uses_task_dependencies', None) + self.on_all_tasks_complete = kwargs.get('on_all_tasks_complete', None) + self.on_task_failure = kwargs.get('on_task_failure', None) + self.constraints = kwargs.get('constraints', None) + self.job_manager_task = kwargs.get('job_manager_task', None) + self.job_preparation_task = kwargs.get('job_preparation_task', None) + self.job_release_task = kwargs.get('job_release_task', None) + self.common_environment_settings = kwargs.get('common_environment_settings', None) + self.pool_info = kwargs.get('pool_info', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/job_specification_py3.py b/azure-batch/azure/batch/models/job_specification_py3.py new file mode 100644 index 000000000000..09484bf88c66 --- /dev/null +++ b/azure-batch/azure/batch/models/job_specification_py3.py @@ -0,0 +1,125 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobSpecification(Model): + """Specifies details of the jobs to be created on a schedule. + + All required parameters must be populated in order to send to Azure. + + :param priority: The priority of jobs created under this schedule. + Priority values can range from -1000 to 1000, with -1000 being the lowest + priority and 1000 being the highest priority. The default value is 0. This + priority is used as the default for all jobs under the job schedule. You + can update a job's priority after it has been created using by using the + update job API. + :type priority: int + :param display_name: The display name for jobs created under this + schedule. The name need not be unique and can contain any Unicode + characters up to a maximum length of 1024. + :type display_name: str + :param uses_task_dependencies: Whether tasks in the job can define + dependencies on each other. The default is false. + :type uses_task_dependencies: bool + :param on_all_tasks_complete: The action the Batch service should take + when all tasks in a job created under this schedule are in the completed + state. Note that if a job contains no tasks, then all tasks are considered + complete. This option is therefore most commonly used with a Job Manager + task; if you want to use automatic job termination without a Job Manager, + you should initially set onAllTasksComplete to noaction and update the job + properties to set onAllTasksComplete to terminatejob once you have + finished adding tasks. The default is noaction. Possible values include: + 'noAction', 'terminateJob' + :type on_all_tasks_complete: str or ~azure.batch.models.OnAllTasksComplete + :param on_task_failure: The action the Batch service should take when any + task fails in a job created under this schedule. A task is considered to + have failed if it have failed if has a failureInfo. A failureInfo is set + if the task completes with a non-zero exit code after exhausting its retry + count, or if there was an error starting the task, for example due to a + resource file download error. The default is noaction. Possible values + include: 'noAction', 'performExitOptionsJobAction' + :type on_task_failure: str or ~azure.batch.models.OnTaskFailure + :param constraints: The execution constraints for jobs created under this + schedule. + :type constraints: ~azure.batch.models.JobConstraints + :param job_manager_task: The details of a Job Manager task to be launched + when a job is started under this schedule. If the job does not specify a + Job Manager task, the user must explicitly add tasks to the job using the + Task API. If the job does specify a Job Manager task, the Batch service + creates the Job Manager task when the job is created, and will try to + schedule the Job Manager task before scheduling other tasks in the job. + :type job_manager_task: ~azure.batch.models.JobManagerTask + :param job_preparation_task: The Job Preparation task for jobs created + under this schedule. If a job has a Job Preparation task, the Batch + service will run the Job Preparation task on a compute node before + starting any tasks of that job on that compute node. + :type job_preparation_task: ~azure.batch.models.JobPreparationTask + :param job_release_task: The Job Release task for jobs created under this + schedule. The primary purpose of the Job Release task is to undo changes + to compute nodes made by the Job Preparation task. Example activities + include deleting local files, or shutting down services that were started + as part of job preparation. A Job Release task cannot be specified without + also specifying a Job Preparation task for the job. The Batch service runs + the Job Release task on the compute nodes that have run the Job + Preparation task. + :type job_release_task: ~azure.batch.models.JobReleaseTask + :param common_environment_settings: A list of common environment variable + settings. These environment variables are set for all tasks in jobs + created under this schedule (including the Job Manager, Job Preparation + and Job Release tasks). Individual tasks can override an environment + setting specified here by specifying the same setting name with a + different value. + :type common_environment_settings: + list[~azure.batch.models.EnvironmentSetting] + :param pool_info: Required. The pool on which the Batch service runs the + tasks of jobs created under this schedule. + :type pool_info: ~azure.batch.models.PoolInformation + :param metadata: A list of name-value pairs associated with each job + created under this schedule as metadata. The Batch service does not assign + any meaning to metadata; it is solely for the use of user code. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _validation = { + 'pool_info': {'required': True}, + } + + _attribute_map = { + 'priority': {'key': 'priority', 'type': 'int'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'uses_task_dependencies': {'key': 'usesTaskDependencies', 'type': 'bool'}, + 'on_all_tasks_complete': {'key': 'onAllTasksComplete', 'type': 'OnAllTasksComplete'}, + 'on_task_failure': {'key': 'onTaskFailure', 'type': 'OnTaskFailure'}, + 'constraints': {'key': 'constraints', 'type': 'JobConstraints'}, + 'job_manager_task': {'key': 'jobManagerTask', 'type': 'JobManagerTask'}, + 'job_preparation_task': {'key': 'jobPreparationTask', 'type': 'JobPreparationTask'}, + 'job_release_task': {'key': 'jobReleaseTask', 'type': 'JobReleaseTask'}, + 'common_environment_settings': {'key': 'commonEnvironmentSettings', 'type': '[EnvironmentSetting]'}, + 'pool_info': {'key': 'poolInfo', 'type': 'PoolInformation'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, pool_info, priority: int=None, display_name: str=None, uses_task_dependencies: bool=None, on_all_tasks_complete=None, on_task_failure=None, constraints=None, job_manager_task=None, job_preparation_task=None, job_release_task=None, common_environment_settings=None, metadata=None, **kwargs) -> None: + super(JobSpecification, self).__init__(**kwargs) + self.priority = priority + self.display_name = display_name + self.uses_task_dependencies = uses_task_dependencies + self.on_all_tasks_complete = on_all_tasks_complete + self.on_task_failure = on_task_failure + self.constraints = constraints + self.job_manager_task = job_manager_task + self.job_preparation_task = job_preparation_task + self.job_release_task = job_release_task + self.common_environment_settings = common_environment_settings + self.pool_info = pool_info + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/job_statistics.py b/azure-batch/azure/batch/models/job_statistics.py index c1ce4d1d98e8..ca95a31dba53 100644 --- a/azure-batch/azure/batch/models/job_statistics.py +++ b/azure-batch/azure/batch/models/job_statistics.py @@ -15,56 +15,59 @@ class JobStatistics(Model): """Resource usage statistics for a job. - :param url: The URL of the statistics. + All required parameters must be populated in order to send to Azure. + + :param url: Required. The URL of the statistics. :type url: str - :param start_time: The start time of the time range covered by the - statistics. + :param start_time: Required. The start time of the time range covered by + the statistics. :type start_time: datetime - :param last_update_time: The time at which the statistics were last - updated. All statistics are limited to the range between startTime and - lastUpdateTime. + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. :type last_update_time: datetime - :param user_cpu_time: The total user mode CPU time (summed across all - cores and all compute nodes) consumed by all tasks in the job. + :param user_cpu_time: Required. The total user mode CPU time (summed + across all cores and all compute nodes) consumed by all tasks in the job. :type user_cpu_time: timedelta - :param kernel_cpu_time: The total kernel mode CPU time (summed across all - cores and all compute nodes) consumed by all tasks in the job. + :param kernel_cpu_time: Required. The total kernel mode CPU time (summed + across all cores and all compute nodes) consumed by all tasks in the job. :type kernel_cpu_time: timedelta - :param wall_clock_time: The total wall clock time of all tasks in the job. - The wall clock time is the elapsed time from when the task started running - on a compute node to when it finished (or to the last time the statistics - were updated, if the task had not finished by then). If a task was - retried, this includes the wall clock time of all the task retries. + :param wall_clock_time: Required. The total wall clock time of all tasks + in the job. The wall clock time is the elapsed time from when the task + started running on a compute node to when it finished (or to the last time + the statistics were updated, if the task had not finished by then). If a + task was retried, this includes the wall clock time of all the task + retries. :type wall_clock_time: timedelta - :param read_iops: The total number of disk read operations made by all - tasks in the job. + :param read_iops: Required. The total number of disk read operations made + by all tasks in the job. :type read_iops: long - :param write_iops: The total number of disk write operations made by all - tasks in the job. + :param write_iops: Required. The total number of disk write operations + made by all tasks in the job. :type write_iops: long - :param read_io_gi_b: The total amount of data in GiB read from disk by all - tasks in the job. + :param read_io_gi_b: Required. The total amount of data in GiB read from + disk by all tasks in the job. :type read_io_gi_b: float - :param write_io_gi_b: The total amount of data in GiB written to disk by - all tasks in the job. + :param write_io_gi_b: Required. The total amount of data in GiB written to + disk by all tasks in the job. :type write_io_gi_b: float - :param num_succeeded_tasks: The total number of tasks successfully - completed in the job during the given time range. A task completes - successfully if it returns exit code 0. + :param num_succeeded_tasks: Required. The total number of tasks + successfully completed in the job during the given time range. A task + completes successfully if it returns exit code 0. :type num_succeeded_tasks: long - :param num_failed_tasks: The total number of tasks in the job that failed - during the given time range. A task fails if it exhausts its maximum retry - count without returning exit code 0. + :param num_failed_tasks: Required. The total number of tasks in the job + that failed during the given time range. A task fails if it exhausts its + maximum retry count without returning exit code 0. :type num_failed_tasks: long - :param num_task_retries: The total number of retries on all the tasks in - the job during the given time range. + :param num_task_retries: Required. The total number of retries on all the + tasks in the job during the given time range. :type num_task_retries: long - :param wait_time: The total wait time of all tasks in the job. The wait - time for a task is defined as the elapsed time between the creation of the - task and the start of task execution. (If the task is retried due to - failures, the wait time is the time to the most recent task execution.) - This value is only reported in the account lifetime statistics; it is not - included in the job statistics. + :param wait_time: Required. The total wait time of all tasks in the job. + The wait time for a task is defined as the elapsed time between the + creation of the task and the start of task execution. (If the task is + retried due to failures, the wait time is the time to the most recent task + execution.) This value is only reported in the account lifetime + statistics; it is not included in the job statistics. :type wait_time: timedelta """ @@ -102,19 +105,19 @@ class JobStatistics(Model): 'wait_time': {'key': 'waitTime', 'type': 'duration'}, } - def __init__(self, url, start_time, last_update_time, user_cpu_time, kernel_cpu_time, wall_clock_time, read_iops, write_iops, read_io_gi_b, write_io_gi_b, num_succeeded_tasks, num_failed_tasks, num_task_retries, wait_time): - super(JobStatistics, self).__init__() - self.url = url - self.start_time = start_time - self.last_update_time = last_update_time - self.user_cpu_time = user_cpu_time - self.kernel_cpu_time = kernel_cpu_time - self.wall_clock_time = wall_clock_time - self.read_iops = read_iops - self.write_iops = write_iops - self.read_io_gi_b = read_io_gi_b - self.write_io_gi_b = write_io_gi_b - self.num_succeeded_tasks = num_succeeded_tasks - self.num_failed_tasks = num_failed_tasks - self.num_task_retries = num_task_retries - self.wait_time = wait_time + def __init__(self, **kwargs): + super(JobStatistics, self).__init__(**kwargs) + self.url = kwargs.get('url', None) + self.start_time = kwargs.get('start_time', None) + self.last_update_time = kwargs.get('last_update_time', None) + self.user_cpu_time = kwargs.get('user_cpu_time', None) + self.kernel_cpu_time = kwargs.get('kernel_cpu_time', None) + self.wall_clock_time = kwargs.get('wall_clock_time', None) + self.read_iops = kwargs.get('read_iops', None) + self.write_iops = kwargs.get('write_iops', None) + self.read_io_gi_b = kwargs.get('read_io_gi_b', None) + self.write_io_gi_b = kwargs.get('write_io_gi_b', None) + self.num_succeeded_tasks = kwargs.get('num_succeeded_tasks', None) + self.num_failed_tasks = kwargs.get('num_failed_tasks', None) + self.num_task_retries = kwargs.get('num_task_retries', None) + self.wait_time = kwargs.get('wait_time', None) diff --git a/azure-batch/azure/batch/models/job_statistics_py3.py b/azure-batch/azure/batch/models/job_statistics_py3.py new file mode 100644 index 000000000000..2f55b15aca3f --- /dev/null +++ b/azure-batch/azure/batch/models/job_statistics_py3.py @@ -0,0 +1,123 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobStatistics(Model): + """Resource usage statistics for a job. + + All required parameters must be populated in order to send to Azure. + + :param url: Required. The URL of the statistics. + :type url: str + :param start_time: Required. The start time of the time range covered by + the statistics. + :type start_time: datetime + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. + :type last_update_time: datetime + :param user_cpu_time: Required. The total user mode CPU time (summed + across all cores and all compute nodes) consumed by all tasks in the job. + :type user_cpu_time: timedelta + :param kernel_cpu_time: Required. The total kernel mode CPU time (summed + across all cores and all compute nodes) consumed by all tasks in the job. + :type kernel_cpu_time: timedelta + :param wall_clock_time: Required. The total wall clock time of all tasks + in the job. The wall clock time is the elapsed time from when the task + started running on a compute node to when it finished (or to the last time + the statistics were updated, if the task had not finished by then). If a + task was retried, this includes the wall clock time of all the task + retries. + :type wall_clock_time: timedelta + :param read_iops: Required. The total number of disk read operations made + by all tasks in the job. + :type read_iops: long + :param write_iops: Required. The total number of disk write operations + made by all tasks in the job. + :type write_iops: long + :param read_io_gi_b: Required. The total amount of data in GiB read from + disk by all tasks in the job. + :type read_io_gi_b: float + :param write_io_gi_b: Required. The total amount of data in GiB written to + disk by all tasks in the job. + :type write_io_gi_b: float + :param num_succeeded_tasks: Required. The total number of tasks + successfully completed in the job during the given time range. A task + completes successfully if it returns exit code 0. + :type num_succeeded_tasks: long + :param num_failed_tasks: Required. The total number of tasks in the job + that failed during the given time range. A task fails if it exhausts its + maximum retry count without returning exit code 0. + :type num_failed_tasks: long + :param num_task_retries: Required. The total number of retries on all the + tasks in the job during the given time range. + :type num_task_retries: long + :param wait_time: Required. The total wait time of all tasks in the job. + The wait time for a task is defined as the elapsed time between the + creation of the task and the start of task execution. (If the task is + retried due to failures, the wait time is the time to the most recent task + execution.) This value is only reported in the account lifetime + statistics; it is not included in the job statistics. + :type wait_time: timedelta + """ + + _validation = { + 'url': {'required': True}, + 'start_time': {'required': True}, + 'last_update_time': {'required': True}, + 'user_cpu_time': {'required': True}, + 'kernel_cpu_time': {'required': True}, + 'wall_clock_time': {'required': True}, + 'read_iops': {'required': True}, + 'write_iops': {'required': True}, + 'read_io_gi_b': {'required': True}, + 'write_io_gi_b': {'required': True}, + 'num_succeeded_tasks': {'required': True}, + 'num_failed_tasks': {'required': True}, + 'num_task_retries': {'required': True}, + 'wait_time': {'required': True}, + } + + _attribute_map = { + 'url': {'key': 'url', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'}, + 'user_cpu_time': {'key': 'userCPUTime', 'type': 'duration'}, + 'kernel_cpu_time': {'key': 'kernelCPUTime', 'type': 'duration'}, + 'wall_clock_time': {'key': 'wallClockTime', 'type': 'duration'}, + 'read_iops': {'key': 'readIOps', 'type': 'long'}, + 'write_iops': {'key': 'writeIOps', 'type': 'long'}, + 'read_io_gi_b': {'key': 'readIOGiB', 'type': 'float'}, + 'write_io_gi_b': {'key': 'writeIOGiB', 'type': 'float'}, + 'num_succeeded_tasks': {'key': 'numSucceededTasks', 'type': 'long'}, + 'num_failed_tasks': {'key': 'numFailedTasks', 'type': 'long'}, + 'num_task_retries': {'key': 'numTaskRetries', 'type': 'long'}, + 'wait_time': {'key': 'waitTime', 'type': 'duration'}, + } + + def __init__(self, *, url: str, start_time, last_update_time, user_cpu_time, kernel_cpu_time, wall_clock_time, read_iops: int, write_iops: int, read_io_gi_b: float, write_io_gi_b: float, num_succeeded_tasks: int, num_failed_tasks: int, num_task_retries: int, wait_time, **kwargs) -> None: + super(JobStatistics, self).__init__(**kwargs) + self.url = url + self.start_time = start_time + self.last_update_time = last_update_time + self.user_cpu_time = user_cpu_time + self.kernel_cpu_time = kernel_cpu_time + self.wall_clock_time = wall_clock_time + self.read_iops = read_iops + self.write_iops = write_iops + self.read_io_gi_b = read_io_gi_b + self.write_io_gi_b = write_io_gi_b + self.num_succeeded_tasks = num_succeeded_tasks + self.num_failed_tasks = num_failed_tasks + self.num_task_retries = num_task_retries + self.wait_time = wait_time diff --git a/azure-batch/azure/batch/models/job_terminate_options.py b/azure-batch/azure/batch/models/job_terminate_options.py index 63689889ef70..b858c4045284 100644 --- a/azure-batch/azure/batch/models/job_terminate_options.py +++ b/azure-batch/azure/batch/models/job_terminate_options.py @@ -50,13 +50,24 @@ class JobTerminateOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobTerminateOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobTerminateOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_terminate_options_py3.py b/azure-batch/azure/batch/models/job_terminate_options_py3.py new file mode 100644 index 000000000000..77173bcc4971 --- /dev/null +++ b/azure-batch/azure/batch/models/job_terminate_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobTerminateOptions(Model): + """Additional parameters for terminate operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobTerminateOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_terminate_parameter.py b/azure-batch/azure/batch/models/job_terminate_parameter.py index 1fe22775e9fd..4be6eaac6509 100644 --- a/azure-batch/azure/batch/models/job_terminate_parameter.py +++ b/azure-batch/azure/batch/models/job_terminate_parameter.py @@ -24,6 +24,6 @@ class JobTerminateParameter(Model): 'terminate_reason': {'key': 'terminateReason', 'type': 'str'}, } - def __init__(self, terminate_reason=None): - super(JobTerminateParameter, self).__init__() - self.terminate_reason = terminate_reason + def __init__(self, **kwargs): + super(JobTerminateParameter, self).__init__(**kwargs) + self.terminate_reason = kwargs.get('terminate_reason', None) diff --git a/azure-batch/azure/batch/models/job_terminate_parameter_py3.py b/azure-batch/azure/batch/models/job_terminate_parameter_py3.py new file mode 100644 index 000000000000..4a4965552291 --- /dev/null +++ b/azure-batch/azure/batch/models/job_terminate_parameter_py3.py @@ -0,0 +1,29 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobTerminateParameter(Model): + """Options when terminating a job. + + :param terminate_reason: The text you want to appear as the job's + TerminateReason. The default is 'UserTerminate'. + :type terminate_reason: str + """ + + _attribute_map = { + 'terminate_reason': {'key': 'terminateReason', 'type': 'str'}, + } + + def __init__(self, *, terminate_reason: str=None, **kwargs) -> None: + super(JobTerminateParameter, self).__init__(**kwargs) + self.terminate_reason = terminate_reason diff --git a/azure-batch/azure/batch/models/job_update_options.py b/azure-batch/azure/batch/models/job_update_options.py index f01a8853bbce..a11f18ab4d33 100644 --- a/azure-batch/azure/batch/models/job_update_options.py +++ b/azure-batch/azure/batch/models/job_update_options.py @@ -50,13 +50,24 @@ class JobUpdateOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(JobUpdateOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(JobUpdateOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/job_update_options_py3.py b/azure-batch/azure/batch/models/job_update_options_py3.py new file mode 100644 index 000000000000..61a47c218b78 --- /dev/null +++ b/azure-batch/azure/batch/models/job_update_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobUpdateOptions(Model): + """Additional parameters for update operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(JobUpdateOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/job_update_parameter.py b/azure-batch/azure/batch/models/job_update_parameter.py index 07be542de7bf..35f830630d8c 100644 --- a/azure-batch/azure/batch/models/job_update_parameter.py +++ b/azure-batch/azure/batch/models/job_update_parameter.py @@ -15,6 +15,8 @@ class JobUpdateParameter(Model): """The set of changes to be made to a job. + All required parameters must be populated in order to send to Azure. + :param priority: The priority of the job. Priority values can range from -1000 to 1000, with -1000 being the lowest priority and 1000 being the highest priority. If omitted, it is set to the default value 0. @@ -22,12 +24,13 @@ class JobUpdateParameter(Model): :param constraints: The execution constraints for the job. If omitted, the constraints are cleared. :type constraints: ~azure.batch.models.JobConstraints - :param pool_info: The pool on which the Batch service runs the job's - tasks. You may change the pool for a job only when the job is disabled. - The Update Job call will fail if you include the poolInfo element and the - job is not disabled. If you specify an autoPoolSpecification specification - in the poolInfo, only the keepAlive property can be updated, and then only - if the auto pool has a poolLifetimeOption of job. + :param pool_info: Required. The pool on which the Batch service runs the + job's tasks. You may change the pool for a job only when the job is + disabled. The Update Job call will fail if you include the poolInfo + element and the job is not disabled. If you specify an + autoPoolSpecification specification in the poolInfo, only the keepAlive + property can be updated, and then only if the auto pool has a + poolLifetimeOption of job. :type pool_info: ~azure.batch.models.PoolInformation :param metadata: A list of name-value pairs associated with the job as metadata. If omitted, it takes the default value of an empty list; in @@ -60,10 +63,10 @@ class JobUpdateParameter(Model): 'on_all_tasks_complete': {'key': 'onAllTasksComplete', 'type': 'OnAllTasksComplete'}, } - def __init__(self, pool_info, priority=None, constraints=None, metadata=None, on_all_tasks_complete=None): - super(JobUpdateParameter, self).__init__() - self.priority = priority - self.constraints = constraints - self.pool_info = pool_info - self.metadata = metadata - self.on_all_tasks_complete = on_all_tasks_complete + def __init__(self, **kwargs): + super(JobUpdateParameter, self).__init__(**kwargs) + self.priority = kwargs.get('priority', None) + self.constraints = kwargs.get('constraints', None) + self.pool_info = kwargs.get('pool_info', None) + self.metadata = kwargs.get('metadata', None) + self.on_all_tasks_complete = kwargs.get('on_all_tasks_complete', None) diff --git a/azure-batch/azure/batch/models/job_update_parameter_py3.py b/azure-batch/azure/batch/models/job_update_parameter_py3.py new file mode 100644 index 000000000000..9dce5ea1ff94 --- /dev/null +++ b/azure-batch/azure/batch/models/job_update_parameter_py3.py @@ -0,0 +1,72 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class JobUpdateParameter(Model): + """The set of changes to be made to a job. + + All required parameters must be populated in order to send to Azure. + + :param priority: The priority of the job. Priority values can range from + -1000 to 1000, with -1000 being the lowest priority and 1000 being the + highest priority. If omitted, it is set to the default value 0. + :type priority: int + :param constraints: The execution constraints for the job. If omitted, the + constraints are cleared. + :type constraints: ~azure.batch.models.JobConstraints + :param pool_info: Required. The pool on which the Batch service runs the + job's tasks. You may change the pool for a job only when the job is + disabled. The Update Job call will fail if you include the poolInfo + element and the job is not disabled. If you specify an + autoPoolSpecification specification in the poolInfo, only the keepAlive + property can be updated, and then only if the auto pool has a + poolLifetimeOption of job. + :type pool_info: ~azure.batch.models.PoolInformation + :param metadata: A list of name-value pairs associated with the job as + metadata. If omitted, it takes the default value of an empty list; in + effect, any existing metadata is deleted. + :type metadata: list[~azure.batch.models.MetadataItem] + :param on_all_tasks_complete: The action the Batch service should take + when all tasks in the job are in the completed state. If omitted, the + completion behavior is set to noaction. If the current value is + terminatejob, this is an error because a job's completion behavior may not + be changed from terminatejob to noaction. You may not change the value + from terminatejob to noaction - that is, once you have engaged automatic + job termination, you cannot turn it off again. If you try to do this, the + request fails and Batch returns status code 400 (Bad Request) and an + 'invalid property value' error response. If you do not specify this + element in a PUT request, it is equivalent to passing noaction. This is an + error if the current value is terminatejob. Possible values include: + 'noAction', 'terminateJob' + :type on_all_tasks_complete: str or ~azure.batch.models.OnAllTasksComplete + """ + + _validation = { + 'pool_info': {'required': True}, + } + + _attribute_map = { + 'priority': {'key': 'priority', 'type': 'int'}, + 'constraints': {'key': 'constraints', 'type': 'JobConstraints'}, + 'pool_info': {'key': 'poolInfo', 'type': 'PoolInformation'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + 'on_all_tasks_complete': {'key': 'onAllTasksComplete', 'type': 'OnAllTasksComplete'}, + } + + def __init__(self, *, pool_info, priority: int=None, constraints=None, metadata=None, on_all_tasks_complete=None, **kwargs) -> None: + super(JobUpdateParameter, self).__init__(**kwargs) + self.priority = priority + self.constraints = constraints + self.pool_info = pool_info + self.metadata = metadata + self.on_all_tasks_complete = on_all_tasks_complete diff --git a/azure-batch/azure/batch/models/linux_user_configuration.py b/azure-batch/azure/batch/models/linux_user_configuration.py index 0bfab5417eaf..6ba1218254d1 100644 --- a/azure-batch/azure/batch/models/linux_user_configuration.py +++ b/azure-batch/azure/batch/models/linux_user_configuration.py @@ -40,8 +40,8 @@ class LinuxUserConfiguration(Model): 'ssh_private_key': {'key': 'sshPrivateKey', 'type': 'str'}, } - def __init__(self, uid=None, gid=None, ssh_private_key=None): - super(LinuxUserConfiguration, self).__init__() - self.uid = uid - self.gid = gid - self.ssh_private_key = ssh_private_key + def __init__(self, **kwargs): + super(LinuxUserConfiguration, self).__init__(**kwargs) + self.uid = kwargs.get('uid', None) + self.gid = kwargs.get('gid', None) + self.ssh_private_key = kwargs.get('ssh_private_key', None) diff --git a/azure-batch/azure/batch/models/linux_user_configuration_py3.py b/azure-batch/azure/batch/models/linux_user_configuration_py3.py new file mode 100644 index 000000000000..cb35b4c40a9f --- /dev/null +++ b/azure-batch/azure/batch/models/linux_user_configuration_py3.py @@ -0,0 +1,47 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class LinuxUserConfiguration(Model): + """Properties used to create a user account on a Linux node. + + :param uid: The user ID of the user account. The uid and gid properties + must be specified together or not at all. If not specified the underlying + operating system picks the uid. + :type uid: int + :param gid: The group ID for the user account. The uid and gid properties + must be specified together or not at all. If not specified the underlying + operating system picks the gid. + :type gid: int + :param ssh_private_key: The SSH private key for the user account. The + private key must not be password protected. The private key is used to + automatically configure asymmetric-key based authentication for SSH + between nodes in a Linux pool when the pool's enableInterNodeCommunication + property is true (it is ignored if enableInterNodeCommunication is false). + It does this by placing the key pair into the user's .ssh directory. If + not specified, password-less SSH is not configured between nodes (no + modification of the user's .ssh directory is done). + :type ssh_private_key: str + """ + + _attribute_map = { + 'uid': {'key': 'uid', 'type': 'int'}, + 'gid': {'key': 'gid', 'type': 'int'}, + 'ssh_private_key': {'key': 'sshPrivateKey', 'type': 'str'}, + } + + def __init__(self, *, uid: int=None, gid: int=None, ssh_private_key: str=None, **kwargs) -> None: + super(LinuxUserConfiguration, self).__init__(**kwargs) + self.uid = uid + self.gid = gid + self.ssh_private_key = ssh_private_key diff --git a/azure-batch/azure/batch/models/metadata_item.py b/azure-batch/azure/batch/models/metadata_item.py index c290040874cf..d1d203e892b5 100644 --- a/azure-batch/azure/batch/models/metadata_item.py +++ b/azure-batch/azure/batch/models/metadata_item.py @@ -18,9 +18,11 @@ class MetadataItem(Model): The Batch service does not assign any meaning to this metadata; it is solely for the use of user code. - :param name: The name of the metadata item. + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the metadata item. :type name: str - :param value: The value of the metadata item. + :param value: Required. The value of the metadata item. :type value: str """ @@ -34,7 +36,7 @@ class MetadataItem(Model): 'value': {'key': 'value', 'type': 'str'}, } - def __init__(self, name, value): - super(MetadataItem, self).__init__() - self.name = name - self.value = value + def __init__(self, **kwargs): + super(MetadataItem, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.value = kwargs.get('value', None) diff --git a/azure-batch/azure/batch/models/metadata_item_py3.py b/azure-batch/azure/batch/models/metadata_item_py3.py new file mode 100644 index 000000000000..3d127cd16290 --- /dev/null +++ b/azure-batch/azure/batch/models/metadata_item_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class MetadataItem(Model): + """A name-value pair associated with a Batch service resource. + + The Batch service does not assign any meaning to this metadata; it is + solely for the use of user code. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the metadata item. + :type name: str + :param value: Required. The value of the metadata item. + :type value: str + """ + + _validation = { + 'name': {'required': True}, + 'value': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, *, name: str, value: str, **kwargs) -> None: + super(MetadataItem, self).__init__(**kwargs) + self.name = name + self.value = value diff --git a/azure-batch/azure/batch/models/multi_instance_settings.py b/azure-batch/azure/batch/models/multi_instance_settings.py index 7485dce25d5b..1fad0897388d 100644 --- a/azure-batch/azure/batch/models/multi_instance_settings.py +++ b/azure-batch/azure/batch/models/multi_instance_settings.py @@ -17,14 +17,16 @@ class MultiInstanceSettings(Model): Multi-instance tasks are commonly used to support MPI tasks. + All required parameters must be populated in order to send to Azure. + :param number_of_instances: The number of compute nodes required by the task. If omitted, the default is 1. :type number_of_instances: int - :param coordination_command_line: The command line to run on all the - compute nodes to enable them to coordinate when the primary runs the main - task command. A typical coordination command line launches a background - service and verifies that the service is ready to process inter-node - messages. + :param coordination_command_line: Required. The command line to run on all + the compute nodes to enable them to coordinate when the primary runs the + main task command. A typical coordination command line launches a + background service and verifies that the service is ready to process + inter-node messages. :type coordination_command_line: str :param common_resource_files: A list of files that the Batch service will download before running the coordination command line. The difference @@ -33,7 +35,11 @@ class MultiInstanceSettings(Model): whereas task resource files are downloaded only for the primary. Also note that these resource files are not downloaded to the task working directory, but instead are downloaded to the task root directory (one - directory above the working directory). + directory above the working directory). There is a maximum size for the + list of resource files. When the max size is exceeded, the request will + fail and the response error code will be RequestEntityTooLarge. If this + occurs, the collection of ResourceFiles must be reduced in size. This can + be achieved using .zip files, Application Packages, or Docker Containers. :type common_resource_files: list[~azure.batch.models.ResourceFile] """ @@ -47,8 +53,8 @@ class MultiInstanceSettings(Model): 'common_resource_files': {'key': 'commonResourceFiles', 'type': '[ResourceFile]'}, } - def __init__(self, coordination_command_line, number_of_instances=None, common_resource_files=None): - super(MultiInstanceSettings, self).__init__() - self.number_of_instances = number_of_instances - self.coordination_command_line = coordination_command_line - self.common_resource_files = common_resource_files + def __init__(self, **kwargs): + super(MultiInstanceSettings, self).__init__(**kwargs) + self.number_of_instances = kwargs.get('number_of_instances', None) + self.coordination_command_line = kwargs.get('coordination_command_line', None) + self.common_resource_files = kwargs.get('common_resource_files', None) diff --git a/azure-batch/azure/batch/models/multi_instance_settings_py3.py b/azure-batch/azure/batch/models/multi_instance_settings_py3.py new file mode 100644 index 000000000000..0ea3de8e31ed --- /dev/null +++ b/azure-batch/azure/batch/models/multi_instance_settings_py3.py @@ -0,0 +1,60 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class MultiInstanceSettings(Model): + """Settings which specify how to run a multi-instance task. + + Multi-instance tasks are commonly used to support MPI tasks. + + All required parameters must be populated in order to send to Azure. + + :param number_of_instances: The number of compute nodes required by the + task. If omitted, the default is 1. + :type number_of_instances: int + :param coordination_command_line: Required. The command line to run on all + the compute nodes to enable them to coordinate when the primary runs the + main task command. A typical coordination command line launches a + background service and verifies that the service is ready to process + inter-node messages. + :type coordination_command_line: str + :param common_resource_files: A list of files that the Batch service will + download before running the coordination command line. The difference + between common resource files and task resource files is that common + resource files are downloaded for all subtasks including the primary, + whereas task resource files are downloaded only for the primary. Also note + that these resource files are not downloaded to the task working + directory, but instead are downloaded to the task root directory (one + directory above the working directory). There is a maximum size for the + list of resource files. When the max size is exceeded, the request will + fail and the response error code will be RequestEntityTooLarge. If this + occurs, the collection of ResourceFiles must be reduced in size. This can + be achieved using .zip files, Application Packages, or Docker Containers. + :type common_resource_files: list[~azure.batch.models.ResourceFile] + """ + + _validation = { + 'coordination_command_line': {'required': True}, + } + + _attribute_map = { + 'number_of_instances': {'key': 'numberOfInstances', 'type': 'int'}, + 'coordination_command_line': {'key': 'coordinationCommandLine', 'type': 'str'}, + 'common_resource_files': {'key': 'commonResourceFiles', 'type': '[ResourceFile]'}, + } + + def __init__(self, *, coordination_command_line: str, number_of_instances: int=None, common_resource_files=None, **kwargs) -> None: + super(MultiInstanceSettings, self).__init__(**kwargs) + self.number_of_instances = number_of_instances + self.coordination_command_line = coordination_command_line + self.common_resource_files = common_resource_files diff --git a/azure-batch/azure/batch/models/name_value_pair.py b/azure-batch/azure/batch/models/name_value_pair.py index 34db94e4d198..d2775a33c3be 100644 --- a/azure-batch/azure/batch/models/name_value_pair.py +++ b/azure-batch/azure/batch/models/name_value_pair.py @@ -26,7 +26,7 @@ class NameValuePair(Model): 'value': {'key': 'value', 'type': 'str'}, } - def __init__(self, name=None, value=None): - super(NameValuePair, self).__init__() - self.name = name - self.value = value + def __init__(self, **kwargs): + super(NameValuePair, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.value = kwargs.get('value', None) diff --git a/azure-batch/azure/batch/models/name_value_pair_py3.py b/azure-batch/azure/batch/models/name_value_pair_py3.py new file mode 100644 index 000000000000..9e508e565226 --- /dev/null +++ b/azure-batch/azure/batch/models/name_value_pair_py3.py @@ -0,0 +1,32 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NameValuePair(Model): + """Represents a name-value pair. + + :param name: The name in the name-value pair. + :type name: str + :param value: The value in the name-value pair. + :type value: str + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'value': {'key': 'value', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, value: str=None, **kwargs) -> None: + super(NameValuePair, self).__init__(**kwargs) + self.name = name + self.value = value diff --git a/azure-batch/azure/batch/models/network_configuration.py b/azure-batch/azure/batch/models/network_configuration.py index afd49f02b004..2bb54a8e3f64 100644 --- a/azure-batch/azure/batch/models/network_configuration.py +++ b/azure-batch/azure/batch/models/network_configuration.py @@ -54,7 +54,7 @@ class NetworkConfiguration(Model): 'endpoint_configuration': {'key': 'endpointConfiguration', 'type': 'PoolEndpointConfiguration'}, } - def __init__(self, subnet_id=None, endpoint_configuration=None): - super(NetworkConfiguration, self).__init__() - self.subnet_id = subnet_id - self.endpoint_configuration = endpoint_configuration + def __init__(self, **kwargs): + super(NetworkConfiguration, self).__init__(**kwargs) + self.subnet_id = kwargs.get('subnet_id', None) + self.endpoint_configuration = kwargs.get('endpoint_configuration', None) diff --git a/azure-batch/azure/batch/models/network_configuration_py3.py b/azure-batch/azure/batch/models/network_configuration_py3.py new file mode 100644 index 000000000000..475d1adcabda --- /dev/null +++ b/azure-batch/azure/batch/models/network_configuration_py3.py @@ -0,0 +1,60 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NetworkConfiguration(Model): + """The network configuration for a pool. + + :param subnet_id: The ARM resource identifier of the virtual network + subnet which the compute nodes of the pool will join. This is of the form + /subscriptions/{subscription}/resourceGroups/{group}/providers/{provider}/virtualNetworks/{network}/subnets/{subnet}. + The virtual network must be in the same region and subscription as the + Azure Batch account. The specified subnet should have enough free IP + addresses to accommodate the number of nodes in the pool. If the subnet + doesn't have enough free IP addresses, the pool will partially allocate + compute nodes, and a resize error will occur. The 'MicrosoftAzureBatch' + service principal must have the 'Classic Virtual Machine Contributor' + Role-Based Access Control (RBAC) role for the specified VNet. The + specified subnet must allow communication from the Azure Batch service to + be able to schedule tasks on the compute nodes. This can be verified by + checking if the specified VNet has any associated Network Security Groups + (NSG). If communication to the compute nodes in the specified subnet is + denied by an NSG, then the Batch service will set the state of the compute + nodes to unusable. For pools created with virtualMachineConfiguration only + ARM virtual networks ('Microsoft.Network/virtualNetworks') are supported, + but for pools created with cloudServiceConfiguration both ARM and classic + virtual networks are supported. If the specified VNet has any associated + Network Security Groups (NSG), then a few reserved system ports must be + enabled for inbound communication. For pools created with a virtual + machine configuration, enable ports 29876 and 29877, as well as port 22 + for Linux and port 3389 for Windows. For pools created with a cloud + service configuration, enable ports 10100, 20100, and 30100. Also enable + outbound connections to Azure Storage on port 443. For more details see: + https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration + :type subnet_id: str + :param endpoint_configuration: The configuration for endpoints on compute + nodes in the Batch pool. Pool endpoint configuration is only supported on + pools with the virtualMachineConfiguration property. + :type endpoint_configuration: + ~azure.batch.models.PoolEndpointConfiguration + """ + + _attribute_map = { + 'subnet_id': {'key': 'subnetId', 'type': 'str'}, + 'endpoint_configuration': {'key': 'endpointConfiguration', 'type': 'PoolEndpointConfiguration'}, + } + + def __init__(self, *, subnet_id: str=None, endpoint_configuration=None, **kwargs) -> None: + super(NetworkConfiguration, self).__init__(**kwargs) + self.subnet_id = subnet_id + self.endpoint_configuration = endpoint_configuration diff --git a/azure-batch/azure/batch/models/network_security_group_rule.py b/azure-batch/azure/batch/models/network_security_group_rule.py index b119cded8261..569693bf55ed 100644 --- a/azure-batch/azure/batch/models/network_security_group_rule.py +++ b/azure-batch/azure/batch/models/network_security_group_rule.py @@ -15,21 +15,24 @@ class NetworkSecurityGroupRule(Model): """A network security group rule to apply to an inbound endpoint. - :param priority: The priority for this rule. Priorities within a pool must - be unique and are evaluated in order of priority. The lower the number the - higher the priority. For example, rules could be specified with order - numbers of 150, 250, and 350. The rule with the order number of 150 takes - precedence over the rule that has an order of 250. Allowed priorities are - 150 to 3500. If any reserved or duplicate values are provided the request - fails with HTTP status code 400. + All required parameters must be populated in order to send to Azure. + + :param priority: Required. The priority for this rule. Priorities within a + pool must be unique and are evaluated in order of priority. The lower the + number the higher the priority. For example, rules could be specified with + order numbers of 150, 250, and 350. The rule with the order number of 150 + takes precedence over the rule that has an order of 250. Allowed + priorities are 150 to 3500. If any reserved or duplicate values are + provided the request fails with HTTP status code 400. :type priority: int - :param access: The action that should be taken for a specified IP address, - subnet range or tag. Possible values include: 'allow', 'deny' + :param access: Required. The action that should be taken for a specified + IP address, subnet range or tag. Possible values include: 'allow', 'deny' :type access: str or ~azure.batch.models.NetworkSecurityGroupRuleAccess - :param source_address_prefix: The source address prefix or tag to match - for the rule. Valid values are a single IP address (i.e. 10.10.10.10), IP - subnet (i.e. 192.168.1.0/24), default tag, or * (for all addresses). If - any other values are provided the request fails with HTTP status code 400. + :param source_address_prefix: Required. The source address prefix or tag + to match for the rule. Valid values are a single IP address (i.e. + 10.10.10.10), IP subnet (i.e. 192.168.1.0/24), default tag, or * (for all + addresses). If any other values are provided the request fails with HTTP + status code 400. :type source_address_prefix: str """ @@ -45,8 +48,8 @@ class NetworkSecurityGroupRule(Model): 'source_address_prefix': {'key': 'sourceAddressPrefix', 'type': 'str'}, } - def __init__(self, priority, access, source_address_prefix): - super(NetworkSecurityGroupRule, self).__init__() - self.priority = priority - self.access = access - self.source_address_prefix = source_address_prefix + def __init__(self, **kwargs): + super(NetworkSecurityGroupRule, self).__init__(**kwargs) + self.priority = kwargs.get('priority', None) + self.access = kwargs.get('access', None) + self.source_address_prefix = kwargs.get('source_address_prefix', None) diff --git a/azure-batch/azure/batch/models/network_security_group_rule_py3.py b/azure-batch/azure/batch/models/network_security_group_rule_py3.py new file mode 100644 index 000000000000..9fec92baec7a --- /dev/null +++ b/azure-batch/azure/batch/models/network_security_group_rule_py3.py @@ -0,0 +1,55 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NetworkSecurityGroupRule(Model): + """A network security group rule to apply to an inbound endpoint. + + All required parameters must be populated in order to send to Azure. + + :param priority: Required. The priority for this rule. Priorities within a + pool must be unique and are evaluated in order of priority. The lower the + number the higher the priority. For example, rules could be specified with + order numbers of 150, 250, and 350. The rule with the order number of 150 + takes precedence over the rule that has an order of 250. Allowed + priorities are 150 to 3500. If any reserved or duplicate values are + provided the request fails with HTTP status code 400. + :type priority: int + :param access: Required. The action that should be taken for a specified + IP address, subnet range or tag. Possible values include: 'allow', 'deny' + :type access: str or ~azure.batch.models.NetworkSecurityGroupRuleAccess + :param source_address_prefix: Required. The source address prefix or tag + to match for the rule. Valid values are a single IP address (i.e. + 10.10.10.10), IP subnet (i.e. 192.168.1.0/24), default tag, or * (for all + addresses). If any other values are provided the request fails with HTTP + status code 400. + :type source_address_prefix: str + """ + + _validation = { + 'priority': {'required': True}, + 'access': {'required': True}, + 'source_address_prefix': {'required': True}, + } + + _attribute_map = { + 'priority': {'key': 'priority', 'type': 'int'}, + 'access': {'key': 'access', 'type': 'NetworkSecurityGroupRuleAccess'}, + 'source_address_prefix': {'key': 'sourceAddressPrefix', 'type': 'str'}, + } + + def __init__(self, *, priority: int, access, source_address_prefix: str, **kwargs) -> None: + super(NetworkSecurityGroupRule, self).__init__(**kwargs) + self.priority = priority + self.access = access + self.source_address_prefix = source_address_prefix diff --git a/azure-batch/azure/batch/models/node_agent_information.py b/azure-batch/azure/batch/models/node_agent_information.py new file mode 100644 index 000000000000..0d61a707c779 --- /dev/null +++ b/azure-batch/azure/batch/models/node_agent_information.py @@ -0,0 +1,47 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeAgentInformation(Model): + """Information about the node agent. + + The Batch node agent is a program that runs on each node in the pool and + provides Batch capability on the compute node. + + All required parameters must be populated in order to send to Azure. + + :param version: Required. The version of the Batch node agent running on + the compute node. This version number can be checked against the node + agent release notes located at + https://github.com/Azure/Batch/blob/master/changelogs/nodeagent/CHANGELOG.md. + :type version: str + :param last_update_time: Required. The time when the node agent was + updated on the compute node. This is the most recent time that the node + agent was updated to a new version. + :type last_update_time: datetime + """ + + _validation = { + 'version': {'required': True}, + 'last_update_time': {'required': True}, + } + + _attribute_map = { + 'version': {'key': 'version', 'type': 'str'}, + 'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'}, + } + + def __init__(self, **kwargs): + super(NodeAgentInformation, self).__init__(**kwargs) + self.version = kwargs.get('version', None) + self.last_update_time = kwargs.get('last_update_time', None) diff --git a/azure-batch/azure/batch/models/node_agent_information_py3.py b/azure-batch/azure/batch/models/node_agent_information_py3.py new file mode 100644 index 000000000000..770e3ca529ce --- /dev/null +++ b/azure-batch/azure/batch/models/node_agent_information_py3.py @@ -0,0 +1,47 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeAgentInformation(Model): + """Information about the node agent. + + The Batch node agent is a program that runs on each node in the pool and + provides Batch capability on the compute node. + + All required parameters must be populated in order to send to Azure. + + :param version: Required. The version of the Batch node agent running on + the compute node. This version number can be checked against the node + agent release notes located at + https://github.com/Azure/Batch/blob/master/changelogs/nodeagent/CHANGELOG.md. + :type version: str + :param last_update_time: Required. The time when the node agent was + updated on the compute node. This is the most recent time that the node + agent was updated to a new version. + :type last_update_time: datetime + """ + + _validation = { + 'version': {'required': True}, + 'last_update_time': {'required': True}, + } + + _attribute_map = { + 'version': {'key': 'version', 'type': 'str'}, + 'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'}, + } + + def __init__(self, *, version: str, last_update_time, **kwargs) -> None: + super(NodeAgentInformation, self).__init__(**kwargs) + self.version = version + self.last_update_time = last_update_time diff --git a/azure-batch/azure/batch/models/node_agent_sku.py b/azure-batch/azure/batch/models/node_agent_sku.py index ddd46e3c2644..dac567dd5a5b 100644 --- a/azure-batch/azure/batch/models/node_agent_sku.py +++ b/azure-batch/azure/batch/models/node_agent_sku.py @@ -38,8 +38,8 @@ class NodeAgentSku(Model): 'os_type': {'key': 'osType', 'type': 'OSType'}, } - def __init__(self, id=None, verified_image_references=None, os_type=None): - super(NodeAgentSku, self).__init__() - self.id = id - self.verified_image_references = verified_image_references - self.os_type = os_type + def __init__(self, **kwargs): + super(NodeAgentSku, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.verified_image_references = kwargs.get('verified_image_references', None) + self.os_type = kwargs.get('os_type', None) diff --git a/azure-batch/azure/batch/models/node_agent_sku_py3.py b/azure-batch/azure/batch/models/node_agent_sku_py3.py new file mode 100644 index 000000000000..29475f4004aa --- /dev/null +++ b/azure-batch/azure/batch/models/node_agent_sku_py3.py @@ -0,0 +1,45 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeAgentSku(Model): + """A node agent SKU supported by the Batch service. + + The Batch node agent is a program that runs on each node in the pool, and + provides the command-and-control interface between the node and the Batch + service. There are different implementations of the node agent, known as + SKUs, for different operating systems. + + :param id: The ID of the node agent SKU. + :type id: str + :param verified_image_references: The list of Azure Marketplace images + verified to be compatible with this node agent SKU. This collection is not + exhaustive (the node agent may be compatible with other images). + :type verified_image_references: list[~azure.batch.models.ImageReference] + :param os_type: The type of operating system (e.g. Windows or Linux) + compatible with the node agent SKU. Possible values include: 'linux', + 'windows' + :type os_type: str or ~azure.batch.models.OSType + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'verified_image_references': {'key': 'verifiedImageReferences', 'type': '[ImageReference]'}, + 'os_type': {'key': 'osType', 'type': 'OSType'}, + } + + def __init__(self, *, id: str=None, verified_image_references=None, os_type=None, **kwargs) -> None: + super(NodeAgentSku, self).__init__(**kwargs) + self.id = id + self.verified_image_references = verified_image_references + self.os_type = os_type diff --git a/azure-batch/azure/batch/models/node_counts.py b/azure-batch/azure/batch/models/node_counts.py index ae2ec0e7fd79..de54c0c01b1c 100644 --- a/azure-batch/azure/batch/models/node_counts.py +++ b/azure-batch/azure/batch/models/node_counts.py @@ -15,35 +15,38 @@ class NodeCounts(Model): """The number of nodes in each node state. - :param creating: The number of nodes in the creating state. + All required parameters must be populated in order to send to Azure. + + :param creating: Required. The number of nodes in the creating state. :type creating: int - :param idle: The number of nodes in the idle state. + :param idle: Required. The number of nodes in the idle state. :type idle: int - :param offline: The number of nodes in the offline state. + :param offline: Required. The number of nodes in the offline state. :type offline: int - :param preempted: The number of nodes in the preempted state. + :param preempted: Required. The number of nodes in the preempted state. :type preempted: int - :param rebooting: The count of nodes in the rebooting state. + :param rebooting: Required. The count of nodes in the rebooting state. :type rebooting: int - :param reimaging: The number of nodes in the reimaging state. + :param reimaging: Required. The number of nodes in the reimaging state. :type reimaging: int - :param running: The number of nodes in the running state. + :param running: Required. The number of nodes in the running state. :type running: int - :param starting: The number of nodes in the starting state. + :param starting: Required. The number of nodes in the starting state. :type starting: int - :param start_task_failed: The number of nodes in the startTaskFailed - state. + :param start_task_failed: Required. The number of nodes in the + startTaskFailed state. :type start_task_failed: int - :param leaving_pool: The number of nodes in the leavingPool state. + :param leaving_pool: Required. The number of nodes in the leavingPool + state. :type leaving_pool: int - :param unknown: The number of nodes in the unknown state. + :param unknown: Required. The number of nodes in the unknown state. :type unknown: int - :param unusable: The number of nodes in the unusable state. + :param unusable: Required. The number of nodes in the unusable state. :type unusable: int - :param waiting_for_start_task: The number of nodes in the + :param waiting_for_start_task: Required. The number of nodes in the waitingForStartTask state. :type waiting_for_start_task: int - :param total: The total number of nodes. + :param total: Required. The total number of nodes. :type total: int """ @@ -81,19 +84,19 @@ class NodeCounts(Model): 'total': {'key': 'total', 'type': 'int'}, } - def __init__(self, creating, idle, offline, preempted, rebooting, reimaging, running, starting, start_task_failed, leaving_pool, unknown, unusable, waiting_for_start_task, total): - super(NodeCounts, self).__init__() - self.creating = creating - self.idle = idle - self.offline = offline - self.preempted = preempted - self.rebooting = rebooting - self.reimaging = reimaging - self.running = running - self.starting = starting - self.start_task_failed = start_task_failed - self.leaving_pool = leaving_pool - self.unknown = unknown - self.unusable = unusable - self.waiting_for_start_task = waiting_for_start_task - self.total = total + def __init__(self, **kwargs): + super(NodeCounts, self).__init__(**kwargs) + self.creating = kwargs.get('creating', None) + self.idle = kwargs.get('idle', None) + self.offline = kwargs.get('offline', None) + self.preempted = kwargs.get('preempted', None) + self.rebooting = kwargs.get('rebooting', None) + self.reimaging = kwargs.get('reimaging', None) + self.running = kwargs.get('running', None) + self.starting = kwargs.get('starting', None) + self.start_task_failed = kwargs.get('start_task_failed', None) + self.leaving_pool = kwargs.get('leaving_pool', None) + self.unknown = kwargs.get('unknown', None) + self.unusable = kwargs.get('unusable', None) + self.waiting_for_start_task = kwargs.get('waiting_for_start_task', None) + self.total = kwargs.get('total', None) diff --git a/azure-batch/azure/batch/models/node_counts_py3.py b/azure-batch/azure/batch/models/node_counts_py3.py new file mode 100644 index 000000000000..bfeca712f86b --- /dev/null +++ b/azure-batch/azure/batch/models/node_counts_py3.py @@ -0,0 +1,102 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeCounts(Model): + """The number of nodes in each node state. + + All required parameters must be populated in order to send to Azure. + + :param creating: Required. The number of nodes in the creating state. + :type creating: int + :param idle: Required. The number of nodes in the idle state. + :type idle: int + :param offline: Required. The number of nodes in the offline state. + :type offline: int + :param preempted: Required. The number of nodes in the preempted state. + :type preempted: int + :param rebooting: Required. The count of nodes in the rebooting state. + :type rebooting: int + :param reimaging: Required. The number of nodes in the reimaging state. + :type reimaging: int + :param running: Required. The number of nodes in the running state. + :type running: int + :param starting: Required. The number of nodes in the starting state. + :type starting: int + :param start_task_failed: Required. The number of nodes in the + startTaskFailed state. + :type start_task_failed: int + :param leaving_pool: Required. The number of nodes in the leavingPool + state. + :type leaving_pool: int + :param unknown: Required. The number of nodes in the unknown state. + :type unknown: int + :param unusable: Required. The number of nodes in the unusable state. + :type unusable: int + :param waiting_for_start_task: Required. The number of nodes in the + waitingForStartTask state. + :type waiting_for_start_task: int + :param total: Required. The total number of nodes. + :type total: int + """ + + _validation = { + 'creating': {'required': True}, + 'idle': {'required': True}, + 'offline': {'required': True}, + 'preempted': {'required': True}, + 'rebooting': {'required': True}, + 'reimaging': {'required': True}, + 'running': {'required': True}, + 'starting': {'required': True}, + 'start_task_failed': {'required': True}, + 'leaving_pool': {'required': True}, + 'unknown': {'required': True}, + 'unusable': {'required': True}, + 'waiting_for_start_task': {'required': True}, + 'total': {'required': True}, + } + + _attribute_map = { + 'creating': {'key': 'creating', 'type': 'int'}, + 'idle': {'key': 'idle', 'type': 'int'}, + 'offline': {'key': 'offline', 'type': 'int'}, + 'preempted': {'key': 'preempted', 'type': 'int'}, + 'rebooting': {'key': 'rebooting', 'type': 'int'}, + 'reimaging': {'key': 'reimaging', 'type': 'int'}, + 'running': {'key': 'running', 'type': 'int'}, + 'starting': {'key': 'starting', 'type': 'int'}, + 'start_task_failed': {'key': 'startTaskFailed', 'type': 'int'}, + 'leaving_pool': {'key': 'leavingPool', 'type': 'int'}, + 'unknown': {'key': 'unknown', 'type': 'int'}, + 'unusable': {'key': 'unusable', 'type': 'int'}, + 'waiting_for_start_task': {'key': 'waitingForStartTask', 'type': 'int'}, + 'total': {'key': 'total', 'type': 'int'}, + } + + def __init__(self, *, creating: int, idle: int, offline: int, preempted: int, rebooting: int, reimaging: int, running: int, starting: int, start_task_failed: int, leaving_pool: int, unknown: int, unusable: int, waiting_for_start_task: int, total: int, **kwargs) -> None: + super(NodeCounts, self).__init__(**kwargs) + self.creating = creating + self.idle = idle + self.offline = offline + self.preempted = preempted + self.rebooting = rebooting + self.reimaging = reimaging + self.running = running + self.starting = starting + self.start_task_failed = start_task_failed + self.leaving_pool = leaving_pool + self.unknown = unknown + self.unusable = unusable + self.waiting_for_start_task = waiting_for_start_task + self.total = total diff --git a/azure-batch/azure/batch/models/node_disable_scheduling_parameter.py b/azure-batch/azure/batch/models/node_disable_scheduling_parameter.py index c08b8ee63f9a..e92b0262792e 100644 --- a/azure-batch/azure/batch/models/node_disable_scheduling_parameter.py +++ b/azure-batch/azure/batch/models/node_disable_scheduling_parameter.py @@ -27,6 +27,6 @@ class NodeDisableSchedulingParameter(Model): 'node_disable_scheduling_option': {'key': 'nodeDisableSchedulingOption', 'type': 'DisableComputeNodeSchedulingOption'}, } - def __init__(self, node_disable_scheduling_option=None): - super(NodeDisableSchedulingParameter, self).__init__() - self.node_disable_scheduling_option = node_disable_scheduling_option + def __init__(self, **kwargs): + super(NodeDisableSchedulingParameter, self).__init__(**kwargs) + self.node_disable_scheduling_option = kwargs.get('node_disable_scheduling_option', None) diff --git a/azure-batch/azure/batch/models/node_disable_scheduling_parameter_py3.py b/azure-batch/azure/batch/models/node_disable_scheduling_parameter_py3.py new file mode 100644 index 000000000000..d6de68c56102 --- /dev/null +++ b/azure-batch/azure/batch/models/node_disable_scheduling_parameter_py3.py @@ -0,0 +1,32 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeDisableSchedulingParameter(Model): + """Options for disabling scheduling on a compute node. + + :param node_disable_scheduling_option: What to do with currently running + tasks when disabling task scheduling on the compute node. The default + value is requeue. Possible values include: 'requeue', 'terminate', + 'taskCompletion' + :type node_disable_scheduling_option: str or + ~azure.batch.models.DisableComputeNodeSchedulingOption + """ + + _attribute_map = { + 'node_disable_scheduling_option': {'key': 'nodeDisableSchedulingOption', 'type': 'DisableComputeNodeSchedulingOption'}, + } + + def __init__(self, *, node_disable_scheduling_option=None, **kwargs) -> None: + super(NodeDisableSchedulingParameter, self).__init__(**kwargs) + self.node_disable_scheduling_option = node_disable_scheduling_option diff --git a/azure-batch/azure/batch/models/node_file.py b/azure-batch/azure/batch/models/node_file.py index 3b997849d181..93fa29d61733 100644 --- a/azure-batch/azure/batch/models/node_file.py +++ b/azure-batch/azure/batch/models/node_file.py @@ -32,9 +32,9 @@ class NodeFile(Model): 'properties': {'key': 'properties', 'type': 'FileProperties'}, } - def __init__(self, name=None, url=None, is_directory=None, properties=None): - super(NodeFile, self).__init__() - self.name = name - self.url = url - self.is_directory = is_directory - self.properties = properties + def __init__(self, **kwargs): + super(NodeFile, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.url = kwargs.get('url', None) + self.is_directory = kwargs.get('is_directory', None) + self.properties = kwargs.get('properties', None) diff --git a/azure-batch/azure/batch/models/node_file_py3.py b/azure-batch/azure/batch/models/node_file_py3.py new file mode 100644 index 000000000000..410f310d3751 --- /dev/null +++ b/azure-batch/azure/batch/models/node_file_py3.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeFile(Model): + """Information about a file or directory on a compute node. + + :param name: The file path. + :type name: str + :param url: The URL of the file. + :type url: str + :param is_directory: Whether the object represents a directory. + :type is_directory: bool + :param properties: The file properties. + :type properties: ~azure.batch.models.FileProperties + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + 'is_directory': {'key': 'isDirectory', 'type': 'bool'}, + 'properties': {'key': 'properties', 'type': 'FileProperties'}, + } + + def __init__(self, *, name: str=None, url: str=None, is_directory: bool=None, properties=None, **kwargs) -> None: + super(NodeFile, self).__init__(**kwargs) + self.name = name + self.url = url + self.is_directory = is_directory + self.properties = properties diff --git a/azure-batch/azure/batch/models/node_reboot_parameter.py b/azure-batch/azure/batch/models/node_reboot_parameter.py index 6536d4ee5035..10e13ad753fd 100644 --- a/azure-batch/azure/batch/models/node_reboot_parameter.py +++ b/azure-batch/azure/batch/models/node_reboot_parameter.py @@ -26,6 +26,6 @@ class NodeRebootParameter(Model): 'node_reboot_option': {'key': 'nodeRebootOption', 'type': 'ComputeNodeRebootOption'}, } - def __init__(self, node_reboot_option=None): - super(NodeRebootParameter, self).__init__() - self.node_reboot_option = node_reboot_option + def __init__(self, **kwargs): + super(NodeRebootParameter, self).__init__(**kwargs) + self.node_reboot_option = kwargs.get('node_reboot_option', None) diff --git a/azure-batch/azure/batch/models/node_reboot_parameter_py3.py b/azure-batch/azure/batch/models/node_reboot_parameter_py3.py new file mode 100644 index 000000000000..0c21c6d1c19e --- /dev/null +++ b/azure-batch/azure/batch/models/node_reboot_parameter_py3.py @@ -0,0 +1,31 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeRebootParameter(Model): + """Options for rebooting a compute node. + + :param node_reboot_option: When to reboot the compute node and what to do + with currently running tasks. The default value is requeue. Possible + values include: 'requeue', 'terminate', 'taskCompletion', 'retainedData' + :type node_reboot_option: str or + ~azure.batch.models.ComputeNodeRebootOption + """ + + _attribute_map = { + 'node_reboot_option': {'key': 'nodeRebootOption', 'type': 'ComputeNodeRebootOption'}, + } + + def __init__(self, *, node_reboot_option=None, **kwargs) -> None: + super(NodeRebootParameter, self).__init__(**kwargs) + self.node_reboot_option = node_reboot_option diff --git a/azure-batch/azure/batch/models/node_reimage_parameter.py b/azure-batch/azure/batch/models/node_reimage_parameter.py index c2da4dc0905d..aa51f1413afd 100644 --- a/azure-batch/azure/batch/models/node_reimage_parameter.py +++ b/azure-batch/azure/batch/models/node_reimage_parameter.py @@ -26,6 +26,6 @@ class NodeReimageParameter(Model): 'node_reimage_option': {'key': 'nodeReimageOption', 'type': 'ComputeNodeReimageOption'}, } - def __init__(self, node_reimage_option=None): - super(NodeReimageParameter, self).__init__() - self.node_reimage_option = node_reimage_option + def __init__(self, **kwargs): + super(NodeReimageParameter, self).__init__(**kwargs) + self.node_reimage_option = kwargs.get('node_reimage_option', None) diff --git a/azure-batch/azure/batch/models/node_reimage_parameter_py3.py b/azure-batch/azure/batch/models/node_reimage_parameter_py3.py new file mode 100644 index 000000000000..7af3930561bb --- /dev/null +++ b/azure-batch/azure/batch/models/node_reimage_parameter_py3.py @@ -0,0 +1,31 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeReimageParameter(Model): + """Options for reimaging a compute node. + + :param node_reimage_option: When to reimage the compute node and what to + do with currently running tasks. The default value is requeue. Possible + values include: 'requeue', 'terminate', 'taskCompletion', 'retainedData' + :type node_reimage_option: str or + ~azure.batch.models.ComputeNodeReimageOption + """ + + _attribute_map = { + 'node_reimage_option': {'key': 'nodeReimageOption', 'type': 'ComputeNodeReimageOption'}, + } + + def __init__(self, *, node_reimage_option=None, **kwargs) -> None: + super(NodeReimageParameter, self).__init__(**kwargs) + self.node_reimage_option = node_reimage_option diff --git a/azure-batch/azure/batch/models/node_remove_parameter.py b/azure-batch/azure/batch/models/node_remove_parameter.py index 7835d4002fb8..f997671b2b46 100644 --- a/azure-batch/azure/batch/models/node_remove_parameter.py +++ b/azure-batch/azure/batch/models/node_remove_parameter.py @@ -15,8 +15,10 @@ class NodeRemoveParameter(Model): """Options for removing compute nodes from a pool. - :param node_list: A list containing the IDs of the compute nodes to be - removed from the specified pool. + All required parameters must be populated in order to send to Azure. + + :param node_list: Required. A list containing the IDs of the compute nodes + to be removed from the specified pool. :type node_list: list[str] :param resize_timeout: The timeout for removal of compute nodes to the pool. The default value is 15 minutes. The minimum value is 5 minutes. If @@ -42,8 +44,8 @@ class NodeRemoveParameter(Model): 'node_deallocation_option': {'key': 'nodeDeallocationOption', 'type': 'ComputeNodeDeallocationOption'}, } - def __init__(self, node_list, resize_timeout=None, node_deallocation_option=None): - super(NodeRemoveParameter, self).__init__() - self.node_list = node_list - self.resize_timeout = resize_timeout - self.node_deallocation_option = node_deallocation_option + def __init__(self, **kwargs): + super(NodeRemoveParameter, self).__init__(**kwargs) + self.node_list = kwargs.get('node_list', None) + self.resize_timeout = kwargs.get('resize_timeout', None) + self.node_deallocation_option = kwargs.get('node_deallocation_option', None) diff --git a/azure-batch/azure/batch/models/node_remove_parameter_py3.py b/azure-batch/azure/batch/models/node_remove_parameter_py3.py new file mode 100644 index 000000000000..b9dbbc4e55a7 --- /dev/null +++ b/azure-batch/azure/batch/models/node_remove_parameter_py3.py @@ -0,0 +1,51 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeRemoveParameter(Model): + """Options for removing compute nodes from a pool. + + All required parameters must be populated in order to send to Azure. + + :param node_list: Required. A list containing the IDs of the compute nodes + to be removed from the specified pool. + :type node_list: list[str] + :param resize_timeout: The timeout for removal of compute nodes to the + pool. The default value is 15 minutes. The minimum value is 5 minutes. If + you specify a value less than 5 minutes, the Batch service returns an + error; if you are calling the REST API directly, the HTTP status code is + 400 (Bad Request). + :type resize_timeout: timedelta + :param node_deallocation_option: Determines what to do with a node and its + running task(s) after it has been selected for deallocation. The default + value is requeue. Possible values include: 'requeue', 'terminate', + 'taskCompletion', 'retainedData' + :type node_deallocation_option: str or + ~azure.batch.models.ComputeNodeDeallocationOption + """ + + _validation = { + 'node_list': {'required': True, 'max_items': 100}, + } + + _attribute_map = { + 'node_list': {'key': 'nodeList', 'type': '[str]'}, + 'resize_timeout': {'key': 'resizeTimeout', 'type': 'duration'}, + 'node_deallocation_option': {'key': 'nodeDeallocationOption', 'type': 'ComputeNodeDeallocationOption'}, + } + + def __init__(self, *, node_list, resize_timeout=None, node_deallocation_option=None, **kwargs) -> None: + super(NodeRemoveParameter, self).__init__(**kwargs) + self.node_list = node_list + self.resize_timeout = resize_timeout + self.node_deallocation_option = node_deallocation_option diff --git a/azure-batch/azure/batch/models/node_update_user_parameter.py b/azure-batch/azure/batch/models/node_update_user_parameter.py index 4a15b1d9cbe3..02df471c8df2 100644 --- a/azure-batch/azure/batch/models/node_update_user_parameter.py +++ b/azure-batch/azure/batch/models/node_update_user_parameter.py @@ -41,8 +41,8 @@ class NodeUpdateUserParameter(Model): 'ssh_public_key': {'key': 'sshPublicKey', 'type': 'str'}, } - def __init__(self, password=None, expiry_time=None, ssh_public_key=None): - super(NodeUpdateUserParameter, self).__init__() - self.password = password - self.expiry_time = expiry_time - self.ssh_public_key = ssh_public_key + def __init__(self, **kwargs): + super(NodeUpdateUserParameter, self).__init__(**kwargs) + self.password = kwargs.get('password', None) + self.expiry_time = kwargs.get('expiry_time', None) + self.ssh_public_key = kwargs.get('ssh_public_key', None) diff --git a/azure-batch/azure/batch/models/node_update_user_parameter_py3.py b/azure-batch/azure/batch/models/node_update_user_parameter_py3.py new file mode 100644 index 000000000000..3ff93927ae88 --- /dev/null +++ b/azure-batch/azure/batch/models/node_update_user_parameter_py3.py @@ -0,0 +1,48 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class NodeUpdateUserParameter(Model): + """The set of changes to be made to a user account on a node. + + :param password: The password of the account. The password is required for + Windows nodes (those created with 'cloudServiceConfiguration', or created + with 'virtualMachineConfiguration' using a Windows image reference). For + Linux compute nodes, the password can optionally be specified along with + the sshPublicKey property. If omitted, any existing password is removed. + :type password: str + :param expiry_time: The time at which the account should expire. If + omitted, the default is 1 day from the current time. For Linux compute + nodes, the expiryTime has a precision up to a day. + :type expiry_time: datetime + :param ssh_public_key: The SSH public key that can be used for remote + login to the compute node. The public key should be compatible with + OpenSSH encoding and should be base 64 encoded. This property can be + specified only for Linux nodes. If this is specified for a Windows node, + then the Batch service rejects the request; if you are calling the REST + API directly, the HTTP status code is 400 (Bad Request). If omitted, any + existing SSH public key is removed. + :type ssh_public_key: str + """ + + _attribute_map = { + 'password': {'key': 'password', 'type': 'str'}, + 'expiry_time': {'key': 'expiryTime', 'type': 'iso-8601'}, + 'ssh_public_key': {'key': 'sshPublicKey', 'type': 'str'}, + } + + def __init__(self, *, password: str=None, expiry_time=None, ssh_public_key: str=None, **kwargs) -> None: + super(NodeUpdateUserParameter, self).__init__(**kwargs) + self.password = password + self.expiry_time = expiry_time + self.ssh_public_key = ssh_public_key diff --git a/azure-batch/azure/batch/models/os_disk.py b/azure-batch/azure/batch/models/os_disk.py index ddd159087dbc..08916fa20048 100644 --- a/azure-batch/azure/batch/models/os_disk.py +++ b/azure-batch/azure/batch/models/os_disk.py @@ -16,7 +16,8 @@ class OSDisk(Model): """Settings for the operating system disk of the virtual machine. :param caching: The type of caching to enable for the OS disk. The default - value for caching is none. For information about the caching options see: + value for caching is readwrite. For information about the caching options + see: https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/. Possible values include: 'none', 'readOnly', 'readWrite' :type caching: str or ~azure.batch.models.CachingType @@ -26,6 +27,6 @@ class OSDisk(Model): 'caching': {'key': 'caching', 'type': 'CachingType'}, } - def __init__(self, caching=None): - super(OSDisk, self).__init__() - self.caching = caching + def __init__(self, **kwargs): + super(OSDisk, self).__init__(**kwargs) + self.caching = kwargs.get('caching', None) diff --git a/azure-batch/azure/batch/models/os_disk_py3.py b/azure-batch/azure/batch/models/os_disk_py3.py new file mode 100644 index 000000000000..4780c4fa1443 --- /dev/null +++ b/azure-batch/azure/batch/models/os_disk_py3.py @@ -0,0 +1,32 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class OSDisk(Model): + """Settings for the operating system disk of the virtual machine. + + :param caching: The type of caching to enable for the OS disk. The default + value for caching is readwrite. For information about the caching options + see: + https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/. + Possible values include: 'none', 'readOnly', 'readWrite' + :type caching: str or ~azure.batch.models.CachingType + """ + + _attribute_map = { + 'caching': {'key': 'caching', 'type': 'CachingType'}, + } + + def __init__(self, *, caching=None, **kwargs) -> None: + super(OSDisk, self).__init__(**kwargs) + self.caching = caching diff --git a/azure-batch/azure/batch/models/output_file.py b/azure-batch/azure/batch/models/output_file.py index 14b9ccb8089b..b16fa5929a46 100644 --- a/azure-batch/azure/batch/models/output_file.py +++ b/azure-batch/azure/batch/models/output_file.py @@ -16,28 +16,31 @@ class OutputFile(Model): """A specification for uploading files from an Azure Batch node to another location after the Batch service has finished executing the task process. - :param file_pattern: A pattern indicating which file(s) to upload. Both - relative and absolute paths are supported. Relative paths are relative to - the task working directory. The following wildcards are supported: * - matches 0 or more characters (for example pattern abc* would match abc or - abcdef), ** matches any directory, ? matches any single character, [abc] - matches one character in the brackets, and [a-c] matches one character in - the range. Brackets can include a negation to match any character not - specified (for example [!abc] matches any character but a, b, or c). If a - file name starts with "." it is ignored by default but may be matched by - specifying it explicitly (for example *.gif will not match .a.gif, but - .*.gif will). A simple example: **\\*.txt matches any file that does not - start in '.' and ends with .txt in the task working directory or any - subdirectory. If the filename contains a wildcard character it can be - escaped using brackets (for example abc[*] would match a file named abc*). - Note that both \\ and / are treated as directory separators on Windows, - but only / is on Linux. Environment variables (%var% on Windows or $var on - Linux) are expanded prior to the pattern being applied. + All required parameters must be populated in order to send to Azure. + + :param file_pattern: Required. A pattern indicating which file(s) to + upload. Both relative and absolute paths are supported. Relative paths are + relative to the task working directory. The following wildcards are + supported: * matches 0 or more characters (for example pattern abc* would + match abc or abcdef), ** matches any directory, ? matches any single + character, [abc] matches one character in the brackets, and [a-c] matches + one character in the range. Brackets can include a negation to match any + character not specified (for example [!abc] matches any character but a, + b, or c). If a file name starts with "." it is ignored by default but may + be matched by specifying it explicitly (for example *.gif will not match + .a.gif, but .*.gif will). A simple example: **\\*.txt matches any file + that does not start in '.' and ends with .txt in the task working + directory or any subdirectory. If the filename contains a wildcard + character it can be escaped using brackets (for example abc[*] would match + a file named abc*). Note that both \\ and / are treated as directory + separators on Windows, but only / is on Linux. Environment variables + (%var% on Windows or $var on Linux) are expanded prior to the pattern + being applied. :type file_pattern: str - :param destination: The destination for the output file(s). + :param destination: Required. The destination for the output file(s). :type destination: ~azure.batch.models.OutputFileDestination - :param upload_options: Additional options for the upload operation, - including under what conditions to perform the upload. + :param upload_options: Required. Additional options for the upload + operation, including under what conditions to perform the upload. :type upload_options: ~azure.batch.models.OutputFileUploadOptions """ @@ -53,8 +56,8 @@ class OutputFile(Model): 'upload_options': {'key': 'uploadOptions', 'type': 'OutputFileUploadOptions'}, } - def __init__(self, file_pattern, destination, upload_options): - super(OutputFile, self).__init__() - self.file_pattern = file_pattern - self.destination = destination - self.upload_options = upload_options + def __init__(self, **kwargs): + super(OutputFile, self).__init__(**kwargs) + self.file_pattern = kwargs.get('file_pattern', None) + self.destination = kwargs.get('destination', None) + self.upload_options = kwargs.get('upload_options', None) diff --git a/azure-batch/azure/batch/models/output_file_blob_container_destination.py b/azure-batch/azure/batch/models/output_file_blob_container_destination.py index 1a03909e1e22..ee86a5896023 100644 --- a/azure-batch/azure/batch/models/output_file_blob_container_destination.py +++ b/azure-batch/azure/batch/models/output_file_blob_container_destination.py @@ -15,6 +15,8 @@ class OutputFileBlobContainerDestination(Model): """Specifies a file upload destination within an Azure blob storage container. + All required parameters must be populated in order to send to Azure. + :param path: The destination blob or virtual directory within the Azure Storage container. If filePattern refers to a specific file (i.e. contains no wildcards), then path is the name of the blob to which to upload that @@ -24,9 +26,9 @@ class OutputFileBlobContainerDestination(Model): omitted, file(s) are uploaded to the root of the container with a blob name matching their file name. :type path: str - :param container_url: The URL of the container within Azure Blob Storage - to which to upload the file(s). The URL must include a Shared Access - Signature (SAS) granting write permissions to the container. + :param container_url: Required. The URL of the container within Azure Blob + Storage to which to upload the file(s). The URL must include a Shared + Access Signature (SAS) granting write permissions to the container. :type container_url: str """ @@ -39,7 +41,7 @@ class OutputFileBlobContainerDestination(Model): 'container_url': {'key': 'containerUrl', 'type': 'str'}, } - def __init__(self, container_url, path=None): - super(OutputFileBlobContainerDestination, self).__init__() - self.path = path - self.container_url = container_url + def __init__(self, **kwargs): + super(OutputFileBlobContainerDestination, self).__init__(**kwargs) + self.path = kwargs.get('path', None) + self.container_url = kwargs.get('container_url', None) diff --git a/azure-batch/azure/batch/models/output_file_blob_container_destination_py3.py b/azure-batch/azure/batch/models/output_file_blob_container_destination_py3.py new file mode 100644 index 000000000000..3f0c9ce020f3 --- /dev/null +++ b/azure-batch/azure/batch/models/output_file_blob_container_destination_py3.py @@ -0,0 +1,47 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class OutputFileBlobContainerDestination(Model): + """Specifies a file upload destination within an Azure blob storage container. + + All required parameters must be populated in order to send to Azure. + + :param path: The destination blob or virtual directory within the Azure + Storage container. If filePattern refers to a specific file (i.e. contains + no wildcards), then path is the name of the blob to which to upload that + file. If filePattern contains one or more wildcards (and therefore may + match multiple files), then path is the name of the blob virtual directory + (which is prepended to each blob name) to which to upload the file(s). If + omitted, file(s) are uploaded to the root of the container with a blob + name matching their file name. + :type path: str + :param container_url: Required. The URL of the container within Azure Blob + Storage to which to upload the file(s). The URL must include a Shared + Access Signature (SAS) granting write permissions to the container. + :type container_url: str + """ + + _validation = { + 'container_url': {'required': True}, + } + + _attribute_map = { + 'path': {'key': 'path', 'type': 'str'}, + 'container_url': {'key': 'containerUrl', 'type': 'str'}, + } + + def __init__(self, *, container_url: str, path: str=None, **kwargs) -> None: + super(OutputFileBlobContainerDestination, self).__init__(**kwargs) + self.path = path + self.container_url = container_url diff --git a/azure-batch/azure/batch/models/output_file_destination.py b/azure-batch/azure/batch/models/output_file_destination.py index 9a3e996c3dce..1033743cb4f5 100644 --- a/azure-batch/azure/batch/models/output_file_destination.py +++ b/azure-batch/azure/batch/models/output_file_destination.py @@ -24,6 +24,6 @@ class OutputFileDestination(Model): 'container': {'key': 'container', 'type': 'OutputFileBlobContainerDestination'}, } - def __init__(self, container=None): - super(OutputFileDestination, self).__init__() - self.container = container + def __init__(self, **kwargs): + super(OutputFileDestination, self).__init__(**kwargs) + self.container = kwargs.get('container', None) diff --git a/azure-batch/azure/batch/models/output_file_destination_py3.py b/azure-batch/azure/batch/models/output_file_destination_py3.py new file mode 100644 index 000000000000..e7c652b6aed6 --- /dev/null +++ b/azure-batch/azure/batch/models/output_file_destination_py3.py @@ -0,0 +1,29 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class OutputFileDestination(Model): + """The destination to which a file should be uploaded. + + :param container: A location in Azure blob storage to which files are + uploaded. + :type container: ~azure.batch.models.OutputFileBlobContainerDestination + """ + + _attribute_map = { + 'container': {'key': 'container', 'type': 'OutputFileBlobContainerDestination'}, + } + + def __init__(self, *, container=None, **kwargs) -> None: + super(OutputFileDestination, self).__init__(**kwargs) + self.container = container diff --git a/azure-batch/azure/batch/models/output_file_py3.py b/azure-batch/azure/batch/models/output_file_py3.py new file mode 100644 index 000000000000..fee0d5022126 --- /dev/null +++ b/azure-batch/azure/batch/models/output_file_py3.py @@ -0,0 +1,63 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class OutputFile(Model): + """A specification for uploading files from an Azure Batch node to another + location after the Batch service has finished executing the task process. + + All required parameters must be populated in order to send to Azure. + + :param file_pattern: Required. A pattern indicating which file(s) to + upload. Both relative and absolute paths are supported. Relative paths are + relative to the task working directory. The following wildcards are + supported: * matches 0 or more characters (for example pattern abc* would + match abc or abcdef), ** matches any directory, ? matches any single + character, [abc] matches one character in the brackets, and [a-c] matches + one character in the range. Brackets can include a negation to match any + character not specified (for example [!abc] matches any character but a, + b, or c). If a file name starts with "." it is ignored by default but may + be matched by specifying it explicitly (for example *.gif will not match + .a.gif, but .*.gif will). A simple example: **\\*.txt matches any file + that does not start in '.' and ends with .txt in the task working + directory or any subdirectory. If the filename contains a wildcard + character it can be escaped using brackets (for example abc[*] would match + a file named abc*). Note that both \\ and / are treated as directory + separators on Windows, but only / is on Linux. Environment variables + (%var% on Windows or $var on Linux) are expanded prior to the pattern + being applied. + :type file_pattern: str + :param destination: Required. The destination for the output file(s). + :type destination: ~azure.batch.models.OutputFileDestination + :param upload_options: Required. Additional options for the upload + operation, including under what conditions to perform the upload. + :type upload_options: ~azure.batch.models.OutputFileUploadOptions + """ + + _validation = { + 'file_pattern': {'required': True}, + 'destination': {'required': True}, + 'upload_options': {'required': True}, + } + + _attribute_map = { + 'file_pattern': {'key': 'filePattern', 'type': 'str'}, + 'destination': {'key': 'destination', 'type': 'OutputFileDestination'}, + 'upload_options': {'key': 'uploadOptions', 'type': 'OutputFileUploadOptions'}, + } + + def __init__(self, *, file_pattern: str, destination, upload_options, **kwargs) -> None: + super(OutputFile, self).__init__(**kwargs) + self.file_pattern = file_pattern + self.destination = destination + self.upload_options = upload_options diff --git a/azure-batch/azure/batch/models/output_file_upload_options.py b/azure-batch/azure/batch/models/output_file_upload_options.py index c79f5703ac64..c626a355339e 100644 --- a/azure-batch/azure/batch/models/output_file_upload_options.py +++ b/azure-batch/azure/batch/models/output_file_upload_options.py @@ -16,9 +16,12 @@ class OutputFileUploadOptions(Model): """Details about an output file upload operation, including under what conditions to perform the upload. - :param upload_condition: The conditions under which the task output file - or set of files should be uploaded. The default is taskcompletion. - Possible values include: 'taskSuccess', 'taskFailure', 'taskCompletion' + All required parameters must be populated in order to send to Azure. + + :param upload_condition: Required. The conditions under which the task + output file or set of files should be uploaded. The default is + taskcompletion. Possible values include: 'taskSuccess', 'taskFailure', + 'taskCompletion' :type upload_condition: str or ~azure.batch.models.OutputFileUploadCondition """ @@ -31,6 +34,6 @@ class OutputFileUploadOptions(Model): 'upload_condition': {'key': 'uploadCondition', 'type': 'OutputFileUploadCondition'}, } - def __init__(self, upload_condition): - super(OutputFileUploadOptions, self).__init__() - self.upload_condition = upload_condition + def __init__(self, **kwargs): + super(OutputFileUploadOptions, self).__init__(**kwargs) + self.upload_condition = kwargs.get('upload_condition', None) diff --git a/azure-batch/azure/batch/models/output_file_upload_options_py3.py b/azure-batch/azure/batch/models/output_file_upload_options_py3.py new file mode 100644 index 000000000000..628d8794e03c --- /dev/null +++ b/azure-batch/azure/batch/models/output_file_upload_options_py3.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class OutputFileUploadOptions(Model): + """Details about an output file upload operation, including under what + conditions to perform the upload. + + All required parameters must be populated in order to send to Azure. + + :param upload_condition: Required. The conditions under which the task + output file or set of files should be uploaded. The default is + taskcompletion. Possible values include: 'taskSuccess', 'taskFailure', + 'taskCompletion' + :type upload_condition: str or + ~azure.batch.models.OutputFileUploadCondition + """ + + _validation = { + 'upload_condition': {'required': True}, + } + + _attribute_map = { + 'upload_condition': {'key': 'uploadCondition', 'type': 'OutputFileUploadCondition'}, + } + + def __init__(self, *, upload_condition, **kwargs) -> None: + super(OutputFileUploadOptions, self).__init__(**kwargs) + self.upload_condition = upload_condition diff --git a/azure-batch/azure/batch/models/pool_add_options.py b/azure-batch/azure/batch/models/pool_add_options.py index 99940fc149c4..04d968a84494 100644 --- a/azure-batch/azure/batch/models/pool_add_options.py +++ b/azure-batch/azure/batch/models/pool_add_options.py @@ -31,9 +31,16 @@ class PoolAddOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(PoolAddOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolAddOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/pool_add_options_py3.py b/azure-batch/azure/batch/models/pool_add_options_py3.py new file mode 100644 index 000000000000..62b3e62b2bbc --- /dev/null +++ b/azure-batch/azure/batch/models/pool_add_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolAddOptions(Model): + """Additional parameters for add operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(PoolAddOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/pool_add_parameter.py b/azure-batch/azure/batch/models/pool_add_parameter.py index 46ced65611e8..7d21c67bc843 100644 --- a/azure-batch/azure/batch/models/pool_add_parameter.py +++ b/azure-batch/azure/batch/models/pool_add_parameter.py @@ -15,20 +15,22 @@ class PoolAddParameter(Model): """A pool in the Azure Batch service to add. - :param id: A string that uniquely identifies the pool within the account. - The ID can contain any combination of alphanumeric characters including - hyphens and underscores, and cannot contain more than 64 characters. The - ID is case-preserving and case-insensitive (that is, you may not have two - pool IDs within an account that differ only by case). + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the pool within the + account. The ID can contain any combination of alphanumeric characters + including hyphens and underscores, and cannot contain more than 64 + characters. The ID is case-preserving and case-insensitive (that is, you + may not have two pool IDs within an account that differ only by case). :type id: str :param display_name: The display name for the pool. The display name need not be unique and can contain any Unicode characters up to a maximum length of 1024. :type display_name: str - :param vm_size: The size of virtual machines in the pool. All virtual - machines in a pool are the same size. For information about available - sizes of virtual machines for Cloud Services pools (pools created with - cloudServiceConfiguration), see Sizes for Cloud Services + :param vm_size: Required. The size of virtual machines in the pool. All + virtual machines in a pool are the same size. For information about + available sizes of virtual machines for Cloud Services pools (pools + created with cloudServiceConfiguration), see Sizes for Cloud Services (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for pools using images from @@ -170,26 +172,26 @@ class PoolAddParameter(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, id, vm_size, display_name=None, cloud_service_configuration=None, virtual_machine_configuration=None, resize_timeout=None, target_dedicated_nodes=None, target_low_priority_nodes=None, enable_auto_scale=None, auto_scale_formula=None, auto_scale_evaluation_interval=None, enable_inter_node_communication=None, network_configuration=None, start_task=None, certificate_references=None, application_package_references=None, application_licenses=None, max_tasks_per_node=None, task_scheduling_policy=None, user_accounts=None, metadata=None): - super(PoolAddParameter, self).__init__() - self.id = id - self.display_name = display_name - self.vm_size = vm_size - self.cloud_service_configuration = cloud_service_configuration - self.virtual_machine_configuration = virtual_machine_configuration - self.resize_timeout = resize_timeout - self.target_dedicated_nodes = target_dedicated_nodes - self.target_low_priority_nodes = target_low_priority_nodes - self.enable_auto_scale = enable_auto_scale - self.auto_scale_formula = auto_scale_formula - self.auto_scale_evaluation_interval = auto_scale_evaluation_interval - self.enable_inter_node_communication = enable_inter_node_communication - self.network_configuration = network_configuration - self.start_task = start_task - self.certificate_references = certificate_references - self.application_package_references = application_package_references - self.application_licenses = application_licenses - self.max_tasks_per_node = max_tasks_per_node - self.task_scheduling_policy = task_scheduling_policy - self.user_accounts = user_accounts - self.metadata = metadata + def __init__(self, **kwargs): + super(PoolAddParameter, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.vm_size = kwargs.get('vm_size', None) + self.cloud_service_configuration = kwargs.get('cloud_service_configuration', None) + self.virtual_machine_configuration = kwargs.get('virtual_machine_configuration', None) + self.resize_timeout = kwargs.get('resize_timeout', None) + self.target_dedicated_nodes = kwargs.get('target_dedicated_nodes', None) + self.target_low_priority_nodes = kwargs.get('target_low_priority_nodes', None) + self.enable_auto_scale = kwargs.get('enable_auto_scale', None) + self.auto_scale_formula = kwargs.get('auto_scale_formula', None) + self.auto_scale_evaluation_interval = kwargs.get('auto_scale_evaluation_interval', None) + self.enable_inter_node_communication = kwargs.get('enable_inter_node_communication', None) + self.network_configuration = kwargs.get('network_configuration', None) + self.start_task = kwargs.get('start_task', None) + self.certificate_references = kwargs.get('certificate_references', None) + self.application_package_references = kwargs.get('application_package_references', None) + self.application_licenses = kwargs.get('application_licenses', None) + self.max_tasks_per_node = kwargs.get('max_tasks_per_node', None) + self.task_scheduling_policy = kwargs.get('task_scheduling_policy', None) + self.user_accounts = kwargs.get('user_accounts', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/pool_add_parameter_py3.py b/azure-batch/azure/batch/models/pool_add_parameter_py3.py new file mode 100644 index 000000000000..170963fa94ce --- /dev/null +++ b/azure-batch/azure/batch/models/pool_add_parameter_py3.py @@ -0,0 +1,197 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolAddParameter(Model): + """A pool in the Azure Batch service to add. + + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the pool within the + account. The ID can contain any combination of alphanumeric characters + including hyphens and underscores, and cannot contain more than 64 + characters. The ID is case-preserving and case-insensitive (that is, you + may not have two pool IDs within an account that differ only by case). + :type id: str + :param display_name: The display name for the pool. The display name need + not be unique and can contain any Unicode characters up to a maximum + length of 1024. + :type display_name: str + :param vm_size: Required. The size of virtual machines in the pool. All + virtual machines in a pool are the same size. For information about + available sizes of virtual machines for Cloud Services pools (pools + created with cloudServiceConfiguration), see Sizes for Cloud Services + (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). + Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and + A2V2. For information about available VM sizes for pools using images from + the Virtual Machines Marketplace (pools created with + virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) + (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) + or Sizes for Virtual Machines (Windows) + (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). + Batch supports all Azure VM sizes except STANDARD_A0 and those with + premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series). + :type vm_size: str + :param cloud_service_configuration: The cloud service configuration for + the pool. This property and virtualMachineConfiguration are mutually + exclusive and one of the properties must be specified. This property + cannot be specified if the Batch account was created with its + poolAllocationMode property set to 'UserSubscription'. + :type cloud_service_configuration: + ~azure.batch.models.CloudServiceConfiguration + :param virtual_machine_configuration: The virtual machine configuration + for the pool. This property and cloudServiceConfiguration are mutually + exclusive and one of the properties must be specified. + :type virtual_machine_configuration: + ~azure.batch.models.VirtualMachineConfiguration + :param resize_timeout: The timeout for allocation of compute nodes to the + pool. This timeout applies only to manual scaling; it has no effect when + enableAutoScale is set to true. The default value is 15 minutes. The + minimum value is 5 minutes. If you specify a value less than 5 minutes, + the Batch service returns an error; if you are calling the REST API + directly, the HTTP status code is 400 (Bad Request). + :type resize_timeout: timedelta + :param target_dedicated_nodes: The desired number of dedicated compute + nodes in the pool. This property must not be specified if enableAutoScale + is set to true. If enableAutoScale is set to false, then you must set + either targetDedicatedNodes, targetLowPriorityNodes, or both. + :type target_dedicated_nodes: int + :param target_low_priority_nodes: The desired number of low-priority + compute nodes in the pool. This property must not be specified if + enableAutoScale is set to true. If enableAutoScale is set to false, then + you must set either targetDedicatedNodes, targetLowPriorityNodes, or both. + :type target_low_priority_nodes: int + :param enable_auto_scale: Whether the pool size should automatically + adjust over time. If false, at least one of targetDedicateNodes and + targetLowPriorityNodes must be specified. If true, the autoScaleFormula + property is required and the pool automatically resizes according to the + formula. The default value is false. + :type enable_auto_scale: bool + :param auto_scale_formula: A formula for the desired number of compute + nodes in the pool. This property must not be specified if enableAutoScale + is set to false. It is required if enableAutoScale is set to true. The + formula is checked for validity before the pool is created. If the formula + is not valid, the Batch service rejects the request with detailed error + information. For more information about specifying this formula, see + 'Automatically scale compute nodes in an Azure Batch pool' + (https://azure.microsoft.com/documentation/articles/batch-automatic-scaling/). + :type auto_scale_formula: str + :param auto_scale_evaluation_interval: The time interval at which to + automatically adjust the pool size according to the autoscale formula. The + default value is 15 minutes. The minimum and maximum value are 5 minutes + and 168 hours respectively. If you specify a value less than 5 minutes or + greater than 168 hours, the Batch service returns an error; if you are + calling the REST API directly, the HTTP status code is 400 (Bad Request). + :type auto_scale_evaluation_interval: timedelta + :param enable_inter_node_communication: Whether the pool permits direct + communication between nodes. Enabling inter-node communication limits the + maximum size of the pool due to deployment restrictions on the nodes of + the pool. This may result in the pool not reaching its desired size. The + default value is false. + :type enable_inter_node_communication: bool + :param network_configuration: The network configuration for the pool. + :type network_configuration: ~azure.batch.models.NetworkConfiguration + :param start_task: A task specified to run on each compute node as it + joins the pool. The task runs when the node is added to the pool or when + the node is restarted. + :type start_task: ~azure.batch.models.StartTask + :param certificate_references: The list of certificates to be installed on + each compute node in the pool. For Windows compute nodes, the Batch + service installs the certificates to the specified certificate store and + location. For Linux compute nodes, the certificates are stored in a + directory inside the task working directory and an environment variable + AZ_BATCH_CERTIFICATES_DIR is supplied to the task to query for this + location. For certificates with visibility of 'remoteUser', a 'certs' + directory is created in the user's home directory (e.g., + /home/{user-name}/certs) and certificates are placed in that directory. + :type certificate_references: + list[~azure.batch.models.CertificateReference] + :param application_package_references: The list of application packages to + be installed on each compute node in the pool. + :type application_package_references: + list[~azure.batch.models.ApplicationPackageReference] + :param application_licenses: The list of application licenses the Batch + service will make available on each compute node in the pool. The list of + application licenses must be a subset of available Batch service + application licenses. If a license is requested which is not supported, + pool creation will fail. + :type application_licenses: list[str] + :param max_tasks_per_node: The maximum number of tasks that can run + concurrently on a single compute node in the pool. The default value is 1. + The maximum value of this setting depends on the size of the compute nodes + in the pool (the vmSize setting). + :type max_tasks_per_node: int + :param task_scheduling_policy: How tasks are distributed across compute + nodes in a pool. + :type task_scheduling_policy: ~azure.batch.models.TaskSchedulingPolicy + :param user_accounts: The list of user accounts to be created on each node + in the pool. + :type user_accounts: list[~azure.batch.models.UserAccount] + :param metadata: A list of name-value pairs associated with the pool as + metadata. The Batch service does not assign any meaning to metadata; it is + solely for the use of user code. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _validation = { + 'id': {'required': True}, + 'vm_size': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'cloud_service_configuration': {'key': 'cloudServiceConfiguration', 'type': 'CloudServiceConfiguration'}, + 'virtual_machine_configuration': {'key': 'virtualMachineConfiguration', 'type': 'VirtualMachineConfiguration'}, + 'resize_timeout': {'key': 'resizeTimeout', 'type': 'duration'}, + 'target_dedicated_nodes': {'key': 'targetDedicatedNodes', 'type': 'int'}, + 'target_low_priority_nodes': {'key': 'targetLowPriorityNodes', 'type': 'int'}, + 'enable_auto_scale': {'key': 'enableAutoScale', 'type': 'bool'}, + 'auto_scale_formula': {'key': 'autoScaleFormula', 'type': 'str'}, + 'auto_scale_evaluation_interval': {'key': 'autoScaleEvaluationInterval', 'type': 'duration'}, + 'enable_inter_node_communication': {'key': 'enableInterNodeCommunication', 'type': 'bool'}, + 'network_configuration': {'key': 'networkConfiguration', 'type': 'NetworkConfiguration'}, + 'start_task': {'key': 'startTask', 'type': 'StartTask'}, + 'certificate_references': {'key': 'certificateReferences', 'type': '[CertificateReference]'}, + 'application_package_references': {'key': 'applicationPackageReferences', 'type': '[ApplicationPackageReference]'}, + 'application_licenses': {'key': 'applicationLicenses', 'type': '[str]'}, + 'max_tasks_per_node': {'key': 'maxTasksPerNode', 'type': 'int'}, + 'task_scheduling_policy': {'key': 'taskSchedulingPolicy', 'type': 'TaskSchedulingPolicy'}, + 'user_accounts': {'key': 'userAccounts', 'type': '[UserAccount]'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, id: str, vm_size: str, display_name: str=None, cloud_service_configuration=None, virtual_machine_configuration=None, resize_timeout=None, target_dedicated_nodes: int=None, target_low_priority_nodes: int=None, enable_auto_scale: bool=None, auto_scale_formula: str=None, auto_scale_evaluation_interval=None, enable_inter_node_communication: bool=None, network_configuration=None, start_task=None, certificate_references=None, application_package_references=None, application_licenses=None, max_tasks_per_node: int=None, task_scheduling_policy=None, user_accounts=None, metadata=None, **kwargs) -> None: + super(PoolAddParameter, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.vm_size = vm_size + self.cloud_service_configuration = cloud_service_configuration + self.virtual_machine_configuration = virtual_machine_configuration + self.resize_timeout = resize_timeout + self.target_dedicated_nodes = target_dedicated_nodes + self.target_low_priority_nodes = target_low_priority_nodes + self.enable_auto_scale = enable_auto_scale + self.auto_scale_formula = auto_scale_formula + self.auto_scale_evaluation_interval = auto_scale_evaluation_interval + self.enable_inter_node_communication = enable_inter_node_communication + self.network_configuration = network_configuration + self.start_task = start_task + self.certificate_references = certificate_references + self.application_package_references = application_package_references + self.application_licenses = application_licenses + self.max_tasks_per_node = max_tasks_per_node + self.task_scheduling_policy = task_scheduling_policy + self.user_accounts = user_accounts + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/pool_delete_options.py b/azure-batch/azure/batch/models/pool_delete_options.py index 887a2c4c63ac..622241dc3594 100644 --- a/azure-batch/azure/batch/models/pool_delete_options.py +++ b/azure-batch/azure/batch/models/pool_delete_options.py @@ -50,13 +50,24 @@ class PoolDeleteOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolDeleteOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolDeleteOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_delete_options_py3.py b/azure-batch/azure/batch/models/pool_delete_options_py3.py new file mode 100644 index 000000000000..7ca41443a137 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_delete_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolDeleteOptions(Model): + """Additional parameters for delete operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolDeleteOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_disable_auto_scale_options.py b/azure-batch/azure/batch/models/pool_disable_auto_scale_options.py index 3413357b222f..96b0bc7c88f1 100644 --- a/azure-batch/azure/batch/models/pool_disable_auto_scale_options.py +++ b/azure-batch/azure/batch/models/pool_disable_auto_scale_options.py @@ -31,9 +31,16 @@ class PoolDisableAutoScaleOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(PoolDisableAutoScaleOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolDisableAutoScaleOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/pool_disable_auto_scale_options_py3.py b/azure-batch/azure/batch/models/pool_disable_auto_scale_options_py3.py new file mode 100644 index 000000000000..4a069bd0bf26 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_disable_auto_scale_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolDisableAutoScaleOptions(Model): + """Additional parameters for disable_auto_scale operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(PoolDisableAutoScaleOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/pool_enable_auto_scale_options.py b/azure-batch/azure/batch/models/pool_enable_auto_scale_options.py index 9ada604e2365..dd77582f25cd 100644 --- a/azure-batch/azure/batch/models/pool_enable_auto_scale_options.py +++ b/azure-batch/azure/batch/models/pool_enable_auto_scale_options.py @@ -50,13 +50,24 @@ class PoolEnableAutoScaleOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolEnableAutoScaleOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolEnableAutoScaleOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_enable_auto_scale_options_py3.py b/azure-batch/azure/batch/models/pool_enable_auto_scale_options_py3.py new file mode 100644 index 000000000000..507bd7022974 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_enable_auto_scale_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolEnableAutoScaleOptions(Model): + """Additional parameters for enable_auto_scale operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolEnableAutoScaleOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_enable_auto_scale_parameter.py b/azure-batch/azure/batch/models/pool_enable_auto_scale_parameter.py index e832aa0268a4..793c71c54d9f 100644 --- a/azure-batch/azure/batch/models/pool_enable_auto_scale_parameter.py +++ b/azure-batch/azure/batch/models/pool_enable_auto_scale_parameter.py @@ -41,7 +41,7 @@ class PoolEnableAutoScaleParameter(Model): 'auto_scale_evaluation_interval': {'key': 'autoScaleEvaluationInterval', 'type': 'duration'}, } - def __init__(self, auto_scale_formula=None, auto_scale_evaluation_interval=None): - super(PoolEnableAutoScaleParameter, self).__init__() - self.auto_scale_formula = auto_scale_formula - self.auto_scale_evaluation_interval = auto_scale_evaluation_interval + def __init__(self, **kwargs): + super(PoolEnableAutoScaleParameter, self).__init__(**kwargs) + self.auto_scale_formula = kwargs.get('auto_scale_formula', None) + self.auto_scale_evaluation_interval = kwargs.get('auto_scale_evaluation_interval', None) diff --git a/azure-batch/azure/batch/models/pool_enable_auto_scale_parameter_py3.py b/azure-batch/azure/batch/models/pool_enable_auto_scale_parameter_py3.py new file mode 100644 index 000000000000..1c0019e4b390 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_enable_auto_scale_parameter_py3.py @@ -0,0 +1,47 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolEnableAutoScaleParameter(Model): + """Options for enabling automatic scaling on a pool. + + :param auto_scale_formula: The formula for the desired number of compute + nodes in the pool. The formula is checked for validity before it is + applied to the pool. If the formula is not valid, the Batch service + rejects the request with detailed error information. For more information + about specifying this formula, see Automatically scale compute nodes in an + Azure Batch pool + (https://azure.microsoft.com/en-us/documentation/articles/batch-automatic-scaling). + :type auto_scale_formula: str + :param auto_scale_evaluation_interval: The time interval at which to + automatically adjust the pool size according to the autoscale formula. The + default value is 15 minutes. The minimum and maximum value are 5 minutes + and 168 hours respectively. If you specify a value less than 5 minutes or + greater than 168 hours, the Batch service rejects the request with an + invalid property value error; if you are calling the REST API directly, + the HTTP status code is 400 (Bad Request). If you specify a new interval, + then the existing autoscale evaluation schedule will be stopped and a new + autoscale evaluation schedule will be started, with its starting time + being the time when this request was issued. + :type auto_scale_evaluation_interval: timedelta + """ + + _attribute_map = { + 'auto_scale_formula': {'key': 'autoScaleFormula', 'type': 'str'}, + 'auto_scale_evaluation_interval': {'key': 'autoScaleEvaluationInterval', 'type': 'duration'}, + } + + def __init__(self, *, auto_scale_formula: str=None, auto_scale_evaluation_interval=None, **kwargs) -> None: + super(PoolEnableAutoScaleParameter, self).__init__(**kwargs) + self.auto_scale_formula = auto_scale_formula + self.auto_scale_evaluation_interval = auto_scale_evaluation_interval diff --git a/azure-batch/azure/batch/models/pool_endpoint_configuration.py b/azure-batch/azure/batch/models/pool_endpoint_configuration.py index b9611dc55282..97859ff2bcb8 100644 --- a/azure-batch/azure/batch/models/pool_endpoint_configuration.py +++ b/azure-batch/azure/batch/models/pool_endpoint_configuration.py @@ -15,11 +15,13 @@ class PoolEndpointConfiguration(Model): """The endpoint configuration for a pool. - :param inbound_nat_pools: A list of inbound NAT pools that can be used to - address specific ports on an individual compute node externally. The - maximum number of inbound NAT pools per Batch pool is 5. If the maximum - number of inbound NAT pools is exceeded the request fails with HTTP status - code 400. + All required parameters must be populated in order to send to Azure. + + :param inbound_nat_pools: Required. A list of inbound NAT pools that can + be used to address specific ports on an individual compute node + externally. The maximum number of inbound NAT pools per Batch pool is 5. + If the maximum number of inbound NAT pools is exceeded the request fails + with HTTP status code 400. :type inbound_nat_pools: list[~azure.batch.models.InboundNATPool] """ @@ -31,6 +33,6 @@ class PoolEndpointConfiguration(Model): 'inbound_nat_pools': {'key': 'inboundNATPools', 'type': '[InboundNATPool]'}, } - def __init__(self, inbound_nat_pools): - super(PoolEndpointConfiguration, self).__init__() - self.inbound_nat_pools = inbound_nat_pools + def __init__(self, **kwargs): + super(PoolEndpointConfiguration, self).__init__(**kwargs) + self.inbound_nat_pools = kwargs.get('inbound_nat_pools', None) diff --git a/azure-batch/azure/batch/models/pool_endpoint_configuration_py3.py b/azure-batch/azure/batch/models/pool_endpoint_configuration_py3.py new file mode 100644 index 000000000000..95788b53078a --- /dev/null +++ b/azure-batch/azure/batch/models/pool_endpoint_configuration_py3.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolEndpointConfiguration(Model): + """The endpoint configuration for a pool. + + All required parameters must be populated in order to send to Azure. + + :param inbound_nat_pools: Required. A list of inbound NAT pools that can + be used to address specific ports on an individual compute node + externally. The maximum number of inbound NAT pools per Batch pool is 5. + If the maximum number of inbound NAT pools is exceeded the request fails + with HTTP status code 400. + :type inbound_nat_pools: list[~azure.batch.models.InboundNATPool] + """ + + _validation = { + 'inbound_nat_pools': {'required': True}, + } + + _attribute_map = { + 'inbound_nat_pools': {'key': 'inboundNATPools', 'type': '[InboundNATPool]'}, + } + + def __init__(self, *, inbound_nat_pools, **kwargs) -> None: + super(PoolEndpointConfiguration, self).__init__(**kwargs) + self.inbound_nat_pools = inbound_nat_pools diff --git a/azure-batch/azure/batch/models/pool_evaluate_auto_scale_options.py b/azure-batch/azure/batch/models/pool_evaluate_auto_scale_options.py index 0ad965181bfc..5fbb7ad3fbd2 100644 --- a/azure-batch/azure/batch/models/pool_evaluate_auto_scale_options.py +++ b/azure-batch/azure/batch/models/pool_evaluate_auto_scale_options.py @@ -31,9 +31,16 @@ class PoolEvaluateAutoScaleOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(PoolEvaluateAutoScaleOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolEvaluateAutoScaleOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/pool_evaluate_auto_scale_options_py3.py b/azure-batch/azure/batch/models/pool_evaluate_auto_scale_options_py3.py new file mode 100644 index 000000000000..a2f09b9dd6ee --- /dev/null +++ b/azure-batch/azure/batch/models/pool_evaluate_auto_scale_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolEvaluateAutoScaleOptions(Model): + """Additional parameters for evaluate_auto_scale operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(PoolEvaluateAutoScaleOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/pool_evaluate_auto_scale_parameter.py b/azure-batch/azure/batch/models/pool_evaluate_auto_scale_parameter.py index bfa49f8aa63c..c74cfac21768 100644 --- a/azure-batch/azure/batch/models/pool_evaluate_auto_scale_parameter.py +++ b/azure-batch/azure/batch/models/pool_evaluate_auto_scale_parameter.py @@ -15,10 +15,12 @@ class PoolEvaluateAutoScaleParameter(Model): """Options for evaluating an automatic scaling formula on a pool. - :param auto_scale_formula: The formula for the desired number of compute - nodes in the pool. The formula is validated and its results calculated, - but it is not applied to the pool. To apply the formula to the pool, - 'Enable automatic scaling on a pool'. For more information about + All required parameters must be populated in order to send to Azure. + + :param auto_scale_formula: Required. The formula for the desired number of + compute nodes in the pool. The formula is validated and its results + calculated, but it is not applied to the pool. To apply the formula to the + pool, 'Enable automatic scaling on a pool'. For more information about specifying this formula, see Automatically scale compute nodes in an Azure Batch pool (https://azure.microsoft.com/en-us/documentation/articles/batch-automatic-scaling). @@ -33,6 +35,6 @@ class PoolEvaluateAutoScaleParameter(Model): 'auto_scale_formula': {'key': 'autoScaleFormula', 'type': 'str'}, } - def __init__(self, auto_scale_formula): - super(PoolEvaluateAutoScaleParameter, self).__init__() - self.auto_scale_formula = auto_scale_formula + def __init__(self, **kwargs): + super(PoolEvaluateAutoScaleParameter, self).__init__(**kwargs) + self.auto_scale_formula = kwargs.get('auto_scale_formula', None) diff --git a/azure-batch/azure/batch/models/pool_evaluate_auto_scale_parameter_py3.py b/azure-batch/azure/batch/models/pool_evaluate_auto_scale_parameter_py3.py new file mode 100644 index 000000000000..5102b28e41bd --- /dev/null +++ b/azure-batch/azure/batch/models/pool_evaluate_auto_scale_parameter_py3.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolEvaluateAutoScaleParameter(Model): + """Options for evaluating an automatic scaling formula on a pool. + + All required parameters must be populated in order to send to Azure. + + :param auto_scale_formula: Required. The formula for the desired number of + compute nodes in the pool. The formula is validated and its results + calculated, but it is not applied to the pool. To apply the formula to the + pool, 'Enable automatic scaling on a pool'. For more information about + specifying this formula, see Automatically scale compute nodes in an Azure + Batch pool + (https://azure.microsoft.com/en-us/documentation/articles/batch-automatic-scaling). + :type auto_scale_formula: str + """ + + _validation = { + 'auto_scale_formula': {'required': True}, + } + + _attribute_map = { + 'auto_scale_formula': {'key': 'autoScaleFormula', 'type': 'str'}, + } + + def __init__(self, *, auto_scale_formula: str, **kwargs) -> None: + super(PoolEvaluateAutoScaleParameter, self).__init__(**kwargs) + self.auto_scale_formula = auto_scale_formula diff --git a/azure-batch/azure/batch/models/pool_exists_options.py b/azure-batch/azure/batch/models/pool_exists_options.py index edbde4a4a1b4..feffd1c91596 100644 --- a/azure-batch/azure/batch/models/pool_exists_options.py +++ b/azure-batch/azure/batch/models/pool_exists_options.py @@ -50,13 +50,24 @@ class PoolExistsOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolExistsOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolExistsOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_exists_options_py3.py b/azure-batch/azure/batch/models/pool_exists_options_py3.py new file mode 100644 index 000000000000..de152edb3231 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_exists_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolExistsOptions(Model): + """Additional parameters for exists operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolExistsOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_get_all_lifetime_statistics_options.py b/azure-batch/azure/batch/models/pool_get_all_lifetime_statistics_options.py index 3b2254c68365..dbbbcf45e91c 100644 --- a/azure-batch/azure/batch/models/pool_get_all_lifetime_statistics_options.py +++ b/azure-batch/azure/batch/models/pool_get_all_lifetime_statistics_options.py @@ -31,9 +31,16 @@ class PoolGetAllLifetimeStatisticsOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(PoolGetAllLifetimeStatisticsOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolGetAllLifetimeStatisticsOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/pool_get_all_lifetime_statistics_options_py3.py b/azure-batch/azure/batch/models/pool_get_all_lifetime_statistics_options_py3.py new file mode 100644 index 000000000000..0fc18020b72c --- /dev/null +++ b/azure-batch/azure/batch/models/pool_get_all_lifetime_statistics_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolGetAllLifetimeStatisticsOptions(Model): + """Additional parameters for get_all_lifetime_statistics operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(PoolGetAllLifetimeStatisticsOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/pool_get_options.py b/azure-batch/azure/batch/models/pool_get_options.py index 0d34b2553406..a629c21e20c4 100644 --- a/azure-batch/azure/batch/models/pool_get_options.py +++ b/azure-batch/azure/batch/models/pool_get_options.py @@ -54,15 +54,28 @@ class PoolGetOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, select=None, expand=None, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolGetOptions, self).__init__() - self.select = select - self.expand = expand - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolGetOptions, self).__init__(**kwargs) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_get_options_py3.py b/azure-batch/azure/batch/models/pool_get_options_py3.py new file mode 100644 index 000000000000..c0b04bd53d29 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_get_options_py3.py @@ -0,0 +1,81 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolGetOptions(Model): + """Additional parameters for get operation. + + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, select: str=None, expand: str=None, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolGetOptions, self).__init__(**kwargs) + self.select = select + self.expand = expand + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_information.py b/azure-batch/azure/batch/models/pool_information.py index e23b3e31aa00..132e32bbe90e 100644 --- a/azure-batch/azure/batch/models/pool_information.py +++ b/azure-batch/azure/batch/models/pool_information.py @@ -41,7 +41,7 @@ class PoolInformation(Model): 'auto_pool_specification': {'key': 'autoPoolSpecification', 'type': 'AutoPoolSpecification'}, } - def __init__(self, pool_id=None, auto_pool_specification=None): - super(PoolInformation, self).__init__() - self.pool_id = pool_id - self.auto_pool_specification = auto_pool_specification + def __init__(self, **kwargs): + super(PoolInformation, self).__init__(**kwargs) + self.pool_id = kwargs.get('pool_id', None) + self.auto_pool_specification = kwargs.get('auto_pool_specification', None) diff --git a/azure-batch/azure/batch/models/pool_information_py3.py b/azure-batch/azure/batch/models/pool_information_py3.py new file mode 100644 index 000000000000..6fc8d2cefc46 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_information_py3.py @@ -0,0 +1,47 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolInformation(Model): + """Specifies how a job should be assigned to a pool. + + :param pool_id: The ID of an existing pool. All the tasks of the job will + run on the specified pool. You must ensure that the pool referenced by + this property exists. If the pool does not exist at the time the Batch + service tries to schedule a job, no tasks for the job will run until you + create a pool with that id. Note that the Batch service will not reject + the job request; it will simply not run tasks until the pool exists. You + must specify either the pool ID or the auto pool specification, but not + both. + :type pool_id: str + :param auto_pool_specification: Characteristics for a temporary 'auto + pool'. The Batch service will create this auto pool when the job is + submitted. If auto pool creation fails, the Batch service moves the job to + a completed state, and the pool creation error is set in the job's + scheduling error property. The Batch service manages the lifetime (both + creation and, unless keepAlive is specified, deletion) of the auto pool. + Any user actions that affect the lifetime of the auto pool while the job + is active will result in unexpected behavior. You must specify either the + pool ID or the auto pool specification, but not both. + :type auto_pool_specification: ~azure.batch.models.AutoPoolSpecification + """ + + _attribute_map = { + 'pool_id': {'key': 'poolId', 'type': 'str'}, + 'auto_pool_specification': {'key': 'autoPoolSpecification', 'type': 'AutoPoolSpecification'}, + } + + def __init__(self, *, pool_id: str=None, auto_pool_specification=None, **kwargs) -> None: + super(PoolInformation, self).__init__(**kwargs) + self.pool_id = pool_id + self.auto_pool_specification = auto_pool_specification diff --git a/azure-batch/azure/batch/models/pool_list_options.py b/azure-batch/azure/batch/models/pool_list_options.py index 81f293aef929..1b37afe66b52 100644 --- a/azure-batch/azure/batch/models/pool_list_options.py +++ b/azure-batch/azure/batch/models/pool_list_options.py @@ -42,13 +42,24 @@ class PoolListOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, select=None, expand=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(PoolListOptions, self).__init__() - self.filter = filter - self.select = select - self.expand = expand - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolListOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/pool_list_options_py3.py b/azure-batch/azure/batch/models/pool_list_options_py3.py new file mode 100644 index 000000000000..5cc33a41e41d --- /dev/null +++ b/azure-batch/azure/batch/models/pool_list_options_py3.py @@ -0,0 +1,65 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolListOptions(Model): + """Additional parameters for list operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-pools. + :type filter: str + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 pools can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, select: str=None, expand: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(PoolListOptions, self).__init__(**kwargs) + self.filter = filter + self.select = select + self.expand = expand + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/pool_list_usage_metrics_options.py b/azure-batch/azure/batch/models/pool_list_usage_metrics_options.py index bb8d7c8d6286..5b52f71aa07d 100644 --- a/azure-batch/azure/batch/models/pool_list_usage_metrics_options.py +++ b/azure-batch/azure/batch/models/pool_list_usage_metrics_options.py @@ -48,13 +48,24 @@ class PoolListUsageMetricsOptions(Model): :type ocp_date: datetime """ - def __init__(self, start_time=None, end_time=None, filter=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(PoolListUsageMetricsOptions, self).__init__() - self.start_time = start_time - self.end_time = end_time - self.filter = filter - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'start_time': {'key': '', 'type': 'iso-8601'}, + 'end_time': {'key': '', 'type': 'iso-8601'}, + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolListUsageMetricsOptions, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.filter = kwargs.get('filter', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/pool_list_usage_metrics_options_py3.py b/azure-batch/azure/batch/models/pool_list_usage_metrics_options_py3.py new file mode 100644 index 000000000000..2141cfa500f9 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_list_usage_metrics_options_py3.py @@ -0,0 +1,71 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolListUsageMetricsOptions(Model): + """Additional parameters for list_usage_metrics operation. + + :param start_time: The earliest time from which to include metrics. This + must be at least two and a half hours before the current time. If not + specified this defaults to the start time of the last aggregation interval + currently available. + :type start_time: datetime + :param end_time: The latest time from which to include metrics. This must + be at least two hours before the current time. If not specified this + defaults to the end time of the last aggregation interval currently + available. + :type end_time: datetime + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-account-usage-metrics. + :type filter: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 results will be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'start_time': {'key': '', 'type': 'iso-8601'}, + 'end_time': {'key': '', 'type': 'iso-8601'}, + 'filter': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, start_time=None, end_time=None, filter: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(PoolListUsageMetricsOptions, self).__init__(**kwargs) + self.start_time = start_time + self.end_time = end_time + self.filter = filter + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/pool_node_counts.py b/azure-batch/azure/batch/models/pool_node_counts.py index bddf61e3cf79..0430b0af4fc8 100644 --- a/azure-batch/azure/batch/models/pool_node_counts.py +++ b/azure-batch/azure/batch/models/pool_node_counts.py @@ -15,7 +15,9 @@ class PoolNodeCounts(Model): """The number of nodes in each state for a pool. - :param pool_id: The ID of the pool. + All required parameters must be populated in order to send to Azure. + + :param pool_id: Required. The ID of the pool. :type pool_id: str :param dedicated: The number of dedicated nodes in each state. :type dedicated: ~azure.batch.models.NodeCounts @@ -33,8 +35,8 @@ class PoolNodeCounts(Model): 'low_priority': {'key': 'lowPriority', 'type': 'NodeCounts'}, } - def __init__(self, pool_id, dedicated=None, low_priority=None): - super(PoolNodeCounts, self).__init__() - self.pool_id = pool_id - self.dedicated = dedicated - self.low_priority = low_priority + def __init__(self, **kwargs): + super(PoolNodeCounts, self).__init__(**kwargs) + self.pool_id = kwargs.get('pool_id', None) + self.dedicated = kwargs.get('dedicated', None) + self.low_priority = kwargs.get('low_priority', None) diff --git a/azure-batch/azure/batch/models/pool_node_counts_py3.py b/azure-batch/azure/batch/models/pool_node_counts_py3.py new file mode 100644 index 000000000000..63ef08249e62 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_node_counts_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolNodeCounts(Model): + """The number of nodes in each state for a pool. + + All required parameters must be populated in order to send to Azure. + + :param pool_id: Required. The ID of the pool. + :type pool_id: str + :param dedicated: The number of dedicated nodes in each state. + :type dedicated: ~azure.batch.models.NodeCounts + :param low_priority: The number of low priority nodes in each state. + :type low_priority: ~azure.batch.models.NodeCounts + """ + + _validation = { + 'pool_id': {'required': True}, + } + + _attribute_map = { + 'pool_id': {'key': 'poolId', 'type': 'str'}, + 'dedicated': {'key': 'dedicated', 'type': 'NodeCounts'}, + 'low_priority': {'key': 'lowPriority', 'type': 'NodeCounts'}, + } + + def __init__(self, *, pool_id: str, dedicated=None, low_priority=None, **kwargs) -> None: + super(PoolNodeCounts, self).__init__(**kwargs) + self.pool_id = pool_id + self.dedicated = dedicated + self.low_priority = low_priority diff --git a/azure-batch/azure/batch/models/pool_patch_options.py b/azure-batch/azure/batch/models/pool_patch_options.py index 7e90942cbd6a..82b54aef4320 100644 --- a/azure-batch/azure/batch/models/pool_patch_options.py +++ b/azure-batch/azure/batch/models/pool_patch_options.py @@ -50,13 +50,24 @@ class PoolPatchOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolPatchOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolPatchOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_patch_options_py3.py b/azure-batch/azure/batch/models/pool_patch_options_py3.py new file mode 100644 index 000000000000..ff9f10f09236 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_patch_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolPatchOptions(Model): + """Additional parameters for patch operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolPatchOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_patch_parameter.py b/azure-batch/azure/batch/models/pool_patch_parameter.py index ebfb0afec1d9..b78ca4969660 100644 --- a/azure-batch/azure/batch/models/pool_patch_parameter.py +++ b/azure-batch/azure/batch/models/pool_patch_parameter.py @@ -58,9 +58,9 @@ class PoolPatchParameter(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, start_task=None, certificate_references=None, application_package_references=None, metadata=None): - super(PoolPatchParameter, self).__init__() - self.start_task = start_task - self.certificate_references = certificate_references - self.application_package_references = application_package_references - self.metadata = metadata + def __init__(self, **kwargs): + super(PoolPatchParameter, self).__init__(**kwargs) + self.start_task = kwargs.get('start_task', None) + self.certificate_references = kwargs.get('certificate_references', None) + self.application_package_references = kwargs.get('application_package_references', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/pool_patch_parameter_py3.py b/azure-batch/azure/batch/models/pool_patch_parameter_py3.py new file mode 100644 index 000000000000..6fb389e8ea51 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_patch_parameter_py3.py @@ -0,0 +1,66 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolPatchParameter(Model): + """The set of changes to be made to a pool. + + :param start_task: A task to run on each compute node as it joins the + pool. The task runs when the node is added to the pool or when the node is + restarted. If this element is present, it overwrites any existing start + task. If omitted, any existing start task is left unchanged. + :type start_task: ~azure.batch.models.StartTask + :param certificate_references: A list of certificates to be installed on + each compute node in the pool. If this element is present, it replaces any + existing certificate references configured on the pool. If omitted, any + existing certificate references are left unchanged. For Windows compute + nodes, the Batch service installs the certificates to the specified + certificate store and location. For Linux compute nodes, the certificates + are stored in a directory inside the task working directory and an + environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the task to + query for this location. For certificates with visibility of 'remoteUser', + a 'certs' directory is created in the user's home directory (e.g., + /home/{user-name}/certs) and certificates are placed in that directory. + :type certificate_references: + list[~azure.batch.models.CertificateReference] + :param application_package_references: A list of application packages to + be installed on each compute node in the pool. Changes to application + package references affect all new compute nodes joining the pool, but do + not affect compute nodes that are already in the pool until they are + rebooted or reimaged. If this element is present, it replaces any existing + application package references. If you specify an empty collection, then + all application package references are removed from the pool. If omitted, + any existing application package references are left unchanged. + :type application_package_references: + list[~azure.batch.models.ApplicationPackageReference] + :param metadata: A list of name-value pairs associated with the pool as + metadata. If this element is present, it replaces any existing metadata + configured on the pool. If you specify an empty collection, any metadata + is removed from the pool. If omitted, any existing metadata is left + unchanged. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _attribute_map = { + 'start_task': {'key': 'startTask', 'type': 'StartTask'}, + 'certificate_references': {'key': 'certificateReferences', 'type': '[CertificateReference]'}, + 'application_package_references': {'key': 'applicationPackageReferences', 'type': '[ApplicationPackageReference]'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, start_task=None, certificate_references=None, application_package_references=None, metadata=None, **kwargs) -> None: + super(PoolPatchParameter, self).__init__(**kwargs) + self.start_task = start_task + self.certificate_references = certificate_references + self.application_package_references = application_package_references + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/pool_remove_nodes_options.py b/azure-batch/azure/batch/models/pool_remove_nodes_options.py index beaa734ea509..14be8ddd200d 100644 --- a/azure-batch/azure/batch/models/pool_remove_nodes_options.py +++ b/azure-batch/azure/batch/models/pool_remove_nodes_options.py @@ -50,13 +50,24 @@ class PoolRemoveNodesOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolRemoveNodesOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolRemoveNodesOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_remove_nodes_options_py3.py b/azure-batch/azure/batch/models/pool_remove_nodes_options_py3.py new file mode 100644 index 000000000000..1fe5eb974b24 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_remove_nodes_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolRemoveNodesOptions(Model): + """Additional parameters for remove_nodes operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolRemoveNodesOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_resize_options.py b/azure-batch/azure/batch/models/pool_resize_options.py index 14fce92a01e2..e83a7cccfb65 100644 --- a/azure-batch/azure/batch/models/pool_resize_options.py +++ b/azure-batch/azure/batch/models/pool_resize_options.py @@ -50,13 +50,24 @@ class PoolResizeOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolResizeOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolResizeOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_resize_options_py3.py b/azure-batch/azure/batch/models/pool_resize_options_py3.py new file mode 100644 index 000000000000..ef457e811516 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_resize_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolResizeOptions(Model): + """Additional parameters for resize operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolResizeOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_resize_parameter.py b/azure-batch/azure/batch/models/pool_resize_parameter.py index aae5abad46f6..e37a88c8b189 100644 --- a/azure-batch/azure/batch/models/pool_resize_parameter.py +++ b/azure-batch/azure/batch/models/pool_resize_parameter.py @@ -42,9 +42,9 @@ class PoolResizeParameter(Model): 'node_deallocation_option': {'key': 'nodeDeallocationOption', 'type': 'ComputeNodeDeallocationOption'}, } - def __init__(self, target_dedicated_nodes=None, target_low_priority_nodes=None, resize_timeout=None, node_deallocation_option=None): - super(PoolResizeParameter, self).__init__() - self.target_dedicated_nodes = target_dedicated_nodes - self.target_low_priority_nodes = target_low_priority_nodes - self.resize_timeout = resize_timeout - self.node_deallocation_option = node_deallocation_option + def __init__(self, **kwargs): + super(PoolResizeParameter, self).__init__(**kwargs) + self.target_dedicated_nodes = kwargs.get('target_dedicated_nodes', None) + self.target_low_priority_nodes = kwargs.get('target_low_priority_nodes', None) + self.resize_timeout = kwargs.get('resize_timeout', None) + self.node_deallocation_option = kwargs.get('node_deallocation_option', None) diff --git a/azure-batch/azure/batch/models/pool_resize_parameter_py3.py b/azure-batch/azure/batch/models/pool_resize_parameter_py3.py new file mode 100644 index 000000000000..6aff469f7765 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_resize_parameter_py3.py @@ -0,0 +1,50 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolResizeParameter(Model): + """Options for changing the size of a pool. + + :param target_dedicated_nodes: The desired number of dedicated compute + nodes in the pool. + :type target_dedicated_nodes: int + :param target_low_priority_nodes: The desired number of low-priority + compute nodes in the pool. + :type target_low_priority_nodes: int + :param resize_timeout: The timeout for allocation of compute nodes to the + pool or removal of compute nodes from the pool. The default value is 15 + minutes. The minimum value is 5 minutes. If you specify a value less than + 5 minutes, the Batch service returns an error; if you are calling the REST + API directly, the HTTP status code is 400 (Bad Request). + :type resize_timeout: timedelta + :param node_deallocation_option: Determines what to do with a node and its + running task(s) if the pool size is decreasing. The default value is + requeue. Possible values include: 'requeue', 'terminate', + 'taskCompletion', 'retainedData' + :type node_deallocation_option: str or + ~azure.batch.models.ComputeNodeDeallocationOption + """ + + _attribute_map = { + 'target_dedicated_nodes': {'key': 'targetDedicatedNodes', 'type': 'int'}, + 'target_low_priority_nodes': {'key': 'targetLowPriorityNodes', 'type': 'int'}, + 'resize_timeout': {'key': 'resizeTimeout', 'type': 'duration'}, + 'node_deallocation_option': {'key': 'nodeDeallocationOption', 'type': 'ComputeNodeDeallocationOption'}, + } + + def __init__(self, *, target_dedicated_nodes: int=None, target_low_priority_nodes: int=None, resize_timeout=None, node_deallocation_option=None, **kwargs) -> None: + super(PoolResizeParameter, self).__init__(**kwargs) + self.target_dedicated_nodes = target_dedicated_nodes + self.target_low_priority_nodes = target_low_priority_nodes + self.resize_timeout = resize_timeout + self.node_deallocation_option = node_deallocation_option diff --git a/azure-batch/azure/batch/models/pool_specification.py b/azure-batch/azure/batch/models/pool_specification.py index a49acc6d198b..465157cbe90f 100644 --- a/azure-batch/azure/batch/models/pool_specification.py +++ b/azure-batch/azure/batch/models/pool_specification.py @@ -15,24 +15,17 @@ class PoolSpecification(Model): """Specification for creating a new pool. + All required parameters must be populated in order to send to Azure. + :param display_name: The display name for the pool. The display name need not be unique and can contain any Unicode characters up to a maximum length of 1024. :type display_name: str - :param vm_size: The size of the virtual machines in the pool. All virtual - machines in a pool are the same size. For information about available - sizes of virtual machines for Cloud Services pools (pools created with - cloudServiceConfiguration), see Sizes for Cloud Services - (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). - Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and - A2V2. For information about available VM sizes for pools using images from - the Virtual Machines Marketplace (pools created with - virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) - (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) - or Sizes for Virtual Machines (Windows) - (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). - Batch supports all Azure VM sizes except STANDARD_A0 and those with - premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series). + :param vm_size: Required. The size of the virtual machines in the pool. + All virtual machines in a pool are the same size. For information about + available sizes of virtual machines in pools, see Choose a VM size for + compute nodes in an Azure Batch pool + (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). :type vm_size: str :param cloud_service_configuration: The cloud service configuration for the pool. This property must be specified if the pool needs to be created @@ -129,7 +122,9 @@ class PoolSpecification(Model): service will make available on each compute node in the pool. The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, - pool creation will fail. + pool creation will fail. The permitted licenses available on the pool are + 'maya', 'vray', '3dsmax', 'arnold'. An additional charge applies for each + application license added to the pool. :type application_licenses: list[str] :param user_accounts: The list of user accounts to be created on each node in the pool. @@ -167,25 +162,25 @@ class PoolSpecification(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, vm_size, display_name=None, cloud_service_configuration=None, virtual_machine_configuration=None, max_tasks_per_node=None, task_scheduling_policy=None, resize_timeout=None, target_dedicated_nodes=None, target_low_priority_nodes=None, enable_auto_scale=None, auto_scale_formula=None, auto_scale_evaluation_interval=None, enable_inter_node_communication=None, network_configuration=None, start_task=None, certificate_references=None, application_package_references=None, application_licenses=None, user_accounts=None, metadata=None): - super(PoolSpecification, self).__init__() - self.display_name = display_name - self.vm_size = vm_size - self.cloud_service_configuration = cloud_service_configuration - self.virtual_machine_configuration = virtual_machine_configuration - self.max_tasks_per_node = max_tasks_per_node - self.task_scheduling_policy = task_scheduling_policy - self.resize_timeout = resize_timeout - self.target_dedicated_nodes = target_dedicated_nodes - self.target_low_priority_nodes = target_low_priority_nodes - self.enable_auto_scale = enable_auto_scale - self.auto_scale_formula = auto_scale_formula - self.auto_scale_evaluation_interval = auto_scale_evaluation_interval - self.enable_inter_node_communication = enable_inter_node_communication - self.network_configuration = network_configuration - self.start_task = start_task - self.certificate_references = certificate_references - self.application_package_references = application_package_references - self.application_licenses = application_licenses - self.user_accounts = user_accounts - self.metadata = metadata + def __init__(self, **kwargs): + super(PoolSpecification, self).__init__(**kwargs) + self.display_name = kwargs.get('display_name', None) + self.vm_size = kwargs.get('vm_size', None) + self.cloud_service_configuration = kwargs.get('cloud_service_configuration', None) + self.virtual_machine_configuration = kwargs.get('virtual_machine_configuration', None) + self.max_tasks_per_node = kwargs.get('max_tasks_per_node', None) + self.task_scheduling_policy = kwargs.get('task_scheduling_policy', None) + self.resize_timeout = kwargs.get('resize_timeout', None) + self.target_dedicated_nodes = kwargs.get('target_dedicated_nodes', None) + self.target_low_priority_nodes = kwargs.get('target_low_priority_nodes', None) + self.enable_auto_scale = kwargs.get('enable_auto_scale', None) + self.auto_scale_formula = kwargs.get('auto_scale_formula', None) + self.auto_scale_evaluation_interval = kwargs.get('auto_scale_evaluation_interval', None) + self.enable_inter_node_communication = kwargs.get('enable_inter_node_communication', None) + self.network_configuration = kwargs.get('network_configuration', None) + self.start_task = kwargs.get('start_task', None) + self.certificate_references = kwargs.get('certificate_references', None) + self.application_package_references = kwargs.get('application_package_references', None) + self.application_licenses = kwargs.get('application_licenses', None) + self.user_accounts = kwargs.get('user_accounts', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/pool_specification_py3.py b/azure-batch/azure/batch/models/pool_specification_py3.py new file mode 100644 index 000000000000..7f7587526c5b --- /dev/null +++ b/azure-batch/azure/batch/models/pool_specification_py3.py @@ -0,0 +1,186 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolSpecification(Model): + """Specification for creating a new pool. + + All required parameters must be populated in order to send to Azure. + + :param display_name: The display name for the pool. The display name need + not be unique and can contain any Unicode characters up to a maximum + length of 1024. + :type display_name: str + :param vm_size: Required. The size of the virtual machines in the pool. + All virtual machines in a pool are the same size. For information about + available sizes of virtual machines in pools, see Choose a VM size for + compute nodes in an Azure Batch pool + (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). + :type vm_size: str + :param cloud_service_configuration: The cloud service configuration for + the pool. This property must be specified if the pool needs to be created + with Azure PaaS VMs. This property and virtualMachineConfiguration are + mutually exclusive and one of the properties must be specified. If neither + is specified then the Batch service returns an error; if you are calling + the REST API directly, the HTTP status code is 400 (Bad Request). This + property cannot be specified if the Batch account was created with its + poolAllocationMode property set to 'UserSubscription'. + :type cloud_service_configuration: + ~azure.batch.models.CloudServiceConfiguration + :param virtual_machine_configuration: The virtual machine configuration + for the pool. This property must be specified if the pool needs to be + created with Azure IaaS VMs. This property and cloudServiceConfiguration + are mutually exclusive and one of the properties must be specified. If + neither is specified then the Batch service returns an error; if you are + calling the REST API directly, the HTTP status code is 400 (Bad Request). + :type virtual_machine_configuration: + ~azure.batch.models.VirtualMachineConfiguration + :param max_tasks_per_node: The maximum number of tasks that can run + concurrently on a single compute node in the pool. The default value is 1. + The maximum value of this setting depends on the size of the compute nodes + in the pool (the vmSize setting). + :type max_tasks_per_node: int + :param task_scheduling_policy: How tasks are distributed across compute + nodes in a pool. + :type task_scheduling_policy: ~azure.batch.models.TaskSchedulingPolicy + :param resize_timeout: The timeout for allocation of compute nodes to the + pool. This timeout applies only to manual scaling; it has no effect when + enableAutoScale is set to true. The default value is 15 minutes. The + minimum value is 5 minutes. If you specify a value less than 5 minutes, + the Batch service rejects the request with an error; if you are calling + the REST API directly, the HTTP status code is 400 (Bad Request). + :type resize_timeout: timedelta + :param target_dedicated_nodes: The desired number of dedicated compute + nodes in the pool. This property must not be specified if enableAutoScale + is set to true. If enableAutoScale is set to false, then you must set + either targetDedicatedNodes, targetLowPriorityNodes, or both. + :type target_dedicated_nodes: int + :param target_low_priority_nodes: The desired number of low-priority + compute nodes in the pool. This property must not be specified if + enableAutoScale is set to true. If enableAutoScale is set to false, then + you must set either targetDedicatedNodes, targetLowPriorityNodes, or both. + :type target_low_priority_nodes: int + :param enable_auto_scale: Whether the pool size should automatically + adjust over time. If false, at least one of targetDedicateNodes and + targetLowPriorityNodes must be specified. If true, the autoScaleFormula + element is required. The pool automatically resizes according to the + formula. The default value is false. + :type enable_auto_scale: bool + :param auto_scale_formula: The formula for the desired number of compute + nodes in the pool. This property must not be specified if enableAutoScale + is set to false. It is required if enableAutoScale is set to true. The + formula is checked for validity before the pool is created. If the formula + is not valid, the Batch service rejects the request with detailed error + information. + :type auto_scale_formula: str + :param auto_scale_evaluation_interval: The time interval at which to + automatically adjust the pool size according to the autoscale formula. The + default value is 15 minutes. The minimum and maximum value are 5 minutes + and 168 hours respectively. If you specify a value less than 5 minutes or + greater than 168 hours, the Batch service rejects the request with an + invalid property value error; if you are calling the REST API directly, + the HTTP status code is 400 (Bad Request). + :type auto_scale_evaluation_interval: timedelta + :param enable_inter_node_communication: Whether the pool permits direct + communication between nodes. Enabling inter-node communication limits the + maximum size of the pool due to deployment restrictions on the nodes of + the pool. This may result in the pool not reaching its desired size. The + default value is false. + :type enable_inter_node_communication: bool + :param network_configuration: The network configuration for the pool. + :type network_configuration: ~azure.batch.models.NetworkConfiguration + :param start_task: A task to run on each compute node as it joins the + pool. The task runs when the node is added to the pool or when the node is + restarted. + :type start_task: ~azure.batch.models.StartTask + :param certificate_references: A list of certificates to be installed on + each compute node in the pool. For Windows compute nodes, the Batch + service installs the certificates to the specified certificate store and + location. For Linux compute nodes, the certificates are stored in a + directory inside the task working directory and an environment variable + AZ_BATCH_CERTIFICATES_DIR is supplied to the task to query for this + location. For certificates with visibility of 'remoteUser', a 'certs' + directory is created in the user's home directory (e.g., + /home/{user-name}/certs) and certificates are placed in that directory. + :type certificate_references: + list[~azure.batch.models.CertificateReference] + :param application_package_references: The list of application packages to + be installed on each compute node in the pool. + :type application_package_references: + list[~azure.batch.models.ApplicationPackageReference] + :param application_licenses: The list of application licenses the Batch + service will make available on each compute node in the pool. The list of + application licenses must be a subset of available Batch service + application licenses. If a license is requested which is not supported, + pool creation will fail. The permitted licenses available on the pool are + 'maya', 'vray', '3dsmax', 'arnold'. An additional charge applies for each + application license added to the pool. + :type application_licenses: list[str] + :param user_accounts: The list of user accounts to be created on each node + in the pool. + :type user_accounts: list[~azure.batch.models.UserAccount] + :param metadata: A list of name-value pairs associated with the pool as + metadata. The Batch service does not assign any meaning to metadata; it is + solely for the use of user code. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _validation = { + 'vm_size': {'required': True}, + } + + _attribute_map = { + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'cloud_service_configuration': {'key': 'cloudServiceConfiguration', 'type': 'CloudServiceConfiguration'}, + 'virtual_machine_configuration': {'key': 'virtualMachineConfiguration', 'type': 'VirtualMachineConfiguration'}, + 'max_tasks_per_node': {'key': 'maxTasksPerNode', 'type': 'int'}, + 'task_scheduling_policy': {'key': 'taskSchedulingPolicy', 'type': 'TaskSchedulingPolicy'}, + 'resize_timeout': {'key': 'resizeTimeout', 'type': 'duration'}, + 'target_dedicated_nodes': {'key': 'targetDedicatedNodes', 'type': 'int'}, + 'target_low_priority_nodes': {'key': 'targetLowPriorityNodes', 'type': 'int'}, + 'enable_auto_scale': {'key': 'enableAutoScale', 'type': 'bool'}, + 'auto_scale_formula': {'key': 'autoScaleFormula', 'type': 'str'}, + 'auto_scale_evaluation_interval': {'key': 'autoScaleEvaluationInterval', 'type': 'duration'}, + 'enable_inter_node_communication': {'key': 'enableInterNodeCommunication', 'type': 'bool'}, + 'network_configuration': {'key': 'networkConfiguration', 'type': 'NetworkConfiguration'}, + 'start_task': {'key': 'startTask', 'type': 'StartTask'}, + 'certificate_references': {'key': 'certificateReferences', 'type': '[CertificateReference]'}, + 'application_package_references': {'key': 'applicationPackageReferences', 'type': '[ApplicationPackageReference]'}, + 'application_licenses': {'key': 'applicationLicenses', 'type': '[str]'}, + 'user_accounts': {'key': 'userAccounts', 'type': '[UserAccount]'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, vm_size: str, display_name: str=None, cloud_service_configuration=None, virtual_machine_configuration=None, max_tasks_per_node: int=None, task_scheduling_policy=None, resize_timeout=None, target_dedicated_nodes: int=None, target_low_priority_nodes: int=None, enable_auto_scale: bool=None, auto_scale_formula: str=None, auto_scale_evaluation_interval=None, enable_inter_node_communication: bool=None, network_configuration=None, start_task=None, certificate_references=None, application_package_references=None, application_licenses=None, user_accounts=None, metadata=None, **kwargs) -> None: + super(PoolSpecification, self).__init__(**kwargs) + self.display_name = display_name + self.vm_size = vm_size + self.cloud_service_configuration = cloud_service_configuration + self.virtual_machine_configuration = virtual_machine_configuration + self.max_tasks_per_node = max_tasks_per_node + self.task_scheduling_policy = task_scheduling_policy + self.resize_timeout = resize_timeout + self.target_dedicated_nodes = target_dedicated_nodes + self.target_low_priority_nodes = target_low_priority_nodes + self.enable_auto_scale = enable_auto_scale + self.auto_scale_formula = auto_scale_formula + self.auto_scale_evaluation_interval = auto_scale_evaluation_interval + self.enable_inter_node_communication = enable_inter_node_communication + self.network_configuration = network_configuration + self.start_task = start_task + self.certificate_references = certificate_references + self.application_package_references = application_package_references + self.application_licenses = application_licenses + self.user_accounts = user_accounts + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/pool_statistics.py b/azure-batch/azure/batch/models/pool_statistics.py index cbeb803bcd2f..297e40d5d450 100644 --- a/azure-batch/azure/batch/models/pool_statistics.py +++ b/azure-batch/azure/batch/models/pool_statistics.py @@ -16,14 +16,16 @@ class PoolStatistics(Model): """Contains utilization and resource usage statistics for the lifetime of a pool. - :param url: The URL for the statistics. + All required parameters must be populated in order to send to Azure. + + :param url: Required. The URL for the statistics. :type url: str - :param start_time: The start time of the time range covered by the - statistics. + :param start_time: Required. The start time of the time range covered by + the statistics. :type start_time: datetime - :param last_update_time: The time at which the statistics were last - updated. All statistics are limited to the range between startTime and - lastUpdateTime. + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. :type last_update_time: datetime :param usage_stats: Statistics related to pool usage, such as the amount of core-time used. @@ -47,10 +49,10 @@ class PoolStatistics(Model): 'resource_stats': {'key': 'resourceStats', 'type': 'ResourceStatistics'}, } - def __init__(self, url, start_time, last_update_time, usage_stats=None, resource_stats=None): - super(PoolStatistics, self).__init__() - self.url = url - self.start_time = start_time - self.last_update_time = last_update_time - self.usage_stats = usage_stats - self.resource_stats = resource_stats + def __init__(self, **kwargs): + super(PoolStatistics, self).__init__(**kwargs) + self.url = kwargs.get('url', None) + self.start_time = kwargs.get('start_time', None) + self.last_update_time = kwargs.get('last_update_time', None) + self.usage_stats = kwargs.get('usage_stats', None) + self.resource_stats = kwargs.get('resource_stats', None) diff --git a/azure-batch/azure/batch/models/pool_statistics_py3.py b/azure-batch/azure/batch/models/pool_statistics_py3.py new file mode 100644 index 000000000000..f79e93b80cf9 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_statistics_py3.py @@ -0,0 +1,58 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolStatistics(Model): + """Contains utilization and resource usage statistics for the lifetime of a + pool. + + All required parameters must be populated in order to send to Azure. + + :param url: Required. The URL for the statistics. + :type url: str + :param start_time: Required. The start time of the time range covered by + the statistics. + :type start_time: datetime + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. + :type last_update_time: datetime + :param usage_stats: Statistics related to pool usage, such as the amount + of core-time used. + :type usage_stats: ~azure.batch.models.UsageStatistics + :param resource_stats: Statistics related to resource consumption by + compute nodes in the pool. + :type resource_stats: ~azure.batch.models.ResourceStatistics + """ + + _validation = { + 'url': {'required': True}, + 'start_time': {'required': True}, + 'last_update_time': {'required': True}, + } + + _attribute_map = { + 'url': {'key': 'url', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'}, + 'usage_stats': {'key': 'usageStats', 'type': 'UsageStatistics'}, + 'resource_stats': {'key': 'resourceStats', 'type': 'ResourceStatistics'}, + } + + def __init__(self, *, url: str, start_time, last_update_time, usage_stats=None, resource_stats=None, **kwargs) -> None: + super(PoolStatistics, self).__init__(**kwargs) + self.url = url + self.start_time = start_time + self.last_update_time = last_update_time + self.usage_stats = usage_stats + self.resource_stats = resource_stats diff --git a/azure-batch/azure/batch/models/pool_stop_resize_options.py b/azure-batch/azure/batch/models/pool_stop_resize_options.py index 887dc52a647c..ab8fec735f61 100644 --- a/azure-batch/azure/batch/models/pool_stop_resize_options.py +++ b/azure-batch/azure/batch/models/pool_stop_resize_options.py @@ -50,13 +50,24 @@ class PoolStopResizeOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolStopResizeOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolStopResizeOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_stop_resize_options_py3.py b/azure-batch/azure/batch/models/pool_stop_resize_options_py3.py new file mode 100644 index 000000000000..d5cc404e03c2 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_stop_resize_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolStopResizeOptions(Model): + """Additional parameters for stop_resize operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolStopResizeOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_update_properties_options.py b/azure-batch/azure/batch/models/pool_update_properties_options.py index e4cab02081be..ca7f97cbdf2f 100644 --- a/azure-batch/azure/batch/models/pool_update_properties_options.py +++ b/azure-batch/azure/batch/models/pool_update_properties_options.py @@ -31,9 +31,16 @@ class PoolUpdatePropertiesOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(PoolUpdatePropertiesOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolUpdatePropertiesOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/pool_update_properties_options_py3.py b/azure-batch/azure/batch/models/pool_update_properties_options_py3.py new file mode 100644 index 000000000000..edf5065c50e0 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_update_properties_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolUpdatePropertiesOptions(Model): + """Additional parameters for update_properties operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(PoolUpdatePropertiesOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/pool_update_properties_parameter.py b/azure-batch/azure/batch/models/pool_update_properties_parameter.py index d356dae1808c..bbc35acc119d 100644 --- a/azure-batch/azure/batch/models/pool_update_properties_parameter.py +++ b/azure-batch/azure/batch/models/pool_update_properties_parameter.py @@ -15,39 +15,41 @@ class PoolUpdatePropertiesParameter(Model): """The set of changes to be made to a pool. + All required parameters must be populated in order to send to Azure. + :param start_task: A task to run on each compute node as it joins the pool. The task runs when the node is added to the pool or when the node is restarted. If this element is present, it overwrites any existing start task. If omitted, any existing start task is removed from the pool. :type start_task: ~azure.batch.models.StartTask - :param certificate_references: A list of certificates to be installed on - each compute node in the pool. This list replaces any existing certificate - references configured on the pool. If you specify an empty collection, any - existing certificate references are removed from the pool. For Windows - compute nodes, the Batch service installs the certificates to the - specified certificate store and location. For Linux compute nodes, the - certificates are stored in a directory inside the task working directory - and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the - task to query for this location. For certificates with visibility of - 'remoteUser', a 'certs' directory is created in the user's home directory - (e.g., /home/{user-name}/certs) and certificates are placed in that - directory. + :param certificate_references: Required. A list of certificates to be + installed on each compute node in the pool. This list replaces any + existing certificate references configured on the pool. If you specify an + empty collection, any existing certificate references are removed from the + pool. For Windows compute nodes, the Batch service installs the + certificates to the specified certificate store and location. For Linux + compute nodes, the certificates are stored in a directory inside the task + working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is + supplied to the task to query for this location. For certificates with + visibility of 'remoteUser', a 'certs' directory is created in the user's + home directory (e.g., /home/{user-name}/certs) and certificates are placed + in that directory. :type certificate_references: list[~azure.batch.models.CertificateReference] - :param application_package_references: A list of application packages to - be installed on each compute node in the pool. The list replaces any - existing application package references on the pool. Changes to - application package references affect all new compute nodes joining the + :param application_package_references: Required. A list of application + packages to be installed on each compute node in the pool. The list + replaces any existing application package references on the pool. Changes + to application package references affect all new compute nodes joining the pool, but do not affect compute nodes that are already in the pool until they are rebooted or reimaged. If omitted, or if you specify an empty collection, any existing application packages references are removed from the pool. :type application_package_references: list[~azure.batch.models.ApplicationPackageReference] - :param metadata: A list of name-value pairs associated with the pool as - metadata. This list replaces any existing metadata configured on the pool. - If omitted, or if you specify an empty collection, any existing metadata - is removed from the pool. + :param metadata: Required. A list of name-value pairs associated with the + pool as metadata. This list replaces any existing metadata configured on + the pool. If omitted, or if you specify an empty collection, any existing + metadata is removed from the pool. :type metadata: list[~azure.batch.models.MetadataItem] """ @@ -64,9 +66,9 @@ class PoolUpdatePropertiesParameter(Model): 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, } - def __init__(self, certificate_references, application_package_references, metadata, start_task=None): - super(PoolUpdatePropertiesParameter, self).__init__() - self.start_task = start_task - self.certificate_references = certificate_references - self.application_package_references = application_package_references - self.metadata = metadata + def __init__(self, **kwargs): + super(PoolUpdatePropertiesParameter, self).__init__(**kwargs) + self.start_task = kwargs.get('start_task', None) + self.certificate_references = kwargs.get('certificate_references', None) + self.application_package_references = kwargs.get('application_package_references', None) + self.metadata = kwargs.get('metadata', None) diff --git a/azure-batch/azure/batch/models/pool_update_properties_parameter_py3.py b/azure-batch/azure/batch/models/pool_update_properties_parameter_py3.py new file mode 100644 index 000000000000..20457439a19f --- /dev/null +++ b/azure-batch/azure/batch/models/pool_update_properties_parameter_py3.py @@ -0,0 +1,74 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolUpdatePropertiesParameter(Model): + """The set of changes to be made to a pool. + + All required parameters must be populated in order to send to Azure. + + :param start_task: A task to run on each compute node as it joins the + pool. The task runs when the node is added to the pool or when the node is + restarted. If this element is present, it overwrites any existing start + task. If omitted, any existing start task is removed from the pool. + :type start_task: ~azure.batch.models.StartTask + :param certificate_references: Required. A list of certificates to be + installed on each compute node in the pool. This list replaces any + existing certificate references configured on the pool. If you specify an + empty collection, any existing certificate references are removed from the + pool. For Windows compute nodes, the Batch service installs the + certificates to the specified certificate store and location. For Linux + compute nodes, the certificates are stored in a directory inside the task + working directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is + supplied to the task to query for this location. For certificates with + visibility of 'remoteUser', a 'certs' directory is created in the user's + home directory (e.g., /home/{user-name}/certs) and certificates are placed + in that directory. + :type certificate_references: + list[~azure.batch.models.CertificateReference] + :param application_package_references: Required. A list of application + packages to be installed on each compute node in the pool. The list + replaces any existing application package references on the pool. Changes + to application package references affect all new compute nodes joining the + pool, but do not affect compute nodes that are already in the pool until + they are rebooted or reimaged. If omitted, or if you specify an empty + collection, any existing application packages references are removed from + the pool. + :type application_package_references: + list[~azure.batch.models.ApplicationPackageReference] + :param metadata: Required. A list of name-value pairs associated with the + pool as metadata. This list replaces any existing metadata configured on + the pool. If omitted, or if you specify an empty collection, any existing + metadata is removed from the pool. + :type metadata: list[~azure.batch.models.MetadataItem] + """ + + _validation = { + 'certificate_references': {'required': True}, + 'application_package_references': {'required': True}, + 'metadata': {'required': True}, + } + + _attribute_map = { + 'start_task': {'key': 'startTask', 'type': 'StartTask'}, + 'certificate_references': {'key': 'certificateReferences', 'type': '[CertificateReference]'}, + 'application_package_references': {'key': 'applicationPackageReferences', 'type': '[ApplicationPackageReference]'}, + 'metadata': {'key': 'metadata', 'type': '[MetadataItem]'}, + } + + def __init__(self, *, certificate_references, application_package_references, metadata, start_task=None, **kwargs) -> None: + super(PoolUpdatePropertiesParameter, self).__init__(**kwargs) + self.start_task = start_task + self.certificate_references = certificate_references + self.application_package_references = application_package_references + self.metadata = metadata diff --git a/azure-batch/azure/batch/models/pool_upgrade_os_options.py b/azure-batch/azure/batch/models/pool_upgrade_os_options.py index 19197471bf85..fbdfdf91e457 100644 --- a/azure-batch/azure/batch/models/pool_upgrade_os_options.py +++ b/azure-batch/azure/batch/models/pool_upgrade_os_options.py @@ -50,13 +50,24 @@ class PoolUpgradeOsOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(PoolUpgradeOsOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(PoolUpgradeOsOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/pool_upgrade_os_options_py3.py b/azure-batch/azure/batch/models/pool_upgrade_os_options_py3.py new file mode 100644 index 000000000000..67884745c1c4 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_upgrade_os_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolUpgradeOsOptions(Model): + """Additional parameters for upgrade_os operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(PoolUpgradeOsOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/pool_upgrade_os_parameter.py b/azure-batch/azure/batch/models/pool_upgrade_os_parameter.py index b26210f6a04d..17141ac0e652 100644 --- a/azure-batch/azure/batch/models/pool_upgrade_os_parameter.py +++ b/azure-batch/azure/batch/models/pool_upgrade_os_parameter.py @@ -15,8 +15,10 @@ class PoolUpgradeOSParameter(Model): """Options for upgrading the operating system of compute nodes in a pool. - :param target_os_version: The Azure Guest OS version to be installed on - the virtual machines in the pool. + All required parameters must be populated in order to send to Azure. + + :param target_os_version: Required. The Azure Guest OS version to be + installed on the virtual machines in the pool. :type target_os_version: str """ @@ -28,6 +30,6 @@ class PoolUpgradeOSParameter(Model): 'target_os_version': {'key': 'targetOSVersion', 'type': 'str'}, } - def __init__(self, target_os_version): - super(PoolUpgradeOSParameter, self).__init__() - self.target_os_version = target_os_version + def __init__(self, **kwargs): + super(PoolUpgradeOSParameter, self).__init__(**kwargs) + self.target_os_version = kwargs.get('target_os_version', None) diff --git a/azure-batch/azure/batch/models/pool_upgrade_os_parameter_py3.py b/azure-batch/azure/batch/models/pool_upgrade_os_parameter_py3.py new file mode 100644 index 000000000000..de2169d028da --- /dev/null +++ b/azure-batch/azure/batch/models/pool_upgrade_os_parameter_py3.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolUpgradeOSParameter(Model): + """Options for upgrading the operating system of compute nodes in a pool. + + All required parameters must be populated in order to send to Azure. + + :param target_os_version: Required. The Azure Guest OS version to be + installed on the virtual machines in the pool. + :type target_os_version: str + """ + + _validation = { + 'target_os_version': {'required': True}, + } + + _attribute_map = { + 'target_os_version': {'key': 'targetOSVersion', 'type': 'str'}, + } + + def __init__(self, *, target_os_version: str, **kwargs) -> None: + super(PoolUpgradeOSParameter, self).__init__(**kwargs) + self.target_os_version = target_os_version diff --git a/azure-batch/azure/batch/models/pool_usage_metrics.py b/azure-batch/azure/batch/models/pool_usage_metrics.py index 73e62c9b187e..93cfa03f6d8f 100644 --- a/azure-batch/azure/batch/models/pool_usage_metrics.py +++ b/azure-batch/azure/batch/models/pool_usage_metrics.py @@ -15,38 +15,31 @@ class PoolUsageMetrics(Model): """Usage metrics for a pool across an aggregation interval. - :param pool_id: The ID of the pool whose metrics are aggregated in this - entry. + All required parameters must be populated in order to send to Azure. + + :param pool_id: Required. The ID of the pool whose metrics are aggregated + in this entry. :type pool_id: str - :param start_time: The start time of the aggregation interval covered by - this entry. + :param start_time: Required. The start time of the aggregation interval + covered by this entry. :type start_time: datetime - :param end_time: The end time of the aggregation interval covered by this - entry. + :param end_time: Required. The end time of the aggregation interval + covered by this entry. :type end_time: datetime - :param vm_size: The size of virtual machines in the pool. All VMs in a - pool are the same size. For information about available sizes of virtual - machines in pools, see Choose a VM size for compute nodes in an Azure - Batch pool (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). - Batch supports all Cloud Services VM sizes except ExtraSmall, - STANDARD_A1_V2 and STANDARD_A2_V2. For information about available VM - sizes for pools using images from the Virtual Machines Marketplace (pools - created with virtualMachineConfiguration) see Sizes for Virtual Machines - (Linux) - (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) - or Sizes for Virtual Machines (Windows) - (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). - Batch supports all Azure VM sizes except STANDARD_A0 and those with - premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series). + :param vm_size: Required. The size of virtual machines in the pool. All + VMs in a pool are the same size. For information about available sizes of + virtual machines in pools, see Choose a VM size for compute nodes in an + Azure Batch pool + (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). :type vm_size: str - :param total_core_hours: The total core hours used in the pool during this - aggregation interval. + :param total_core_hours: Required. The total core hours used in the pool + during this aggregation interval. :type total_core_hours: float - :param data_ingress_gi_b: The cross data center network ingress to the - pool during this interval, in GiB. + :param data_ingress_gi_b: Required. The cross data center network ingress + to the pool during this interval, in GiB. :type data_ingress_gi_b: float - :param data_egress_gi_b: The cross data center network egress from the - pool during this interval, in GiB. + :param data_egress_gi_b: Required. The cross data center network egress + from the pool during this interval, in GiB. :type data_egress_gi_b: float """ @@ -70,12 +63,12 @@ class PoolUsageMetrics(Model): 'data_egress_gi_b': {'key': 'dataEgressGiB', 'type': 'float'}, } - def __init__(self, pool_id, start_time, end_time, vm_size, total_core_hours, data_ingress_gi_b, data_egress_gi_b): - super(PoolUsageMetrics, self).__init__() - self.pool_id = pool_id - self.start_time = start_time - self.end_time = end_time - self.vm_size = vm_size - self.total_core_hours = total_core_hours - self.data_ingress_gi_b = data_ingress_gi_b - self.data_egress_gi_b = data_egress_gi_b + def __init__(self, **kwargs): + super(PoolUsageMetrics, self).__init__(**kwargs) + self.pool_id = kwargs.get('pool_id', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.vm_size = kwargs.get('vm_size', None) + self.total_core_hours = kwargs.get('total_core_hours', None) + self.data_ingress_gi_b = kwargs.get('data_ingress_gi_b', None) + self.data_egress_gi_b = kwargs.get('data_egress_gi_b', None) diff --git a/azure-batch/azure/batch/models/pool_usage_metrics_py3.py b/azure-batch/azure/batch/models/pool_usage_metrics_py3.py new file mode 100644 index 000000000000..5c7ea9ebdf73 --- /dev/null +++ b/azure-batch/azure/batch/models/pool_usage_metrics_py3.py @@ -0,0 +1,74 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class PoolUsageMetrics(Model): + """Usage metrics for a pool across an aggregation interval. + + All required parameters must be populated in order to send to Azure. + + :param pool_id: Required. The ID of the pool whose metrics are aggregated + in this entry. + :type pool_id: str + :param start_time: Required. The start time of the aggregation interval + covered by this entry. + :type start_time: datetime + :param end_time: Required. The end time of the aggregation interval + covered by this entry. + :type end_time: datetime + :param vm_size: Required. The size of virtual machines in the pool. All + VMs in a pool are the same size. For information about available sizes of + virtual machines in pools, see Choose a VM size for compute nodes in an + Azure Batch pool + (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). + :type vm_size: str + :param total_core_hours: Required. The total core hours used in the pool + during this aggregation interval. + :type total_core_hours: float + :param data_ingress_gi_b: Required. The cross data center network ingress + to the pool during this interval, in GiB. + :type data_ingress_gi_b: float + :param data_egress_gi_b: Required. The cross data center network egress + from the pool during this interval, in GiB. + :type data_egress_gi_b: float + """ + + _validation = { + 'pool_id': {'required': True}, + 'start_time': {'required': True}, + 'end_time': {'required': True}, + 'vm_size': {'required': True}, + 'total_core_hours': {'required': True}, + 'data_ingress_gi_b': {'required': True}, + 'data_egress_gi_b': {'required': True}, + } + + _attribute_map = { + 'pool_id': {'key': 'poolId', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'total_core_hours': {'key': 'totalCoreHours', 'type': 'float'}, + 'data_ingress_gi_b': {'key': 'dataIngressGiB', 'type': 'float'}, + 'data_egress_gi_b': {'key': 'dataEgressGiB', 'type': 'float'}, + } + + def __init__(self, *, pool_id: str, start_time, end_time, vm_size: str, total_core_hours: float, data_ingress_gi_b: float, data_egress_gi_b: float, **kwargs) -> None: + super(PoolUsageMetrics, self).__init__(**kwargs) + self.pool_id = pool_id + self.start_time = start_time + self.end_time = end_time + self.vm_size = vm_size + self.total_core_hours = total_core_hours + self.data_ingress_gi_b = data_ingress_gi_b + self.data_egress_gi_b = data_egress_gi_b diff --git a/azure-batch/azure/batch/models/recent_job.py b/azure-batch/azure/batch/models/recent_job.py index f4aa8661a8a4..11d430a5393a 100644 --- a/azure-batch/azure/batch/models/recent_job.py +++ b/azure-batch/azure/batch/models/recent_job.py @@ -26,7 +26,7 @@ class RecentJob(Model): 'url': {'key': 'url', 'type': 'str'}, } - def __init__(self, id=None, url=None): - super(RecentJob, self).__init__() - self.id = id - self.url = url + def __init__(self, **kwargs): + super(RecentJob, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.url = kwargs.get('url', None) diff --git a/azure-batch/azure/batch/models/recent_job_py3.py b/azure-batch/azure/batch/models/recent_job_py3.py new file mode 100644 index 000000000000..94b133aeab05 --- /dev/null +++ b/azure-batch/azure/batch/models/recent_job_py3.py @@ -0,0 +1,32 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class RecentJob(Model): + """Information about the most recent job to run under the job schedule. + + :param id: The ID of the job. + :type id: str + :param url: The URL of the job. + :type url: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'url': {'key': 'url', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, url: str=None, **kwargs) -> None: + super(RecentJob, self).__init__(**kwargs) + self.id = id + self.url = url diff --git a/azure-batch/azure/batch/models/resize_error.py b/azure-batch/azure/batch/models/resize_error.py index 7ed9f536d320..8d166d81a8c3 100644 --- a/azure-batch/azure/batch/models/resize_error.py +++ b/azure-batch/azure/batch/models/resize_error.py @@ -32,8 +32,8 @@ class ResizeError(Model): 'values': {'key': 'values', 'type': '[NameValuePair]'}, } - def __init__(self, code=None, message=None, values=None): - super(ResizeError, self).__init__() - self.code = code - self.message = message - self.values = values + def __init__(self, **kwargs): + super(ResizeError, self).__init__(**kwargs) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) + self.values = kwargs.get('values', None) diff --git a/azure-batch/azure/batch/models/resize_error_py3.py b/azure-batch/azure/batch/models/resize_error_py3.py new file mode 100644 index 000000000000..9e400e601df5 --- /dev/null +++ b/azure-batch/azure/batch/models/resize_error_py3.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ResizeError(Model): + """An error that occurred when resizing a pool. + + :param code: An identifier for the pool resize error. Codes are invariant + and are intended to be consumed programmatically. + :type code: str + :param message: A message describing the pool resize error, intended to be + suitable for display in a user interface. + :type message: str + :param values: A list of additional error details related to the pool + resize error. + :type values: list[~azure.batch.models.NameValuePair] + """ + + _attribute_map = { + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + 'values': {'key': 'values', 'type': '[NameValuePair]'}, + } + + def __init__(self, *, code: str=None, message: str=None, values=None, **kwargs) -> None: + super(ResizeError, self).__init__(**kwargs) + self.code = code + self.message = message + self.values = values diff --git a/azure-batch/azure/batch/models/resource_file.py b/azure-batch/azure/batch/models/resource_file.py index d5178c66d6f6..f7a04764b4a3 100644 --- a/azure-batch/azure/batch/models/resource_file.py +++ b/azure-batch/azure/batch/models/resource_file.py @@ -15,15 +15,17 @@ class ResourceFile(Model): """A file to be downloaded from Azure blob storage to a compute node. - :param blob_source: The URL of the file within Azure Blob Storage. This - URL must be readable using anonymous access; that is, the Batch service - does not present any credentials when downloading the blob. There are two - ways to get such a URL for a blob in Azure storage: include a Shared - Access Signature (SAS) granting read permissions on the blob, or set the - ACL for the blob or its container to allow public access. + All required parameters must be populated in order to send to Azure. + + :param blob_source: Required. The URL of the file within Azure Blob + Storage. This URL must be readable using anonymous access; that is, the + Batch service does not present any credentials when downloading the blob. + There are two ways to get such a URL for a blob in Azure storage: include + a Shared Access Signature (SAS) granting read permissions on the blob, or + set the ACL for the blob or its container to allow public access. :type blob_source: str - :param file_path: The location on the compute node to which to download - the file, relative to the task's working directory. + :param file_path: Required. The location on the compute node to which to + download the file, relative to the task's working directory. :type file_path: str :param file_mode: The file permission mode attribute in octal format. This property applies only to files being downloaded to Linux compute nodes. It @@ -44,8 +46,8 @@ class ResourceFile(Model): 'file_mode': {'key': 'fileMode', 'type': 'str'}, } - def __init__(self, blob_source, file_path, file_mode=None): - super(ResourceFile, self).__init__() - self.blob_source = blob_source - self.file_path = file_path - self.file_mode = file_mode + def __init__(self, **kwargs): + super(ResourceFile, self).__init__(**kwargs) + self.blob_source = kwargs.get('blob_source', None) + self.file_path = kwargs.get('file_path', None) + self.file_mode = kwargs.get('file_mode', None) diff --git a/azure-batch/azure/batch/models/resource_file_py3.py b/azure-batch/azure/batch/models/resource_file_py3.py new file mode 100644 index 000000000000..b7c792e7b587 --- /dev/null +++ b/azure-batch/azure/batch/models/resource_file_py3.py @@ -0,0 +1,53 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ResourceFile(Model): + """A file to be downloaded from Azure blob storage to a compute node. + + All required parameters must be populated in order to send to Azure. + + :param blob_source: Required. The URL of the file within Azure Blob + Storage. This URL must be readable using anonymous access; that is, the + Batch service does not present any credentials when downloading the blob. + There are two ways to get such a URL for a blob in Azure storage: include + a Shared Access Signature (SAS) granting read permissions on the blob, or + set the ACL for the blob or its container to allow public access. + :type blob_source: str + :param file_path: Required. The location on the compute node to which to + download the file, relative to the task's working directory. + :type file_path: str + :param file_mode: The file permission mode attribute in octal format. This + property applies only to files being downloaded to Linux compute nodes. It + will be ignored if it is specified for a resourceFile which will be + downloaded to a Windows node. If this property is not specified for a + Linux node, then a default value of 0770 is applied to the file. + :type file_mode: str + """ + + _validation = { + 'blob_source': {'required': True}, + 'file_path': {'required': True}, + } + + _attribute_map = { + 'blob_source': {'key': 'blobSource', 'type': 'str'}, + 'file_path': {'key': 'filePath', 'type': 'str'}, + 'file_mode': {'key': 'fileMode', 'type': 'str'}, + } + + def __init__(self, *, blob_source: str, file_path: str, file_mode: str=None, **kwargs) -> None: + super(ResourceFile, self).__init__(**kwargs) + self.blob_source = blob_source + self.file_path = file_path + self.file_mode = file_mode diff --git a/azure-batch/azure/batch/models/resource_statistics.py b/azure-batch/azure/batch/models/resource_statistics.py index 39548f017071..5e861d9ef830 100644 --- a/azure-batch/azure/batch/models/resource_statistics.py +++ b/azure-batch/azure/batch/models/resource_statistics.py @@ -15,45 +15,47 @@ class ResourceStatistics(Model): """Statistics related to resource consumption by compute nodes in a pool. - :param start_time: The start time of the time range covered by the - statistics. + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The start time of the time range covered by + the statistics. :type start_time: datetime - :param last_update_time: The time at which the statistics were last - updated. All statistics are limited to the range between startTime and - lastUpdateTime. + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. :type last_update_time: datetime - :param avg_cpu_percentage: The average CPU usage across all nodes in the - pool (percentage per node). + :param avg_cpu_percentage: Required. The average CPU usage across all + nodes in the pool (percentage per node). :type avg_cpu_percentage: float - :param avg_memory_gi_b: The average memory usage in GiB across all nodes - in the pool. + :param avg_memory_gi_b: Required. The average memory usage in GiB across + all nodes in the pool. :type avg_memory_gi_b: float - :param peak_memory_gi_b: The peak memory usage in GiB across all nodes in - the pool. + :param peak_memory_gi_b: Required. The peak memory usage in GiB across all + nodes in the pool. :type peak_memory_gi_b: float - :param avg_disk_gi_b: The average used disk space in GiB across all nodes - in the pool. + :param avg_disk_gi_b: Required. The average used disk space in GiB across + all nodes in the pool. :type avg_disk_gi_b: float - :param peak_disk_gi_b: The peak used disk space in GiB across all nodes in - the pool. + :param peak_disk_gi_b: Required. The peak used disk space in GiB across + all nodes in the pool. :type peak_disk_gi_b: float - :param disk_read_iops: The total number of disk read operations across all - nodes in the pool. + :param disk_read_iops: Required. The total number of disk read operations + across all nodes in the pool. :type disk_read_iops: long - :param disk_write_iops: The total number of disk write operations across - all nodes in the pool. + :param disk_write_iops: Required. The total number of disk write + operations across all nodes in the pool. :type disk_write_iops: long - :param disk_read_gi_b: The total amount of data in GiB of disk reads - across all nodes in the pool. + :param disk_read_gi_b: Required. The total amount of data in GiB of disk + reads across all nodes in the pool. :type disk_read_gi_b: float - :param disk_write_gi_b: The total amount of data in GiB of disk writes - across all nodes in the pool. + :param disk_write_gi_b: Required. The total amount of data in GiB of disk + writes across all nodes in the pool. :type disk_write_gi_b: float - :param network_read_gi_b: The total amount of data in GiB of network reads - across all nodes in the pool. + :param network_read_gi_b: Required. The total amount of data in GiB of + network reads across all nodes in the pool. :type network_read_gi_b: float - :param network_write_gi_b: The total amount of data in GiB of network - writes across all nodes in the pool. + :param network_write_gi_b: Required. The total amount of data in GiB of + network writes across all nodes in the pool. :type network_write_gi_b: float """ @@ -89,18 +91,18 @@ class ResourceStatistics(Model): 'network_write_gi_b': {'key': 'networkWriteGiB', 'type': 'float'}, } - def __init__(self, start_time, last_update_time, avg_cpu_percentage, avg_memory_gi_b, peak_memory_gi_b, avg_disk_gi_b, peak_disk_gi_b, disk_read_iops, disk_write_iops, disk_read_gi_b, disk_write_gi_b, network_read_gi_b, network_write_gi_b): - super(ResourceStatistics, self).__init__() - self.start_time = start_time - self.last_update_time = last_update_time - self.avg_cpu_percentage = avg_cpu_percentage - self.avg_memory_gi_b = avg_memory_gi_b - self.peak_memory_gi_b = peak_memory_gi_b - self.avg_disk_gi_b = avg_disk_gi_b - self.peak_disk_gi_b = peak_disk_gi_b - self.disk_read_iops = disk_read_iops - self.disk_write_iops = disk_write_iops - self.disk_read_gi_b = disk_read_gi_b - self.disk_write_gi_b = disk_write_gi_b - self.network_read_gi_b = network_read_gi_b - self.network_write_gi_b = network_write_gi_b + def __init__(self, **kwargs): + super(ResourceStatistics, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.last_update_time = kwargs.get('last_update_time', None) + self.avg_cpu_percentage = kwargs.get('avg_cpu_percentage', None) + self.avg_memory_gi_b = kwargs.get('avg_memory_gi_b', None) + self.peak_memory_gi_b = kwargs.get('peak_memory_gi_b', None) + self.avg_disk_gi_b = kwargs.get('avg_disk_gi_b', None) + self.peak_disk_gi_b = kwargs.get('peak_disk_gi_b', None) + self.disk_read_iops = kwargs.get('disk_read_iops', None) + self.disk_write_iops = kwargs.get('disk_write_iops', None) + self.disk_read_gi_b = kwargs.get('disk_read_gi_b', None) + self.disk_write_gi_b = kwargs.get('disk_write_gi_b', None) + self.network_read_gi_b = kwargs.get('network_read_gi_b', None) + self.network_write_gi_b = kwargs.get('network_write_gi_b', None) diff --git a/azure-batch/azure/batch/models/resource_statistics_py3.py b/azure-batch/azure/batch/models/resource_statistics_py3.py new file mode 100644 index 000000000000..bcf0830f444a --- /dev/null +++ b/azure-batch/azure/batch/models/resource_statistics_py3.py @@ -0,0 +1,108 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ResourceStatistics(Model): + """Statistics related to resource consumption by compute nodes in a pool. + + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The start time of the time range covered by + the statistics. + :type start_time: datetime + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. + :type last_update_time: datetime + :param avg_cpu_percentage: Required. The average CPU usage across all + nodes in the pool (percentage per node). + :type avg_cpu_percentage: float + :param avg_memory_gi_b: Required. The average memory usage in GiB across + all nodes in the pool. + :type avg_memory_gi_b: float + :param peak_memory_gi_b: Required. The peak memory usage in GiB across all + nodes in the pool. + :type peak_memory_gi_b: float + :param avg_disk_gi_b: Required. The average used disk space in GiB across + all nodes in the pool. + :type avg_disk_gi_b: float + :param peak_disk_gi_b: Required. The peak used disk space in GiB across + all nodes in the pool. + :type peak_disk_gi_b: float + :param disk_read_iops: Required. The total number of disk read operations + across all nodes in the pool. + :type disk_read_iops: long + :param disk_write_iops: Required. The total number of disk write + operations across all nodes in the pool. + :type disk_write_iops: long + :param disk_read_gi_b: Required. The total amount of data in GiB of disk + reads across all nodes in the pool. + :type disk_read_gi_b: float + :param disk_write_gi_b: Required. The total amount of data in GiB of disk + writes across all nodes in the pool. + :type disk_write_gi_b: float + :param network_read_gi_b: Required. The total amount of data in GiB of + network reads across all nodes in the pool. + :type network_read_gi_b: float + :param network_write_gi_b: Required. The total amount of data in GiB of + network writes across all nodes in the pool. + :type network_write_gi_b: float + """ + + _validation = { + 'start_time': {'required': True}, + 'last_update_time': {'required': True}, + 'avg_cpu_percentage': {'required': True}, + 'avg_memory_gi_b': {'required': True}, + 'peak_memory_gi_b': {'required': True}, + 'avg_disk_gi_b': {'required': True}, + 'peak_disk_gi_b': {'required': True}, + 'disk_read_iops': {'required': True}, + 'disk_write_iops': {'required': True}, + 'disk_read_gi_b': {'required': True}, + 'disk_write_gi_b': {'required': True}, + 'network_read_gi_b': {'required': True}, + 'network_write_gi_b': {'required': True}, + } + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'}, + 'avg_cpu_percentage': {'key': 'avgCPUPercentage', 'type': 'float'}, + 'avg_memory_gi_b': {'key': 'avgMemoryGiB', 'type': 'float'}, + 'peak_memory_gi_b': {'key': 'peakMemoryGiB', 'type': 'float'}, + 'avg_disk_gi_b': {'key': 'avgDiskGiB', 'type': 'float'}, + 'peak_disk_gi_b': {'key': 'peakDiskGiB', 'type': 'float'}, + 'disk_read_iops': {'key': 'diskReadIOps', 'type': 'long'}, + 'disk_write_iops': {'key': 'diskWriteIOps', 'type': 'long'}, + 'disk_read_gi_b': {'key': 'diskReadGiB', 'type': 'float'}, + 'disk_write_gi_b': {'key': 'diskWriteGiB', 'type': 'float'}, + 'network_read_gi_b': {'key': 'networkReadGiB', 'type': 'float'}, + 'network_write_gi_b': {'key': 'networkWriteGiB', 'type': 'float'}, + } + + def __init__(self, *, start_time, last_update_time, avg_cpu_percentage: float, avg_memory_gi_b: float, peak_memory_gi_b: float, avg_disk_gi_b: float, peak_disk_gi_b: float, disk_read_iops: int, disk_write_iops: int, disk_read_gi_b: float, disk_write_gi_b: float, network_read_gi_b: float, network_write_gi_b: float, **kwargs) -> None: + super(ResourceStatistics, self).__init__(**kwargs) + self.start_time = start_time + self.last_update_time = last_update_time + self.avg_cpu_percentage = avg_cpu_percentage + self.avg_memory_gi_b = avg_memory_gi_b + self.peak_memory_gi_b = peak_memory_gi_b + self.avg_disk_gi_b = avg_disk_gi_b + self.peak_disk_gi_b = peak_disk_gi_b + self.disk_read_iops = disk_read_iops + self.disk_write_iops = disk_write_iops + self.disk_read_gi_b = disk_read_gi_b + self.disk_write_gi_b = disk_write_gi_b + self.network_read_gi_b = network_read_gi_b + self.network_write_gi_b = network_write_gi_b diff --git a/azure-batch/azure/batch/models/schedule.py b/azure-batch/azure/batch/models/schedule.py index 4070986b8f9a..e6339eb98840 100644 --- a/azure-batch/azure/batch/models/schedule.py +++ b/azure-batch/azure/batch/models/schedule.py @@ -66,9 +66,9 @@ class Schedule(Model): 'recurrence_interval': {'key': 'recurrenceInterval', 'type': 'duration'}, } - def __init__(self, do_not_run_until=None, do_not_run_after=None, start_window=None, recurrence_interval=None): - super(Schedule, self).__init__() - self.do_not_run_until = do_not_run_until - self.do_not_run_after = do_not_run_after - self.start_window = start_window - self.recurrence_interval = recurrence_interval + def __init__(self, **kwargs): + super(Schedule, self).__init__(**kwargs) + self.do_not_run_until = kwargs.get('do_not_run_until', None) + self.do_not_run_after = kwargs.get('do_not_run_after', None) + self.start_window = kwargs.get('start_window', None) + self.recurrence_interval = kwargs.get('recurrence_interval', None) diff --git a/azure-batch/azure/batch/models/schedule_py3.py b/azure-batch/azure/batch/models/schedule_py3.py new file mode 100644 index 000000000000..66ab18a44f61 --- /dev/null +++ b/azure-batch/azure/batch/models/schedule_py3.py @@ -0,0 +1,74 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class Schedule(Model): + """The schedule according to which jobs will be created. + + :param do_not_run_until: The earliest time at which any job may be created + under this job schedule. If you do not specify a doNotRunUntil time, the + schedule becomes ready to create jobs immediately. + :type do_not_run_until: datetime + :param do_not_run_after: A time after which no job will be created under + this job schedule. The schedule will move to the completed state as soon + as this deadline is past and there is no active job under this job + schedule. If you do not specify a doNotRunAfter time, and you are creating + a recurring job schedule, the job schedule will remain active until you + explicitly terminate it. + :type do_not_run_after: datetime + :param start_window: The time interval, starting from the time at which + the schedule indicates a job should be created, within which a job must be + created. If a job is not created within the startWindow interval, then the + 'opportunity' is lost; no job will be created until the next recurrence of + the schedule. If the schedule is recurring, and the startWindow is longer + than the recurrence interval, then this is equivalent to an infinite + startWindow, because the job that is 'due' in one recurrenceInterval is + not carried forward into the next recurrence interval. The default is + infinite. The minimum value is 1 minute. If you specify a lower value, the + Batch service rejects the schedule with an error; if you are calling the + REST API directly, the HTTP status code is 400 (Bad Request). + :type start_window: timedelta + :param recurrence_interval: The time interval between the start times of + two successive jobs under the job schedule. A job schedule can have at + most one active job under it at any given time. Because a job schedule can + have at most one active job under it at any given time, if it is time to + create a new job under a job schedule, but the previous job is still + running, the Batch service will not create the new job until the previous + job finishes. If the previous job does not finish within the startWindow + period of the new recurrenceInterval, then no new job will be scheduled + for that interval. For recurring jobs, you should normally specify a + jobManagerTask in the jobSpecification. If you do not use jobManagerTask, + you will need an external process to monitor when jobs are created, add + tasks to the jobs and terminate the jobs ready for the next recurrence. + The default is that the schedule does not recur: one job is created, + within the startWindow after the doNotRunUntil time, and the schedule is + complete as soon as that job finishes. The minimum value is 1 minute. If + you specify a lower value, the Batch service rejects the schedule with an + error; if you are calling the REST API directly, the HTTP status code is + 400 (Bad Request). + :type recurrence_interval: timedelta + """ + + _attribute_map = { + 'do_not_run_until': {'key': 'doNotRunUntil', 'type': 'iso-8601'}, + 'do_not_run_after': {'key': 'doNotRunAfter', 'type': 'iso-8601'}, + 'start_window': {'key': 'startWindow', 'type': 'duration'}, + 'recurrence_interval': {'key': 'recurrenceInterval', 'type': 'duration'}, + } + + def __init__(self, *, do_not_run_until=None, do_not_run_after=None, start_window=None, recurrence_interval=None, **kwargs) -> None: + super(Schedule, self).__init__(**kwargs) + self.do_not_run_until = do_not_run_until + self.do_not_run_after = do_not_run_after + self.start_window = start_window + self.recurrence_interval = recurrence_interval diff --git a/azure-batch/azure/batch/models/start_task.py b/azure-batch/azure/batch/models/start_task.py index b455e0106e09..9f0ad707b635 100644 --- a/azure-batch/azure/batch/models/start_task.py +++ b/azure-batch/azure/batch/models/start_task.py @@ -27,14 +27,16 @@ class StartTask(Model): data. The best practice for long running tasks is to use some form of checkpointing. - :param command_line: The command line of the start task. The command line - does not run under a shell, and therefore cannot take advantage of shell - features such as environment variable expansion. If you want to take - advantage of such features, you should invoke the shell in the command - line, for example using "cmd /c MyCommand" in Windows or "/bin/sh -c - MyCommand" in Linux. If the command line refers to file paths, it should - use a relative path (relative to the task working directory), or use the - Batch provided environment variable + All required parameters must be populated in order to send to Azure. + + :param command_line: Required. The command line of the start task. The + command line does not run under a shell, and therefore cannot take + advantage of shell features such as environment variable expansion. If you + want to take advantage of such features, you should invoke the shell in + the command line, for example using "cmd /c MyCommand" in Windows or + "/bin/sh -c MyCommand" in Linux. If the command line refers to file paths, + it should use a relative path (relative to the task working directory), or + use the Batch provided environment variable (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). :type command_line: str :param container_settings: The settings for the container under which the @@ -45,8 +47,13 @@ class StartTask(Model): container. :type container_settings: ~azure.batch.models.TaskContainerSettings :param resource_files: A list of files that the Batch service will - download to the compute node before running the command line. Files listed - under this element are located in the task's working directory. + download to the compute node before running the command line. There is a + maximum size for the list of resource files. When the max size is + exceeded, the request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. Files listed under this + element are located in the task's working directory. :type resource_files: list[~azure.batch.models.ResourceFile] :param environment_settings: A list of environment variable settings for the start task. @@ -92,12 +99,12 @@ class StartTask(Model): 'wait_for_success': {'key': 'waitForSuccess', 'type': 'bool'}, } - def __init__(self, command_line, container_settings=None, resource_files=None, environment_settings=None, user_identity=None, max_task_retry_count=None, wait_for_success=None): - super(StartTask, self).__init__() - self.command_line = command_line - self.container_settings = container_settings - self.resource_files = resource_files - self.environment_settings = environment_settings - self.user_identity = user_identity - self.max_task_retry_count = max_task_retry_count - self.wait_for_success = wait_for_success + def __init__(self, **kwargs): + super(StartTask, self).__init__(**kwargs) + self.command_line = kwargs.get('command_line', None) + self.container_settings = kwargs.get('container_settings', None) + self.resource_files = kwargs.get('resource_files', None) + self.environment_settings = kwargs.get('environment_settings', None) + self.user_identity = kwargs.get('user_identity', None) + self.max_task_retry_count = kwargs.get('max_task_retry_count', None) + self.wait_for_success = kwargs.get('wait_for_success', None) diff --git a/azure-batch/azure/batch/models/start_task_information.py b/azure-batch/azure/batch/models/start_task_information.py index 79f320658714..e8b68b0812df 100644 --- a/azure-batch/azure/batch/models/start_task_information.py +++ b/azure-batch/azure/batch/models/start_task_information.py @@ -15,12 +15,15 @@ class StartTaskInformation(Model): """Information about a start task running on a compute node. - :param state: The state of the start task on the compute node. Possible - values include: 'running', 'completed' + All required parameters must be populated in order to send to Azure. + + :param state: Required. The state of the start task on the compute node. + Possible values include: 'running', 'completed' :type state: str or ~azure.batch.models.StartTaskState - :param start_time: The time at which the start task started running. This - value is reset every time the task is restarted or retried (that is, this - is the most recent time at which the start task started running). + :param start_time: Required. The time at which the start task started + running. This value is reset every time the task is restarted or retried + (that is, this is the most recent time at which the start task started + running). :type start_time: datetime :param end_time: The time at which the start task stopped running. This is the end time of the most recent run of the start task, if that run has @@ -46,11 +49,11 @@ class StartTaskInformation(Model): property is set only if the task is in the completed state and encountered a failure. :type failure_info: ~azure.batch.models.TaskFailureInformation - :param retry_count: The number of times the task has been retried by the - Batch service. Task application failures (non-zero exit code) are retried, - pre-processing errors (the task could not be run) and file upload errors - are not retried. The Batch service will retry the task up to the limit - specified by the constraints. + :param retry_count: Required. The number of times the task has been + retried by the Batch service. Task application failures (non-zero exit + code) are retried, pre-processing errors (the task could not be run) and + file upload errors are not retried. The Batch service will retry the task + up to the limit specified by the constraints. :type retry_count: int :param last_retry_time: The most recent time at which a retry of the task started running. This element is present only if the task was retried @@ -83,14 +86,14 @@ class StartTaskInformation(Model): 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, } - def __init__(self, state, start_time, retry_count, end_time=None, exit_code=None, container_info=None, failure_info=None, last_retry_time=None, result=None): - super(StartTaskInformation, self).__init__() - self.state = state - self.start_time = start_time - self.end_time = end_time - self.exit_code = exit_code - self.container_info = container_info - self.failure_info = failure_info - self.retry_count = retry_count - self.last_retry_time = last_retry_time - self.result = result + def __init__(self, **kwargs): + super(StartTaskInformation, self).__init__(**kwargs) + self.state = kwargs.get('state', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.exit_code = kwargs.get('exit_code', None) + self.container_info = kwargs.get('container_info', None) + self.failure_info = kwargs.get('failure_info', None) + self.retry_count = kwargs.get('retry_count', None) + self.last_retry_time = kwargs.get('last_retry_time', None) + self.result = kwargs.get('result', None) diff --git a/azure-batch/azure/batch/models/start_task_information_py3.py b/azure-batch/azure/batch/models/start_task_information_py3.py new file mode 100644 index 000000000000..cb434ab21729 --- /dev/null +++ b/azure-batch/azure/batch/models/start_task_information_py3.py @@ -0,0 +1,99 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class StartTaskInformation(Model): + """Information about a start task running on a compute node. + + All required parameters must be populated in order to send to Azure. + + :param state: Required. The state of the start task on the compute node. + Possible values include: 'running', 'completed' + :type state: str or ~azure.batch.models.StartTaskState + :param start_time: Required. The time at which the start task started + running. This value is reset every time the task is restarted or retried + (that is, this is the most recent time at which the start task started + running). + :type start_time: datetime + :param end_time: The time at which the start task stopped running. This is + the end time of the most recent run of the start task, if that run has + completed (even if that run failed and a retry is pending). This element + is not present if the start task is currently running. + :type end_time: datetime + :param exit_code: The exit code of the program specified on the start task + command line. This property is set only if the start task is in the + completed state. In general, the exit code for a process reflects the + specific convention implemented by the application developer for that + process. If you use the exit code value to make decisions in your code, be + sure that you know the exit code convention used by the application + process. However, if the Batch service terminates the start task (due to + timeout, or user termination via the API) you may see an operating + system-defined exit code. + :type exit_code: int + :param container_info: Information about the container under which the + task is executing. This property is set only if the task runs in a + container context. + :type container_info: + ~azure.batch.models.TaskContainerExecutionInformation + :param failure_info: Information describing the task failure, if any. This + property is set only if the task is in the completed state and encountered + a failure. + :type failure_info: ~azure.batch.models.TaskFailureInformation + :param retry_count: Required. The number of times the task has been + retried by the Batch service. Task application failures (non-zero exit + code) are retried, pre-processing errors (the task could not be run) and + file upload errors are not retried. The Batch service will retry the task + up to the limit specified by the constraints. + :type retry_count: int + :param last_retry_time: The most recent time at which a retry of the task + started running. This element is present only if the task was retried + (i.e. retryCount is nonzero). If present, this is typically the same as + startTime, but may be different if the task has been restarted for reasons + other than retry; for example, if the compute node was rebooted during a + retry, then the startTime is updated but the lastRetryTime is not. + :type last_retry_time: datetime + :param result: The result of the task execution. If the value is 'failed', + then the details of the failure can be found in the failureInfo property. + Possible values include: 'success', 'failure' + :type result: str or ~azure.batch.models.TaskExecutionResult + """ + + _validation = { + 'state': {'required': True}, + 'start_time': {'required': True}, + 'retry_count': {'required': True}, + } + + _attribute_map = { + 'state': {'key': 'state', 'type': 'StartTaskState'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'exit_code': {'key': 'exitCode', 'type': 'int'}, + 'container_info': {'key': 'containerInfo', 'type': 'TaskContainerExecutionInformation'}, + 'failure_info': {'key': 'failureInfo', 'type': 'TaskFailureInformation'}, + 'retry_count': {'key': 'retryCount', 'type': 'int'}, + 'last_retry_time': {'key': 'lastRetryTime', 'type': 'iso-8601'}, + 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, + } + + def __init__(self, *, state, start_time, retry_count: int, end_time=None, exit_code: int=None, container_info=None, failure_info=None, last_retry_time=None, result=None, **kwargs) -> None: + super(StartTaskInformation, self).__init__(**kwargs) + self.state = state + self.start_time = start_time + self.end_time = end_time + self.exit_code = exit_code + self.container_info = container_info + self.failure_info = failure_info + self.retry_count = retry_count + self.last_retry_time = last_retry_time + self.result = result diff --git a/azure-batch/azure/batch/models/start_task_py3.py b/azure-batch/azure/batch/models/start_task_py3.py new file mode 100644 index 000000000000..7fb958151b3e --- /dev/null +++ b/azure-batch/azure/batch/models/start_task_py3.py @@ -0,0 +1,110 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class StartTask(Model): + """A task which is run when a compute node joins a pool in the Azure Batch + service, or when the compute node is rebooted or reimaged. + + Batch will retry tasks when a recovery operation is triggered on a compute + node. Examples of recovery operations include (but are not limited to) when + an unhealthy compute node is rebooted or a compute node disappeared due to + host failure. Retries due to recovery operations are independent of and are + not counted against the maxTaskRetryCount. Even if the maxTaskRetryCount is + 0, an internal retry due to a recovery operation may occur. Because of + this, all tasks should be idempotent. This means tasks need to tolerate + being interrupted and restarted without causing any corruption or duplicate + data. The best practice for long running tasks is to use some form of + checkpointing. + + All required parameters must be populated in order to send to Azure. + + :param command_line: Required. The command line of the start task. The + command line does not run under a shell, and therefore cannot take + advantage of shell features such as environment variable expansion. If you + want to take advantage of such features, you should invoke the shell in + the command line, for example using "cmd /c MyCommand" in Windows or + "/bin/sh -c MyCommand" in Linux. If the command line refers to file paths, + it should use a relative path (relative to the task working directory), or + use the Batch provided environment variable + (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). + :type command_line: str + :param container_settings: The settings for the container under which the + start task runs. When this is specified, all directories recursively below + the AZ_BATCH_NODE_ROOT_DIR (the root of Azure Batch directories on the + node) are mapped into the container, all task environment variables are + mapped into the container, and the task command line is executed in the + container. + :type container_settings: ~azure.batch.models.TaskContainerSettings + :param resource_files: A list of files that the Batch service will + download to the compute node before running the command line. There is a + maximum size for the list of resource files. When the max size is + exceeded, the request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. Files listed under this + element are located in the task's working directory. + :type resource_files: list[~azure.batch.models.ResourceFile] + :param environment_settings: A list of environment variable settings for + the start task. + :type environment_settings: list[~azure.batch.models.EnvironmentSetting] + :param user_identity: The user identity under which the start task runs. + If omitted, the task runs as a non-administrative user unique to the task. + :type user_identity: ~azure.batch.models.UserIdentity + :param max_task_retry_count: The maximum number of times the task may be + retried. The Batch service retries a task if its exit code is nonzero. + Note that this value specifically controls the number of retries. The + Batch service will try the task once, and may then retry up to this limit. + For example, if the maximum retry count is 3, Batch tries the task up to 4 + times (one initial try and 3 retries). If the maximum retry count is 0, + the Batch service does not retry the task. If the maximum retry count is + -1, the Batch service retries the task without limit. + :type max_task_retry_count: int + :param wait_for_success: Whether the Batch service should wait for the + start task to complete successfully (that is, to exit with exit code 0) + before scheduling any tasks on the compute node. If true and the start + task fails on a compute node, the Batch service retries the start task up + to its maximum retry count (maxTaskRetryCount). If the task has still not + completed successfully after all retries, then the Batch service marks the + compute node unusable, and will not schedule tasks to it. This condition + can be detected via the node state and failure info details. If false, the + Batch service will not wait for the start task to complete. In this case, + other tasks can start executing on the compute node while the start task + is still running; and even if the start task fails, new tasks will + continue to be scheduled on the node. The default is false. + :type wait_for_success: bool + """ + + _validation = { + 'command_line': {'required': True}, + } + + _attribute_map = { + 'command_line': {'key': 'commandLine', 'type': 'str'}, + 'container_settings': {'key': 'containerSettings', 'type': 'TaskContainerSettings'}, + 'resource_files': {'key': 'resourceFiles', 'type': '[ResourceFile]'}, + 'environment_settings': {'key': 'environmentSettings', 'type': '[EnvironmentSetting]'}, + 'user_identity': {'key': 'userIdentity', 'type': 'UserIdentity'}, + 'max_task_retry_count': {'key': 'maxTaskRetryCount', 'type': 'int'}, + 'wait_for_success': {'key': 'waitForSuccess', 'type': 'bool'}, + } + + def __init__(self, *, command_line: str, container_settings=None, resource_files=None, environment_settings=None, user_identity=None, max_task_retry_count: int=None, wait_for_success: bool=None, **kwargs) -> None: + super(StartTask, self).__init__(**kwargs) + self.command_line = command_line + self.container_settings = container_settings + self.resource_files = resource_files + self.environment_settings = environment_settings + self.user_identity = user_identity + self.max_task_retry_count = max_task_retry_count + self.wait_for_success = wait_for_success diff --git a/azure-batch/azure/batch/models/subtask_information.py b/azure-batch/azure/batch/models/subtask_information.py index 48ff530ae8d6..dbbff70448ec 100644 --- a/azure-batch/azure/batch/models/subtask_information.py +++ b/azure-batch/azure/batch/models/subtask_information.py @@ -81,17 +81,17 @@ class SubtaskInformation(Model): 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, } - def __init__(self, id=None, node_info=None, start_time=None, end_time=None, exit_code=None, container_info=None, failure_info=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, result=None): - super(SubtaskInformation, self).__init__() - self.id = id - self.node_info = node_info - self.start_time = start_time - self.end_time = end_time - self.exit_code = exit_code - self.container_info = container_info - self.failure_info = failure_info - self.state = state - self.state_transition_time = state_transition_time - self.previous_state = previous_state - self.previous_state_transition_time = previous_state_transition_time - self.result = result + def __init__(self, **kwargs): + super(SubtaskInformation, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.node_info = kwargs.get('node_info', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.exit_code = kwargs.get('exit_code', None) + self.container_info = kwargs.get('container_info', None) + self.failure_info = kwargs.get('failure_info', None) + self.state = kwargs.get('state', None) + self.state_transition_time = kwargs.get('state_transition_time', None) + self.previous_state = kwargs.get('previous_state', None) + self.previous_state_transition_time = kwargs.get('previous_state_transition_time', None) + self.result = kwargs.get('result', None) diff --git a/azure-batch/azure/batch/models/subtask_information_py3.py b/azure-batch/azure/batch/models/subtask_information_py3.py new file mode 100644 index 000000000000..1399c8660186 --- /dev/null +++ b/azure-batch/azure/batch/models/subtask_information_py3.py @@ -0,0 +1,97 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class SubtaskInformation(Model): + """Information about an Azure Batch subtask. + + :param id: The ID of the subtask. + :type id: int + :param node_info: Information about the compute node on which the subtask + ran. + :type node_info: ~azure.batch.models.ComputeNodeInformation + :param start_time: The time at which the subtask started running. If the + subtask has been restarted or retried, this is the most recent time at + which the subtask started running. + :type start_time: datetime + :param end_time: The time at which the subtask completed. This property is + set only if the subtask is in the Completed state. + :type end_time: datetime + :param exit_code: The exit code of the program specified on the subtask + command line. This property is set only if the subtask is in the completed + state. In general, the exit code for a process reflects the specific + convention implemented by the application developer for that process. If + you use the exit code value to make decisions in your code, be sure that + you know the exit code convention used by the application process. + However, if the Batch service terminates the subtask (due to timeout, or + user termination via the API) you may see an operating system-defined exit + code. + :type exit_code: int + :param container_info: Information about the container under which the + task is executing. This property is set only if the task runs in a + container context. + :type container_info: + ~azure.batch.models.TaskContainerExecutionInformation + :param failure_info: Information describing the task failure, if any. This + property is set only if the task is in the completed state and encountered + a failure. + :type failure_info: ~azure.batch.models.TaskFailureInformation + :param state: The current state of the subtask. Possible values include: + 'preparing', 'running', 'completed' + :type state: str or ~azure.batch.models.SubtaskState + :param state_transition_time: The time at which the subtask entered its + current state. + :type state_transition_time: datetime + :param previous_state: The previous state of the subtask. This property is + not set if the subtask is in its initial running state. Possible values + include: 'preparing', 'running', 'completed' + :type previous_state: str or ~azure.batch.models.SubtaskState + :param previous_state_transition_time: The time at which the subtask + entered its previous state. This property is not set if the subtask is in + its initial running state. + :type previous_state_transition_time: datetime + :param result: The result of the task execution. If the value is 'failed', + then the details of the failure can be found in the failureInfo property. + Possible values include: 'success', 'failure' + :type result: str or ~azure.batch.models.TaskExecutionResult + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'int'}, + 'node_info': {'key': 'nodeInfo', 'type': 'ComputeNodeInformation'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'exit_code': {'key': 'exitCode', 'type': 'int'}, + 'container_info': {'key': 'containerInfo', 'type': 'TaskContainerExecutionInformation'}, + 'failure_info': {'key': 'failureInfo', 'type': 'TaskFailureInformation'}, + 'state': {'key': 'state', 'type': 'SubtaskState'}, + 'state_transition_time': {'key': 'stateTransitionTime', 'type': 'iso-8601'}, + 'previous_state': {'key': 'previousState', 'type': 'SubtaskState'}, + 'previous_state_transition_time': {'key': 'previousStateTransitionTime', 'type': 'iso-8601'}, + 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, + } + + def __init__(self, *, id: int=None, node_info=None, start_time=None, end_time=None, exit_code: int=None, container_info=None, failure_info=None, state=None, state_transition_time=None, previous_state=None, previous_state_transition_time=None, result=None, **kwargs) -> None: + super(SubtaskInformation, self).__init__(**kwargs) + self.id = id + self.node_info = node_info + self.start_time = start_time + self.end_time = end_time + self.exit_code = exit_code + self.container_info = container_info + self.failure_info = failure_info + self.state = state + self.state_transition_time = state_transition_time + self.previous_state = previous_state + self.previous_state_transition_time = previous_state_transition_time + self.result = result diff --git a/azure-batch/azure/batch/models/task_add_collection_options.py b/azure-batch/azure/batch/models/task_add_collection_options.py index d74fafab7c08..f0622c9c6dfc 100644 --- a/azure-batch/azure/batch/models/task_add_collection_options.py +++ b/azure-batch/azure/batch/models/task_add_collection_options.py @@ -31,9 +31,16 @@ class TaskAddCollectionOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(TaskAddCollectionOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskAddCollectionOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/task_add_collection_options_py3.py b/azure-batch/azure/batch/models/task_add_collection_options_py3.py new file mode 100644 index 000000000000..634f522c04f0 --- /dev/null +++ b/azure-batch/azure/batch/models/task_add_collection_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskAddCollectionOptions(Model): + """Additional parameters for add_collection operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(TaskAddCollectionOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/task_add_collection_parameter.py b/azure-batch/azure/batch/models/task_add_collection_parameter.py index bfa88fff8419..56b615c4a7a1 100644 --- a/azure-batch/azure/batch/models/task_add_collection_parameter.py +++ b/azure-batch/azure/batch/models/task_add_collection_parameter.py @@ -15,11 +15,13 @@ class TaskAddCollectionParameter(Model): """A collection of Azure Batch tasks to add. - :param value: The collection of tasks to add. The total serialized size of - this collection must be less than 4MB. If it is greater than 4MB (for - example if each task has 100's of resource files or environment - variables), the request will fail with code 'RequestBodyTooLarge' and - should be retried again with fewer tasks. + All required parameters must be populated in order to send to Azure. + + :param value: Required. The collection of tasks to add. The maximum count + of tasks is 100. The total serialized size of this collection must be less + than 1MB. If it is greater than 1MB (for example if each task has 100's of + resource files or environment variables), the request will fail with code + 'RequestBodyTooLarge' and should be retried again with fewer tasks. :type value: list[~azure.batch.models.TaskAddParameter] """ @@ -31,6 +33,6 @@ class TaskAddCollectionParameter(Model): 'value': {'key': 'value', 'type': '[TaskAddParameter]'}, } - def __init__(self, value): - super(TaskAddCollectionParameter, self).__init__() - self.value = value + def __init__(self, **kwargs): + super(TaskAddCollectionParameter, self).__init__(**kwargs) + self.value = kwargs.get('value', None) diff --git a/azure-batch/azure/batch/models/task_add_collection_parameter_py3.py b/azure-batch/azure/batch/models/task_add_collection_parameter_py3.py new file mode 100644 index 000000000000..bfeaf536c43a --- /dev/null +++ b/azure-batch/azure/batch/models/task_add_collection_parameter_py3.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskAddCollectionParameter(Model): + """A collection of Azure Batch tasks to add. + + All required parameters must be populated in order to send to Azure. + + :param value: Required. The collection of tasks to add. The maximum count + of tasks is 100. The total serialized size of this collection must be less + than 1MB. If it is greater than 1MB (for example if each task has 100's of + resource files or environment variables), the request will fail with code + 'RequestBodyTooLarge' and should be retried again with fewer tasks. + :type value: list[~azure.batch.models.TaskAddParameter] + """ + + _validation = { + 'value': {'required': True, 'max_items': 100}, + } + + _attribute_map = { + 'value': {'key': 'value', 'type': '[TaskAddParameter]'}, + } + + def __init__(self, *, value, **kwargs) -> None: + super(TaskAddCollectionParameter, self).__init__(**kwargs) + self.value = value diff --git a/azure-batch/azure/batch/models/task_add_collection_result.py b/azure-batch/azure/batch/models/task_add_collection_result.py index 8811388c8e3e..0dbc142075ad 100644 --- a/azure-batch/azure/batch/models/task_add_collection_result.py +++ b/azure-batch/azure/batch/models/task_add_collection_result.py @@ -23,6 +23,6 @@ class TaskAddCollectionResult(Model): 'value': {'key': 'value', 'type': '[TaskAddResult]'}, } - def __init__(self, value=None): - super(TaskAddCollectionResult, self).__init__() - self.value = value + def __init__(self, **kwargs): + super(TaskAddCollectionResult, self).__init__(**kwargs) + self.value = kwargs.get('value', None) diff --git a/azure-batch/azure/batch/models/task_add_collection_result_py3.py b/azure-batch/azure/batch/models/task_add_collection_result_py3.py new file mode 100644 index 000000000000..06cde63a9c5a --- /dev/null +++ b/azure-batch/azure/batch/models/task_add_collection_result_py3.py @@ -0,0 +1,28 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskAddCollectionResult(Model): + """The result of adding a collection of tasks to a job. + + :param value: The results of the add task collection operation. + :type value: list[~azure.batch.models.TaskAddResult] + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': '[TaskAddResult]'}, + } + + def __init__(self, *, value=None, **kwargs) -> None: + super(TaskAddCollectionResult, self).__init__(**kwargs) + self.value = value diff --git a/azure-batch/azure/batch/models/task_add_options.py b/azure-batch/azure/batch/models/task_add_options.py index 53482e408885..667cc19d1208 100644 --- a/azure-batch/azure/batch/models/task_add_options.py +++ b/azure-batch/azure/batch/models/task_add_options.py @@ -31,9 +31,16 @@ class TaskAddOptions(Model): :type ocp_date: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(TaskAddOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskAddOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/task_add_options_py3.py b/azure-batch/azure/batch/models/task_add_options_py3.py new file mode 100644 index 000000000000..da9c6a8c3e46 --- /dev/null +++ b/azure-batch/azure/batch/models/task_add_options_py3.py @@ -0,0 +1,46 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskAddOptions(Model): + """Additional parameters for add operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(TaskAddOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/task_add_parameter.py b/azure-batch/azure/batch/models/task_add_parameter.py index cf752aefd842..c0ac69877a6d 100644 --- a/azure-batch/azure/batch/models/task_add_parameter.py +++ b/azure-batch/azure/batch/models/task_add_parameter.py @@ -26,26 +26,28 @@ class TaskAddParameter(Model): data. The best practice for long running tasks is to use some form of checkpointing. - :param id: A string that uniquely identifies the task within the job. The - ID can contain any combination of alphanumeric characters including - hyphens and underscores, and cannot contain more than 64 characters. The - ID is case-preserving and case-insensitive (that is, you may not have two - IDs within a job that differ only by case). + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the task within the + job. The ID can contain any combination of alphanumeric characters + including hyphens and underscores, and cannot contain more than 64 + characters. The ID is case-preserving and case-insensitive (that is, you + may not have two IDs within a job that differ only by case). :type id: str :param display_name: A display name for the task. The display name need not be unique and can contain any Unicode characters up to a maximum length of 1024. :type display_name: str - :param command_line: The command line of the task. For multi-instance - tasks, the command line is executed as the primary task, after the primary - task and all subtasks have finished executing the coordination command - line. The command line does not run under a shell, and therefore cannot - take advantage of shell features such as environment variable expansion. - If you want to take advantage of such features, you should invoke the - shell in the command line, for example using "cmd /c MyCommand" in Windows - or "/bin/sh -c MyCommand" in Linux. If the command line refers to file - paths, it should use a relative path (relative to the task working - directory), or use the Batch provided environment variable + :param command_line: Required. The command line of the task. For + multi-instance tasks, the command line is executed as the primary task, + after the primary task and all subtasks have finished executing the + coordination command line. The command line does not run under a shell, + and therefore cannot take advantage of shell features such as environment + variable expansion. If you want to take advantage of such features, you + should invoke the shell in the command line, for example using "cmd /c + MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux. If the command + line refers to file paths, it should use a relative path (relative to the + task working directory), or use the Batch provided environment variable (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). :type command_line: str :param container_settings: The settings for the container under which the @@ -63,7 +65,12 @@ class TaskAddParameter(Model): :param resource_files: A list of files that the Batch service will download to the compute node before running the command line. For multi-instance tasks, the resource files will only be downloaded to the - compute node on which the primary task is executed. + compute node on which the primary task is executed. There is a maximum + size for the list of resource files. When the max size is exceeded, the + request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. :type resource_files: list[~azure.batch.models.ResourceFile] :param output_files: A list of files that the Batch service will upload from the compute node after running the command line. For multi-instance @@ -141,20 +148,20 @@ class TaskAddParameter(Model): 'authentication_token_settings': {'key': 'authenticationTokenSettings', 'type': 'AuthenticationTokenSettings'}, } - def __init__(self, id, command_line, display_name=None, container_settings=None, exit_conditions=None, resource_files=None, output_files=None, environment_settings=None, affinity_info=None, constraints=None, user_identity=None, multi_instance_settings=None, depends_on=None, application_package_references=None, authentication_token_settings=None): - super(TaskAddParameter, self).__init__() - self.id = id - self.display_name = display_name - self.command_line = command_line - self.container_settings = container_settings - self.exit_conditions = exit_conditions - self.resource_files = resource_files - self.output_files = output_files - self.environment_settings = environment_settings - self.affinity_info = affinity_info - self.constraints = constraints - self.user_identity = user_identity - self.multi_instance_settings = multi_instance_settings - self.depends_on = depends_on - self.application_package_references = application_package_references - self.authentication_token_settings = authentication_token_settings + def __init__(self, **kwargs): + super(TaskAddParameter, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.display_name = kwargs.get('display_name', None) + self.command_line = kwargs.get('command_line', None) + self.container_settings = kwargs.get('container_settings', None) + self.exit_conditions = kwargs.get('exit_conditions', None) + self.resource_files = kwargs.get('resource_files', None) + self.output_files = kwargs.get('output_files', None) + self.environment_settings = kwargs.get('environment_settings', None) + self.affinity_info = kwargs.get('affinity_info', None) + self.constraints = kwargs.get('constraints', None) + self.user_identity = kwargs.get('user_identity', None) + self.multi_instance_settings = kwargs.get('multi_instance_settings', None) + self.depends_on = kwargs.get('depends_on', None) + self.application_package_references = kwargs.get('application_package_references', None) + self.authentication_token_settings = kwargs.get('authentication_token_settings', None) diff --git a/azure-batch/azure/batch/models/task_add_parameter_py3.py b/azure-batch/azure/batch/models/task_add_parameter_py3.py new file mode 100644 index 000000000000..31f571e71d31 --- /dev/null +++ b/azure-batch/azure/batch/models/task_add_parameter_py3.py @@ -0,0 +1,167 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskAddParameter(Model): + """An Azure Batch task to add. + + Batch will retry tasks when a recovery operation is triggered on a compute + node. Examples of recovery operations include (but are not limited to) when + an unhealthy compute node is rebooted or a compute node disappeared due to + host failure. Retries due to recovery operations are independent of and are + not counted against the maxTaskRetryCount. Even if the maxTaskRetryCount is + 0, an internal retry due to a recovery operation may occur. Because of + this, all tasks should be idempotent. This means tasks need to tolerate + being interrupted and restarted without causing any corruption or duplicate + data. The best practice for long running tasks is to use some form of + checkpointing. + + All required parameters must be populated in order to send to Azure. + + :param id: Required. A string that uniquely identifies the task within the + job. The ID can contain any combination of alphanumeric characters + including hyphens and underscores, and cannot contain more than 64 + characters. The ID is case-preserving and case-insensitive (that is, you + may not have two IDs within a job that differ only by case). + :type id: str + :param display_name: A display name for the task. The display name need + not be unique and can contain any Unicode characters up to a maximum + length of 1024. + :type display_name: str + :param command_line: Required. The command line of the task. For + multi-instance tasks, the command line is executed as the primary task, + after the primary task and all subtasks have finished executing the + coordination command line. The command line does not run under a shell, + and therefore cannot take advantage of shell features such as environment + variable expansion. If you want to take advantage of such features, you + should invoke the shell in the command line, for example using "cmd /c + MyCommand" in Windows or "/bin/sh -c MyCommand" in Linux. If the command + line refers to file paths, it should use a relative path (relative to the + task working directory), or use the Batch provided environment variable + (https://docs.microsoft.com/en-us/azure/batch/batch-compute-node-environment-variables). + :type command_line: str + :param container_settings: The settings for the container under which the + task runs. If the pool that will run this task has containerConfiguration + set, this must be set as well. If the pool that will run this task doesn't + have containerConfiguration set, this must not be set. When this is + specified, all directories recursively below the AZ_BATCH_NODE_ROOT_DIR + (the root of Azure Batch directories on the node) are mapped into the + container, all task environment variables are mapped into the container, + and the task command line is executed in the container. + :type container_settings: ~azure.batch.models.TaskContainerSettings + :param exit_conditions: How the Batch service should respond when the task + completes. + :type exit_conditions: ~azure.batch.models.ExitConditions + :param resource_files: A list of files that the Batch service will + download to the compute node before running the command line. For + multi-instance tasks, the resource files will only be downloaded to the + compute node on which the primary task is executed. There is a maximum + size for the list of resource files. When the max size is exceeded, the + request will fail and the response error code will be + RequestEntityTooLarge. If this occurs, the collection of ResourceFiles + must be reduced in size. This can be achieved using .zip files, + Application Packages, or Docker Containers. + :type resource_files: list[~azure.batch.models.ResourceFile] + :param output_files: A list of files that the Batch service will upload + from the compute node after running the command line. For multi-instance + tasks, the files will only be uploaded from the compute node on which the + primary task is executed. + :type output_files: list[~azure.batch.models.OutputFile] + :param environment_settings: A list of environment variable settings for + the task. + :type environment_settings: list[~azure.batch.models.EnvironmentSetting] + :param affinity_info: A locality hint that can be used by the Batch + service to select a compute node on which to start the new task. + :type affinity_info: ~azure.batch.models.AffinityInformation + :param constraints: The execution constraints that apply to this task. If + you do not specify constraints, the maxTaskRetryCount is the + maxTaskRetryCount specified for the job, and the maxWallClockTime and + retentionTime are infinite. + :type constraints: ~azure.batch.models.TaskConstraints + :param user_identity: The user identity under which the task runs. If + omitted, the task runs as a non-administrative user unique to the task. + :type user_identity: ~azure.batch.models.UserIdentity + :param multi_instance_settings: An object that indicates that the task is + a multi-instance task, and contains information about how to run the + multi-instance task. + :type multi_instance_settings: ~azure.batch.models.MultiInstanceSettings + :param depends_on: The tasks that this task depends on. This task will not + be scheduled until all tasks that it depends on have completed + successfully. If any of those tasks fail and exhaust their retry counts, + this task will never be scheduled. If the job does not have + usesTaskDependencies set to true, and this element is present, the request + fails with error code TaskDependenciesNotSpecifiedOnJob. + :type depends_on: ~azure.batch.models.TaskDependencies + :param application_package_references: A list of application packages that + the Batch service will deploy to the compute node before running the + command line. Application packages are downloaded and deployed to a shared + directory, not the task working directory. Therefore, if a referenced + package is already on the compute node, and is up to date, then it is not + re-downloaded; the existing copy on the compute node is used. If a + referenced application package cannot be installed, for example because + the package has been deleted or because download failed, the task fails. + :type application_package_references: + list[~azure.batch.models.ApplicationPackageReference] + :param authentication_token_settings: The settings for an authentication + token that the task can use to perform Batch service operations. If this + property is set, the Batch service provides the task with an + authentication token which can be used to authenticate Batch service + operations without requiring an account access key. The token is provided + via the AZ_BATCH_AUTHENTICATION_TOKEN environment variable. The operations + that the task can carry out using the token depend on the settings. For + example, a task can request job permissions in order to add other tasks to + the job, or check the status of the job or of other tasks under the job. + :type authentication_token_settings: + ~azure.batch.models.AuthenticationTokenSettings + """ + + _validation = { + 'id': {'required': True}, + 'command_line': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'display_name': {'key': 'displayName', 'type': 'str'}, + 'command_line': {'key': 'commandLine', 'type': 'str'}, + 'container_settings': {'key': 'containerSettings', 'type': 'TaskContainerSettings'}, + 'exit_conditions': {'key': 'exitConditions', 'type': 'ExitConditions'}, + 'resource_files': {'key': 'resourceFiles', 'type': '[ResourceFile]'}, + 'output_files': {'key': 'outputFiles', 'type': '[OutputFile]'}, + 'environment_settings': {'key': 'environmentSettings', 'type': '[EnvironmentSetting]'}, + 'affinity_info': {'key': 'affinityInfo', 'type': 'AffinityInformation'}, + 'constraints': {'key': 'constraints', 'type': 'TaskConstraints'}, + 'user_identity': {'key': 'userIdentity', 'type': 'UserIdentity'}, + 'multi_instance_settings': {'key': 'multiInstanceSettings', 'type': 'MultiInstanceSettings'}, + 'depends_on': {'key': 'dependsOn', 'type': 'TaskDependencies'}, + 'application_package_references': {'key': 'applicationPackageReferences', 'type': '[ApplicationPackageReference]'}, + 'authentication_token_settings': {'key': 'authenticationTokenSettings', 'type': 'AuthenticationTokenSettings'}, + } + + def __init__(self, *, id: str, command_line: str, display_name: str=None, container_settings=None, exit_conditions=None, resource_files=None, output_files=None, environment_settings=None, affinity_info=None, constraints=None, user_identity=None, multi_instance_settings=None, depends_on=None, application_package_references=None, authentication_token_settings=None, **kwargs) -> None: + super(TaskAddParameter, self).__init__(**kwargs) + self.id = id + self.display_name = display_name + self.command_line = command_line + self.container_settings = container_settings + self.exit_conditions = exit_conditions + self.resource_files = resource_files + self.output_files = output_files + self.environment_settings = environment_settings + self.affinity_info = affinity_info + self.constraints = constraints + self.user_identity = user_identity + self.multi_instance_settings = multi_instance_settings + self.depends_on = depends_on + self.application_package_references = application_package_references + self.authentication_token_settings = authentication_token_settings diff --git a/azure-batch/azure/batch/models/task_add_result.py b/azure-batch/azure/batch/models/task_add_result.py index 49c4a9abb453..7528e30d9506 100644 --- a/azure-batch/azure/batch/models/task_add_result.py +++ b/azure-batch/azure/batch/models/task_add_result.py @@ -15,10 +15,12 @@ class TaskAddResult(Model): """Result for a single task added as part of an add task collection operation. - :param status: The status of the add task request. Possible values - include: 'success', 'clientError', 'serverError' + All required parameters must be populated in order to send to Azure. + + :param status: Required. The status of the add task request. Possible + values include: 'success', 'clientError', 'serverError' :type status: str or ~azure.batch.models.TaskAddStatus - :param task_id: The ID of the task for which this is the result. + :param task_id: Required. The ID of the task for which this is the result. :type task_id: str :param e_tag: The ETag of the task, if the task was successfully added. You can use this to detect whether the task has changed between requests. @@ -48,11 +50,11 @@ class TaskAddResult(Model): 'error': {'key': 'error', 'type': 'BatchError'}, } - def __init__(self, status, task_id, e_tag=None, last_modified=None, location=None, error=None): - super(TaskAddResult, self).__init__() - self.status = status - self.task_id = task_id - self.e_tag = e_tag - self.last_modified = last_modified - self.location = location - self.error = error + def __init__(self, **kwargs): + super(TaskAddResult, self).__init__(**kwargs) + self.status = kwargs.get('status', None) + self.task_id = kwargs.get('task_id', None) + self.e_tag = kwargs.get('e_tag', None) + self.last_modified = kwargs.get('last_modified', None) + self.location = kwargs.get('location', None) + self.error = kwargs.get('error', None) diff --git a/azure-batch/azure/batch/models/task_add_result_py3.py b/azure-batch/azure/batch/models/task_add_result_py3.py new file mode 100644 index 000000000000..7add806bdee3 --- /dev/null +++ b/azure-batch/azure/batch/models/task_add_result_py3.py @@ -0,0 +1,60 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskAddResult(Model): + """Result for a single task added as part of an add task collection operation. + + All required parameters must be populated in order to send to Azure. + + :param status: Required. The status of the add task request. Possible + values include: 'success', 'clientError', 'serverError' + :type status: str or ~azure.batch.models.TaskAddStatus + :param task_id: Required. The ID of the task for which this is the result. + :type task_id: str + :param e_tag: The ETag of the task, if the task was successfully added. + You can use this to detect whether the task has changed between requests. + In particular, you can be pass the ETag with an Update Task request to + specify that your changes should take effect only if nobody else has + modified the job in the meantime. + :type e_tag: str + :param last_modified: The last modified time of the task. + :type last_modified: datetime + :param location: The URL of the task, if the task was successfully added. + :type location: str + :param error: The error encountered while attempting to add the task. + :type error: ~azure.batch.models.BatchError + """ + + _validation = { + 'status': {'required': True}, + 'task_id': {'required': True}, + } + + _attribute_map = { + 'status': {'key': 'status', 'type': 'TaskAddStatus'}, + 'task_id': {'key': 'taskId', 'type': 'str'}, + 'e_tag': {'key': 'eTag', 'type': 'str'}, + 'last_modified': {'key': 'lastModified', 'type': 'iso-8601'}, + 'location': {'key': 'location', 'type': 'str'}, + 'error': {'key': 'error', 'type': 'BatchError'}, + } + + def __init__(self, *, status, task_id: str, e_tag: str=None, last_modified=None, location: str=None, error=None, **kwargs) -> None: + super(TaskAddResult, self).__init__(**kwargs) + self.status = status + self.task_id = task_id + self.e_tag = e_tag + self.last_modified = last_modified + self.location = location + self.error = error diff --git a/azure-batch/azure/batch/models/task_constraints.py b/azure-batch/azure/batch/models/task_constraints.py index 86452bec78a2..22898fad6ff2 100644 --- a/azure-batch/azure/batch/models/task_constraints.py +++ b/azure-batch/azure/batch/models/task_constraints.py @@ -46,8 +46,8 @@ class TaskConstraints(Model): 'max_task_retry_count': {'key': 'maxTaskRetryCount', 'type': 'int'}, } - def __init__(self, max_wall_clock_time=None, retention_time=None, max_task_retry_count=None): - super(TaskConstraints, self).__init__() - self.max_wall_clock_time = max_wall_clock_time - self.retention_time = retention_time - self.max_task_retry_count = max_task_retry_count + def __init__(self, **kwargs): + super(TaskConstraints, self).__init__(**kwargs) + self.max_wall_clock_time = kwargs.get('max_wall_clock_time', None) + self.retention_time = kwargs.get('retention_time', None) + self.max_task_retry_count = kwargs.get('max_task_retry_count', None) diff --git a/azure-batch/azure/batch/models/task_constraints_py3.py b/azure-batch/azure/batch/models/task_constraints_py3.py new file mode 100644 index 000000000000..2070d09669c6 --- /dev/null +++ b/azure-batch/azure/batch/models/task_constraints_py3.py @@ -0,0 +1,53 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskConstraints(Model): + """Execution constraints to apply to a task. + + :param max_wall_clock_time: The maximum elapsed time that the task may + run, measured from the time the task starts. If the task does not complete + within the time limit, the Batch service terminates it. If this is not + specified, there is no time limit on how long the task may run. + :type max_wall_clock_time: timedelta + :param retention_time: The minimum time to retain the task directory on + the compute node where it ran, from the time it completes execution. After + this time, the Batch service may delete the task directory and all its + contents. The default is infinite, i.e. the task directory will be + retained until the compute node is removed or reimaged. + :type retention_time: timedelta + :param max_task_retry_count: The maximum number of times the task may be + retried. The Batch service retries a task if its exit code is nonzero. + Note that this value specifically controls the number of retries for the + task executable due to a nonzero exit code. The Batch service will try the + task once, and may then retry up to this limit. For example, if the + maximum retry count is 3, Batch tries the task up to 4 times (one initial + try and 3 retries). If the maximum retry count is 0, the Batch service + does not retry the task after the first attempt. If the maximum retry + count is -1, the Batch service retries the task without limit. Resource + files and application packages are only downloaded again if the task is + retried on a new compute node. + :type max_task_retry_count: int + """ + + _attribute_map = { + 'max_wall_clock_time': {'key': 'maxWallClockTime', 'type': 'duration'}, + 'retention_time': {'key': 'retentionTime', 'type': 'duration'}, + 'max_task_retry_count': {'key': 'maxTaskRetryCount', 'type': 'int'}, + } + + def __init__(self, *, max_wall_clock_time=None, retention_time=None, max_task_retry_count: int=None, **kwargs) -> None: + super(TaskConstraints, self).__init__(**kwargs) + self.max_wall_clock_time = max_wall_clock_time + self.retention_time = retention_time + self.max_task_retry_count = max_task_retry_count diff --git a/azure-batch/azure/batch/models/task_container_execution_information.py b/azure-batch/azure/batch/models/task_container_execution_information.py index 1bbcbc1776da..6ade9177af36 100644 --- a/azure-batch/azure/batch/models/task_container_execution_information.py +++ b/azure-batch/azure/batch/models/task_container_execution_information.py @@ -33,8 +33,8 @@ class TaskContainerExecutionInformation(Model): 'error': {'key': 'error', 'type': 'str'}, } - def __init__(self, container_id=None, state=None, error=None): - super(TaskContainerExecutionInformation, self).__init__() - self.container_id = container_id - self.state = state - self.error = error + def __init__(self, **kwargs): + super(TaskContainerExecutionInformation, self).__init__(**kwargs) + self.container_id = kwargs.get('container_id', None) + self.state = kwargs.get('state', None) + self.error = kwargs.get('error', None) diff --git a/azure-batch/azure/batch/models/task_container_execution_information_py3.py b/azure-batch/azure/batch/models/task_container_execution_information_py3.py new file mode 100644 index 000000000000..44f9e7e62b55 --- /dev/null +++ b/azure-batch/azure/batch/models/task_container_execution_information_py3.py @@ -0,0 +1,40 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskContainerExecutionInformation(Model): + """Contains information about the container which a task is executing. + + :param container_id: The ID of the container. + :type container_id: str + :param state: The state of the container. This is the state of the + container according to the Docker service. It is equivalent to the status + field returned by "docker inspect". + :type state: str + :param error: Detailed error information about the container. This is the + detailed error string from the Docker service, if available. It is + equivalent to the error field returned by "docker inspect". + :type error: str + """ + + _attribute_map = { + 'container_id': {'key': 'containerId', 'type': 'str'}, + 'state': {'key': 'state', 'type': 'str'}, + 'error': {'key': 'error', 'type': 'str'}, + } + + def __init__(self, *, container_id: str=None, state: str=None, error: str=None, **kwargs) -> None: + super(TaskContainerExecutionInformation, self).__init__(**kwargs) + self.container_id = container_id + self.state = state + self.error = error diff --git a/azure-batch/azure/batch/models/task_container_settings.py b/azure-batch/azure/batch/models/task_container_settings.py index 041e5f3a89aa..ac1a56f827a5 100644 --- a/azure-batch/azure/batch/models/task_container_settings.py +++ b/azure-batch/azure/batch/models/task_container_settings.py @@ -15,14 +15,16 @@ class TaskContainerSettings(Model): """The container settings for a task. + All required parameters must be populated in order to send to Azure. + :param container_run_options: Additional options to the container create command. These additional options are supplied as arguments to the "docker create" command, in addition to those controlled by the Batch Service. :type container_run_options: str - :param image_name: The image to use to create the container in which the - task will run. This is the full image reference, as would be specified to - "docker pull". If no tag is provided as part of the image name, the tag - ":latest" is used as a default. + :param image_name: Required. The image to use to create the container in + which the task will run. This is the full image reference, as would be + specified to "docker pull". If no tag is provided as part of the image + name, the tag ":latest" is used as a default. :type image_name: str :param registry: The private registry which contains the container image. This setting can be omitted if was already provided at pool creation. @@ -39,8 +41,8 @@ class TaskContainerSettings(Model): 'registry': {'key': 'registry', 'type': 'ContainerRegistry'}, } - def __init__(self, image_name, container_run_options=None, registry=None): - super(TaskContainerSettings, self).__init__() - self.container_run_options = container_run_options - self.image_name = image_name - self.registry = registry + def __init__(self, **kwargs): + super(TaskContainerSettings, self).__init__(**kwargs) + self.container_run_options = kwargs.get('container_run_options', None) + self.image_name = kwargs.get('image_name', None) + self.registry = kwargs.get('registry', None) diff --git a/azure-batch/azure/batch/models/task_container_settings_py3.py b/azure-batch/azure/batch/models/task_container_settings_py3.py new file mode 100644 index 000000000000..dabd7b99c516 --- /dev/null +++ b/azure-batch/azure/batch/models/task_container_settings_py3.py @@ -0,0 +1,48 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskContainerSettings(Model): + """The container settings for a task. + + All required parameters must be populated in order to send to Azure. + + :param container_run_options: Additional options to the container create + command. These additional options are supplied as arguments to the "docker + create" command, in addition to those controlled by the Batch Service. + :type container_run_options: str + :param image_name: Required. The image to use to create the container in + which the task will run. This is the full image reference, as would be + specified to "docker pull". If no tag is provided as part of the image + name, the tag ":latest" is used as a default. + :type image_name: str + :param registry: The private registry which contains the container image. + This setting can be omitted if was already provided at pool creation. + :type registry: ~azure.batch.models.ContainerRegistry + """ + + _validation = { + 'image_name': {'required': True}, + } + + _attribute_map = { + 'container_run_options': {'key': 'containerRunOptions', 'type': 'str'}, + 'image_name': {'key': 'imageName', 'type': 'str'}, + 'registry': {'key': 'registry', 'type': 'ContainerRegistry'}, + } + + def __init__(self, *, image_name: str, container_run_options: str=None, registry=None, **kwargs) -> None: + super(TaskContainerSettings, self).__init__(**kwargs) + self.container_run_options = container_run_options + self.image_name = image_name + self.registry = registry diff --git a/azure-batch/azure/batch/models/task_counts.py b/azure-batch/azure/batch/models/task_counts.py index 9662b020ff1d..057f2d7ada4c 100644 --- a/azure-batch/azure/batch/models/task_counts.py +++ b/azure-batch/azure/batch/models/task_counts.py @@ -15,22 +15,21 @@ class TaskCounts(Model): """The task counts for a job. - :param active: The number of tasks in the active state. + All required parameters must be populated in order to send to Azure. + + :param active: Required. The number of tasks in the active state. :type active: int - :param running: The number of tasks in the running or preparing state. + :param running: Required. The number of tasks in the running or preparing + state. :type running: int - :param completed: The number of tasks in the completed state. + :param completed: Required. The number of tasks in the completed state. :type completed: int - :param succeeded: The number of tasks which succeeded. A task succeeds if - its result (found in the executionInfo property) is 'success'. + :param succeeded: Required. The number of tasks which succeeded. A task + succeeds if its result (found in the executionInfo property) is 'success'. :type succeeded: int - :param failed: The number of tasks which failed. A task fails if its - result (found in the executionInfo property) is 'failure'. + :param failed: Required. The number of tasks which failed. A task fails if + its result (found in the executionInfo property) is 'failure'. :type failed: int - :param validation_status: Whether the task counts have been validated. - Possible values include: 'validated', 'unvalidated' - :type validation_status: str or - ~azure.batch.models.TaskCountValidationStatus """ _validation = { @@ -39,7 +38,6 @@ class TaskCounts(Model): 'completed': {'required': True}, 'succeeded': {'required': True}, 'failed': {'required': True}, - 'validation_status': {'required': True}, } _attribute_map = { @@ -48,14 +46,12 @@ class TaskCounts(Model): 'completed': {'key': 'completed', 'type': 'int'}, 'succeeded': {'key': 'succeeded', 'type': 'int'}, 'failed': {'key': 'failed', 'type': 'int'}, - 'validation_status': {'key': 'validationStatus', 'type': 'TaskCountValidationStatus'}, } - def __init__(self, active, running, completed, succeeded, failed, validation_status): - super(TaskCounts, self).__init__() - self.active = active - self.running = running - self.completed = completed - self.succeeded = succeeded - self.failed = failed - self.validation_status = validation_status + def __init__(self, **kwargs): + super(TaskCounts, self).__init__(**kwargs) + self.active = kwargs.get('active', None) + self.running = kwargs.get('running', None) + self.completed = kwargs.get('completed', None) + self.succeeded = kwargs.get('succeeded', None) + self.failed = kwargs.get('failed', None) diff --git a/azure-batch/azure/batch/models/task_counts_py3.py b/azure-batch/azure/batch/models/task_counts_py3.py new file mode 100644 index 000000000000..623c7dd86e04 --- /dev/null +++ b/azure-batch/azure/batch/models/task_counts_py3.py @@ -0,0 +1,57 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskCounts(Model): + """The task counts for a job. + + All required parameters must be populated in order to send to Azure. + + :param active: Required. The number of tasks in the active state. + :type active: int + :param running: Required. The number of tasks in the running or preparing + state. + :type running: int + :param completed: Required. The number of tasks in the completed state. + :type completed: int + :param succeeded: Required. The number of tasks which succeeded. A task + succeeds if its result (found in the executionInfo property) is 'success'. + :type succeeded: int + :param failed: Required. The number of tasks which failed. A task fails if + its result (found in the executionInfo property) is 'failure'. + :type failed: int + """ + + _validation = { + 'active': {'required': True}, + 'running': {'required': True}, + 'completed': {'required': True}, + 'succeeded': {'required': True}, + 'failed': {'required': True}, + } + + _attribute_map = { + 'active': {'key': 'active', 'type': 'int'}, + 'running': {'key': 'running', 'type': 'int'}, + 'completed': {'key': 'completed', 'type': 'int'}, + 'succeeded': {'key': 'succeeded', 'type': 'int'}, + 'failed': {'key': 'failed', 'type': 'int'}, + } + + def __init__(self, *, active: int, running: int, completed: int, succeeded: int, failed: int, **kwargs) -> None: + super(TaskCounts, self).__init__(**kwargs) + self.active = active + self.running = running + self.completed = completed + self.succeeded = succeeded + self.failed = failed diff --git a/azure-batch/azure/batch/models/task_delete_options.py b/azure-batch/azure/batch/models/task_delete_options.py index 4deb04ebc5d0..2daf7608a81a 100644 --- a/azure-batch/azure/batch/models/task_delete_options.py +++ b/azure-batch/azure/batch/models/task_delete_options.py @@ -50,13 +50,24 @@ class TaskDeleteOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(TaskDeleteOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskDeleteOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/task_delete_options_py3.py b/azure-batch/azure/batch/models/task_delete_options_py3.py new file mode 100644 index 000000000000..4b836c652275 --- /dev/null +++ b/azure-batch/azure/batch/models/task_delete_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskDeleteOptions(Model): + """Additional parameters for delete operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(TaskDeleteOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/task_dependencies.py b/azure-batch/azure/batch/models/task_dependencies.py index ec8868cde3e0..f5bfb8c41a68 100644 --- a/azure-batch/azure/batch/models/task_dependencies.py +++ b/azure-batch/azure/batch/models/task_dependencies.py @@ -36,7 +36,7 @@ class TaskDependencies(Model): 'task_id_ranges': {'key': 'taskIdRanges', 'type': '[TaskIdRange]'}, } - def __init__(self, task_ids=None, task_id_ranges=None): - super(TaskDependencies, self).__init__() - self.task_ids = task_ids - self.task_id_ranges = task_id_ranges + def __init__(self, **kwargs): + super(TaskDependencies, self).__init__(**kwargs) + self.task_ids = kwargs.get('task_ids', None) + self.task_id_ranges = kwargs.get('task_id_ranges', None) diff --git a/azure-batch/azure/batch/models/task_dependencies_py3.py b/azure-batch/azure/batch/models/task_dependencies_py3.py new file mode 100644 index 000000000000..133f3268f68b --- /dev/null +++ b/azure-batch/azure/batch/models/task_dependencies_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskDependencies(Model): + """Specifies any dependencies of a task. Any task that is explicitly specified + or within a dependency range must complete before the dependant task will + be scheduled. + + :param task_ids: The list of task IDs that this task depends on. All tasks + in this list must complete successfully before the dependent task can be + scheduled. The taskIds collection is limited to 64000 characters total + (i.e. the combined length of all task IDs). If the taskIds collection + exceeds the maximum length, the Add Task request fails with error code + TaskDependencyListTooLong. In this case consider using task ID ranges + instead. + :type task_ids: list[str] + :param task_id_ranges: The list of task ID ranges that this task depends + on. All tasks in all ranges must complete successfully before the + dependent task can be scheduled. + :type task_id_ranges: list[~azure.batch.models.TaskIdRange] + """ + + _attribute_map = { + 'task_ids': {'key': 'taskIds', 'type': '[str]'}, + 'task_id_ranges': {'key': 'taskIdRanges', 'type': '[TaskIdRange]'}, + } + + def __init__(self, *, task_ids=None, task_id_ranges=None, **kwargs) -> None: + super(TaskDependencies, self).__init__(**kwargs) + self.task_ids = task_ids + self.task_id_ranges = task_id_ranges diff --git a/azure-batch/azure/batch/models/task_execution_information.py b/azure-batch/azure/batch/models/task_execution_information.py index dd0cc32c4b6a..97e313dd382e 100644 --- a/azure-batch/azure/batch/models/task_execution_information.py +++ b/azure-batch/azure/batch/models/task_execution_information.py @@ -15,6 +15,8 @@ class TaskExecutionInformation(Model): """Information about the execution of a task. + All required parameters must be populated in order to send to Azure. + :param start_time: The time at which the task started running. 'Running' corresponds to the running state, so if the task specifies resource files or application packages, then the start time reflects the time at which @@ -45,11 +47,11 @@ class TaskExecutionInformation(Model): property is set only if the task is in the completed state and encountered a failure. :type failure_info: ~azure.batch.models.TaskFailureInformation - :param retry_count: The number of times the task has been retried by the - Batch service. Task application failures (non-zero exit code) are retried, - pre-processing errors (the task could not be run) and file upload errors - are not retried. The Batch service will retry the task up to the limit - specified by the constraints. + :param retry_count: Required. The number of times the task has been + retried by the Batch service. Task application failures (non-zero exit + code) are retried, pre-processing errors (the task could not be run) and + file upload errors are not retried. The Batch service will retry the task + up to the limit specified by the constraints. :type retry_count: int :param last_retry_time: The most recent time at which a retry of the task started running. This element is present only if the task was retried @@ -58,12 +60,12 @@ class TaskExecutionInformation(Model): other than retry; for example, if the compute node was rebooted during a retry, then the startTime is updated but the lastRetryTime is not. :type last_retry_time: datetime - :param requeue_count: The number of times the task has been requeued by - the Batch service as the result of a user request. When the user removes - nodes from a pool (by resizing/shrinking the pool) or when the job is - being disabled, the user can specify that running tasks on the nodes be - requeued for execution. This count tracks how many times the task has been - requeued for these reasons. + :param requeue_count: Required. The number of times the task has been + requeued by the Batch service as the result of a user request. When the + user removes nodes from a pool (by resizing/shrinking the pool) or when + the job is being disabled, the user can specify that running tasks on the + nodes be requeued for execution. This count tracks how many times the task + has been requeued for these reasons. :type requeue_count: int :param last_requeue_time: The most recent time at which the task has been requeued by the Batch service as the result of a user request. This @@ -93,15 +95,15 @@ class TaskExecutionInformation(Model): 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, } - def __init__(self, retry_count, requeue_count, start_time=None, end_time=None, exit_code=None, container_info=None, failure_info=None, last_retry_time=None, last_requeue_time=None, result=None): - super(TaskExecutionInformation, self).__init__() - self.start_time = start_time - self.end_time = end_time - self.exit_code = exit_code - self.container_info = container_info - self.failure_info = failure_info - self.retry_count = retry_count - self.last_retry_time = last_retry_time - self.requeue_count = requeue_count - self.last_requeue_time = last_requeue_time - self.result = result + def __init__(self, **kwargs): + super(TaskExecutionInformation, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) + self.exit_code = kwargs.get('exit_code', None) + self.container_info = kwargs.get('container_info', None) + self.failure_info = kwargs.get('failure_info', None) + self.retry_count = kwargs.get('retry_count', None) + self.last_retry_time = kwargs.get('last_retry_time', None) + self.requeue_count = kwargs.get('requeue_count', None) + self.last_requeue_time = kwargs.get('last_requeue_time', None) + self.result = kwargs.get('result', None) diff --git a/azure-batch/azure/batch/models/task_execution_information_py3.py b/azure-batch/azure/batch/models/task_execution_information_py3.py new file mode 100644 index 000000000000..330bb6f4b152 --- /dev/null +++ b/azure-batch/azure/batch/models/task_execution_information_py3.py @@ -0,0 +1,109 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskExecutionInformation(Model): + """Information about the execution of a task. + + All required parameters must be populated in order to send to Azure. + + :param start_time: The time at which the task started running. 'Running' + corresponds to the running state, so if the task specifies resource files + or application packages, then the start time reflects the time at which + the task started downloading or deploying these. If the task has been + restarted or retried, this is the most recent time at which the task + started running. This property is present only for tasks that are in the + running or completed state. + :type start_time: datetime + :param end_time: The time at which the task completed. This property is + set only if the task is in the Completed state. + :type end_time: datetime + :param exit_code: The exit code of the program specified on the task + command line. This property is set only if the task is in the completed + state. In general, the exit code for a process reflects the specific + convention implemented by the application developer for that process. If + you use the exit code value to make decisions in your code, be sure that + you know the exit code convention used by the application process. + However, if the Batch service terminates the task (due to timeout, or user + termination via the API) you may see an operating system-defined exit + code. + :type exit_code: int + :param container_info: Information about the container under which the + task is executing. This property is set only if the task runs in a + container context. + :type container_info: + ~azure.batch.models.TaskContainerExecutionInformation + :param failure_info: Information describing the task failure, if any. This + property is set only if the task is in the completed state and encountered + a failure. + :type failure_info: ~azure.batch.models.TaskFailureInformation + :param retry_count: Required. The number of times the task has been + retried by the Batch service. Task application failures (non-zero exit + code) are retried, pre-processing errors (the task could not be run) and + file upload errors are not retried. The Batch service will retry the task + up to the limit specified by the constraints. + :type retry_count: int + :param last_retry_time: The most recent time at which a retry of the task + started running. This element is present only if the task was retried + (i.e. retryCount is nonzero). If present, this is typically the same as + startTime, but may be different if the task has been restarted for reasons + other than retry; for example, if the compute node was rebooted during a + retry, then the startTime is updated but the lastRetryTime is not. + :type last_retry_time: datetime + :param requeue_count: Required. The number of times the task has been + requeued by the Batch service as the result of a user request. When the + user removes nodes from a pool (by resizing/shrinking the pool) or when + the job is being disabled, the user can specify that running tasks on the + nodes be requeued for execution. This count tracks how many times the task + has been requeued for these reasons. + :type requeue_count: int + :param last_requeue_time: The most recent time at which the task has been + requeued by the Batch service as the result of a user request. This + property is set only if the requeueCount is nonzero. + :type last_requeue_time: datetime + :param result: The result of the task execution. If the value is 'failed', + then the details of the failure can be found in the failureInfo property. + Possible values include: 'success', 'failure' + :type result: str or ~azure.batch.models.TaskExecutionResult + """ + + _validation = { + 'retry_count': {'required': True}, + 'requeue_count': {'required': True}, + } + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + 'exit_code': {'key': 'exitCode', 'type': 'int'}, + 'container_info': {'key': 'containerInfo', 'type': 'TaskContainerExecutionInformation'}, + 'failure_info': {'key': 'failureInfo', 'type': 'TaskFailureInformation'}, + 'retry_count': {'key': 'retryCount', 'type': 'int'}, + 'last_retry_time': {'key': 'lastRetryTime', 'type': 'iso-8601'}, + 'requeue_count': {'key': 'requeueCount', 'type': 'int'}, + 'last_requeue_time': {'key': 'lastRequeueTime', 'type': 'iso-8601'}, + 'result': {'key': 'result', 'type': 'TaskExecutionResult'}, + } + + def __init__(self, *, retry_count: int, requeue_count: int, start_time=None, end_time=None, exit_code: int=None, container_info=None, failure_info=None, last_retry_time=None, last_requeue_time=None, result=None, **kwargs) -> None: + super(TaskExecutionInformation, self).__init__(**kwargs) + self.start_time = start_time + self.end_time = end_time + self.exit_code = exit_code + self.container_info = container_info + self.failure_info = failure_info + self.retry_count = retry_count + self.last_retry_time = last_retry_time + self.requeue_count = requeue_count + self.last_requeue_time = last_requeue_time + self.result = result diff --git a/azure-batch/azure/batch/models/task_failure_information.py b/azure-batch/azure/batch/models/task_failure_information.py index 46437cef188d..fc6a45fc30f7 100644 --- a/azure-batch/azure/batch/models/task_failure_information.py +++ b/azure-batch/azure/batch/models/task_failure_information.py @@ -15,8 +15,10 @@ class TaskFailureInformation(Model): """Information about a task failure. - :param category: The category of the task error. Possible values include: - 'userError', 'serverError' + All required parameters must be populated in order to send to Azure. + + :param category: Required. The category of the task error. Possible values + include: 'userError', 'serverError' :type category: str or ~azure.batch.models.ErrorCategory :param code: An identifier for the task error. Codes are invariant and are intended to be consumed programmatically. @@ -39,9 +41,9 @@ class TaskFailureInformation(Model): 'details': {'key': 'details', 'type': '[NameValuePair]'}, } - def __init__(self, category, code=None, message=None, details=None): - super(TaskFailureInformation, self).__init__() - self.category = category - self.code = code - self.message = message - self.details = details + def __init__(self, **kwargs): + super(TaskFailureInformation, self).__init__(**kwargs) + self.category = kwargs.get('category', None) + self.code = kwargs.get('code', None) + self.message = kwargs.get('message', None) + self.details = kwargs.get('details', None) diff --git a/azure-batch/azure/batch/models/task_failure_information_py3.py b/azure-batch/azure/batch/models/task_failure_information_py3.py new file mode 100644 index 000000000000..b5eece450dc3 --- /dev/null +++ b/azure-batch/azure/batch/models/task_failure_information_py3.py @@ -0,0 +1,49 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskFailureInformation(Model): + """Information about a task failure. + + All required parameters must be populated in order to send to Azure. + + :param category: Required. The category of the task error. Possible values + include: 'userError', 'serverError' + :type category: str or ~azure.batch.models.ErrorCategory + :param code: An identifier for the task error. Codes are invariant and are + intended to be consumed programmatically. + :type code: str + :param message: A message describing the task error, intended to be + suitable for display in a user interface. + :type message: str + :param details: A list of additional details related to the error. + :type details: list[~azure.batch.models.NameValuePair] + """ + + _validation = { + 'category': {'required': True}, + } + + _attribute_map = { + 'category': {'key': 'category', 'type': 'ErrorCategory'}, + 'code': {'key': 'code', 'type': 'str'}, + 'message': {'key': 'message', 'type': 'str'}, + 'details': {'key': 'details', 'type': '[NameValuePair]'}, + } + + def __init__(self, *, category, code: str=None, message: str=None, details=None, **kwargs) -> None: + super(TaskFailureInformation, self).__init__(**kwargs) + self.category = category + self.code = code + self.message = message + self.details = details diff --git a/azure-batch/azure/batch/models/task_get_options.py b/azure-batch/azure/batch/models/task_get_options.py index 4638042553eb..08c1fd8a9cdc 100644 --- a/azure-batch/azure/batch/models/task_get_options.py +++ b/azure-batch/azure/batch/models/task_get_options.py @@ -54,15 +54,28 @@ class TaskGetOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, select=None, expand=None, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(TaskGetOptions, self).__init__() - self.select = select - self.expand = expand - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskGetOptions, self).__init__(**kwargs) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/task_get_options_py3.py b/azure-batch/azure/batch/models/task_get_options_py3.py new file mode 100644 index 000000000000..68699028e903 --- /dev/null +++ b/azure-batch/azure/batch/models/task_get_options_py3.py @@ -0,0 +1,81 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskGetOptions(Model): + """Additional parameters for get operation. + + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, select: str=None, expand: str=None, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(TaskGetOptions, self).__init__(**kwargs) + self.select = select + self.expand = expand + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/task_id_range.py b/azure-batch/azure/batch/models/task_id_range.py index 4d6e27bcdb60..db30d858755c 100644 --- a/azure-batch/azure/batch/models/task_id_range.py +++ b/azure-batch/azure/batch/models/task_id_range.py @@ -20,9 +20,11 @@ class TaskIdRange(Model): The start and end of the range are inclusive. For example, if a range has start 9 and end 12, then it represents tasks '9', '10', '11' and '12'. - :param start: The first task ID in the range. + All required parameters must be populated in order to send to Azure. + + :param start: Required. The first task ID in the range. :type start: int - :param end: The last task ID in the range. + :param end: Required. The last task ID in the range. :type end: int """ @@ -36,7 +38,7 @@ class TaskIdRange(Model): 'end': {'key': 'end', 'type': 'int'}, } - def __init__(self, start, end): - super(TaskIdRange, self).__init__() - self.start = start - self.end = end + def __init__(self, **kwargs): + super(TaskIdRange, self).__init__(**kwargs) + self.start = kwargs.get('start', None) + self.end = kwargs.get('end', None) diff --git a/azure-batch/azure/batch/models/task_id_range_py3.py b/azure-batch/azure/batch/models/task_id_range_py3.py new file mode 100644 index 000000000000..446ed8ee1a49 --- /dev/null +++ b/azure-batch/azure/batch/models/task_id_range_py3.py @@ -0,0 +1,44 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskIdRange(Model): + """A range of task IDs that a task can depend on. All tasks with IDs in the + range must complete successfully before the dependent task can be + scheduled. + + The start and end of the range are inclusive. For example, if a range has + start 9 and end 12, then it represents tasks '9', '10', '11' and '12'. + + All required parameters must be populated in order to send to Azure. + + :param start: Required. The first task ID in the range. + :type start: int + :param end: Required. The last task ID in the range. + :type end: int + """ + + _validation = { + 'start': {'required': True}, + 'end': {'required': True}, + } + + _attribute_map = { + 'start': {'key': 'start', 'type': 'int'}, + 'end': {'key': 'end', 'type': 'int'}, + } + + def __init__(self, *, start: int, end: int, **kwargs) -> None: + super(TaskIdRange, self).__init__(**kwargs) + self.start = start + self.end = end diff --git a/azure-batch/azure/batch/models/task_information.py b/azure-batch/azure/batch/models/task_information.py index 068ddd03044f..6e8ec0d11021 100644 --- a/azure-batch/azure/batch/models/task_information.py +++ b/azure-batch/azure/batch/models/task_information.py @@ -15,6 +15,8 @@ class TaskInformation(Model): """Information about a task running on a compute node. + All required parameters must be populated in order to send to Azure. + :param task_url: The URL of the task. :type task_url: str :param job_id: The ID of the job to which the task belongs. @@ -24,8 +26,8 @@ class TaskInformation(Model): :param subtask_id: The ID of the subtask if the task is a multi-instance task. :type subtask_id: int - :param task_state: The current state of the task. Possible values include: - 'active', 'preparing', 'running', 'completed' + :param task_state: Required. The current state of the task. Possible + values include: 'active', 'preparing', 'running', 'completed' :type task_state: str or ~azure.batch.models.TaskState :param execution_info: Information about the execution of the task. :type execution_info: ~azure.batch.models.TaskExecutionInformation @@ -44,11 +46,11 @@ class TaskInformation(Model): 'execution_info': {'key': 'executionInfo', 'type': 'TaskExecutionInformation'}, } - def __init__(self, task_state, task_url=None, job_id=None, task_id=None, subtask_id=None, execution_info=None): - super(TaskInformation, self).__init__() - self.task_url = task_url - self.job_id = job_id - self.task_id = task_id - self.subtask_id = subtask_id - self.task_state = task_state - self.execution_info = execution_info + def __init__(self, **kwargs): + super(TaskInformation, self).__init__(**kwargs) + self.task_url = kwargs.get('task_url', None) + self.job_id = kwargs.get('job_id', None) + self.task_id = kwargs.get('task_id', None) + self.subtask_id = kwargs.get('subtask_id', None) + self.task_state = kwargs.get('task_state', None) + self.execution_info = kwargs.get('execution_info', None) diff --git a/azure-batch/azure/batch/models/task_information_py3.py b/azure-batch/azure/batch/models/task_information_py3.py new file mode 100644 index 000000000000..9406cba44907 --- /dev/null +++ b/azure-batch/azure/batch/models/task_information_py3.py @@ -0,0 +1,56 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskInformation(Model): + """Information about a task running on a compute node. + + All required parameters must be populated in order to send to Azure. + + :param task_url: The URL of the task. + :type task_url: str + :param job_id: The ID of the job to which the task belongs. + :type job_id: str + :param task_id: The ID of the task. + :type task_id: str + :param subtask_id: The ID of the subtask if the task is a multi-instance + task. + :type subtask_id: int + :param task_state: Required. The current state of the task. Possible + values include: 'active', 'preparing', 'running', 'completed' + :type task_state: str or ~azure.batch.models.TaskState + :param execution_info: Information about the execution of the task. + :type execution_info: ~azure.batch.models.TaskExecutionInformation + """ + + _validation = { + 'task_state': {'required': True}, + } + + _attribute_map = { + 'task_url': {'key': 'taskUrl', 'type': 'str'}, + 'job_id': {'key': 'jobId', 'type': 'str'}, + 'task_id': {'key': 'taskId', 'type': 'str'}, + 'subtask_id': {'key': 'subtaskId', 'type': 'int'}, + 'task_state': {'key': 'taskState', 'type': 'TaskState'}, + 'execution_info': {'key': 'executionInfo', 'type': 'TaskExecutionInformation'}, + } + + def __init__(self, *, task_state, task_url: str=None, job_id: str=None, task_id: str=None, subtask_id: int=None, execution_info=None, **kwargs) -> None: + super(TaskInformation, self).__init__(**kwargs) + self.task_url = task_url + self.job_id = job_id + self.task_id = task_id + self.subtask_id = subtask_id + self.task_state = task_state + self.execution_info = execution_info diff --git a/azure-batch/azure/batch/models/task_list_options.py b/azure-batch/azure/batch/models/task_list_options.py index b93babcfe518..08c9cb009442 100644 --- a/azure-batch/azure/batch/models/task_list_options.py +++ b/azure-batch/azure/batch/models/task_list_options.py @@ -42,13 +42,24 @@ class TaskListOptions(Model): :type ocp_date: datetime """ - def __init__(self, filter=None, select=None, expand=None, max_results=1000, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(TaskListOptions, self).__init__() - self.filter = filter - self.select = select - self.expand = expand - self.max_results = max_results - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskListOptions, self).__init__(**kwargs) + self.filter = kwargs.get('filter', None) + self.select = kwargs.get('select', None) + self.expand = kwargs.get('expand', None) + self.max_results = kwargs.get('max_results', 1000) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/task_list_options_py3.py b/azure-batch/azure/batch/models/task_list_options_py3.py new file mode 100644 index 000000000000..bb02726e7b4f --- /dev/null +++ b/azure-batch/azure/batch/models/task_list_options_py3.py @@ -0,0 +1,65 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskListOptions(Model): + """Additional parameters for list operation. + + :param filter: An OData $filter clause. For more information on + constructing this filter, see + https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-tasks. + :type filter: str + :param select: An OData $select clause. + :type select: str + :param expand: An OData $expand clause. + :type expand: str + :param max_results: The maximum number of items to return in the response. + A maximum of 1000 tasks can be returned. Default value: 1000 . + :type max_results: int + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'filter': {'key': '', 'type': 'str'}, + 'select': {'key': '', 'type': 'str'}, + 'expand': {'key': '', 'type': 'str'}, + 'max_results': {'key': '', 'type': 'int'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, filter: str=None, select: str=None, expand: str=None, max_results: int=1000, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(TaskListOptions, self).__init__(**kwargs) + self.filter = filter + self.select = select + self.expand = expand + self.max_results = max_results + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/task_list_subtasks_options.py b/azure-batch/azure/batch/models/task_list_subtasks_options.py index a016f2f08602..8157cee27c5a 100644 --- a/azure-batch/azure/batch/models/task_list_subtasks_options.py +++ b/azure-batch/azure/batch/models/task_list_subtasks_options.py @@ -33,10 +33,18 @@ class TaskListSubtasksOptions(Model): :type ocp_date: datetime """ - def __init__(self, select=None, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None): - super(TaskListSubtasksOptions, self).__init__() - self.select = select - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskListSubtasksOptions, self).__init__(**kwargs) + self.select = kwargs.get('select', None) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) diff --git a/azure-batch/azure/batch/models/task_list_subtasks_options_py3.py b/azure-batch/azure/batch/models/task_list_subtasks_options_py3.py new file mode 100644 index 000000000000..b8810800dea7 --- /dev/null +++ b/azure-batch/azure/batch/models/task_list_subtasks_options_py3.py @@ -0,0 +1,50 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskListSubtasksOptions(Model): + """Additional parameters for list_subtasks operation. + + :param select: An OData $select clause. + :type select: str + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + """ + + _attribute_map = { + 'select': {'key': '', 'type': 'str'}, + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, select: str=None, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, **kwargs) -> None: + super(TaskListSubtasksOptions, self).__init__(**kwargs) + self.select = select + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date diff --git a/azure-batch/azure/batch/models/task_reactivate_options.py b/azure-batch/azure/batch/models/task_reactivate_options.py index 031d7f7f0eb0..fe0746114191 100644 --- a/azure-batch/azure/batch/models/task_reactivate_options.py +++ b/azure-batch/azure/batch/models/task_reactivate_options.py @@ -50,13 +50,24 @@ class TaskReactivateOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(TaskReactivateOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskReactivateOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/task_reactivate_options_py3.py b/azure-batch/azure/batch/models/task_reactivate_options_py3.py new file mode 100644 index 000000000000..bd39d6c9c5b6 --- /dev/null +++ b/azure-batch/azure/batch/models/task_reactivate_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskReactivateOptions(Model): + """Additional parameters for reactivate operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(TaskReactivateOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/task_scheduling_policy.py b/azure-batch/azure/batch/models/task_scheduling_policy.py index 993389ea90b0..2f121acb77bf 100644 --- a/azure-batch/azure/batch/models/task_scheduling_policy.py +++ b/azure-batch/azure/batch/models/task_scheduling_policy.py @@ -15,8 +15,10 @@ class TaskSchedulingPolicy(Model): """Specifies how tasks should be distributed across compute nodes. - :param node_fill_type: How tasks are distributed across compute nodes in a - pool. Possible values include: 'spread', 'pack' + All required parameters must be populated in order to send to Azure. + + :param node_fill_type: Required. How tasks are distributed across compute + nodes in a pool. Possible values include: 'spread', 'pack' :type node_fill_type: str or ~azure.batch.models.ComputeNodeFillType """ @@ -28,6 +30,6 @@ class TaskSchedulingPolicy(Model): 'node_fill_type': {'key': 'nodeFillType', 'type': 'ComputeNodeFillType'}, } - def __init__(self, node_fill_type): - super(TaskSchedulingPolicy, self).__init__() - self.node_fill_type = node_fill_type + def __init__(self, **kwargs): + super(TaskSchedulingPolicy, self).__init__(**kwargs) + self.node_fill_type = kwargs.get('node_fill_type', None) diff --git a/azure-batch/azure/batch/models/task_scheduling_policy_py3.py b/azure-batch/azure/batch/models/task_scheduling_policy_py3.py new file mode 100644 index 000000000000..f3ff79a160ed --- /dev/null +++ b/azure-batch/azure/batch/models/task_scheduling_policy_py3.py @@ -0,0 +1,35 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskSchedulingPolicy(Model): + """Specifies how tasks should be distributed across compute nodes. + + All required parameters must be populated in order to send to Azure. + + :param node_fill_type: Required. How tasks are distributed across compute + nodes in a pool. Possible values include: 'spread', 'pack' + :type node_fill_type: str or ~azure.batch.models.ComputeNodeFillType + """ + + _validation = { + 'node_fill_type': {'required': True}, + } + + _attribute_map = { + 'node_fill_type': {'key': 'nodeFillType', 'type': 'ComputeNodeFillType'}, + } + + def __init__(self, *, node_fill_type, **kwargs) -> None: + super(TaskSchedulingPolicy, self).__init__(**kwargs) + self.node_fill_type = node_fill_type diff --git a/azure-batch/azure/batch/models/task_statistics.py b/azure-batch/azure/batch/models/task_statistics.py index d36e0a8a1a23..b5f877fc5838 100644 --- a/azure-batch/azure/batch/models/task_statistics.py +++ b/azure-batch/azure/batch/models/task_statistics.py @@ -15,41 +15,45 @@ class TaskStatistics(Model): """Resource usage statistics for a task. - :param url: The URL of the statistics. + All required parameters must be populated in order to send to Azure. + + :param url: Required. The URL of the statistics. :type url: str - :param start_time: The start time of the time range covered by the - statistics. + :param start_time: Required. The start time of the time range covered by + the statistics. :type start_time: datetime - :param last_update_time: The time at which the statistics were last - updated. All statistics are limited to the range between startTime and - lastUpdateTime. + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. :type last_update_time: datetime - :param user_cpu_time: The total user mode CPU time (summed across all - cores and all compute nodes) consumed by the task. + :param user_cpu_time: Required. The total user mode CPU time (summed + across all cores and all compute nodes) consumed by the task. :type user_cpu_time: timedelta - :param kernel_cpu_time: The total kernel mode CPU time (summed across all - cores and all compute nodes) consumed by the task. + :param kernel_cpu_time: Required. The total kernel mode CPU time (summed + across all cores and all compute nodes) consumed by the task. :type kernel_cpu_time: timedelta - :param wall_clock_time: The total wall clock time of the task. The wall - clock time is the elapsed time from when the task started running on a - compute node to when it finished (or to the last time the statistics were - updated, if the task had not finished by then). If the task was retried, - this includes the wall clock time of all the task retries. + :param wall_clock_time: Required. The total wall clock time of the task. + The wall clock time is the elapsed time from when the task started running + on a compute node to when it finished (or to the last time the statistics + were updated, if the task had not finished by then). If the task was + retried, this includes the wall clock time of all the task retries. :type wall_clock_time: timedelta - :param read_iops: The total number of disk read operations made by the - task. + :param read_iops: Required. The total number of disk read operations made + by the task. :type read_iops: long - :param write_iops: The total number of disk write operations made by the - task. + :param write_iops: Required. The total number of disk write operations + made by the task. :type write_iops: long - :param read_io_gi_b: The total gibibytes read from disk by the task. + :param read_io_gi_b: Required. The total gibibytes read from disk by the + task. :type read_io_gi_b: float - :param write_io_gi_b: The total gibibytes written to disk by the task. + :param write_io_gi_b: Required. The total gibibytes written to disk by the + task. :type write_io_gi_b: float - :param wait_time: The total wait time of the task. The wait time for a - task is defined as the elapsed time between the creation of the task and - the start of task execution. (If the task is retried due to failures, the - wait time is the time to the most recent task execution.). + :param wait_time: Required. The total wait time of the task. The wait time + for a task is defined as the elapsed time between the creation of the task + and the start of task execution. (If the task is retried due to failures, + the wait time is the time to the most recent task execution.). :type wait_time: timedelta """ @@ -81,16 +85,16 @@ class TaskStatistics(Model): 'wait_time': {'key': 'waitTime', 'type': 'duration'}, } - def __init__(self, url, start_time, last_update_time, user_cpu_time, kernel_cpu_time, wall_clock_time, read_iops, write_iops, read_io_gi_b, write_io_gi_b, wait_time): - super(TaskStatistics, self).__init__() - self.url = url - self.start_time = start_time - self.last_update_time = last_update_time - self.user_cpu_time = user_cpu_time - self.kernel_cpu_time = kernel_cpu_time - self.wall_clock_time = wall_clock_time - self.read_iops = read_iops - self.write_iops = write_iops - self.read_io_gi_b = read_io_gi_b - self.write_io_gi_b = write_io_gi_b - self.wait_time = wait_time + def __init__(self, **kwargs): + super(TaskStatistics, self).__init__(**kwargs) + self.url = kwargs.get('url', None) + self.start_time = kwargs.get('start_time', None) + self.last_update_time = kwargs.get('last_update_time', None) + self.user_cpu_time = kwargs.get('user_cpu_time', None) + self.kernel_cpu_time = kwargs.get('kernel_cpu_time', None) + self.wall_clock_time = kwargs.get('wall_clock_time', None) + self.read_iops = kwargs.get('read_iops', None) + self.write_iops = kwargs.get('write_iops', None) + self.read_io_gi_b = kwargs.get('read_io_gi_b', None) + self.write_io_gi_b = kwargs.get('write_io_gi_b', None) + self.wait_time = kwargs.get('wait_time', None) diff --git a/azure-batch/azure/batch/models/task_statistics_py3.py b/azure-batch/azure/batch/models/task_statistics_py3.py new file mode 100644 index 000000000000..42de1dbaa70c --- /dev/null +++ b/azure-batch/azure/batch/models/task_statistics_py3.py @@ -0,0 +1,100 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskStatistics(Model): + """Resource usage statistics for a task. + + All required parameters must be populated in order to send to Azure. + + :param url: Required. The URL of the statistics. + :type url: str + :param start_time: Required. The start time of the time range covered by + the statistics. + :type start_time: datetime + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. + :type last_update_time: datetime + :param user_cpu_time: Required. The total user mode CPU time (summed + across all cores and all compute nodes) consumed by the task. + :type user_cpu_time: timedelta + :param kernel_cpu_time: Required. The total kernel mode CPU time (summed + across all cores and all compute nodes) consumed by the task. + :type kernel_cpu_time: timedelta + :param wall_clock_time: Required. The total wall clock time of the task. + The wall clock time is the elapsed time from when the task started running + on a compute node to when it finished (or to the last time the statistics + were updated, if the task had not finished by then). If the task was + retried, this includes the wall clock time of all the task retries. + :type wall_clock_time: timedelta + :param read_iops: Required. The total number of disk read operations made + by the task. + :type read_iops: long + :param write_iops: Required. The total number of disk write operations + made by the task. + :type write_iops: long + :param read_io_gi_b: Required. The total gibibytes read from disk by the + task. + :type read_io_gi_b: float + :param write_io_gi_b: Required. The total gibibytes written to disk by the + task. + :type write_io_gi_b: float + :param wait_time: Required. The total wait time of the task. The wait time + for a task is defined as the elapsed time between the creation of the task + and the start of task execution. (If the task is retried due to failures, + the wait time is the time to the most recent task execution.). + :type wait_time: timedelta + """ + + _validation = { + 'url': {'required': True}, + 'start_time': {'required': True}, + 'last_update_time': {'required': True}, + 'user_cpu_time': {'required': True}, + 'kernel_cpu_time': {'required': True}, + 'wall_clock_time': {'required': True}, + 'read_iops': {'required': True}, + 'write_iops': {'required': True}, + 'read_io_gi_b': {'required': True}, + 'write_io_gi_b': {'required': True}, + 'wait_time': {'required': True}, + } + + _attribute_map = { + 'url': {'key': 'url', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'}, + 'user_cpu_time': {'key': 'userCPUTime', 'type': 'duration'}, + 'kernel_cpu_time': {'key': 'kernelCPUTime', 'type': 'duration'}, + 'wall_clock_time': {'key': 'wallClockTime', 'type': 'duration'}, + 'read_iops': {'key': 'readIOps', 'type': 'long'}, + 'write_iops': {'key': 'writeIOps', 'type': 'long'}, + 'read_io_gi_b': {'key': 'readIOGiB', 'type': 'float'}, + 'write_io_gi_b': {'key': 'writeIOGiB', 'type': 'float'}, + 'wait_time': {'key': 'waitTime', 'type': 'duration'}, + } + + def __init__(self, *, url: str, start_time, last_update_time, user_cpu_time, kernel_cpu_time, wall_clock_time, read_iops: int, write_iops: int, read_io_gi_b: float, write_io_gi_b: float, wait_time, **kwargs) -> None: + super(TaskStatistics, self).__init__(**kwargs) + self.url = url + self.start_time = start_time + self.last_update_time = last_update_time + self.user_cpu_time = user_cpu_time + self.kernel_cpu_time = kernel_cpu_time + self.wall_clock_time = wall_clock_time + self.read_iops = read_iops + self.write_iops = write_iops + self.read_io_gi_b = read_io_gi_b + self.write_io_gi_b = write_io_gi_b + self.wait_time = wait_time diff --git a/azure-batch/azure/batch/models/task_terminate_options.py b/azure-batch/azure/batch/models/task_terminate_options.py index 7c932ad2e44f..1908a9daf5e2 100644 --- a/azure-batch/azure/batch/models/task_terminate_options.py +++ b/azure-batch/azure/batch/models/task_terminate_options.py @@ -50,13 +50,24 @@ class TaskTerminateOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(TaskTerminateOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskTerminateOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/task_terminate_options_py3.py b/azure-batch/azure/batch/models/task_terminate_options_py3.py new file mode 100644 index 000000000000..d967db3a62e7 --- /dev/null +++ b/azure-batch/azure/batch/models/task_terminate_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskTerminateOptions(Model): + """Additional parameters for terminate operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(TaskTerminateOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/task_update_options.py b/azure-batch/azure/batch/models/task_update_options.py index dd15609f2a60..32e1ad8200cf 100644 --- a/azure-batch/azure/batch/models/task_update_options.py +++ b/azure-batch/azure/batch/models/task_update_options.py @@ -50,13 +50,24 @@ class TaskUpdateOptions(Model): :type if_unmodified_since: datetime """ - def __init__(self, timeout=30, client_request_id=None, return_client_request_id=False, ocp_date=None, if_match=None, if_none_match=None, if_modified_since=None, if_unmodified_since=None): - super(TaskUpdateOptions, self).__init__() - self.timeout = timeout - self.client_request_id = client_request_id - self.return_client_request_id = return_client_request_id - self.ocp_date = ocp_date - self.if_match = if_match - self.if_none_match = if_none_match - self.if_modified_since = if_modified_since - self.if_unmodified_since = if_unmodified_since + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, **kwargs): + super(TaskUpdateOptions, self).__init__(**kwargs) + self.timeout = kwargs.get('timeout', 30) + self.client_request_id = kwargs.get('client_request_id', None) + self.return_client_request_id = kwargs.get('return_client_request_id', False) + self.ocp_date = kwargs.get('ocp_date', None) + self.if_match = kwargs.get('if_match', None) + self.if_none_match = kwargs.get('if_none_match', None) + self.if_modified_since = kwargs.get('if_modified_since', None) + self.if_unmodified_since = kwargs.get('if_unmodified_since', None) diff --git a/azure-batch/azure/batch/models/task_update_options_py3.py b/azure-batch/azure/batch/models/task_update_options_py3.py new file mode 100644 index 000000000000..2a20ddf57a64 --- /dev/null +++ b/azure-batch/azure/batch/models/task_update_options_py3.py @@ -0,0 +1,73 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskUpdateOptions(Model): + """Additional parameters for update operation. + + :param timeout: The maximum time that the server can spend processing the + request, in seconds. The default is 30 seconds. Default value: 30 . + :type timeout: int + :param client_request_id: The caller-generated request identity, in the + form of a GUID with no decoration such as curly braces, e.g. + 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0. + :type client_request_id: str + :param return_client_request_id: Whether the server should return the + client-request-id in the response. Default value: False . + :type return_client_request_id: bool + :param ocp_date: The time the request was issued. Client libraries + typically set this to the current system clock time; set it explicitly if + you are calling the REST API directly. + :type ocp_date: datetime + :param if_match: An ETag value associated with the version of the resource + known to the client. The operation will be performed only if the + resource's current ETag on the service exactly matches the value specified + by the client. + :type if_match: str + :param if_none_match: An ETag value associated with the version of the + resource known to the client. The operation will be performed only if the + resource's current ETag on the service does not match the value specified + by the client. + :type if_none_match: str + :param if_modified_since: A timestamp indicating the last modified time of + the resource known to the client. The operation will be performed only if + the resource on the service has been modified since the specified time. + :type if_modified_since: datetime + :param if_unmodified_since: A timestamp indicating the last modified time + of the resource known to the client. The operation will be performed only + if the resource on the service has not been modified since the specified + time. + :type if_unmodified_since: datetime + """ + + _attribute_map = { + 'timeout': {'key': '', 'type': 'int'}, + 'client_request_id': {'key': '', 'type': 'str'}, + 'return_client_request_id': {'key': '', 'type': 'bool'}, + 'ocp_date': {'key': '', 'type': 'rfc-1123'}, + 'if_match': {'key': '', 'type': 'str'}, + 'if_none_match': {'key': '', 'type': 'str'}, + 'if_modified_since': {'key': '', 'type': 'rfc-1123'}, + 'if_unmodified_since': {'key': '', 'type': 'rfc-1123'}, + } + + def __init__(self, *, timeout: int=30, client_request_id: str=None, return_client_request_id: bool=False, ocp_date=None, if_match: str=None, if_none_match: str=None, if_modified_since=None, if_unmodified_since=None, **kwargs) -> None: + super(TaskUpdateOptions, self).__init__(**kwargs) + self.timeout = timeout + self.client_request_id = client_request_id + self.return_client_request_id = return_client_request_id + self.ocp_date = ocp_date + self.if_match = if_match + self.if_none_match = if_none_match + self.if_modified_since = if_modified_since + self.if_unmodified_since = if_unmodified_since diff --git a/azure-batch/azure/batch/models/task_update_parameter.py b/azure-batch/azure/batch/models/task_update_parameter.py index 877c74851382..84246a437659 100644 --- a/azure-batch/azure/batch/models/task_update_parameter.py +++ b/azure-batch/azure/batch/models/task_update_parameter.py @@ -25,6 +25,6 @@ class TaskUpdateParameter(Model): 'constraints': {'key': 'constraints', 'type': 'TaskConstraints'}, } - def __init__(self, constraints=None): - super(TaskUpdateParameter, self).__init__() - self.constraints = constraints + def __init__(self, **kwargs): + super(TaskUpdateParameter, self).__init__(**kwargs) + self.constraints = kwargs.get('constraints', None) diff --git a/azure-batch/azure/batch/models/task_update_parameter_py3.py b/azure-batch/azure/batch/models/task_update_parameter_py3.py new file mode 100644 index 000000000000..71594e625bb1 --- /dev/null +++ b/azure-batch/azure/batch/models/task_update_parameter_py3.py @@ -0,0 +1,30 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class TaskUpdateParameter(Model): + """The set of changes to be made to a task. + + :param constraints: Constraints that apply to this task. If omitted, the + task is given the default constraints. For multi-instance tasks, updating + the retention time applies only to the primary task and not subtasks. + :type constraints: ~azure.batch.models.TaskConstraints + """ + + _attribute_map = { + 'constraints': {'key': 'constraints', 'type': 'TaskConstraints'}, + } + + def __init__(self, *, constraints=None, **kwargs) -> None: + super(TaskUpdateParameter, self).__init__(**kwargs) + self.constraints = constraints diff --git a/azure-batch/azure/batch/models/upload_batch_service_logs_configuration.py b/azure-batch/azure/batch/models/upload_batch_service_logs_configuration.py index 4dfee0c3ed50..1f96d326b4a5 100644 --- a/azure-batch/azure/batch/models/upload_batch_service_logs_configuration.py +++ b/azure-batch/azure/batch/models/upload_batch_service_logs_configuration.py @@ -15,18 +15,21 @@ class UploadBatchServiceLogsConfiguration(Model): """The Azure Batch service log files upload configuration for a compute node. - :param container_url: The URL of the container within Azure Blob Storage - to which to upload the Batch Service log file(s). The URL must include a - Shared Access Signature (SAS) granting write permissions to the container. - The SAS duration must allow enough time for the upload to finish. The - start time for SAS is optional and recommended to not be specified. + All required parameters must be populated in order to send to Azure. + + :param container_url: Required. The URL of the container within Azure Blob + Storage to which to upload the Batch Service log file(s). The URL must + include a Shared Access Signature (SAS) granting write permissions to the + container. The SAS duration must allow enough time for the upload to + finish. The start time for SAS is optional and recommended to not be + specified. :type container_url: str - :param start_time: The start of the time range from which to upload Batch - Service log file(s). Any log file containing a log message in the time - range will be uploaded. This means that the operation might retrieve more - logs than have been requested since the entire log file is always - uploaded, but the operation should not retrieve fewer logs than have been - requested. + :param start_time: Required. The start of the time range from which to + upload Batch Service log file(s). Any log file containing a log message in + the time range will be uploaded. This means that the operation might + retrieve more logs than have been requested since the entire log file is + always uploaded, but the operation should not retrieve fewer logs than + have been requested. :type start_time: datetime :param end_time: The end of the time range from which to upload Batch Service log file(s). Any log file containing a log message in the time @@ -49,8 +52,8 @@ class UploadBatchServiceLogsConfiguration(Model): 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, } - def __init__(self, container_url, start_time, end_time=None): - super(UploadBatchServiceLogsConfiguration, self).__init__() - self.container_url = container_url - self.start_time = start_time - self.end_time = end_time + def __init__(self, **kwargs): + super(UploadBatchServiceLogsConfiguration, self).__init__(**kwargs) + self.container_url = kwargs.get('container_url', None) + self.start_time = kwargs.get('start_time', None) + self.end_time = kwargs.get('end_time', None) diff --git a/azure-batch/azure/batch/models/upload_batch_service_logs_configuration_py3.py b/azure-batch/azure/batch/models/upload_batch_service_logs_configuration_py3.py new file mode 100644 index 000000000000..875beb606fb1 --- /dev/null +++ b/azure-batch/azure/batch/models/upload_batch_service_logs_configuration_py3.py @@ -0,0 +1,59 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class UploadBatchServiceLogsConfiguration(Model): + """The Azure Batch service log files upload configuration for a compute node. + + All required parameters must be populated in order to send to Azure. + + :param container_url: Required. The URL of the container within Azure Blob + Storage to which to upload the Batch Service log file(s). The URL must + include a Shared Access Signature (SAS) granting write permissions to the + container. The SAS duration must allow enough time for the upload to + finish. The start time for SAS is optional and recommended to not be + specified. + :type container_url: str + :param start_time: Required. The start of the time range from which to + upload Batch Service log file(s). Any log file containing a log message in + the time range will be uploaded. This means that the operation might + retrieve more logs than have been requested since the entire log file is + always uploaded, but the operation should not retrieve fewer logs than + have been requested. + :type start_time: datetime + :param end_time: The end of the time range from which to upload Batch + Service log file(s). Any log file containing a log message in the time + range will be uploaded. This means that the operation might retrieve more + logs than have been requested since the entire log file is always + uploaded, but the operation should not retrieve fewer logs than have been + requested. If omitted, the default is to upload all logs available after + the startTime. + :type end_time: datetime + """ + + _validation = { + 'container_url': {'required': True}, + 'start_time': {'required': True}, + } + + _attribute_map = { + 'container_url': {'key': 'containerUrl', 'type': 'str'}, + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'end_time': {'key': 'endTime', 'type': 'iso-8601'}, + } + + def __init__(self, *, container_url: str, start_time, end_time=None, **kwargs) -> None: + super(UploadBatchServiceLogsConfiguration, self).__init__(**kwargs) + self.container_url = container_url + self.start_time = start_time + self.end_time = end_time diff --git a/azure-batch/azure/batch/models/upload_batch_service_logs_result.py b/azure-batch/azure/batch/models/upload_batch_service_logs_result.py index 6f84adeef1d6..a2d5a0fe3e1c 100644 --- a/azure-batch/azure/batch/models/upload_batch_service_logs_result.py +++ b/azure-batch/azure/batch/models/upload_batch_service_logs_result.py @@ -16,13 +16,16 @@ class UploadBatchServiceLogsResult(Model): """The result of uploading Batch service log files from a specific compute node. - :param virtual_directory_name: The virtual directory within Azure Blob - Storage container to which the Batch Service log file(s) will be uploaded. - The virtual directory name is part of the blob name for each log file - uploaded, and it is built based poolId, nodeId and a unique identifier. + All required parameters must be populated in order to send to Azure. + + :param virtual_directory_name: Required. The virtual directory within + Azure Blob Storage container to which the Batch Service log file(s) will + be uploaded. The virtual directory name is part of the blob name for each + log file uploaded, and it is built based poolId, nodeId and a unique + identifier. :type virtual_directory_name: str - :param number_of_files_uploaded: The number of log files which will be - uploaded. + :param number_of_files_uploaded: Required. The number of log files which + will be uploaded. :type number_of_files_uploaded: int """ @@ -36,7 +39,7 @@ class UploadBatchServiceLogsResult(Model): 'number_of_files_uploaded': {'key': 'numberOfFilesUploaded', 'type': 'int'}, } - def __init__(self, virtual_directory_name, number_of_files_uploaded): - super(UploadBatchServiceLogsResult, self).__init__() - self.virtual_directory_name = virtual_directory_name - self.number_of_files_uploaded = number_of_files_uploaded + def __init__(self, **kwargs): + super(UploadBatchServiceLogsResult, self).__init__(**kwargs) + self.virtual_directory_name = kwargs.get('virtual_directory_name', None) + self.number_of_files_uploaded = kwargs.get('number_of_files_uploaded', None) diff --git a/azure-batch/azure/batch/models/upload_batch_service_logs_result_py3.py b/azure-batch/azure/batch/models/upload_batch_service_logs_result_py3.py new file mode 100644 index 000000000000..f9547bc287a4 --- /dev/null +++ b/azure-batch/azure/batch/models/upload_batch_service_logs_result_py3.py @@ -0,0 +1,45 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class UploadBatchServiceLogsResult(Model): + """The result of uploading Batch service log files from a specific compute + node. + + All required parameters must be populated in order to send to Azure. + + :param virtual_directory_name: Required. The virtual directory within + Azure Blob Storage container to which the Batch Service log file(s) will + be uploaded. The virtual directory name is part of the blob name for each + log file uploaded, and it is built based poolId, nodeId and a unique + identifier. + :type virtual_directory_name: str + :param number_of_files_uploaded: Required. The number of log files which + will be uploaded. + :type number_of_files_uploaded: int + """ + + _validation = { + 'virtual_directory_name': {'required': True}, + 'number_of_files_uploaded': {'required': True}, + } + + _attribute_map = { + 'virtual_directory_name': {'key': 'virtualDirectoryName', 'type': 'str'}, + 'number_of_files_uploaded': {'key': 'numberOfFilesUploaded', 'type': 'int'}, + } + + def __init__(self, *, virtual_directory_name: str, number_of_files_uploaded: int, **kwargs) -> None: + super(UploadBatchServiceLogsResult, self).__init__(**kwargs) + self.virtual_directory_name = virtual_directory_name + self.number_of_files_uploaded = number_of_files_uploaded diff --git a/azure-batch/azure/batch/models/usage_statistics.py b/azure-batch/azure/batch/models/usage_statistics.py index d5553b84cfda..08d709addec3 100644 --- a/azure-batch/azure/batch/models/usage_statistics.py +++ b/azure-batch/azure/batch/models/usage_statistics.py @@ -15,15 +15,17 @@ class UsageStatistics(Model): """Statistics related to pool usage information. - :param start_time: The start time of the time range covered by the - statistics. + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The start time of the time range covered by + the statistics. :type start_time: datetime - :param last_update_time: The time at which the statistics were last - updated. All statistics are limited to the range between startTime and - lastUpdateTime. + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. :type last_update_time: datetime - :param dedicated_core_time: The aggregated wall-clock time of the - dedicated compute node cores being part of the pool. + :param dedicated_core_time: Required. The aggregated wall-clock time of + the dedicated compute node cores being part of the pool. :type dedicated_core_time: timedelta """ @@ -39,8 +41,8 @@ class UsageStatistics(Model): 'dedicated_core_time': {'key': 'dedicatedCoreTime', 'type': 'duration'}, } - def __init__(self, start_time, last_update_time, dedicated_core_time): - super(UsageStatistics, self).__init__() - self.start_time = start_time - self.last_update_time = last_update_time - self.dedicated_core_time = dedicated_core_time + def __init__(self, **kwargs): + super(UsageStatistics, self).__init__(**kwargs) + self.start_time = kwargs.get('start_time', None) + self.last_update_time = kwargs.get('last_update_time', None) + self.dedicated_core_time = kwargs.get('dedicated_core_time', None) diff --git a/azure-batch/azure/batch/models/usage_statistics_py3.py b/azure-batch/azure/batch/models/usage_statistics_py3.py new file mode 100644 index 000000000000..9fafd25d7130 --- /dev/null +++ b/azure-batch/azure/batch/models/usage_statistics_py3.py @@ -0,0 +1,48 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class UsageStatistics(Model): + """Statistics related to pool usage information. + + All required parameters must be populated in order to send to Azure. + + :param start_time: Required. The start time of the time range covered by + the statistics. + :type start_time: datetime + :param last_update_time: Required. The time at which the statistics were + last updated. All statistics are limited to the range between startTime + and lastUpdateTime. + :type last_update_time: datetime + :param dedicated_core_time: Required. The aggregated wall-clock time of + the dedicated compute node cores being part of the pool. + :type dedicated_core_time: timedelta + """ + + _validation = { + 'start_time': {'required': True}, + 'last_update_time': {'required': True}, + 'dedicated_core_time': {'required': True}, + } + + _attribute_map = { + 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, + 'last_update_time': {'key': 'lastUpdateTime', 'type': 'iso-8601'}, + 'dedicated_core_time': {'key': 'dedicatedCoreTime', 'type': 'duration'}, + } + + def __init__(self, *, start_time, last_update_time, dedicated_core_time, **kwargs) -> None: + super(UsageStatistics, self).__init__(**kwargs) + self.start_time = start_time + self.last_update_time = last_update_time + self.dedicated_core_time = dedicated_core_time diff --git a/azure-batch/azure/batch/models/user_account.py b/azure-batch/azure/batch/models/user_account.py index 43ffe1d3da3c..e630e5ec5df0 100644 --- a/azure-batch/azure/batch/models/user_account.py +++ b/azure-batch/azure/batch/models/user_account.py @@ -16,15 +16,14 @@ class UserAccount(Model): """Properties used to create a user used to execute tasks on an Azure Batch node. - :param name: The name of the user account. + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the user account. :type name: str - :param password: The password for the user account. + :param password: Required. The password for the user account. :type password: str - :param elevation_level: The elevation level of the user account. nonAdmin - - The auto user is a standard user without elevated access. admin - The - auto user is a user with elevated access and operates with full - Administrator permissions. The default value is nonAdmin. Possible values - include: 'nonAdmin', 'admin' + :param elevation_level: The elevation level of the user account. The + default value is nonAdmin. Possible values include: 'nonAdmin', 'admin' :type elevation_level: str or ~azure.batch.models.ElevationLevel :param linux_user_configuration: The Linux-specific user configuration for the user account. This property is ignored if specified on a Windows pool. @@ -44,9 +43,9 @@ class UserAccount(Model): 'linux_user_configuration': {'key': 'linuxUserConfiguration', 'type': 'LinuxUserConfiguration'}, } - def __init__(self, name, password, elevation_level=None, linux_user_configuration=None): - super(UserAccount, self).__init__() - self.name = name - self.password = password - self.elevation_level = elevation_level - self.linux_user_configuration = linux_user_configuration + def __init__(self, **kwargs): + super(UserAccount, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.password = kwargs.get('password', None) + self.elevation_level = kwargs.get('elevation_level', None) + self.linux_user_configuration = kwargs.get('linux_user_configuration', None) diff --git a/azure-batch/azure/batch/models/user_account_py3.py b/azure-batch/azure/batch/models/user_account_py3.py new file mode 100644 index 000000000000..33a2d3690064 --- /dev/null +++ b/azure-batch/azure/batch/models/user_account_py3.py @@ -0,0 +1,51 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class UserAccount(Model): + """Properties used to create a user used to execute tasks on an Azure Batch + node. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. The name of the user account. + :type name: str + :param password: Required. The password for the user account. + :type password: str + :param elevation_level: The elevation level of the user account. The + default value is nonAdmin. Possible values include: 'nonAdmin', 'admin' + :type elevation_level: str or ~azure.batch.models.ElevationLevel + :param linux_user_configuration: The Linux-specific user configuration for + the user account. This property is ignored if specified on a Windows pool. + If not specified, the user is created with the default options. + :type linux_user_configuration: ~azure.batch.models.LinuxUserConfiguration + """ + + _validation = { + 'name': {'required': True}, + 'password': {'required': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'password': {'key': 'password', 'type': 'str'}, + 'elevation_level': {'key': 'elevationLevel', 'type': 'ElevationLevel'}, + 'linux_user_configuration': {'key': 'linuxUserConfiguration', 'type': 'LinuxUserConfiguration'}, + } + + def __init__(self, *, name: str, password: str, elevation_level=None, linux_user_configuration=None, **kwargs) -> None: + super(UserAccount, self).__init__(**kwargs) + self.name = name + self.password = password + self.elevation_level = elevation_level + self.linux_user_configuration = linux_user_configuration diff --git a/azure-batch/azure/batch/models/user_identity.py b/azure-batch/azure/batch/models/user_identity.py index 43d5e0e5e6ca..b75dfd7306b3 100644 --- a/azure-batch/azure/batch/models/user_identity.py +++ b/azure-batch/azure/batch/models/user_identity.py @@ -35,7 +35,7 @@ class UserIdentity(Model): 'auto_user': {'key': 'autoUser', 'type': 'AutoUserSpecification'}, } - def __init__(self, user_name=None, auto_user=None): - super(UserIdentity, self).__init__() - self.user_name = user_name - self.auto_user = auto_user + def __init__(self, **kwargs): + super(UserIdentity, self).__init__(**kwargs) + self.user_name = kwargs.get('user_name', None) + self.auto_user = kwargs.get('auto_user', None) diff --git a/azure-batch/azure/batch/models/user_identity_py3.py b/azure-batch/azure/batch/models/user_identity_py3.py new file mode 100644 index 000000000000..e566f58cd51c --- /dev/null +++ b/azure-batch/azure/batch/models/user_identity_py3.py @@ -0,0 +1,41 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class UserIdentity(Model): + """The definition of the user identity under which the task is run. + + Specify either the userName or autoUser property, but not both. On + CloudServiceConfiguration pools, this user is logged in with the + INTERACTIVE flag. On Windows VirtualMachineConfiguration pools, this user + is logged in with the BATCH flag. + + :param user_name: The name of the user identity under which the task is + run. The userName and autoUser properties are mutually exclusive; you must + specify one but not both. + :type user_name: str + :param auto_user: The auto user under which the task is run. The userName + and autoUser properties are mutually exclusive; you must specify one but + not both. + :type auto_user: ~azure.batch.models.AutoUserSpecification + """ + + _attribute_map = { + 'user_name': {'key': 'username', 'type': 'str'}, + 'auto_user': {'key': 'autoUser', 'type': 'AutoUserSpecification'}, + } + + def __init__(self, *, user_name: str=None, auto_user=None, **kwargs) -> None: + super(UserIdentity, self).__init__(**kwargs) + self.user_name = user_name + self.auto_user = auto_user diff --git a/azure-batch/azure/batch/models/virtual_machine_configuration.py b/azure-batch/azure/batch/models/virtual_machine_configuration.py index 4e7ee23ae81b..52b8d7f6c8c5 100644 --- a/azure-batch/azure/batch/models/virtual_machine_configuration.py +++ b/azure-batch/azure/batch/models/virtual_machine_configuration.py @@ -16,13 +16,15 @@ class VirtualMachineConfiguration(Model): """The configuration for compute nodes in a pool based on the Azure Virtual Machines infrastructure. - :param image_reference: A reference to the Azure Virtual Machines - Marketplace image or the custom Virtual Machine image to use. + All required parameters must be populated in order to send to Azure. + + :param image_reference: Required. A reference to the Azure Virtual + Machines Marketplace image or the custom Virtual Machine image to use. :type image_reference: ~azure.batch.models.ImageReference :param os_disk: Settings for the operating system disk of the Virtual Machine. :type os_disk: ~azure.batch.models.OSDisk - :param node_agent_sku_id: The SKU of the Batch node agent to be + :param node_agent_sku_id: Required. The SKU of the Batch node agent to be provisioned on compute nodes in the pool. The Batch node agent is a program that runs on each node in the pool, and provides the command-and-control interface between the node and the Batch service. @@ -79,12 +81,12 @@ class VirtualMachineConfiguration(Model): 'container_configuration': {'key': 'containerConfiguration', 'type': 'ContainerConfiguration'}, } - def __init__(self, image_reference, node_agent_sku_id, os_disk=None, windows_configuration=None, data_disks=None, license_type=None, container_configuration=None): - super(VirtualMachineConfiguration, self).__init__() - self.image_reference = image_reference - self.os_disk = os_disk - self.node_agent_sku_id = node_agent_sku_id - self.windows_configuration = windows_configuration - self.data_disks = data_disks - self.license_type = license_type - self.container_configuration = container_configuration + def __init__(self, **kwargs): + super(VirtualMachineConfiguration, self).__init__(**kwargs) + self.image_reference = kwargs.get('image_reference', None) + self.os_disk = kwargs.get('os_disk', None) + self.node_agent_sku_id = kwargs.get('node_agent_sku_id', None) + self.windows_configuration = kwargs.get('windows_configuration', None) + self.data_disks = kwargs.get('data_disks', None) + self.license_type = kwargs.get('license_type', None) + self.container_configuration = kwargs.get('container_configuration', None) diff --git a/azure-batch/azure/batch/models/virtual_machine_configuration_py3.py b/azure-batch/azure/batch/models/virtual_machine_configuration_py3.py new file mode 100644 index 000000000000..686568a7e18b --- /dev/null +++ b/azure-batch/azure/batch/models/virtual_machine_configuration_py3.py @@ -0,0 +1,92 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class VirtualMachineConfiguration(Model): + """The configuration for compute nodes in a pool based on the Azure Virtual + Machines infrastructure. + + All required parameters must be populated in order to send to Azure. + + :param image_reference: Required. A reference to the Azure Virtual + Machines Marketplace image or the custom Virtual Machine image to use. + :type image_reference: ~azure.batch.models.ImageReference + :param os_disk: Settings for the operating system disk of the Virtual + Machine. + :type os_disk: ~azure.batch.models.OSDisk + :param node_agent_sku_id: Required. The SKU of the Batch node agent to be + provisioned on compute nodes in the pool. The Batch node agent is a + program that runs on each node in the pool, and provides the + command-and-control interface between the node and the Batch service. + There are different implementations of the node agent, known as SKUs, for + different operating systems. You must specify a node agent SKU which + matches the selected image reference. To get the list of supported node + agent SKUs along with their list of verified image references, see the + 'List supported node agent SKUs' operation. + :type node_agent_sku_id: str + :param windows_configuration: Windows operating system settings on the + virtual machine. This property must not be specified if the imageReference + or osDisk property specifies a Linux OS image. + :type windows_configuration: ~azure.batch.models.WindowsConfiguration + :param data_disks: The configuration for data disks attached to the + comptue nodes in the pool. This property must be specified if the compute + nodes in the pool need to have empty data disks attached to them. This + cannot be updated. Each node gets its own disk (the disk is not a file + share). Existing disks cannot be attached, each attached disk is empty. + When the node is removed from the pool, the disk and all data associated + with it is also deleted. The disk is not formatted after being attached, + it must be formatted before use - for more information see + https://docs.microsoft.com/en-us/azure/virtual-machines/linux/classic/attach-disk#initialize-a-new-data-disk-in-linux + and + https://docs.microsoft.com/en-us/azure/virtual-machines/windows/attach-disk-ps#add-an-empty-data-disk-to-a-virtual-machine. + :type data_disks: list[~azure.batch.models.DataDisk] + :param license_type: The type of on-premises license to be used when + deploying the operating system. This only applies to images that contain + the Windows operating system, and should only be used when you hold valid + on-premises licenses for the nodes which will be deployed. If omitted, no + on-premises licensing discount is applied. Values are: + Windows_Server - The on-premises license is for Windows Server. + Windows_Client - The on-premises license is for Windows Client. + :type license_type: str + :param container_configuration: The container configuration for the pool. + If specified, setup is performed on each node in the pool to allow tasks + to run in containers. All regular tasks and job manager tasks run on this + pool must specify the containerSettings property, and all other tasks may + specify it. + :type container_configuration: ~azure.batch.models.ContainerConfiguration + """ + + _validation = { + 'image_reference': {'required': True}, + 'node_agent_sku_id': {'required': True}, + } + + _attribute_map = { + 'image_reference': {'key': 'imageReference', 'type': 'ImageReference'}, + 'os_disk': {'key': 'osDisk', 'type': 'OSDisk'}, + 'node_agent_sku_id': {'key': 'nodeAgentSKUId', 'type': 'str'}, + 'windows_configuration': {'key': 'windowsConfiguration', 'type': 'WindowsConfiguration'}, + 'data_disks': {'key': 'dataDisks', 'type': '[DataDisk]'}, + 'license_type': {'key': 'licenseType', 'type': 'str'}, + 'container_configuration': {'key': 'containerConfiguration', 'type': 'ContainerConfiguration'}, + } + + def __init__(self, *, image_reference, node_agent_sku_id: str, os_disk=None, windows_configuration=None, data_disks=None, license_type: str=None, container_configuration=None, **kwargs) -> None: + super(VirtualMachineConfiguration, self).__init__(**kwargs) + self.image_reference = image_reference + self.os_disk = os_disk + self.node_agent_sku_id = node_agent_sku_id + self.windows_configuration = windows_configuration + self.data_disks = data_disks + self.license_type = license_type + self.container_configuration = container_configuration diff --git a/azure-batch/azure/batch/models/windows_configuration.py b/azure-batch/azure/batch/models/windows_configuration.py index 00788c976c0b..6b27533d2558 100644 --- a/azure-batch/azure/batch/models/windows_configuration.py +++ b/azure-batch/azure/batch/models/windows_configuration.py @@ -24,6 +24,6 @@ class WindowsConfiguration(Model): 'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'}, } - def __init__(self, enable_automatic_updates=None): - super(WindowsConfiguration, self).__init__() - self.enable_automatic_updates = enable_automatic_updates + def __init__(self, **kwargs): + super(WindowsConfiguration, self).__init__(**kwargs) + self.enable_automatic_updates = kwargs.get('enable_automatic_updates', None) diff --git a/azure-batch/azure/batch/models/windows_configuration_py3.py b/azure-batch/azure/batch/models/windows_configuration_py3.py new file mode 100644 index 000000000000..40a4aedf6494 --- /dev/null +++ b/azure-batch/azure/batch/models/windows_configuration_py3.py @@ -0,0 +1,29 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class WindowsConfiguration(Model): + """Windows operating system settings to apply to the virtual machine. + + :param enable_automatic_updates: Whether automatic updates are enabled on + the virtual machine. If omitted, the default value is true. + :type enable_automatic_updates: bool + """ + + _attribute_map = { + 'enable_automatic_updates': {'key': 'enableAutomaticUpdates', 'type': 'bool'}, + } + + def __init__(self, *, enable_automatic_updates: bool=None, **kwargs) -> None: + super(WindowsConfiguration, self).__init__(**kwargs) + self.enable_automatic_updates = enable_automatic_updates diff --git a/azure-batch/azure/batch/operations/account_operations.py b/azure-batch/azure/batch/operations/account_operations.py index d5081a83a8e0..efd3a9e51e8c 100644 --- a/azure-batch/azure/batch/operations/account_operations.py +++ b/azure-batch/azure/batch/operations/account_operations.py @@ -22,7 +22,7 @@ class AccountOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -96,7 +96,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -111,9 +111,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -191,7 +190,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -206,9 +205,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/operations/application_operations.py b/azure-batch/azure/batch/operations/application_operations.py index 262efcbf532e..864d2ff12226 100644 --- a/azure-batch/azure/batch/operations/application_operations.py +++ b/azure-batch/azure/batch/operations/application_operations.py @@ -22,7 +22,7 @@ class ApplicationOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -97,7 +97,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -112,9 +112,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -187,7 +186,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -202,8 +201,8 @@ def get( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/operations/certificate_operations.py b/azure-batch/azure/batch/operations/certificate_operations.py index 927510a1117e..d4bdafb94a7b 100644 --- a/azure-batch/azure/batch/operations/certificate_operations.py +++ b/azure-batch/azure/batch/operations/certificate_operations.py @@ -22,7 +22,7 @@ class CertificateOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -98,9 +98,8 @@ def add( body_content = self._serialize.body(certificate, 'CertificateAddParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201]: raise models.BatchErrorException(self._deserialize, response) @@ -183,7 +182,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -198,9 +197,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -279,7 +277,6 @@ def cancel_deletion( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -294,8 +291,8 @@ def cancel_deletion( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: raise models.BatchErrorException(self._deserialize, response) @@ -376,7 +373,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -391,8 +387,8 @@ def delete( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -466,7 +462,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -481,8 +477,8 @@ def get( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/operations/compute_node_operations.py b/azure-batch/azure/batch/operations/compute_node_operations.py index daec77959a0a..ea988094f6a4 100644 --- a/azure-batch/azure/batch/operations/compute_node_operations.py +++ b/azure-batch/azure/batch/operations/compute_node_operations.py @@ -22,7 +22,7 @@ class ComputeNodeOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -111,9 +111,8 @@ def add_user( body_content = self._serialize.body(user, 'ComputeNodeUser') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201]: raise models.BatchErrorException(self._deserialize, response) @@ -188,7 +187,6 @@ def delete_user( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -203,8 +201,8 @@ def delete_user( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -301,9 +299,8 @@ def update_user( body_content = self._serialize.body(node_update_user_parameter, 'NodeUpdateUserParameter') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -378,7 +375,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -393,8 +390,8 @@ def get( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -420,7 +417,7 @@ def get( get.metadata = {'url': '/pools/{poolId}/nodes/{nodeId}'} def reboot( - self, pool_id, node_id, compute_node_reboot_options=None, node_reboot_option=None, custom_headers=None, raw=False, **operation_config): + self, pool_id, node_id, node_reboot_option=None, compute_node_reboot_options=None, custom_headers=None, raw=False, **operation_config): """Restarts the specified compute node. You can restart a node only if it is in an idle or running state. @@ -429,16 +426,16 @@ def reboot( :type pool_id: str :param node_id: The ID of the compute node that you want to restart. :type node_id: str - :param compute_node_reboot_options: Additional parameters for the - operation - :type compute_node_reboot_options: - ~azure.batch.models.ComputeNodeRebootOptions :param node_reboot_option: When to reboot the compute node and what to do with currently running tasks. The default value is requeue. Possible values include: 'requeue', 'terminate', 'taskCompletion', 'retainedData' :type node_reboot_option: str or ~azure.batch.models.ComputeNodeRebootOption + :param compute_node_reboot_options: Additional parameters for the + operation + :type compute_node_reboot_options: + ~azure.batch.models.ComputeNodeRebootOptions :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -502,9 +499,8 @@ def reboot( body_content = None # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -522,7 +518,7 @@ def reboot( reboot.metadata = {'url': '/pools/{poolId}/nodes/{nodeId}/reboot'} def reimage( - self, pool_id, node_id, compute_node_reimage_options=None, node_reimage_option=None, custom_headers=None, raw=False, **operation_config): + self, pool_id, node_id, node_reimage_option=None, compute_node_reimage_options=None, custom_headers=None, raw=False, **operation_config): """Reinstalls the operating system on the specified compute node. You can reinstall the operating system on a node only if it is in an @@ -533,16 +529,16 @@ def reimage( :type pool_id: str :param node_id: The ID of the compute node that you want to restart. :type node_id: str - :param compute_node_reimage_options: Additional parameters for the - operation - :type compute_node_reimage_options: - ~azure.batch.models.ComputeNodeReimageOptions :param node_reimage_option: When to reimage the compute node and what to do with currently running tasks. The default value is requeue. Possible values include: 'requeue', 'terminate', 'taskCompletion', 'retainedData' :type node_reimage_option: str or ~azure.batch.models.ComputeNodeReimageOption + :param compute_node_reimage_options: Additional parameters for the + operation + :type compute_node_reimage_options: + ~azure.batch.models.ComputeNodeReimageOptions :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -606,9 +602,8 @@ def reimage( body_content = None # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -626,7 +621,7 @@ def reimage( reimage.metadata = {'url': '/pools/{poolId}/nodes/{nodeId}/reimage'} def disable_scheduling( - self, pool_id, node_id, compute_node_disable_scheduling_options=None, node_disable_scheduling_option=None, custom_headers=None, raw=False, **operation_config): + self, pool_id, node_id, node_disable_scheduling_option=None, compute_node_disable_scheduling_options=None, custom_headers=None, raw=False, **operation_config): """Disables task scheduling on the specified compute node. You can disable task scheduling on a node only if its current @@ -637,16 +632,16 @@ def disable_scheduling( :param node_id: The ID of the compute node on which you want to disable task scheduling. :type node_id: str - :param compute_node_disable_scheduling_options: Additional parameters - for the operation - :type compute_node_disable_scheduling_options: - ~azure.batch.models.ComputeNodeDisableSchedulingOptions :param node_disable_scheduling_option: What to do with currently running tasks when disabling task scheduling on the compute node. The default value is requeue. Possible values include: 'requeue', 'terminate', 'taskCompletion' :type node_disable_scheduling_option: str or ~azure.batch.models.DisableComputeNodeSchedulingOption + :param compute_node_disable_scheduling_options: Additional parameters + for the operation + :type compute_node_disable_scheduling_options: + ~azure.batch.models.ComputeNodeDisableSchedulingOptions :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -710,9 +705,8 @@ def disable_scheduling( body_content = None # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -784,7 +778,6 @@ def enable_scheduling( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -799,8 +792,8 @@ def enable_scheduling( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -877,7 +870,7 @@ def get_remote_login_settings( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -892,8 +885,8 @@ def get_remote_login_settings( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -980,7 +973,7 @@ def get_remote_desktop( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -995,8 +988,8 @@ def get_remote_desktop( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=True, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -1085,6 +1078,7 @@ def upload_batch_service_logs( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; odata=minimalmetadata; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) @@ -1103,9 +1097,8 @@ def upload_batch_service_logs( body_content = self._serialize.body(upload_batch_service_logs_configuration, 'UploadBatchServiceLogsConfiguration') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -1199,7 +1192,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1214,9 +1207,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/operations/file_operations.py b/azure-batch/azure/batch/operations/file_operations.py index 079f78e5a2d1..cf997c3bf42c 100644 --- a/azure-batch/azure/batch/operations/file_operations.py +++ b/azure-batch/azure/batch/operations/file_operations.py @@ -22,7 +22,7 @@ class FileOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -100,7 +100,6 @@ def delete_from_task( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -115,8 +114,8 @@ def delete_from_task( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -199,7 +198,7 @@ def get_from_task( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -220,8 +219,8 @@ def get_from_task( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=True, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -314,7 +313,6 @@ def get_properties_from_task( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -333,8 +331,8 @@ def get_properties_from_task( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.head(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.head(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -420,7 +418,6 @@ def delete_from_compute_node( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -435,8 +432,8 @@ def delete_from_compute_node( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -519,7 +516,7 @@ def get_from_compute_node( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -540,8 +537,8 @@ def get_from_compute_node( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=True, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=True, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -633,7 +630,6 @@ def get_properties_from_compute_node( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -652,8 +648,8 @@ def get_properties_from_compute_node( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.head(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.head(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -750,7 +746,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -765,9 +761,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -860,7 +855,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -875,9 +870,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/operations/job_operations.py b/azure-batch/azure/batch/operations/job_operations.py index 327ed6c51756..333d346add1a 100644 --- a/azure-batch/azure/batch/operations/job_operations.py +++ b/azure-batch/azure/batch/operations/job_operations.py @@ -22,7 +22,7 @@ class JobOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -86,7 +86,7 @@ def get_all_lifetime_statistics( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -101,8 +101,8 @@ def get_all_lifetime_statistics( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -195,7 +195,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -218,8 +217,8 @@ def delete( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -302,7 +301,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -325,8 +324,8 @@ def get( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -441,9 +440,8 @@ def patch( body_content = self._serialize.body(job_patch_parameter, 'JobPatchParameter') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -551,9 +549,8 @@ def update( body_content = self._serialize.body(job_update_parameter, 'JobUpdateParameter') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -668,9 +665,8 @@ def disable( body_content = self._serialize.body(job_disable_parameter, 'JobDisableParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -752,7 +748,6 @@ def enable( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -775,8 +770,8 @@ def enable( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -794,7 +789,7 @@ def enable( enable.metadata = {'url': '/jobs/{jobId}/enable'} def terminate( - self, job_id, job_terminate_options=None, terminate_reason=None, custom_headers=None, raw=False, **operation_config): + self, job_id, terminate_reason=None, job_terminate_options=None, custom_headers=None, raw=False, **operation_config): """Terminates the specified job, marking it as completed. When a Terminate Job request is received, the Batch service sets the @@ -807,11 +802,11 @@ def terminate( :param job_id: The ID of the job to terminate. :type job_id: str - :param job_terminate_options: Additional parameters for the operation - :type job_terminate_options: ~azure.batch.models.JobTerminateOptions :param terminate_reason: The text you want to appear as the job's TerminateReason. The default is 'UserTerminate'. :type terminate_reason: str + :param job_terminate_options: Additional parameters for the operation + :type job_terminate_options: ~azure.batch.models.JobTerminateOptions :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -894,9 +889,8 @@ def terminate( body_content = None # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -984,9 +978,8 @@ def add( body_content = self._serialize.body(job, 'JobAddParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201]: raise models.BatchErrorException(self._deserialize, response) @@ -1071,7 +1064,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1086,9 +1079,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -1183,7 +1175,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1198,9 +1190,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -1298,7 +1289,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1313,9 +1304,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -1339,11 +1329,7 @@ def get_task_counts( Task counts provide a count of the tasks by active, running or completed task state, and a count of tasks which succeeded or failed. - Tasks in the preparing state are counted as running. If the - validationStatus is unvalidated, then the Batch service has not been - able to check state counts against the task states as reported in the - List Tasks API. The validationStatus may be unvalidated if the job - contains more than 200,000 tasks. + Tasks in the preparing state are counted as running. :param job_id: The ID of the job. :type job_id: str @@ -1390,7 +1376,7 @@ def get_task_counts( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1405,8 +1391,8 @@ def get_task_counts( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/operations/job_schedule_operations.py b/azure-batch/azure/batch/operations/job_schedule_operations.py index 6371d970caca..b209a1915ee0 100644 --- a/azure-batch/azure/batch/operations/job_schedule_operations.py +++ b/azure-batch/azure/batch/operations/job_schedule_operations.py @@ -22,7 +22,7 @@ class JobScheduleOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -97,7 +97,6 @@ def exists( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -120,8 +119,8 @@ def exists( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.head(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.head(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: raise models.BatchErrorException(self._deserialize, response) @@ -206,7 +205,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -229,8 +227,8 @@ def delete( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -315,7 +313,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -338,8 +336,8 @@ def get( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -460,9 +458,8 @@ def patch( body_content = self._serialize.body(job_schedule_patch_parameter, 'JobSchedulePatchParameter') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -575,9 +572,8 @@ def update( body_content = self._serialize.body(job_schedule_update_parameter, 'JobScheduleUpdateParameter') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -656,7 +652,6 @@ def disable( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -679,8 +674,8 @@ def disable( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: raise models.BatchErrorException(self._deserialize, response) @@ -757,7 +752,6 @@ def enable( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -780,8 +774,8 @@ def enable( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: raise models.BatchErrorException(self._deserialize, response) @@ -858,7 +852,6 @@ def terminate( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -881,8 +874,8 @@ def terminate( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -961,9 +954,8 @@ def add( body_content = self._serialize.body(cloud_job_schedule, 'JobScheduleAddParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201]: raise models.BatchErrorException(self._deserialize, response) @@ -1050,7 +1042,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1065,9 +1057,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/operations/pool_operations.py b/azure-batch/azure/batch/operations/pool_operations.py index a13312db2bdb..6d9d40f7e5ef 100644 --- a/azure-batch/azure/batch/operations/pool_operations.py +++ b/azure-batch/azure/batch/operations/pool_operations.py @@ -22,7 +22,7 @@ class PoolOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -114,7 +114,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -129,9 +129,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -199,7 +198,7 @@ def get_all_lifetime_statistics( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -214,8 +213,8 @@ def get_all_lifetime_statistics( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -304,9 +303,8 @@ def add( body_content = self._serialize.body(pool, 'PoolAddParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201]: raise models.BatchErrorException(self._deserialize, response) @@ -391,7 +389,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -406,9 +404,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -498,7 +495,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -521,8 +517,8 @@ def delete( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -594,7 +590,6 @@ def exists( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -617,8 +612,8 @@ def exists( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.head(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.head(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200, 404]: raise models.BatchErrorException(self._deserialize, response) @@ -705,7 +700,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -728,8 +723,8 @@ def get( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -845,9 +840,8 @@ def patch( body_content = self._serialize.body(pool_patch_parameter, 'PoolPatchParameter') # Construct and send request - request = self._client.patch(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -913,7 +907,6 @@ def disable_auto_scale( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -928,8 +921,8 @@ def disable_auto_scale( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -947,7 +940,7 @@ def disable_auto_scale( disable_auto_scale.metadata = {'url': '/pools/{poolId}/disableautoscale'} def enable_auto_scale( - self, pool_id, pool_enable_auto_scale_options=None, auto_scale_formula=None, auto_scale_evaluation_interval=None, custom_headers=None, raw=False, **operation_config): + self, pool_id, auto_scale_formula=None, auto_scale_evaluation_interval=None, pool_enable_auto_scale_options=None, custom_headers=None, raw=False, **operation_config): """Enables automatic scaling for a pool. You cannot enable automatic scaling on a pool if a resize operation is @@ -960,10 +953,6 @@ def enable_auto_scale( :param pool_id: The ID of the pool on which to enable automatic scaling. :type pool_id: str - :param pool_enable_auto_scale_options: Additional parameters for the - operation - :type pool_enable_auto_scale_options: - ~azure.batch.models.PoolEnableAutoScaleOptions :param auto_scale_formula: The formula for the desired number of compute nodes in the pool. The formula is checked for validity before it is applied to the pool. If the formula is not valid, the Batch @@ -984,6 +973,10 @@ def enable_auto_scale( be started, with its starting time being the time when this request was issued. :type auto_scale_evaluation_interval: timedelta + :param pool_enable_auto_scale_options: Additional parameters for the + operation + :type pool_enable_auto_scale_options: + ~azure.batch.models.PoolEnableAutoScaleOptions :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -1061,9 +1054,8 @@ def enable_auto_scale( body_content = self._serialize.body(pool_enable_auto_scale_parameter, 'PoolEnableAutoScaleParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -1143,6 +1135,7 @@ def evaluate_auto_scale( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; odata=minimalmetadata; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) @@ -1161,9 +1154,8 @@ def evaluate_auto_scale( body_content = self._serialize.body(pool_evaluate_auto_scale_parameter, 'PoolEvaluateAutoScaleParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -1284,9 +1276,8 @@ def resize( body_content = self._serialize.body(pool_resize_parameter, 'PoolResizeParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -1372,7 +1363,6 @@ def stop_resize( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1395,8 +1385,8 @@ def stop_resize( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -1488,9 +1478,8 @@ def update_properties( body_content = self._serialize.body(pool_update_properties_parameter, 'PoolUpdatePropertiesParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: raise models.BatchErrorException(self._deserialize, response) @@ -1616,9 +1605,8 @@ def upgrade_os( body_content = self._serialize.body(pool_upgrade_os_parameter, 'PoolUpgradeOSParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) @@ -1728,9 +1716,8 @@ def remove_nodes( body_content = self._serialize.body(node_remove_parameter, 'NodeRemoveParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [202]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/operations/task_operations.py b/azure-batch/azure/batch/operations/task_operations.py index 505867585704..526187533a57 100644 --- a/azure-batch/azure/batch/operations/task_operations.py +++ b/azure-batch/azure/batch/operations/task_operations.py @@ -22,7 +22,7 @@ class TaskOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API Version. Constant value: "2018-03-01.6.1". + :ivar api_version: Client API Version. Constant value: "2018-08-01.7.0". """ models = models @@ -32,7 +32,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-03-01.6.1" + self.api_version = "2018-08-01.7.0" self.config = config @@ -107,9 +107,8 @@ def add( body_content = self._serialize.body(task, 'TaskAddParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [201]: raise models.BatchErrorException(self._deserialize, response) @@ -204,7 +203,7 @@ def internal_paging(next_link=None, raw=False): # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -219,9 +218,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send( - request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -263,11 +261,12 @@ def add_collection( :param job_id: The ID of the job to which the task collection is to be added. :type job_id: str - :param value: The collection of tasks to add. The total serialized - size of this collection must be less than 4MB. If it is greater than - 4MB (for example if each task has 100's of resource files or - environment variables), the request will fail with code - 'RequestBodyTooLarge' and should be retried again with fewer tasks. + :param value: The collection of tasks to add. The maximum count of + tasks is 100. The total serialized size of this collection must be + less than 1MB. If it is greater than 1MB (for example if each task has + 100's of resource files or environment variables), the request will + fail with code 'RequestBodyTooLarge' and should be retried again with + fewer tasks. :type value: list[~azure.batch.models.TaskAddParameter] :param task_add_collection_options: Additional parameters for the operation @@ -313,6 +312,7 @@ def add_collection( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; odata=minimalmetadata; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) @@ -331,9 +331,8 @@ def add_collection( body_content = self._serialize.body(task_collection, 'TaskAddCollectionParameter') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -423,7 +422,6 @@ def delete( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -446,8 +444,8 @@ def delete( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.delete(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -537,7 +535,7 @@ def get( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -560,8 +558,8 @@ def get( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -588,20 +586,20 @@ def get( get.metadata = {'url': '/jobs/{jobId}/tasks/{taskId}'} def update( - self, job_id, task_id, task_update_options=None, constraints=None, custom_headers=None, raw=False, **operation_config): + self, job_id, task_id, constraints=None, task_update_options=None, custom_headers=None, raw=False, **operation_config): """Updates the properties of the specified task. :param job_id: The ID of the job containing the task. :type job_id: str :param task_id: The ID of the task to update. :type task_id: str - :param task_update_options: Additional parameters for the operation - :type task_update_options: ~azure.batch.models.TaskUpdateOptions :param constraints: Constraints that apply to this task. If omitted, the task is given the default constraints. For multi-instance tasks, updating the retention time applies only to the primary task and not subtasks. :type constraints: ~azure.batch.models.TaskConstraints + :param task_update_options: Additional parameters for the operation + :type task_update_options: ~azure.batch.models.TaskUpdateOptions :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -680,9 +678,8 @@ def update( body_content = self._serialize.body(task_update_parameter, 'TaskUpdateParameter') # Construct and send request - request = self._client.put(url, query_parameters) - response = self._client.send( - request, header_parameters, body_content, stream=False, **operation_config) + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -760,7 +757,7 @@ def list_subtasks( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' + header_parameters['Accept'] = 'application/json' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -775,8 +772,8 @@ def list_subtasks( header_parameters['ocp-date'] = self._serialize.header("ocp_date", ocp_date, 'rfc-1123') # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [200]: raise models.BatchErrorException(self._deserialize, response) @@ -867,7 +864,6 @@ def terminate( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -890,8 +886,8 @@ def terminate( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: raise models.BatchErrorException(self._deserialize, response) @@ -981,7 +977,6 @@ def reactivate( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -1004,8 +999,8 @@ def reactivate( header_parameters['If-Unmodified-Since'] = self._serialize.header("if_unmodified_since", if_unmodified_since, 'rfc-1123') # Construct and send request - request = self._client.post(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) + request = self._client.post(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) if response.status_code not in [204]: raise models.BatchErrorException(self._deserialize, response) diff --git a/azure-batch/azure/batch/version.py b/azure-batch/azure/batch/version.py index 440b1bcceaf3..654c55a24205 100644 --- a/azure-batch/azure/batch/version.py +++ b/azure-batch/azure/batch/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "4.1.3" +VERSION = "5.0.0" diff --git a/azure-batch/setup.py b/azure-batch/setup.py index dabe5b6ec31e..874bdc2e5693 100644 --- a/azure-batch/setup.py +++ b/azure-batch/setup.py @@ -77,7 +77,7 @@ zip_safe=False, packages=find_packages(exclude=["tests"]), install_requires=[ - 'msrestazure>=0.4.20,<2.0.0', + 'msrestazure>=0.4.32', 'azure-common~=1.1', ], cmdclass=cmdclass diff --git a/azure-batch/tests/batch_preparers.py b/azure-batch/tests/batch_preparers.py index 5b2204ad6351..86fff123a878 100644 --- a/azure-batch/tests/batch_preparers.py +++ b/azure-batch/tests/batch_preparers.py @@ -85,7 +85,7 @@ def create_resource(self, name, **kwargs): group.name, storage.name ) - batch_account.auto_storage=models.AutoStorageBaseProperties(storage_resource) + batch_account.auto_storage=models.AutoStorageBaseProperties(storage_account_id=storage_resource) account_setup = self.client.batch_account.create( group.name, name, @@ -168,7 +168,7 @@ def create_resource(self, name, **kwargs): azure.mgmt.batch.BatchManagementClient) group = self._get_resource_group(**kwargs) batch_account = self._get_batch_account(**kwargs) - user = models.UserAccount('task-user', 'kt#_gahr!@aGERDXA', models.ElevationLevel.admin) + user = models.UserAccount(name='task-user', password='kt#_gahr!@aGERDXA', elevation_level=models.ElevationLevel.admin) vm_size = 'Standard_A1' if self.config == 'paas': @@ -286,7 +286,7 @@ def create_resource(self, name, **kwargs): try: self.client.job.add(self.resource) except azure.batch.models.BatchErrorException as e: - message = "{}: ".format(e.error.code, e.error.message) + message = "{}:{} ".format(e.error.code, e.error.message) for v in e.error.values: message += "\n{}: {}".format(v.key, v.value) raise AzureTestError(message) diff --git a/azure-batch/tests/recordings/test_batch.test_batch_applications.yaml b/azure-batch/tests/recordings/test_batch.test_batch_applications.yaml index 378d3c847f77..ae6b5d20ff11 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_applications.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_applications.yaml @@ -5,22 +5,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:01:32 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:23:12 GMT'] method: GET - uri: https://batchf06f0dd7.westcentralus.batch.azure.com/applications?api-version=2018-03-01.6.1 + uri: https://batchf06f0dd7.eastus.batch.azure.com/applications?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf06f0dd7.westcentralus.batch.azure.com/$metadata#listapplicationsummariesresponses\",\"value\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf06f0dd7.eastus.batch.azure.com/$metadata#listapplicationsummariesresponses\",\"value\":[\r\n \ {\r\n \"id\":\"application_id\",\"versions\":[\r\n \"v1.0\"\r\n \ ]\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:01:33 GMT'] - request-id: [d3b246b1-d9c3-4d37-a43f-1d137511e5a1] + date: ['Fri, 24 Aug 2018 06:23:13 GMT'] + request-id: [f9ccae6c-f942-4a86-8f20-39d58c94e508] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -32,52 +31,51 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:01:33 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:23:13 GMT'] method: GET - uri: https://batchf06f0dd7.westcentralus.batch.azure.com/applications/application_id?api-version=2018-03-01.6.1 + uri: https://batchf06f0dd7.eastus.batch.azure.com/applications/application_id?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf06f0dd7.westcentralus.batch.azure.com/$metadata#getapplicationsummaryresponse/@Element\",\"id\":\"application_id\",\"versions\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf06f0dd7.eastus.batch.azure.com/$metadata#getapplicationsummaryresponse/@Element\",\"id\":\"application_id\",\"versions\":[\r\n \ \"v1.0\"\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:01:34 GMT'] - request-id: [0573d3f0-7f70-4757-bbb1-62da2e1c25a2] + date: ['Fri, 24 Aug 2018 06:23:14 GMT'] + request-id: [48cc2c6a-c810-4bb6-a6dc-777b25c5705d] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"id": "python_task_with_app_package", "applicationPackageReferences": - [{"version": "v1.0", "applicationId": "application_id"}], "commandLine": "cmd - /c \"echo hello world\""}' + body: '{"applicationPackageReferences": [{"applicationId": "application_id", "version": + "v1.0"}], "id": "python_task_with_app_package", "commandLine": "cmd /c \"echo + hello world\""}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['174'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:01:34 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:23:14 GMT'] method: POST - uri: https://batchf06f0dd7.westcentralus.batch.azure.com/jobs/batchf06f0dd7/tasks?api-version=2018-03-01.6.1 + uri: https://batchf06f0dd7.eastus.batch.azure.com/jobs/batchf06f0dd7/tasks?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchf06f0dd7.westcentralus.batch.azure.com/jobs/batchf06f0dd7/tasks/python_task_with_app_package'] + dataserviceid: ['https://batchf06f0dd7.eastus.batch.azure.com/jobs/batchf06f0dd7/tasks/python_task_with_app_package'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:01:35 GMT'] - etag: ['0x8D588A7E0AAFC74'] - last-modified: ['Tue, 13 Mar 2018 06:01:35 GMT'] - location: ['https://batchf06f0dd7.westcentralus.batch.azure.com/jobs/batchf06f0dd7/tasks/python_task_with_app_package'] - request-id: [7075703a-0c5d-4bfe-ba57-38281e41e1da] + date: ['Fri, 24 Aug 2018 06:23:14 GMT'] + etag: ['0x8D6098A132CCBE4'] + last-modified: ['Fri, 24 Aug 2018 06:23:15 GMT'] + location: ['https://batchf06f0dd7.eastus.batch.azure.com/jobs/batchf06f0dd7/tasks/python_task_with_app_package'] + request-id: [eefeba72-ccd4-4bdd-b18a-a6208c7e623e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -89,15 +87,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:01:35 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:23:15 GMT'] method: GET - uri: https://batchf06f0dd7.westcentralus.batch.azure.com/jobs/batchf06f0dd7/tasks/python_task_with_app_package?api-version=2018-03-01.6.1 + uri: https://batchf06f0dd7.eastus.batch.azure.com/jobs/batchf06f0dd7/tasks/python_task_with_app_package?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf06f0dd7.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"python_task_with_app_package\",\"url\":\"https://batchf06f0dd7.westcentralus.batch.azure.com/jobs/batchf06f0dd7/tasks/python_task_with_app_package\",\"eTag\":\"0x8D588A7E0AAFC74\",\"creationTime\":\"2018-03-13T06:01:35.3011316Z\",\"lastModified\":\"2018-03-13T06:01:35.3011316Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:01:35.3011316Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batchf06f0dd7.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"python_task_with_app_package\",\"url\":\"https://batchf06f0dd7.eastus.batch.azure.com/jobs/batchf06f0dd7/tasks/python_task_with_app_package\",\"eTag\":\"0x8D6098A132CCBE4\",\"creationTime\":\"2018-08-24T06:23:15.1343588Z\",\"lastModified\":\"2018-08-24T06:23:15.1343588Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:23:15.1343588Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"applicationPackageReferences\":[\r\n {\r\n \ \"applicationId\":\"application_id\",\"version\":\"v1.0\"\r\n }\r\n \ ],\"userIdentity\":{\r\n \"autoUser\":{\r\n \"elevationLevel\":\"nonadmin\"\r\n @@ -106,10 +103,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:01:35 GMT'] - etag: ['0x8D588A7E0AAFC74'] - last-modified: ['Tue, 13 Mar 2018 06:01:35 GMT'] - request-id: [e37a6a67-a391-49d6-8e05-134cc4d7851d] + date: ['Fri, 24 Aug 2018 06:23:15 GMT'] + etag: ['0x8D6098A132CCBE4'] + last-modified: ['Fri, 24 Aug 2018 06:23:15 GMT'] + request-id: [527593e6-02fe-43bc-9a6d-e332389f63b4] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_certificates.yaml b/azure-batch/tests/recordings/test_batch.test_batch_certificates.yaml index 8ac2d7d3dd15..dc8aabf2c48c 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_certificates.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_certificates.yaml @@ -1,28 +1,27 @@ interactions: - request: - body: '{"data": "MIIGMQIBAzCCBe0GCSqGSIb3DQEHAaCCBd4EggXaMIIF1jCCA8AGCSqGSIb3DQEHAaCCA7EEggOtMIIDqTCCA6UGCyqGSIb3DQEMCgECoIICtjCCArIwHAYKKoZIhvcNAQwBAzAOBAhyd3xCtln3iQICB9AEggKQhe5P10V9iV1BsDlwWT561Yu2hVq3JT8ae/ebx1ZR/gMApVereDKkS9Zg4vFyssusHebbK5pDpU8vfAqle0TM4m7wGsRj453ZorSPUfMpHvQnAOn+2pEpWdMThU7xvZ6DVpwhDOQk9166z+KnKdHGuJKh4haMT7Rw/6xZ1rsBt2423cwTrQVMQyACrEkianpuujubKltN99qRoFAxhQcnYE2KlYKw7lRcExq6mDSYAyk5xJZ1ZFdLj6MAryZroQit/0g5eyhoNEKwWbi8px5j71pRTf7yjN+deMGQKwbGl+3OgaL1UZ5fCjypbVL60kpIBxLZwIJ7p3jJ+q9pbq9zSdzshPYor5lxyUfXqaso/0/91ayNoBzg4hQGh618PhFI6RMGjwkzhB9xk74iweJ9HQyIHf8yx2RCSI22JuCMitPMWSGvOszhbNx3AEDLuiiAOHg391mprEtKZguOIr9LrJwem/YmcHbwyz5YAbZmiseKPkllfC7dafFfCFEkj6R2oegIsZo0pEKYisAXBqT0g+6/jGwuhlZcBo0f7UIZm88iA3MrJCjlXEgV5OcQdoWj+hq0lKEdnhtCKr03AIfukN6+4vjjarZeW1bs0swq0l3XFf5RHa11otshMS4mpewshB9iO9MuKWpRxuxeng4PlKZ/zuBqmPeUrjJ9454oK35Pq+dghfemt7AUpBH/KycDNIZgfdEWUZrRKBGnc519C+RTqxyt5hWL18nJk4LvSd3QKlJ1iyJxClhhb/NWEzPqNdyA5cxen+2T9bd/EqJ2KzRv5/BPVwTQkHH9W/TZElFyvFfOFIW2+03RKbVGw72Mr/0xKZ+awAnEfoU+SL/2Gj2m6PHkqFX2sOCi/tN9EA4xgdswEwYJKoZIhvcNAQkVMQYEBAEAAAAwXQYJKwYBBAGCNxEBMVAeTgBNAGkAYwByAG8AcwBvAGYAdAAgAFMAdAByAG8AbgBnACAAQwByAHkAcAB0AG8AZwByAGEAcABoAGkAYwAgAFAAcgBvAHYAaQBkAGUAcjBlBgkqhkiG9w0BCRQxWB5WAFAAdgBrAFQAbQBwADoANABjAGUANgAwADQAZABhAC0AMAA2ADgAMQAtADQANAAxADUALQBhADIAYwBhAC0ANQA3ADcAMwAwADgAZQA2AGQAOQBhAGMwggIOBgkqhkiG9w0BBwGgggH/BIIB+zCCAfcwggHzBgsqhkiG9w0BDAoBA6CCAcswggHHBgoqhkiG9w0BCRYBoIIBtwSCAbMwggGvMIIBXaADAgECAhAdka3aTQsIsUphgIXGUmeRMAkGBSsOAwIdBQAwFjEUMBIGA1UEAxMLUm9vdCBBZ2VuY3kwHhcNMTYwMTAxMDcwMDAwWhcNMTgwMTAxMDcwMDAwWjASMRAwDgYDVQQDEwdub2Rlc2RrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5fhcxbJHxxBEIDzVOMc56s04U6k4GPY7yMR1m+rBGVRiAyV4RjY6U936dqXHCVD36ps2Q0Z+OeEgyCInkIyVeB1EwXcToOcyeS2YcUb0vRWZDouC3tuFdHwiK1Ed5iW/LksmXDotyV7kpqzaPhOFiMtBuMEwNJcPge9k17hRgRQIDAQABo0swSTBHBgNVHQEEQDA+gBAS5AktBh0dTwCNYSHcFmRjoRgwFjEUMBIGA1UEAxMLUm9vdCBBZ2VuY3mCEAY3bACqAGSKEc+41KpcNfQwCQYFKw4DAh0FAANBAHl2M97QbpzdnwO5HoRBsiEExOcLTNg+GKCr7HUsbzfvrUivw+JLL7qjHAIc5phnK+F5bQ8HKe0L9YXBSKl+fvwxFTATBgkqhkiG9w0BCRUxBgQEAQAAADA7MB8wBwYFKw4DAhoEFGVtyGMqiBd32fGpzlGZQoRM6UQwBBTI0YHFFqTS4Go8CoLgswn29EiuUQICB9A=", - "thumbprint": "cff2ab63c8c955aaf71989efa641b906558d9fb7", "password": "nodesdk", - "certificateFormat": "pfx", "thumbprintAlgorithm": "sha1"}' + body: '{"certificateFormat": "pfx", "thumbprintAlgorithm": "sha1", "thumbprint": + "cff2ab63c8c955aaf71989efa641b906558d9fb7", "password": "nodesdk", "data": "MIIGMQIBAzCCBe0GCSqGSIb3DQEHAaCCBd4EggXaMIIF1jCCA8AGCSqGSIb3DQEHAaCCA7EEggOtMIIDqTCCA6UGCyqGSIb3DQEMCgECoIICtjCCArIwHAYKKoZIhvcNAQwBAzAOBAhyd3xCtln3iQICB9AEggKQhe5P10V9iV1BsDlwWT561Yu2hVq3JT8ae/ebx1ZR/gMApVereDKkS9Zg4vFyssusHebbK5pDpU8vfAqle0TM4m7wGsRj453ZorSPUfMpHvQnAOn+2pEpWdMThU7xvZ6DVpwhDOQk9166z+KnKdHGuJKh4haMT7Rw/6xZ1rsBt2423cwTrQVMQyACrEkianpuujubKltN99qRoFAxhQcnYE2KlYKw7lRcExq6mDSYAyk5xJZ1ZFdLj6MAryZroQit/0g5eyhoNEKwWbi8px5j71pRTf7yjN+deMGQKwbGl+3OgaL1UZ5fCjypbVL60kpIBxLZwIJ7p3jJ+q9pbq9zSdzshPYor5lxyUfXqaso/0/91ayNoBzg4hQGh618PhFI6RMGjwkzhB9xk74iweJ9HQyIHf8yx2RCSI22JuCMitPMWSGvOszhbNx3AEDLuiiAOHg391mprEtKZguOIr9LrJwem/YmcHbwyz5YAbZmiseKPkllfC7dafFfCFEkj6R2oegIsZo0pEKYisAXBqT0g+6/jGwuhlZcBo0f7UIZm88iA3MrJCjlXEgV5OcQdoWj+hq0lKEdnhtCKr03AIfukN6+4vjjarZeW1bs0swq0l3XFf5RHa11otshMS4mpewshB9iO9MuKWpRxuxeng4PlKZ/zuBqmPeUrjJ9454oK35Pq+dghfemt7AUpBH/KycDNIZgfdEWUZrRKBGnc519C+RTqxyt5hWL18nJk4LvSd3QKlJ1iyJxClhhb/NWEzPqNdyA5cxen+2T9bd/EqJ2KzRv5/BPVwTQkHH9W/TZElFyvFfOFIW2+03RKbVGw72Mr/0xKZ+awAnEfoU+SL/2Gj2m6PHkqFX2sOCi/tN9EA4xgdswEwYJKoZIhvcNAQkVMQYEBAEAAAAwXQYJKwYBBAGCNxEBMVAeTgBNAGkAYwByAG8AcwBvAGYAdAAgAFMAdAByAG8AbgBnACAAQwByAHkAcAB0AG8AZwByAGEAcABoAGkAYwAgAFAAcgBvAHYAaQBkAGUAcjBlBgkqhkiG9w0BCRQxWB5WAFAAdgBrAFQAbQBwADoANABjAGUANgAwADQAZABhAC0AMAA2ADgAMQAtADQANAAxADUALQBhADIAYwBhAC0ANQA3ADcAMwAwADgAZQA2AGQAOQBhAGMwggIOBgkqhkiG9w0BBwGgggH/BIIB+zCCAfcwggHzBgsqhkiG9w0BDAoBA6CCAcswggHHBgoqhkiG9w0BCRYBoIIBtwSCAbMwggGvMIIBXaADAgECAhAdka3aTQsIsUphgIXGUmeRMAkGBSsOAwIdBQAwFjEUMBIGA1UEAxMLUm9vdCBBZ2VuY3kwHhcNMTYwMTAxMDcwMDAwWhcNMTgwMTAxMDcwMDAwWjASMRAwDgYDVQQDEwdub2Rlc2RrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC5fhcxbJHxxBEIDzVOMc56s04U6k4GPY7yMR1m+rBGVRiAyV4RjY6U936dqXHCVD36ps2Q0Z+OeEgyCInkIyVeB1EwXcToOcyeS2YcUb0vRWZDouC3tuFdHwiK1Ed5iW/LksmXDotyV7kpqzaPhOFiMtBuMEwNJcPge9k17hRgRQIDAQABo0swSTBHBgNVHQEEQDA+gBAS5AktBh0dTwCNYSHcFmRjoRgwFjEUMBIGA1UEAxMLUm9vdCBBZ2VuY3mCEAY3bACqAGSKEc+41KpcNfQwCQYFKw4DAh0FAANBAHl2M97QbpzdnwO5HoRBsiEExOcLTNg+GKCr7HUsbzfvrUivw+JLL7qjHAIc5phnK+F5bQ8HKe0L9YXBSKl+fvwxFTATBgkqhkiG9w0BCRUxBgQEAQAAADA7MB8wBwYFKw4DAhoEFGVtyGMqiBd32fGpzlGZQoRM6UQwBBTI0YHFFqTS4Go8CoLgswn29EiuUQICB9A="}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['2272'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 18:20:56 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:29:21 GMT'] method: POST - uri: https://batchf0370dc6.westcentralus.batch.azure.com/certificates?api-version=2018-03-01.6.1 + uri: https://batchf0370dc6.eastus.batch.azure.com/certificates?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchf0370dc6.westcentralus.batch.azure.com/certificates(ThumbprintAlgorithm=sha1,Thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)'] + dataserviceid: ['https://batchf0370dc6.eastus.batch.azure.com/certificates(ThumbprintAlgorithm=sha1,Thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 18:20:56 GMT'] - location: ['https://batchf0370dc6.westcentralus.batch.azure.com/certificates(ThumbprintAlgorithm=sha1,Thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)'] - request-id: [9ad880d3-5355-402f-95be-3231b44dc904] + date: ['Fri, 24 Aug 2018 06:29:23 GMT'] + location: ['https://batchf0370dc6.eastus.batch.azure.com/certificates(ThumbprintAlgorithm=sha1,Thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)'] + request-id: [b61d5487-9ca0-4f27-95ff-e4e8544bad89] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -34,22 +33,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 18:20:57 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:29:23 GMT'] method: GET - uri: https://batchf0370dc6.westcentralus.batch.azure.com/certificates?api-version=2018-03-01.6.1 + uri: https://batchf0370dc6.eastus.batch.azure.com/certificates?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0370dc6.westcentralus.batch.azure.com/$metadata#certificates\",\"value\":[\r\n - \ {\r\n \"thumbprint\":\"cff2ab63c8c955aaf71989efa641b906558d9fb7\",\"thumbprintAlgorithm\":\"sha1\",\"url\":\"https://batchf0370dc6.westcentralus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T18:20:57.3313134Z\",\"publicData\":\"MIIBrzCCAV2gAwIBAgIQHZGt2k0LCLFKYYCFxlJnkTAJBgUrDgMCHQUAMBYxFDASBgNVBAMTC1Jvb3QgQWdlbmN5MB4XDTE2MDEwMTA3MDAwMFoXDTE4MDEwMTA3MDAwMFowEjEQMA4GA1UEAxMHbm9kZXNkazCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuX4XMWyR8cQRCA81TjHOerNOFOpOBj2O8jEdZvqwRlUYgMleEY2OlPd+nalxwlQ9+qbNkNGfjnhIMgiJ5CMlXgdRMF3E6DnMnktmHFG9L0VmQ6Lgt7bhXR8IitRHeYlvy5LJlw6Lcle5Kas2j4ThYjLQbjBMDSXD4HvZNe4UYEUCAwEAAaNLMEkwRwYDVR0BBEAwPoAQEuQJLQYdHU8AjWEh3BZkY6EYMBYxFDASBgNVBAMTC1Jvb3QgQWdlbmN5ghAGN2wAqgBkihHPuNSqXDX0MAkGBSsOAwIdBQADQQB5djPe0G6c3Z8DuR6EQbIhBMTnC0zYPhigq+x1LG83761Ir8PiSy+6oxwCHOaYZyvheW0PByntC/WFwUipfn78\"\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0370dc6.eastus.batch.azure.com/$metadata#certificates\",\"value\":[\r\n + \ {\r\n \"thumbprint\":\"cff2ab63c8c955aaf71989efa641b906558d9fb7\",\"thumbprintAlgorithm\":\"sha1\",\"url\":\"https://batchf0370dc6.eastus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:29:23.0731258Z\",\"publicData\":\"MIIBrzCCAV2gAwIBAgIQHZGt2k0LCLFKYYCFxlJnkTAJBgUrDgMCHQUAMBYxFDASBgNVBAMTC1Jvb3QgQWdlbmN5MB4XDTE2MDEwMTA3MDAwMFoXDTE4MDEwMTA3MDAwMFowEjEQMA4GA1UEAxMHbm9kZXNkazCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuX4XMWyR8cQRCA81TjHOerNOFOpOBj2O8jEdZvqwRlUYgMleEY2OlPd+nalxwlQ9+qbNkNGfjnhIMgiJ5CMlXgdRMF3E6DnMnktmHFG9L0VmQ6Lgt7bhXR8IitRHeYlvy5LJlw6Lcle5Kas2j4ThYjLQbjBMDSXD4HvZNe4UYEUCAwEAAaNLMEkwRwYDVR0BBEAwPoAQEuQJLQYdHU8AjWEh3BZkY6EYMBYxFDASBgNVBAMTC1Jvb3QgQWdlbmN5ghAGN2wAqgBkihHPuNSqXDX0MAkGBSsOAwIdBQADQQB5djPe0G6c3Z8DuR6EQbIhBMTnC0zYPhigq+x1LG83761Ir8PiSy+6oxwCHOaYZyvheW0PByntC/WFwUipfn78\"\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 18:20:58 GMT'] - request-id: [736c9c07-7ecc-4935-90ca-44d60e7a965d] + date: ['Fri, 24 Aug 2018 06:29:23 GMT'] + request-id: [c44ec109-7f39-4c48-be50-2cbfd97276d9] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -61,20 +59,19 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 18:20:58 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:29:24 GMT'] method: GET - uri: https://batchf0370dc6.westcentralus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)?api-version=2018-03-01.6.1 + uri: https://batchf0370dc6.eastus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0370dc6.westcentralus.batch.azure.com/$metadata#certificates/@Element\",\"thumbprint\":\"cff2ab63c8c955aaf71989efa641b906558d9fb7\",\"thumbprintAlgorithm\":\"sha1\",\"url\":\"https://batchf0370dc6.westcentralus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T18:20:57.3313134Z\",\"publicData\":\"MIIBrzCCAV2gAwIBAgIQHZGt2k0LCLFKYYCFxlJnkTAJBgUrDgMCHQUAMBYxFDASBgNVBAMTC1Jvb3QgQWdlbmN5MB4XDTE2MDEwMTA3MDAwMFoXDTE4MDEwMTA3MDAwMFowEjEQMA4GA1UEAxMHbm9kZXNkazCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuX4XMWyR8cQRCA81TjHOerNOFOpOBj2O8jEdZvqwRlUYgMleEY2OlPd+nalxwlQ9+qbNkNGfjnhIMgiJ5CMlXgdRMF3E6DnMnktmHFG9L0VmQ6Lgt7bhXR8IitRHeYlvy5LJlw6Lcle5Kas2j4ThYjLQbjBMDSXD4HvZNe4UYEUCAwEAAaNLMEkwRwYDVR0BBEAwPoAQEuQJLQYdHU8AjWEh3BZkY6EYMBYxFDASBgNVBAMTC1Jvb3QgQWdlbmN5ghAGN2wAqgBkihHPuNSqXDX0MAkGBSsOAwIdBQADQQB5djPe0G6c3Z8DuR6EQbIhBMTnC0zYPhigq+x1LG83761Ir8PiSy+6oxwCHOaYZyvheW0PByntC/WFwUipfn78\"\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0370dc6.eastus.batch.azure.com/$metadata#certificates/@Element\",\"thumbprint\":\"cff2ab63c8c955aaf71989efa641b906558d9fb7\",\"thumbprintAlgorithm\":\"sha1\",\"url\":\"https://batchf0370dc6.eastus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:29:23.0731258Z\",\"publicData\":\"MIIBrzCCAV2gAwIBAgIQHZGt2k0LCLFKYYCFxlJnkTAJBgUrDgMCHQUAMBYxFDASBgNVBAMTC1Jvb3QgQWdlbmN5MB4XDTE2MDEwMTA3MDAwMFoXDTE4MDEwMTA3MDAwMFowEjEQMA4GA1UEAxMHbm9kZXNkazCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuX4XMWyR8cQRCA81TjHOerNOFOpOBj2O8jEdZvqwRlUYgMleEY2OlPd+nalxwlQ9+qbNkNGfjnhIMgiJ5CMlXgdRMF3E6DnMnktmHFG9L0VmQ6Lgt7bhXR8IitRHeYlvy5LJlw6Lcle5Kas2j4ThYjLQbjBMDSXD4HvZNe4UYEUCAwEAAaNLMEkwRwYDVR0BBEAwPoAQEuQJLQYdHU8AjWEh3BZkY6EYMBYxFDASBgNVBAMTC1Jvb3QgQWdlbmN5ghAGN2wAqgBkihHPuNSqXDX0MAkGBSsOAwIdBQADQQB5djPe0G6c3Z8DuR6EQbIhBMTnC0zYPhigq+x1LG83761Ir8PiSy+6oxwCHOaYZyvheW0PByntC/WFwUipfn78\"\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 18:20:58 GMT'] - request-id: [0c941d63-615c-4c42-953d-fe5294bf58a6] + date: ['Fri, 24 Aug 2018 06:29:25 GMT'] + request-id: [e062c0f6-1f50-4126-98b0-dec82d6da84e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -87,24 +84,23 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 18:20:59 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:29:25 GMT'] method: POST - uri: https://batchf0370dc6.westcentralus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)/canceldelete?api-version=2018-03-01.6.1 + uri: https://batchf0370dc6.eastus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)/canceldelete?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0370dc6.westcentralus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"CertificateStateActive\",\"message\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0370dc6.eastus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"CertificateStateActive\",\"message\":{\r\n \ \"lang\":\"en-US\",\"value\":\"The specified certificate is in active - state.\\nRequestId:0e110db4-9d65-42dd-8dd1-a90ef128bebf\\nTime:2018-03-13T18:20:59.6432196Z\"\r\n + state.\\nRequestId:ada64886-ee45-451a-8110-54ccf44584eb\\nTime:2018-08-24T06:29:25.7815398Z\"\r\n \ }\r\n}"} headers: - content-length: ['362'] + content-length: ['355'] content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 18:20:59 GMT'] - request-id: [0e110db4-9d65-42dd-8dd1-a90ef128bebf] + date: ['Fri, 24 Aug 2018 06:29:25 GMT'] + request-id: [ada64886-ee45-451a-8110-54ccf44584eb] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] @@ -116,19 +112,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 18:20:59 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:29:25 GMT'] method: DELETE - uri: https://batchf0370dc6.westcentralus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)?api-version=2018-03-01.6.1 + uri: https://batchf0370dc6.eastus.batch.azure.com/certificates(thumbprintAlgorithm=sha1,thumbprint=cff2ab63c8c955aaf71989efa641b906558d9fb7)?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 18:21:00 GMT'] - request-id: [bb3e5671-ca5c-43c2-8ce2-06379800966c] + date: ['Fri, 24 Aug 2018 06:29:25 GMT'] + request-id: [f5c463dc-f692-4095-acdf-55b5ecf2791d] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_compute_node_user.yaml b/azure-batch/tests/recordings/test_batch.test_batch_compute_node_user.yaml index 47eff7769963..66a65f07be5b 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_compute_node_user.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_compute_node_user.yaml @@ -5,22 +5,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:09:06 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:32:23 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:09:07 GMT'] - request-id: [e947d54e-63bf-4837-9104-ef30924484d9] + date: ['Fri, 24 Aug 2018 06:32:23 GMT'] + request-id: [8ec60cce-4fe0-4812-924c-8add41b2d52c] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -32,22 +31,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:09:17 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:32:34 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:09:17 GMT'] - request-id: [86216ba2-19fd-4287-8b77-54e9f717fbd5] + date: ['Fri, 24 Aug 2018 06:32:35 GMT'] + request-id: [4e7bd0ab-33a5-4cbe-bce2-8e874b558fca] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -59,22 +57,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:09:27 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:32:45 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:09:27 GMT'] - request-id: [64824ba0-8f0f-4f22-ab9f-f52be42a4dcf] + date: ['Fri, 24 Aug 2018 06:32:45 GMT'] + request-id: [f1346d3c-54ce-4fc0-92eb-8cb3d8e74f42] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -86,22 +83,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:09:38 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:32:56 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:09:39 GMT'] - request-id: [ed7c7f92-7013-40c6-bcde-25d7567d34e7] + date: ['Fri, 24 Aug 2018 06:32:57 GMT'] + request-id: [0cbb05a8-dcab-411d-9209-b2d5e5d358cc] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -113,22 +109,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:09:49 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:33:07 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:09:49 GMT'] - request-id: [ae8ffe66-7a85-4c78-8047-0df23678c27b] + date: ['Fri, 24 Aug 2018 06:33:08 GMT'] + request-id: [2695ff98-13ac-45fd-878e-2d81b3b9f1c1] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -140,22 +135,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:09:59 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:33:18 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:10:00 GMT'] - request-id: [35c72345-fd9b-495a-8352-bf4cb60ae8f1] + date: ['Fri, 24 Aug 2018 06:33:19 GMT'] + request-id: [08589587-e537-4dd4-aa2a-5d57c47276bb] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -167,22 +161,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:10:10 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:33:29 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:10:11 GMT'] - request-id: [d854d38f-86c8-4747-8c5f-ee5f61853c7e] + date: ['Fri, 24 Aug 2018 06:33:29 GMT'] + request-id: [6ccdef62-d7ee-40f1-8641-e7ee471800ec] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -194,22 +187,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:10:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:33:40 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:10:21 GMT'] - request-id: [a3ed0508-6869-433e-b264-63a2e36c2419] + date: ['Fri, 24 Aug 2018 06:33:41 GMT'] + request-id: [f3b8acb8-0807-4493-b554-5b2cc1ccb221] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -221,22 +213,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:10:31 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:33:51 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:10:32 GMT'] - request-id: [dc59a4db-6e55-4f62-a9de-f37bd32d656c] + date: ['Fri, 24 Aug 2018 06:33:52 GMT'] + request-id: [f52b5f1a-c122-45cc-8782-ffe14a85f7fd] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -248,22 +239,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:10:42 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:34:02 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:10:42 GMT'] - request-id: [10df0550-62b2-4682-ad31-2cbece413259] + date: ['Fri, 24 Aug 2018 06:34:03 GMT'] + request-id: [1ee3615e-64bf-4813-a820-f010308e6bbf] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -275,22 +265,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:10:52 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:34:13 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:10:52 GMT'] - request-id: [469d6809-21b9-4779-bca4-fbbb4832887c] + date: ['Fri, 24 Aug 2018 06:34:14 GMT'] + request-id: [eccaee65-5386-47b9-b2e3-45a82170da65] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -302,22 +291,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:11:03 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:34:24 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:11:04 GMT'] - request-id: [fc38b109-0940-46eb-9c3c-dd60a38010a7] + date: ['Fri, 24 Aug 2018 06:34:24 GMT'] + request-id: [06536e68-7800-4670-b662-82049ecd24eb] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -329,22 +317,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:11:14 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:34:34 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:11:14 GMT'] - request-id: [35f5395b-ae42-452f-a206-e7bdc074e62e] + date: ['Fri, 24 Aug 2018 06:34:35 GMT'] + request-id: [4d42f295-ccb7-4695-a9cf-dadb123d2d52] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -356,22 +343,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:11:24 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:34:45 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:11:25 GMT'] - request-id: [5550e980-30d6-414a-a2eb-640cefe465c0] + date: ['Fri, 24 Aug 2018 06:34:46 GMT'] + request-id: [7290f7a8-fd39-4f67-bbaa-1cf1e3e39040] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -383,22 +369,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:11:35 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:34:56 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:11:35 GMT'] - request-id: [1616a4fe-5c67-40df-8534-ef877117ca33] + date: ['Fri, 24 Aug 2018 06:34:57 GMT'] + request-id: [e150654c-3f78-4e3d-970c-70335a908a8d] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -410,22 +395,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:11:45 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:35:07 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:11:46 GMT'] - request-id: [a9f4d262-1e04-44f9-8dda-0ef60bb36d2e] + date: ['Fri, 24 Aug 2018 06:35:08 GMT'] + request-id: [b4835695-c8f6-40f3-954d-98966310c0db] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -437,22 +421,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:11:56 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:35:18 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:11:57 GMT'] - request-id: [57312756-1d1c-45d6-906e-af5c239a3b17] + date: ['Fri, 24 Aug 2018 06:35:19 GMT'] + request-id: [6f56a9c2-3f9e-49d1-8a98-f15a42c258ad] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -464,22 +447,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:12:07 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:35:29 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:12:07 GMT'] - request-id: [d2f68d28-b51a-4559-8e45-7380abd51c91] + date: ['Fri, 24 Aug 2018 06:35:30 GMT'] + request-id: [5b44ea86-b177-4ed7-9512-398bf827df11] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -491,22 +473,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:12:17 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:35:40 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:12:17 GMT'] - request-id: [7bdfe882-9107-4d42-a045-cc795138a928] + date: ['Fri, 24 Aug 2018 06:35:41 GMT'] + request-id: [cb4ee1b1-9a85-4b11-8af9-f66025db7a67] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -518,22 +499,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:12:28 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:35:51 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:12:28 GMT'] - request-id: [0a5945bd-e157-46d5-9fc6-4d981e6b2e9a] + date: ['Fri, 24 Aug 2018 06:35:52 GMT'] + request-id: [19cff134-860d-403b-9799-974caa83c706] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -545,22 +525,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:12:38 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:36:02 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:12:39 GMT'] - request-id: [0e12beba-2b60-4348-92d8-0123f1b61da6] + date: ['Fri, 24 Aug 2018 06:36:03 GMT'] + request-id: [5b13b2e4-8278-4ba4-9122-3cb3c0f06d22] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -572,22 +551,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:12:49 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:36:13 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:12:50 GMT'] - request-id: [5da22b2b-37aa-4233-aabc-11c2c7d1781b] + date: ['Fri, 24 Aug 2018 06:36:14 GMT'] + request-id: [5522a3a4-b5f0-42bd-8fe3-1aa7433ab19e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -599,22 +577,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:13:00 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:36:24 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:13:00 GMT'] - request-id: [bece6006-bddb-4df3-adde-36ce1867712d] + date: ['Fri, 24 Aug 2018 06:36:25 GMT'] + request-id: [6b65569c-1121-4d7f-82e8-9397b7c1e15f] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -626,22 +603,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:13:10 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:36:35 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:13:11 GMT'] - request-id: [1c2cb0c9-e109-4a0b-8062-62b93e82925a] + date: ['Fri, 24 Aug 2018 06:36:36 GMT'] + request-id: [54f40834-91cb-4be8-aa99-90c31b956e94] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -653,22 +629,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:13:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:36:46 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:13:21 GMT'] - request-id: [91effe40-ce7a-43cb-89d6-8dbf0fdb2f77] + date: ['Fri, 24 Aug 2018 06:36:47 GMT'] + request-id: [5fd6dd79-1946-4263-a88a-adce81a94c2f] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -680,22 +655,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:13:31 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:36:57 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:13:31 GMT'] - request-id: [1899c9fe-62ae-4279-96a4-129d551cd8c5] + date: ['Fri, 24 Aug 2018 06:36:57 GMT'] + request-id: [a5008675-61b3-4683-8613-9feb59c7fe7b] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -707,22 +681,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:13:42 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:37:08 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:13:42 GMT'] - request-id: [0d6b9d66-9c78-4d8f-a3ce-41ddfcfccb2a] + date: ['Fri, 24 Aug 2018 06:37:09 GMT'] + request-id: [1ee6f490-4673-46aa-9188-5779380a7c7c] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -734,22 +707,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:13:52 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:37:19 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:13:53 GMT'] - request-id: [dee48c6c-2235-45d3-919b-81e323c3704b] + date: ['Fri, 24 Aug 2018 06:37:19 GMT'] + request-id: [831038b3-311b-4afe-bf06-4843fe45d069] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -761,22 +733,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:14:03 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:37:30 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:14:04 GMT'] - request-id: [61d19be1-0a3c-436b-b110-61dc434e4343] + date: ['Fri, 24 Aug 2018 06:37:31 GMT'] + request-id: [4e77cfae-25b2-4225-8f7b-66df48d8026f] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -788,22 +759,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:14:14 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:37:41 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:14:14 GMT'] - request-id: [c3e8710f-9cf8-4f6b-96a1-c13c5a15173e] + date: ['Fri, 24 Aug 2018 06:37:42 GMT'] + request-id: [2848b143-0cee-4173-931c-ed80a87bde4a] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -815,22 +785,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:14:24 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:37:52 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:14:25 GMT'] - request-id: [51bff745-82fd-4120-b122-ee4f66167ac2] + date: ['Fri, 24 Aug 2018 06:37:53 GMT'] + request-id: [5bc326aa-2eb8-4084-8878-18b98f98aa07] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -842,22 +811,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:14:35 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:38:03 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:14:35 GMT'] - request-id: [3bcb21c0-5bd1-40af-ab6b-c73bc1c337be] + date: ['Fri, 24 Aug 2018 06:38:04 GMT'] + request-id: [defc1a23-0c6c-44bf-8ab7-518d13dae8fc] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -869,22 +837,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:14:46 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:38:14 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:14:46 GMT'] - request-id: [6f0cfc8b-f8c3-4add-9944-32185bbbed2e] + date: ['Fri, 24 Aug 2018 06:38:15 GMT'] + request-id: [18a7b57c-80b2-490c-8ece-f9c9d0ac4192] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -896,22 +863,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:14:56 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:38:25 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:14:57 GMT'] - request-id: [4913377d-abc1-449c-831b-1dc1835a58e4] + date: ['Fri, 24 Aug 2018 06:38:26 GMT'] + request-id: [7ed4bd5a-835c-495e-8547-6534636c5d65] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -923,22 +889,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:15:07 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:38:36 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:15:07 GMT'] - request-id: [aabfe21a-3524-4eb8-ac9f-05d8662932f7] + date: ['Fri, 24 Aug 2018 06:38:36 GMT'] + request-id: [7493b4c2-ddd6-43c4-8feb-e05ba17dbbc0] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -950,22 +915,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:15:17 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:38:47 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:15:18 GMT'] - request-id: [6336d909-8922-4dc0-b6c8-35050e7a1065] + date: ['Fri, 24 Aug 2018 06:38:47 GMT'] + request-id: [5432a585-df5f-473b-b277-1ca824b2e6cb] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -977,22 +941,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:15:28 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:38:57 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:15:28 GMT'] - request-id: [4257fbd2-e9ec-4981-9290-9f8e36495546] + date: ['Fri, 24 Aug 2018 06:38:58 GMT'] + request-id: [33cbd04a-d03a-4a1e-8818-7d8dfd1da459] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1004,22 +967,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:15:39 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:39:08 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:15:39 GMT'] - request-id: [172964e6-6882-4954-b0dc-ee000a888c73] + date: ['Fri, 24 Aug 2018 06:39:09 GMT'] + request-id: [b0ffdc39-a8d0-40c1-a748-3a7a31469625] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1031,22 +993,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:15:49 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:39:20 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:15:50 GMT'] - request-id: [9c938077-c351-4bac-8a3f-375753c1ef21] + date: ['Fri, 24 Aug 2018 06:39:20 GMT'] + request-id: [82b3c8ad-b7ac-43c5-9c81-a48c0ead5717] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1058,22 +1019,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:16:00 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:39:31 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:16:00 GMT'] - request-id: [63c23a7a-c1e2-4ab0-8d10-f048b5190319] + date: ['Fri, 24 Aug 2018 06:39:31 GMT'] + request-id: [9b66adf3-f283-4c73-96eb-6eea9bf74a95] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1085,22 +1045,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:16:11 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:39:42 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:16:11 GMT'] - request-id: [1fff688e-e24e-42ae-8c30-f6a01eab86da] + date: ['Fri, 24 Aug 2018 06:39:43 GMT'] + request-id: [3658b85e-9684-4eb3-97d1-2e18aeb798ad] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1112,22 +1071,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:16:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:39:53 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:16:21 GMT'] - request-id: [31dc8ec8-e650-47b9-a216-e5a92cff54a8] + date: ['Fri, 24 Aug 2018 06:39:54 GMT'] + request-id: [f2a518f5-ea5a-4bc5-b51a-959a876213e1] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1139,22 +1097,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:16:32 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:40:04 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:16:31 GMT'] - request-id: [e8e2da6c-df7f-4607-9427-11db36351342] + date: ['Fri, 24 Aug 2018 06:40:05 GMT'] + request-id: [92ac9705-e92f-481b-ba67-efec28021aee] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1166,22 +1123,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:16:42 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:40:15 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:32:17.5155687Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:16:43 GMT'] - request-id: [141e9493-b250-44e2-b942-f1e89b0d34c1] + date: ['Fri, 24 Aug 2018 06:40:15 GMT'] + request-id: [1ba6a6ed-808f-48aa-8fd0-b069c8a2eed7] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1193,22 +1149,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:16:53 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:40:26 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"creating\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:08:57.762527Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:16:53 GMT'] - request-id: [bae3a084-d178-4808-8f3d-9d9eeaeb5a80] + date: ['Fri, 24 Aug 2018 06:40:27 GMT'] + request-id: [1ba35165-d8d5-43b1-9f2a-ff7be59fb27f] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1220,22 +1175,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:17:04 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:40:37 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:17:04 GMT'] - request-id: [5e8a78b4-207e-4b11-8029-781e57a17c5e] + date: ['Fri, 24 Aug 2018 06:40:37 GMT'] + request-id: [1db6fc1d-5539-4693-bee7-29ce61c5b916] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1247,22 +1201,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:17:14 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:40:48 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:17:14 GMT'] - request-id: [42eb2c64-5123-4e4d-b813-9eabd0b3e146] + date: ['Fri, 24 Aug 2018 06:40:48 GMT'] + request-id: [6c6703a2-74d5-4173-aa56-d5edf84d59ba] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1274,22 +1227,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:17:25 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:40:59 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:17:25 GMT'] - request-id: [f59d349e-ab5c-4ab5-96b2-bbc5b06a49b0] + date: ['Fri, 24 Aug 2018 06:40:59 GMT'] + request-id: [ff1830ff-9edb-4007-b950-d968ba29ea57] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1301,22 +1253,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:17:35 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:41:09 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:17:35 GMT'] - request-id: [6c591b41-c6ee-497b-8221-e0fd051f9543] + date: ['Fri, 24 Aug 2018 06:41:09 GMT'] + request-id: [11e4c04a-6c6f-4bcd-8e58-4d38a07e7c26] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1328,22 +1279,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:17:46 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:41:20 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:17:46 GMT'] - request-id: [794eef7f-c91a-4028-9858-5187af19b6cd] + date: ['Fri, 24 Aug 2018 06:41:21 GMT'] + request-id: [a039a305-c6aa-46bb-8fc5-a8d232c9b24e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1355,22 +1305,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:17:56 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:41:31 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:17:56 GMT'] - request-id: [94b9fc55-592d-446b-887b-5ffe7edd90c0] + date: ['Fri, 24 Aug 2018 06:41:32 GMT'] + request-id: [b5ad76d1-0dbd-4256-92d4-fc25706f9444] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1382,22 +1331,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:18:07 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:41:42 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:18:07 GMT'] - request-id: [98087c55-be47-419f-949a-12c83bf1804b] + date: ['Fri, 24 Aug 2018 06:41:43 GMT'] + request-id: [61469341-a32e-4cd5-8a36-4b771531373a] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1409,22 +1357,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:18:17 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:41:53 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:40:17.6015183Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:18:17 GMT'] - request-id: [9d743543-6e0c-48bf-8702-d5c07442e377] + date: ['Fri, 24 Aug 2018 06:41:54 GMT'] + request-id: [1d22af66-6270-4495-a8d6-0281c395f50b] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1436,22 +1383,21 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:18:28 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:42:04 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:42:02.5056729Z\",\"lastBootTime\":\"2018-08-24T06:41:53.3126009Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:18:28 GMT'] - request-id: [8819c99d-a7a9-4cdd-8e36-bcf54bd0a8be] + date: ['Fri, 24 Aug 2018 06:42:04 GMT'] + request-id: [1afde3cc-08cc-4686-9c7e-7e513550ebf5] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1463,103 +1409,48 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:18:38 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:42:05 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:16:57.86036Z\",\"lastBootTime\":\"2018-03-13T06:18:34.5667116Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t063217z\",\"url\":\"https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T06:42:02.5056729Z\",\"lastBootTime\":\"2018-08-24T06:41:53.3126009Z\",\"allocationTime\":\"2018-08-24T06:32:17.5155687Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t063217z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:18:39 GMT'] - request-id: [7ff00011-adef-498c-89bd-070ecc9c5644] + date: ['Fri, 24 Aug 2018 06:42:06 GMT'] + request-id: [31ced11c-3044-42b9-9a9f-703eee354b8e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:18:49 GMT'] - method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:18:44.3818137Z\",\"lastBootTime\":\"2018-03-13T06:18:34.5667116Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true\r\n - \ }\r\n ]\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:18:50 GMT'] - request-id: [d933ca50-930c-4db5-8a05-04146b9b2f60] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:18:50 GMT'] - method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch3c670ff0.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t060857z\",\"url\":\"https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:18:44.3818137Z\",\"lastBootTime\":\"2018-03-13T06:18:34.5667116Z\",\"allocationTime\":\"2018-03-13T06:08:57.762527Z\",\"ipAddress\":\"10.72.24.177\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t060857z\",\"vmSize\":\"small\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true\r\n - \ }\r\n ]\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:18:50 GMT'] - request-id: [cbcd50a9-d1f5-48d0-a990-f06af1ae31b8] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: '{"password": "kt#_gahr!@aGERDXA", "isAdmin": false, "name": "BatchPythonSDKUser"}' + body: '{"isAdmin": false, "password": "kt#_gahr!@aGERDXA", "name": "BatchPythonSDKUser"}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['81'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:18:50 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:42:06 GMT'] method: POST - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z/users?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z/users?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z/users/BatchPythonSDKUser'] + dataserviceid: ['https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z/users/BatchPythonSDKUser'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:19:00 GMT'] - location: ['https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z/users/BatchPythonSDKUser'] - request-id: [606c85a5-5cab-4516-a410-405225a00589] + date: ['Fri, 24 Aug 2018 06:42:18 GMT'] + location: ['https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z/users/BatchPythonSDKUser'] + request-id: [0eecc53f-6ba9-46ac-95d4-10cdc2b60273] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1573,19 +1464,19 @@ interactions: Connection: [keep-alive] Content-Length: ['36'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:19:00 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:42:18 GMT'] method: PUT - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z/users/BatchPythonSDKUser?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z/users/BatchPythonSDKUser?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z/users/BatchPythonSDKUser'] + dataserviceid: ['https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z/users/BatchPythonSDKUser'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:19:01 GMT'] - request-id: [d5bb8d4b-a33d-4164-8c36-ff9cbcdede5f] + date: ['Fri, 24 Aug 2018 06:42:19 GMT'] + request-id: [4dafbb16-2798-49cd-b1ea-2cd989d01834] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1597,20 +1488,19 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:19:01 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:42:20 GMT'] method: GET - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z/rdp?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z/rdp?api-version=2018-08-01.7.0 response: - body: {string: "full address:s:52.161.153.70\r\nLoadBalanceInfo:s:Cookie: mstshash=TVM#TVM_IN_0"} + body: {string: "full address:s:104.211.59.195\r\nLoadBalanceInfo:s:Cookie: mstshash=TVM#TVM_IN_0"} headers: content-type: [application/octet-stream] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:19:01 GMT'] - request-id: [79522e94-105a-435d-81aa-e5fb3f7394a4] + date: ['Fri, 24 Aug 2018 06:42:20 GMT'] + request-id: [97699840-76b3-43cd-821d-491464d621e8] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -1623,19 +1513,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:19:01 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:42:21 GMT'] method: DELETE - uri: https://batch3c670ff0.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-3840119875_1-20180313t060857z/users/BatchPythonSDKUser?api-version=2018-03-01.6.1 + uri: https://batch3c670ff0.eastus.batch.azure.com/pools/test_batch_test_batch_compute_node_user3c670ff0/nodes/tvm-587366007_1-20180824t063217z/users/BatchPythonSDKUser?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:19:23 GMT'] - request-id: [ea322cce-dbf0-4acd-bd4d-70530aad0c54] + date: ['Fri, 24 Aug 2018 06:42:25 GMT'] + request-id: [eb2b8926-3cc3-4656-8a6e-4ecd5eda43d5] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_compute_nodes.yaml b/azure-batch/tests/recordings/test_batch.test_batch_compute_nodes.yaml index 89a94d6d9079..33ac3f38472e 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_compute_nodes.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_compute_nodes.yaml @@ -5,25 +5,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:57:23 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:36:48 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.7701714Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-3687402588_2-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.771123Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_2-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.8245617Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:57:24 GMT'] - request-id: [7fe13490-43d4-47c2-bae9-367c19e55579] + date: ['Fri, 24 Aug 2018 20:36:49 GMT'] + request-id: [697464fe-73e4-457f-a687-4331fa7e2a89] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -35,25 +34,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:57:34 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:36:59 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.7701714Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-3687402588_2-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.771123Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_2-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.8245617Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:57:34 GMT'] - request-id: [2c9787d7-20ab-474e-a991-e84342d8a23b] + date: ['Fri, 24 Aug 2018 20:37:00 GMT'] + request-id: [cde39549-522a-4e40-8b2b-91220fc71b4b] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -65,25 +63,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:57:44 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:37:10 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.7701714Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-3687402588_2-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.771123Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_2-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.8245617Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:57:45 GMT'] - request-id: [8ba44bda-2b52-4782-ad0a-ca964da3b6fe] + date: ['Fri, 24 Aug 2018 20:37:10 GMT'] + request-id: [6964e4a7-7fa6-40c9-afb8-571f50f38bcd] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -95,25 +92,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:57:55 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:37:21 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.7701714Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-3687402588_2-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.771123Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_2-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.8245617Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:57:56 GMT'] - request-id: [15bb9811-ca2b-4599-a149-2c108b76bd20] + date: ['Fri, 24 Aug 2018 20:37:21 GMT'] + request-id: [04e7b69f-6f8d-4e3b-beb7-962917621afb] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -125,25 +121,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:06 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:37:32 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.7701714Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-3687402588_2-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.771123Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_2-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.8245617Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:06 GMT'] - request-id: [0f5b3c48-2f79-4981-89ee-38677919d5fb] + date: ['Fri, 24 Aug 2018 20:37:32 GMT'] + request-id: [c515c3e8-8141-48a8-9dfc-2589a4787d88] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -155,25 +150,25 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:17 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:37:42 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.7701714Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-3687402588_2-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.771123Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_2-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:37:43.010896Z\",\"lastBootTime\":\"2018-08-24T20:37:42.4584Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n + \ }\r\n ]\r\n },\"nodeAgentInfo\":{\r\n \"lastUpdateTime\":\"2018-08-24T20:37:42.4584Z\",\"version\":\"1.3.0.8\"\r\n + \ }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:16 GMT'] - request-id: [9d70ee6e-df48-459f-bfbb-10087c6a80c9] + date: ['Fri, 24 Aug 2018 20:37:43 GMT'] + request-id: [8c751ae4-c1bc-4ea7-8dc0-7b5541b99ed8] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -185,25 +180,25 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:27 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:37:53 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.7701714Z\",\"lastBootTime\":\"2018-03-13T19:58:27.992833Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-3687402588_2-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:57:12.771123Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_2-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:37:43.010896Z\",\"lastBootTime\":\"2018-08-24T20:37:42.4584Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n + \ }\r\n ]\r\n },\"nodeAgentInfo\":{\r\n \"lastUpdateTime\":\"2018-08-24T20:37:42.4584Z\",\"version\":\"1.3.0.8\"\r\n + \ }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:28 GMT'] - request-id: [0e83ebe7-4b81-4a26-b0c3-595e31eda651] + date: ['Fri, 24 Aug 2018 20:37:55 GMT'] + request-id: [d0aebf51-0265-4a28-b8eb-1c671df3961b] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -215,25 +210,55 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:38 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:38:05 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:58:28.049633Z\",\"lastBootTime\":\"2018-03-13T19:58:27.992833Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-3687402588_2-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:58:29.187862Z\",\"lastBootTime\":\"2018-03-13T19:58:29.131276Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_2-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:37:43.010896Z\",\"lastBootTime\":\"2018-08-24T20:37:42.4584Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n + \ }\r\n ]\r\n },\"nodeAgentInfo\":{\r\n \"lastUpdateTime\":\"2018-08-24T20:37:42.4584Z\",\"version\":\"1.3.0.8\"\r\n + \ }\r\n }\r\n ]\r\n}"} + headers: + content-type: [application/json;odata=minimalmetadata] + dataserviceversion: ['3.0'] + date: ['Fri, 24 Aug 2018 20:38:05 GMT'] + request-id: [473063d4-f31c-4a40-9390-28647e37e9c1] + server: [Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] + accept-language: [en-US] + ocp-date: ['Fri, 24 Aug 2018 20:38:15 GMT'] + method: GET + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 + response: + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:36:42.7925816Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:37:43.010896Z\",\"lastBootTime\":\"2018-08-24T20:37:42.4584Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n + \ }\r\n ]\r\n },\"nodeAgentInfo\":{\r\n \"lastUpdateTime\":\"2018-08-24T20:37:42.4584Z\",\"version\":\"1.3.0.8\"\r\n + \ }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:39 GMT'] - request-id: [094168d0-103a-4ef8-a8a9-85995ab8ac98] + date: ['Fri, 24 Aug 2018 20:38:16 GMT'] + request-id: [af795988-54c8-4494-a83a-f992ec13cdc6] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -245,49 +270,79 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:39 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:38:26 GMT'] method: GET - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#nodes/@Element\",\"id\":\"tvm-3687402588_1-20180313t195712z\",\"url\":\"https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T19:58:28.049633Z\",\"lastBootTime\":\"2018-03-13T19:58:27.992833Z\",\"allocationTime\":\"2018-03-13T19:57:12.7041532Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t195712z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.157.19\",\"publicFQDN\":\"dnsd677415d-f363-4bfc-9ff4-d19ca820f478-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:38:20.36863Z\",\"lastBootTime\":\"2018-08-24T20:38:19.510392Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n },\"nodeAgentInfo\":{\r\n \"lastUpdateTime\":\"2018-08-24T20:38:19.510392Z\",\"version\":\"1.3.0.8\"\r\n + \ }\r\n },{\r\n \"id\":\"tvm-587366007_2-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:37:43.010896Z\",\"lastBootTime\":\"2018-08-24T20:37:42.4584Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.5\",\"affinityId\":\"TVM:tvm-587366007_2-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.1\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50001,\"backendPort\":22\r\n + \ }\r\n ]\r\n },\"nodeAgentInfo\":{\r\n \"lastUpdateTime\":\"2018-08-24T20:37:42.4584Z\",\"version\":\"1.3.0.8\"\r\n + \ }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:38 GMT'] - request-id: [50d91e4d-dbb7-4e33-bc04-cad9e759358d] + date: ['Fri, 24 Aug 2018 20:38:27 GMT'] + request-id: [39bd28fe-c0d0-42e3-a231-080383e7fc9f] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"startTime": "2018-03-13T19:52:40.029228999999999998Z", "containerUrl": - "https://test.blob.core.windows.net:443/test-container"}' + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] + accept-language: [en-US] + ocp-date: ['Fri, 24 Aug 2018 20:38:27 GMT'] + method: GET + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z?api-version=2018-08-01.7.0 + response: + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#nodes/@Element\",\"id\":\"tvm-587366007_1-20180824t203642z\",\"url\":\"https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:38:20.36863Z\",\"lastBootTime\":\"2018-08-24T20:38:19.510392Z\",\"allocationTime\":\"2018-08-24T20:36:42.7275598Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-587366007_1-20180824t203642z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.66.81\",\"publicFQDN\":\"dns58ffcdff-b942-431f-83bf-506bcaf42653-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n },\"nodeAgentInfo\":{\r\n \"lastUpdateTime\":\"2018-08-24T20:38:19.510392Z\",\"version\":\"1.3.0.8\"\r\n + \ }\r\n}"} + headers: + content-type: [application/json;odata=minimalmetadata] + dataserviceversion: ['3.0'] + date: ['Fri, 24 Aug 2018 20:38:28 GMT'] + request-id: [ac00ecbe-3672-49c1-a2db-39ebf15cc8df] + server: [Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: '{"startTime": "2018-08-24T20:32:28.996988Z", "containerUrl": "https://test.blob.core.windows.net:443/test-container"}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Length: ['129'] + Content-Length: ['117'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:40 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:38:28 GMT'] method: POST - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z/uploadbatchservicelogs?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z/uploadbatchservicelogs?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.westcentralus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.UploadBatchServiceLogsResult\",\"virtualDirectoryName\":\"batchff3f0e45-22F49F5995C85188/test_batch_test_batch_compute_nodesff3f0e45/tvm-3687402588_1-20180313t195712z/c9a5c537-2e1a-4051-a497-2d7022dcfaff\",\"numberOfFilesUploaded\":4\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.UploadBatchServiceLogsResult\",\"virtualDirectoryName\":\"batchff3f0e45-22F41E74EC4D1BE7/test_batch_test_batch_compute_nodesff3f0e45/tvm-587366007_1-20180824t203642z/aa3e88d9-2c2d-4240-8de0-1aa7207f6db2\",\"numberOfFilesUploaded\":4\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:40 GMT'] - request-id: [c9a5c537-2e1a-4051-a497-2d7022dcfaff] + date: ['Fri, 24 Aug 2018 20:38:30 GMT'] + request-id: [aa3e88d9-2c2d-4240-8de0-1aa7207f6db2] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -301,19 +356,19 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:40 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:38:30 GMT'] method: POST - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z/disablescheduling?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z/disablescheduling?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z/disablescheduling'] + dataserviceid: ['https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z/disablescheduling'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:41 GMT'] - request-id: [1483b08b-e160-4cae-9faa-83f6eee05537] + date: ['Fri, 24 Aug 2018 20:38:31 GMT'] + request-id: [0a28f84e-119f-4d25-91cb-c91d240b16e2] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -326,20 +381,19 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:42 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:38:31 GMT'] method: POST - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z/enablescheduling?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z/enablescheduling?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z/enablescheduling'] + dataserviceid: ['https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z/enablescheduling'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:43 GMT'] - request-id: [51005c77-8e0a-4c3c-81b3-dbc36a9fbbf8] + date: ['Fri, 24 Aug 2018 20:38:32 GMT'] + request-id: [4e665bd2-94ef-4c04-b9b8-09a31acac37c] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -353,19 +407,19 @@ interactions: Connection: [keep-alive] Content-Length: ['33'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:43 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:38:32 GMT'] method: POST - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z/reboot?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z/reboot?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_1-20180313t195712z/reboot'] + dataserviceid: ['https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_1-20180824t203642z/reboot'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:43 GMT'] - request-id: [8ce2e183-191e-46e5-b8a4-800dd0ef7f30] + date: ['Fri, 24 Aug 2018 20:38:33 GMT'] + request-id: [7fb087b7-120f-44ab-b9dc-ad6fb7423185] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -379,47 +433,52 @@ interactions: Connection: [keep-alive] Content-Length: ['34'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:43 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:38:33 GMT'] method: POST - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z/reimage?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-587366007_2-20180824t203642z/reimage?api-version=2018-08-01.7.0 response: - body: {string: ''} + body: {string: "{\r\n \"odata.metadata\":\"https://batchff3f0e45.eastus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"OperationNotValidOnNode\",\"message\":{\r\n + \ \"lang\":\"en-US\",\"value\":\"The specified operation is not valid on + the node.\\nRequestId:bb338c4e-2b3a-4ab0-ae2a-27951ded8c86\\nTime:2018-08-24T20:38:34.2377855Z\"\r\n + \ },\"values\":[\r\n {\r\n \"key\":\"Reason\",\"value\":\"Operation + reimage can be invoked only on pools created with cloudServiceConfiguration + \"\r\n }\r\n ]\r\n}"} headers: - dataserviceid: ['https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/nodes/tvm-3687402588_2-20180313t195712z/reimage'] + content-length: ['509'] + content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:43 GMT'] - request-id: [8abc1349-8709-42ae-a183-d6edbe9af24f] + date: ['Fri, 24 Aug 2018 20:38:34 GMT'] + request-id: [bb338c4e-2b3a-4ab0-ae2a-27951ded8c86] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] x-content-type-options: [nosniff] - status: {code: 202, message: Accepted} + status: {code: 409, message: The specified operation is not valid on the node.} - request: - body: '{"nodeList": ["tvm-3687402588_1-20180313t195712z", "tvm-3687402588_2-20180313t195712z"]}' + body: '{"nodeList": ["tvm-587366007_1-20180824t203642z", "tvm-587366007_2-20180824t203642z"]}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Length: ['88'] + Content-Length: ['86'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:58:44 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:38:34 GMT'] method: POST - uri: https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/removenodes?api-version=2018-03-01.6.1 + uri: https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/removenodes?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchff3f0e45.westcentralus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/removenodes'] + dataserviceid: ['https://batchff3f0e45.eastus.batch.azure.com/pools/test_batch_test_batch_compute_nodesff3f0e45/removenodes'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:58:44 GMT'] - etag: ['0x8D5891CD3BA2CE3'] - last-modified: ['Tue, 13 Mar 2018 19:58:44 GMT'] - request-id: [d0324605-557a-47ee-8494-ca262fce5914] + date: ['Fri, 24 Aug 2018 20:38:35 GMT'] + etag: ['0x8D60A0190476D25'] + last-modified: ['Fri, 24 Aug 2018 20:38:35 GMT'] + request-id: [95fe9933-c978-4b24-9351-11267efac1b7] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_create_pools.yaml b/azure-batch/tests/recordings/test_batch.test_batch_create_pools.yaml index 5cba3b68f2ce..2a83749686ac 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_create_pools.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_create_pools.yaml @@ -5,32 +5,36 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:18 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:42 GMT'] method: GET - uri: https://batchf0260dd0.westcentralus.batch.azure.com/nodeagentskus?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/nodeagentskus?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#nodeagentskus\",\"value\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#nodeagentskus\",\"value\":[\r\n \ {\r\n \"id\":\"batch.node.centos 7\",\"verifiedImageReferences\":[\r\n - \ {\r\n \"publisher\":\"OpenLogic\",\"offer\":\"CentOS\",\"sku\":\"7.4\",\"version\":\"latest\"\r\n + \ {\r\n \"publisher\":\"OpenLogic\",\"offer\":\"CentOS\",\"sku\":\"7.5\",\"version\":\"latest\"\r\n + \ },{\r\n \"publisher\":\"OpenLogic\",\"offer\":\"CentOS-HPC\",\"sku\":\"7.4\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"OpenLogic\",\"offer\":\"CentOS-HPC\",\"sku\":\"7.3\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"OpenLogic\",\"offer\":\"CentOS-HPC\",\"sku\":\"7.1\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"Oracle\",\"offer\":\"Oracle-Linux\",\"sku\":\"7.4\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"microsoft-ads\",\"offer\":\"linux-data-science-vm\",\"sku\":\"linuxdsvm\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"batch\",\"offer\":\"rendering-centos73\",\"sku\":\"rendering\",\"version\":\"latest\"\r\n + \ },{\r\n \"publisher\":\"microsoft-azure-batch\",\"offer\":\"centos-container\",\"sku\":\"7-5\",\"version\":\"latest\"\r\n + \ },{\r\n \"publisher\":\"microsoft-azure-batch\",\"offer\":\"centos-container-rdma\",\"sku\":\"7-4\",\"version\":\"latest\"\r\n \ }\r\n ],\"osType\":\"linux\"\r\n },{\r\n \"id\":\"batch.node.debian 8\",\"verifiedImageReferences\":[\r\n {\r\n \"publisher\":\"Credativ\",\"offer\":\"Debian\",\"sku\":\"8\",\"version\":\"latest\"\r\n \ }\r\n ],\"osType\":\"linux\"\r\n },{\r\n \"id\":\"batch.node.debian 9\",\"verifiedImageReferences\":[\r\n {\r\n \"publisher\":\"Credativ\",\"offer\":\"Debian\",\"sku\":\"9\",\"version\":\"latest\"\r\n - \ }\r\n ],\"osType\":\"linux\"\r\n },{\r\n \"id\":\"batch.node.opensuse - 42.1\",\"verifiedImageReferences\":[\r\n {\r\n \"publisher\":\"SUSE\",\"offer\":\"SLES\",\"sku\":\"12-SP2\",\"version\":\"latest\"\r\n \ }\r\n ],\"osType\":\"linux\"\r\n },{\r\n \"id\":\"batch.node.ubuntu 14.04\",\"verifiedImageReferences\":[\r\n {\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"14.04.5-LTS\",\"version\":\"latest\"\r\n \ }\r\n ],\"osType\":\"linux\"\r\n },{\r\n \"id\":\"batch.node.ubuntu 16.04\",\"verifiedImageReferences\":[\r\n {\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n + \ },{\r\n \"publisher\":\"microsoft-azure-batch\",\"offer\":\"ubuntu-server-container\",\"sku\":\"16-04-lts\",\"version\":\"latest\"\r\n + \ },{\r\n \"publisher\":\"microsoft-azure-batch\",\"offer\":\"ubuntu-server-container-rdma\",\"sku\":\"16-04-lts\",\"version\":\"latest\"\r\n + \ }\r\n ],\"osType\":\"linux\"\r\n },{\r\n \"id\":\"batch.node.ubuntu + 18.04\",\"verifiedImageReferences\":[\r\n {\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"18.04-LTS\",\"version\":\"latest\"\r\n \ }\r\n ],\"osType\":\"linux\"\r\n },{\r\n \"id\":\"batch.node.windows amd64\",\"verifiedImageReferences\":[\r\n {\r\n \"publisher\":\"MicrosoftWindowsServer\",\"offer\":\"WindowsServer\",\"sku\":\"2008-R2-SP1\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"MicrosoftWindowsServer\",\"offer\":\"WindowsServer\",\"sku\":\"2008-R2-SP1-smalldisk\",\"version\":\"latest\"\r\n @@ -41,49 +45,49 @@ interactions: \ },{\r\n \"publisher\":\"MicrosoftWindowsServer\",\"offer\":\"WindowsServer\",\"sku\":\"2016-Datacenter\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"MicrosoftWindowsServer\",\"offer\":\"WindowsServer\",\"sku\":\"2016-Datacenter-smalldisk\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"MicrosoftWindowsServer\",\"offer\":\"WindowsServer\",\"sku\":\"2016-Datacenter-with-Containers\",\"version\":\"latest\"\r\n - \ },{\r\n \"publisher\":\"microsoft-ads\",\"offer\":\"standard-data-science-vm\",\"sku\":\"standard-data-science-vm\",\"version\":\"latest\"\r\n + \ },{\r\n \"publisher\":\"microsoft-dsvm\",\"offer\":\"dsvm-windows\",\"sku\":\"server-2016\",\"version\":\"latest\"\r\n \ },{\r\n \"publisher\":\"batch\",\"offer\":\"rendering-windows2016\",\"sku\":\"rendering\",\"version\":\"latest\"\r\n \ }\r\n ],\"osType\":\"windows\"\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:18 GMT'] - request-id: [94563132-2e05-44bb-a3b8-6c19e16e5e6f] + date: ['Fri, 24 Aug 2018 06:58:43 GMT'] + request-id: [8dbeae8a-9a0c-464d-b66b-9a89342f1ca2] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"vmSize": "Standard_A1", "taskSchedulingPolicy": {"nodeFillType": "pack"}, - "userAccounts": [{"password": "kt#_gahr!@aGERDXA", "name": "test-user-1"}, {"password": - "kt#_gahr!@aGERDXA", "elevationLevel": "admin", "name": "test-user-2"}], "id": - "batch_iaas_f0260dd0", "virtualMachineConfiguration": {"nodeAgentSKUId": "batch.node.windows - amd64", "imageReference": {"publisher": "MicrosoftWindowsServer", "sku": "2016-Datacenter-smalldisk", - "offer": "WindowsServer"}, "windowsConfiguration": {"enableAutomaticUpdates": - true}}}' + body: '{"virtualMachineConfiguration": {"windowsConfiguration": {"enableAutomaticUpdates": + true}, "nodeAgentSKUId": "batch.node.windows amd64", "imageReference": {"publisher": + "MicrosoftWindowsServer", "sku": "2016-Datacenter-smalldisk", "offer": "WindowsServer"}}, + "id": "batch_iaas_f0260dd0", "vmSize": "Standard_A1", "userAccounts": [{"password": + "kt#_gahr!@aGERDXA", "name": "test-user-1"}, {"elevationLevel": "admin", "password": + "kt#_gahr!@aGERDXA", "name": "test-user-2"}], "taskSchedulingPolicy": {"nodeFillType": + "pack"}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['523'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:18 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:43 GMT'] method: POST - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_iaas_f0260dd0'] + dataserviceid: ['https://batchf0260dd0.eastus.batch.azure.com/pools/batch_iaas_f0260dd0'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:19 GMT'] - etag: ['0x8D588AE20753E2B'] - last-modified: ['Tue, 13 Mar 2018 06:46:19 GMT'] - location: ['https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_iaas_f0260dd0'] - request-id: [5a21c9e7-71d1-41d4-b37a-0a9117630892] + date: ['Fri, 24 Aug 2018 06:58:44 GMT'] + etag: ['0x8D6098F0876C250'] + last-modified: ['Fri, 24 Aug 2018 06:58:44 GMT'] + location: ['https://batchf0260dd0.eastus.batch.azure.com/pools/batch_iaas_f0260dd0'] + request-id: [d9d38088-6fd9-4ffd-a0fc-a4ab141c5e29] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -95,130 +99,130 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:19 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:44 GMT'] method: GET - uri: https://batchf0260dd0.westcentralus.batch.azure.com/nodecounts?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/nodecounts?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#poolnodecounts\",\"value\":[\r\n - \ {\r\n \"poolId\":\"batch_iaas_f0260dd0\",\"dedicated\":{\r\n \"creating\":0,\"idle\":0,\"offline\":0,\"preempted\":0,\"rebooting\":0,\"reimaging\":0,\"running\":0,\"starting\":0,\"startTaskFailed\":0,\"unusable\":0,\"unknown\":0,\"waitingForStartTask\":0,\"leavingPool\":0,\"total\":0\r\n - \ },\"lowPriority\":{\r\n \"creating\":0,\"idle\":0,\"offline\":0,\"preempted\":0,\"rebooting\":0,\"reimaging\":0,\"running\":0,\"starting\":0,\"startTaskFailed\":0,\"unusable\":0,\"unknown\":0,\"waitingForStartTask\":0,\"leavingPool\":0,\"total\":0\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#poolnodecounts\",\"value\":[\r\n + \ {\r\n \"poolId\":\"batch_iaas_f0260dd0\",\"dedicated\":{\r\n \"creating\":0,\"idle\":0,\"leavingPool\":0,\"offline\":0,\"preempted\":0,\"rebooting\":0,\"reimaging\":0,\"running\":0,\"starting\":0,\"startTaskFailed\":0,\"unusable\":0,\"unknown\":0,\"waitingForStartTask\":0,\"total\":0\r\n + \ },\"lowPriority\":{\r\n \"creating\":0,\"idle\":0,\"leavingPool\":0,\"offline\":0,\"preempted\":0,\"rebooting\":0,\"reimaging\":0,\"running\":0,\"starting\":0,\"startTaskFailed\":0,\"unusable\":0,\"unknown\":0,\"waitingForStartTask\":0,\"total\":0\r\n \ }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:19 GMT'] - request-id: [73f9b113-1ae8-4d3d-af9f-ce3f6cccca78] + date: ['Fri, 24 Aug 2018 06:58:45 GMT'] + request-id: [6a7acf41-f197-4819-867c-ef280ccf6a7b] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: 'b''b\''{"vmSize": "Standard_A1", "id": "batch_network_f0260dd0", "networkConfiguration": - {"subnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"}, - "virtualMachineConfiguration": {"imageReference": {"publisher": "Canonical", - "sku": "16.04-LTS", "offer": "UbuntuServer"}, "nodeAgentSKUId": "batch.node.ubuntu - 16.04"}}\''''' + body: 'b''b\''b\\\''{"virtualMachineConfiguration": {"nodeAgentSKUId": "batch.node.ubuntu + 16.04", "imageReference": {"publisher": "Canonical", "sku": "16.04-LTS", "offer": + "UbuntuServer"}}, "id": "batch_network_f0260dd0", "networkConfiguration": {"subnetId": + "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1"}, + "vmSize": "Standard_A1"}\\\''\''''' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['405'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:19 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:45 GMT'] return-client-request-id: ['false'] method: POST - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?timeout=45&api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0&timeout=45 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"InvalidPropertyValue\",\"message\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"InvalidPropertyValue\",\"message\":{\r\n \ \"lang\":\"en-US\",\"value\":\"The value provided for one of the properties - in the request body is invalid.\\nRequestId:c959587f-498e-4fab-ad84-ab922a7ab88f\\nTime:2018-03-13T06:46:20.4140876Z\"\r\n + in the request body is invalid.\\nRequestId:77328016-7531-42ad-8238-f4d3f1ca7a58\\nTime:2018-08-24T06:58:46.5432738Z\"\r\n \ },\"values\":[\r\n {\r\n \"key\":\"PropertyName\",\"value\":\"subnetId\"\r\n \ },{\r\n \"key\":\"PropertyValue\",\"value\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/subnet1\"\r\n \ },{\r\n \"key\":\"Reason\",\"value\":\"The specified subnetId is in a different subscription and cannot be used with the current Batch account in subscription 00000000-0000-0000-0000-000000000000\"\r\n }\r\n ]\r\n}"} headers: - content-length: ['852'] + content-length: ['845'] content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:20 GMT'] - request-id: [c959587f-498e-4fab-ad84-ab922a7ab88f] + date: ['Fri, 24 Aug 2018 06:58:45 GMT'] + request-id: [77328016-7531-42ad-8238-f4d3f1ca7a58] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] status: {code: 400, message: The value provided for one of the properties in the request body is invalid.} - request: - body: 'b''b\''{"vmSize": "Standard_A1", "id": "batch_image_f0260dd0", "virtualMachineConfiguration": - {"imageReference": {"virtualMachineImageId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test/providers/Microsoft.Compute/images/FakeImage"}, - "nodeAgentSKUId": "batch.node.ubuntu 16.04"}}\''''' + body: 'b''b\''b\\\''{"virtualMachineConfiguration": {"nodeAgentSKUId": "batch.node.ubuntu + 16.04", "imageReference": {"virtualMachineImageId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test/providers/Microsoft.Compute/images/FakeImage"}}, + "id": "batch_image_f0260dd0", "vmSize": "Standard_A1"}\\\''\''''' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['298'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:20 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:46 GMT'] return-client-request-id: ['false'] method: POST - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?timeout=45&api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0&timeout=45 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"InvalidPropertyValue\",\"message\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"InvalidPropertyValue\",\"message\":{\r\n \ \"lang\":\"en-US\",\"value\":\"The value provided for one of the properties - in the request body is invalid.\\nRequestId:47ada245-dcf9-41dd-b5b4-de1785491c0a\\nTime:2018-03-13T06:46:20.9174657Z\"\r\n + in the request body is invalid.\\nRequestId:21fdc10c-a9ba-4b36-a2f5-774096edd858\\nTime:2018-08-24T06:58:47.4802887Z\"\r\n \ },\"values\":[\r\n {\r\n \"key\":\"PropertyName\",\"value\":\"virtualMachineImageId\"\r\n \ },{\r\n \"key\":\"PropertyValue\",\"value\":\"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test/providers/Microsoft.Compute/images/FakeImage\"\r\n \ },{\r\n \"key\":\"Reason\",\"value\":\"The specified virtualMachineImageId is in a different subscription and cannot be used with the current Batch account in subscription 00000000-0000-0000-0000-000000000000\"\r\n }\r\n ]\r\n}"} headers: - content-length: ['857'] + content-length: ['850'] content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:20 GMT'] - request-id: [47ada245-dcf9-41dd-b5b4-de1785491c0a] + date: ['Fri, 24 Aug 2018 06:58:47 GMT'] + request-id: [21fdc10c-a9ba-4b36-a2f5-774096edd858] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] status: {code: 400, message: The value provided for one of the properties in the request body is invalid.} - request: - body: '{"vmSize": "Standard_A1", "id": "batch_osdisk_f0260dd0", "virtualMachineConfiguration": - {"imageReference": {"publisher": "Canonical", "sku": "16.04-LTS", "offer": "UbuntuServer"}, - "osDisk": {"caching": "readwrite"}, "nodeAgentSKUId": "batch.node.ubuntu 16.04"}}' + body: '{"virtualMachineConfiguration": {"nodeAgentSKUId": "batch.node.ubuntu 16.04", + "osDisk": {"caching": "readwrite"}, "imageReference": {"publisher": "Canonical", + "sku": "16.04-LTS", "offer": "UbuntuServer"}}, "id": "batch_osdisk_f0260dd0", + "vmSize": "Standard_A1"}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['261'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:47 GMT'] method: POST - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_osdisk_f0260dd0'] + dataserviceid: ['https://batchf0260dd0.eastus.batch.azure.com/pools/batch_osdisk_f0260dd0'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:21 GMT'] - etag: ['0x8D588AE21CACE33'] - last-modified: ['Tue, 13 Mar 2018 06:46:21 GMT'] - location: ['https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_osdisk_f0260dd0'] - request-id: [710f20b8-7d06-49ea-ac88-b38082e5c5e4] + date: ['Fri, 24 Aug 2018 06:58:48 GMT'] + etag: ['0x8D6098F0AB48090'] + last-modified: ['Fri, 24 Aug 2018 06:58:48 GMT'] + location: ['https://batchf0260dd0.eastus.batch.azure.com/pools/batch_osdisk_f0260dd0'] + request-id: [34a7e8ea-4ce0-4640-a9ae-4cae78fa2348] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -230,15 +234,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:48 GMT'] method: GET - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_osdisk_f0260dd0?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools/batch_osdisk_f0260dd0?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_osdisk_f0260dd0\",\"url\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_osdisk_f0260dd0\",\"eTag\":\"0x8D588AE21CACE33\",\"lastModified\":\"2018-03-13T06:46:21.5419443Z\",\"creationTime\":\"2018-03-13T06:46:21.5419443Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:46:21.5419443Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T06:46:22.0059881Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_osdisk_f0260dd0\",\"url\":\"https://batchf0260dd0.eastus.batch.azure.com/pools/batch_osdisk_f0260dd0\",\"eTag\":\"0x8D6098F0AB48090\",\"lastModified\":\"2018-08-24T06:58:48.4078736Z\",\"creationTime\":\"2018-08-24T06:58:48.4078736Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:58:48.4078736Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T06:58:48.8058971Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"osDisk\":{\r\n \"caching\":\"ReadWrite\"\r\n },\"nodeAgentSKUId\":\"batch.node.ubuntu @@ -246,42 +249,42 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:22 GMT'] - etag: ['0x8D588AE21CACE33'] - last-modified: ['Tue, 13 Mar 2018 06:46:21 GMT'] - request-id: [6505dcbd-08c4-489e-ae71-816f217f1aec] + date: ['Fri, 24 Aug 2018 06:58:49 GMT'] + etag: ['0x8D6098F0AB48090'] + last-modified: ['Fri, 24 Aug 2018 06:58:48 GMT'] + request-id: [2240ec32-4502-4d42-b5a3-a4ff36320ea7] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"vmSize": "Standard_A1", "id": "batch_disk_f0260dd0", "virtualMachineConfiguration": - {"imageReference": {"publisher": "Canonical", "sku": "16.04-LTS", "offer": "UbuntuServer"}, - "dataDisks": [{"diskSizeGB": 50, "lun": 1}], "nodeAgentSKUId": "batch.node.ubuntu - 16.04"}}' + body: '{"virtualMachineConfiguration": {"nodeAgentSKUId": "batch.node.ubuntu 16.04", + "dataDisks": [{"lun": 1, "diskSizeGB": 50}], "imageReference": {"publisher": + "Canonical", "sku": "16.04-LTS", "offer": "UbuntuServer"}}, "id": "batch_disk_f0260dd0", + "vmSize": "Standard_A1"}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['268'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:22 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:49 GMT'] method: POST - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_disk_f0260dd0'] + dataserviceid: ['https://batchf0260dd0.eastus.batch.azure.com/pools/batch_disk_f0260dd0'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:22 GMT'] - etag: ['0x8D588AE227482EB'] - last-modified: ['Tue, 13 Mar 2018 06:46:22 GMT'] - location: ['https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_disk_f0260dd0'] - request-id: [6f432b47-278f-4be4-9dd1-453327c11c1b] + date: ['Fri, 24 Aug 2018 06:58:50 GMT'] + etag: ['0x8D6098F0BCD43C3'] + last-modified: ['Fri, 24 Aug 2018 06:58:50 GMT'] + location: ['https://batchf0260dd0.eastus.batch.azure.com/pools/batch_disk_f0260dd0'] + request-id: [8205d82b-ba94-45d7-83e0-079db095264c] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -293,15 +296,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:22 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:50 GMT'] method: GET - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_disk_f0260dd0?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools/batch_disk_f0260dd0?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_disk_f0260dd0\",\"url\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_disk_f0260dd0\",\"eTag\":\"0x8D588AE227482EB\",\"lastModified\":\"2018-03-13T06:46:22.6541291Z\",\"creationTime\":\"2018-03-13T06:46:22.6541291Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:46:22.6541291Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T06:46:22.9561011Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_disk_f0260dd0\",\"url\":\"https://batchf0260dd0.eastus.batch.azure.com/pools/batch_disk_f0260dd0\",\"eTag\":\"0x8D6098F0BCD43C3\",\"lastModified\":\"2018-08-24T06:58:50.2478787Z\",\"creationTime\":\"2018-08-24T06:58:50.2478787Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:58:50.2478787Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T06:58:50.6939495Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\",\"dataDisks\":[\r\n {\r\n @@ -310,42 +312,42 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:23 GMT'] - etag: ['0x8D588AE227482EB'] - last-modified: ['Tue, 13 Mar 2018 06:46:22 GMT'] - request-id: [dfa283af-a384-4986-a123-d1cff87c11a0] + date: ['Fri, 24 Aug 2018 06:58:50 GMT'] + etag: ['0x8D6098F0BCD43C3'] + last-modified: ['Fri, 24 Aug 2018 06:58:50 GMT'] + request-id: [98d8cc5c-3340-430a-b395-694321f47bbb] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"applicationLicenses": ["maya"], "vmSize": "Standard_A1", "id": "batch_app_f0260dd0", - "virtualMachineConfiguration": {"imageReference": {"publisher": "Canonical", - "sku": "16.04-LTS", "offer": "UbuntuServer"}, "dataDisks": [{"diskSizeGB": 50, - "lun": 1}], "nodeAgentSKUId": "batch.node.ubuntu 16.04"}}' + body: '{"virtualMachineConfiguration": {"nodeAgentSKUId": "batch.node.ubuntu 16.04", + "dataDisks": [{"lun": 1, "diskSizeGB": 50}], "imageReference": {"publisher": + "Canonical", "sku": "16.04-LTS", "offer": "UbuntuServer"}}, "id": "batch_app_f0260dd0", + "applicationLicenses": ["maya"], "vmSize": "Standard_A1"}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['300'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:23 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:51 GMT'] method: POST - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_app_f0260dd0'] + dataserviceid: ['https://batchf0260dd0.eastus.batch.azure.com/pools/batch_app_f0260dd0'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:23 GMT'] - etag: ['0x8D588AE231E4E1B'] - last-modified: ['Tue, 13 Mar 2018 06:46:23 GMT'] - location: ['https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_app_f0260dd0'] - request-id: [864b9079-e0c3-4bb2-ada4-d743a9262530] + date: ['Fri, 24 Aug 2018 06:58:51 GMT'] + etag: ['0x8D6098F0D03B6F1'] + last-modified: ['Fri, 24 Aug 2018 06:58:52 GMT'] + location: ['https://batchf0260dd0.eastus.batch.azure.com/pools/batch_app_f0260dd0'] + request-id: [1a29f859-87e6-4f37-8a4d-df59d2e9e129] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -357,15 +359,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:23 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:52 GMT'] method: GET - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_app_f0260dd0?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools/batch_app_f0260dd0?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_app_f0260dd0\",\"url\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_app_f0260dd0\",\"eTag\":\"0x8D588AE231E4E1B\",\"lastModified\":\"2018-03-13T06:46:23.7668891Z\",\"creationTime\":\"2018-03-13T06:46:23.7668891Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:46:23.7668891Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T06:46:24.0968737Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_app_f0260dd0\",\"url\":\"https://batchf0260dd0.eastus.batch.azure.com/pools/batch_app_f0260dd0\",\"eTag\":\"0x8D6098F0D03B6F1\",\"lastModified\":\"2018-08-24T06:58:52.2824433Z\",\"creationTime\":\"2018-08-24T06:58:52.2824433Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:58:52.2824433Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T06:58:52.6834553Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\",\"dataDisks\":[\r\n {\r\n @@ -374,10 +375,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:24 GMT'] - etag: ['0x8D588AE231E4E1B'] - last-modified: ['Tue, 13 Mar 2018 06:46:23 GMT'] - request-id: [e67ee2a9-9794-47f4-9214-785bb55b75cf] + date: ['Fri, 24 Aug 2018 06:58:53 GMT'] + etag: ['0x8D6098F0D03B6F1'] + last-modified: ['Fri, 24 Aug 2018 06:58:52 GMT'] + request-id: [1890971c-ba0a-4710-8cf6-d3ea05e3ec7a] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -389,27 +390,26 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:24 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:53 GMT'] method: GET - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#pools\",\"value\":[\r\n - \ {\r\n \"id\":\"batch_app_f0260dd0\",\"url\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_app_f0260dd0\",\"eTag\":\"0x8D588AE231E4E1B\",\"lastModified\":\"2018-03-13T06:46:23.7668891Z\",\"creationTime\":\"2018-03-13T06:46:23.7668891Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:46:23.7668891Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T06:46:24.0968737Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#pools\",\"value\":[\r\n + \ {\r\n \"id\":\"batch_app_f0260dd0\",\"url\":\"https://batchf0260dd0.eastus.batch.azure.com/pools/batch_app_f0260dd0\",\"eTag\":\"0x8D6098F0D03B6F1\",\"lastModified\":\"2018-08-24T06:58:52.2824433Z\",\"creationTime\":\"2018-08-24T06:58:52.2824433Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:58:52.2824433Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T06:58:52.6834553Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\",\"dataDisks\":[\r\n \ {\r\n \"lun\":1,\"caching\":\"none\",\"diskSizeGB\":50,\"storageAccountType\":\"standard_lrs\"\r\n \ }\r\n ]\r\n },\"applicationLicenses\":[\r\n \"maya\"\r\n - \ ]\r\n },{\r\n \"id\":\"batch_disk_f0260dd0\",\"url\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_disk_f0260dd0\",\"eTag\":\"0x8D588AE227482EB\",\"lastModified\":\"2018-03-13T06:46:22.6541291Z\",\"creationTime\":\"2018-03-13T06:46:22.6541291Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:46:22.6541291Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T06:46:22.9561011Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + \ ]\r\n },{\r\n \"id\":\"batch_disk_f0260dd0\",\"url\":\"https://batchf0260dd0.eastus.batch.azure.com/pools/batch_disk_f0260dd0\",\"eTag\":\"0x8D6098F0BCD43C3\",\"lastModified\":\"2018-08-24T06:58:50.2478787Z\",\"creationTime\":\"2018-08-24T06:58:50.2478787Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:58:50.2478787Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T06:58:50.6939495Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\",\"dataDisks\":[\r\n \ {\r\n \"lun\":1,\"caching\":\"none\",\"diskSizeGB\":50,\"storageAccountType\":\"standard_lrs\"\r\n - \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"batch_iaas_f0260dd0\",\"url\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_iaas_f0260dd0\",\"eTag\":\"0x8D588AE20753E2B\",\"lastModified\":\"2018-03-13T06:46:19.3034795Z\",\"creationTime\":\"2018-03-13T06:46:19.3034795Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:46:19.3034795Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T06:46:19.3944805Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"userAccounts\":[\r\n + \ }\r\n ]\r\n }\r\n },{\r\n \"id\":\"batch_iaas_f0260dd0\",\"url\":\"https://batchf0260dd0.eastus.batch.azure.com/pools/batch_iaas_f0260dd0\",\"eTag\":\"0x8D6098F0876C250\",\"lastModified\":\"2018-08-24T06:58:44.6477904Z\",\"creationTime\":\"2018-08-24T06:58:44.6477904Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:58:44.6477904Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T06:58:44.7587826Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"userAccounts\":[\r\n \ {\r\n \"name\":\"test-user-1\",\"elevationLevel\":\"nonadmin\"\r\n \ },{\r\n \"name\":\"test-user-2\",\"elevationLevel\":\"admin\"\r\n \ }\r\n ],\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n @@ -417,7 +417,7 @@ interactions: \ \"imageReference\":{\r\n \"publisher\":\"MicrosoftWindowsServer\",\"offer\":\"WindowsServer\",\"sku\":\"2016-Datacenter-smalldisk\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.windows amd64\",\"windowsConfiguration\":{\r\n \ \"enableAutomaticUpdates\":true\r\n }\r\n }\r\n },{\r\n - \ \"id\":\"batch_osdisk_f0260dd0\",\"url\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_osdisk_f0260dd0\",\"eTag\":\"0x8D588AE21CACE33\",\"lastModified\":\"2018-03-13T06:46:21.5419443Z\",\"creationTime\":\"2018-03-13T06:46:21.5419443Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:46:21.5419443Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T06:46:22.0059881Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + \ \"id\":\"batch_osdisk_f0260dd0\",\"url\":\"https://batchf0260dd0.eastus.batch.azure.com/pools/batch_osdisk_f0260dd0\",\"eTag\":\"0x8D6098F0AB48090\",\"lastModified\":\"2018-08-24T06:58:48.4078736Z\",\"creationTime\":\"2018-08-24T06:58:48.4078736Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:58:48.4078736Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T06:58:48.8058971Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"osDisk\":{\r\n \"caching\":\"ReadWrite\"\r\n },\"nodeAgentSKUId\":\"batch.node.ubuntu @@ -425,8 +425,8 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:24 GMT'] - request-id: [c1acc63c-b143-4bad-adda-a821db7be850] + date: ['Fri, 24 Aug 2018 06:58:54 GMT'] + request-id: [a5834dff-a415-4bb1-a1f9-644fb6e7ea8f] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -438,28 +438,27 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:24 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:54 GMT'] return-client-request-id: ['false'] method: GET - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?maxresults=1&timeout=30&api-version=2018-03-01.6.1 + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?maxresults=1&api-version=2018-08-01.7.0&timeout=30 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#pools\",\"value\":[\r\n - \ {\r\n \"id\":\"batch_app_f0260dd0\",\"url\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools/batch_app_f0260dd0\",\"eTag\":\"0x8D588AE231E4E1B\",\"lastModified\":\"2018-03-13T06:46:23.7668891Z\",\"creationTime\":\"2018-03-13T06:46:23.7668891Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:46:23.7668891Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T06:46:24.0968737Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#pools\",\"value\":[\r\n + \ {\r\n \"id\":\"batch_app_f0260dd0\",\"url\":\"https://batchf0260dd0.eastus.batch.azure.com/pools/batch_app_f0260dd0\",\"eTag\":\"0x8D6098F0D03B6F1\",\"lastModified\":\"2018-08-24T06:58:52.2824433Z\",\"creationTime\":\"2018-08-24T06:58:52.2824433Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T06:58:52.2824433Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T06:58:52.6834553Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\",\"dataDisks\":[\r\n \ {\r\n \"lun\":1,\"caching\":\"none\",\"diskSizeGB\":50,\"storageAccountType\":\"standard_lrs\"\r\n \ }\r\n ]\r\n },\"applicationLicenses\":[\r\n \"maya\"\r\n - \ ]\r\n }\r\n ],\"odata.nextLink\":\"https://batchf0260dd0.westcentralus.batch.azure.com/pools?maxresults=1&timeout=30&api-version=2018-03-01.6.1&$skiptoken=WATV2:cql7ntVPRJidU%5E2ono/mmndim5mUw1477yWcMTZ5PF8oBtDskuG40EX9sPjZOcdAIqv3ekFE0xc7MrvVa6tXNBSlkw1LOI5S8%5EAnogXB1LOENiMVQEW0NP9ibo0d7yHOY/rtbbNWTVDwrlB2AkFfS%5EsTYX7bU%5E45s4rl6YEViphiGt4Jy1Pn7ZRTn/0Np8nelTFx1obgS6kz/vgRJf9rlFOAMGmOgMOT4ZIdHRB7MZUZP/3ci6iy3BhZ%5Ek94tawmT1Tn3uc9oHItonsmditX6M3v16r0D6Grw4OBEQ0jVpw=:1$1\"\r\n}"} + \ ]\r\n }\r\n ],\"odata.nextLink\":\"https://batchf0260dd0.eastus.batch.azure.com/pools?maxresults=1&api-version=2018-08-01.7.0&timeout=30&$skiptoken=WATV2:svCGInRCHD/N5oVI5QOwgJPSTYKuoVdoFHTJ0nEWfEyFnaGb/Pep5FFGL5MUo8DO0GijdR2/xIiD6YIOXXsDrD8zJRuUyES%5EOryeegmcqWPPnDsc9M1MxXZxlvBL4mSuOYpmxNA62Sd42uLCG13POSjGobXLnXMTT32sDlJUwT8mshFZTySmHQQ7Tt3Kp2B0f%5E0WcGJpWBe%5E2txfV44BtDOMjQRH0zMoulAx4MpL2vQauUhIKZFnBzvdR8S2s6orKN6N4RNrQXMoVsfD0q%5EvChY8rgsv3yod/jrH3ewN22E=:1$1\"\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:25 GMT'] - request-id: [dc383677-45b5-4b5e-9015-8dfab805ffcd] + date: ['Fri, 24 Aug 2018 06:58:55 GMT'] + request-id: [512032ae-4bc5-4026-8d04-c411e4daec62] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -471,23 +470,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:46:25 GMT'] + ocp-date: ['Fri, 24 Aug 2018 06:58:55 GMT'] return-client-request-id: ['false'] method: GET - uri: https://batchf0260dd0.westcentralus.batch.azure.com/pools?maxresults=1000&timeout=30&$select=id%2Cstate&$filter=startswith%28id%2C%27batch_app_%27%29&api-version=2018-03-01.6.1&$expand=stats + uri: https://batchf0260dd0.eastus.batch.azure.com/pools?maxresults=1000&$select=id%2Cstate&$filter=startswith%28id%2C%27batch_app_%27%29&$expand=stats&api-version=2018-08-01.7.0&timeout=30 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.westcentralus.batch.azure.com/$metadata#pools\",\"value\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0260dd0.eastus.batch.azure.com/$metadata#pools\",\"value\":[\r\n \ {\r\n \"id\":\"batch_app_f0260dd0\",\"state\":\"active\"\r\n }\r\n \ ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:46:25 GMT'] - request-id: [7a344182-7e99-4389-bfcb-9f08acd9602b] + date: ['Fri, 24 Aug 2018 06:58:55 GMT'] + request-id: [cef74f28-4fb2-4082-b769-0f4646b41d3a] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_files.yaml b/azure-batch/tests/recordings/test_batch.test_batch_files.yaml index 2f85e62324af..4c687fd137e0 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_files.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_files.yaml @@ -5,23 +5,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:54:56 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:07:45 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t070741z\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T07:07:41.7112825Z\",\"allocationTime\":\"2018-08-24T07:07:41.5833159Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.44.52\",\"publicFQDN\":\"dns1bd3ee26-0744-40da-a6e9-7bc4a9d45e8a-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:54:57 GMT'] - request-id: [c4a9a0e0-829d-43a1-83ba-08a5755d9e62] + date: ['Fri, 24 Aug 2018 07:07:46 GMT'] + request-id: [99e9e2d9-a79d-4053-a2e4-f68d9c251674] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -33,23 +32,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:55:07 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:07:56 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t070741z\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T07:07:41.7112825Z\",\"allocationTime\":\"2018-08-24T07:07:41.5833159Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.44.52\",\"publicFQDN\":\"dns1bd3ee26-0744-40da-a6e9-7bc4a9d45e8a-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:55:07 GMT'] - request-id: [c14adae0-0fa4-4986-9b23-0926d9d40e82] + date: ['Fri, 24 Aug 2018 07:07:57 GMT'] + request-id: [7b64c47f-6882-4024-b469-a3199088a47d] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -61,23 +59,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:55:18 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:08:07 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t070741z\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T07:07:41.7112825Z\",\"allocationTime\":\"2018-08-24T07:07:41.5833159Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.44.52\",\"publicFQDN\":\"dns1bd3ee26-0744-40da-a6e9-7bc4a9d45e8a-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:55:18 GMT'] - request-id: [bbc6cbf4-073b-4015-8fe1-7415d6db58a5] + date: ['Fri, 24 Aug 2018 07:08:08 GMT'] + request-id: [04c8459e-7880-4fda-bc72-d81a648c89b0] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -89,23 +86,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:55:28 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:08:18 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t070741z\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T07:07:41.7112825Z\",\"allocationTime\":\"2018-08-24T07:07:41.5833159Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.44.52\",\"publicFQDN\":\"dns1bd3ee26-0744-40da-a6e9-7bc4a9d45e8a-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:55:28 GMT'] - request-id: [3248756b-9092-43df-950d-8f47396dfaf1] + date: ['Fri, 24 Aug 2018 07:08:19 GMT'] + request-id: [710cc2d3-1033-4a56-8952-710100500431] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -117,23 +113,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:55:39 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:08:29 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t070741z\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T07:07:41.7112825Z\",\"allocationTime\":\"2018-08-24T07:07:41.5833159Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.44.52\",\"publicFQDN\":\"dns1bd3ee26-0744-40da-a6e9-7bc4a9d45e8a-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:55:39 GMT'] - request-id: [9e09086d-856d-407e-a43d-804d4e629db0] + date: ['Fri, 24 Aug 2018 07:08:29 GMT'] + request-id: [cfbdb958-03d5-4f6f-9ac8-20bceaeafed3] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -145,23 +140,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:55:49 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:08:39 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t070741z\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T07:07:41.7112825Z\",\"allocationTime\":\"2018-08-24T07:07:41.5833159Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.44.52\",\"publicFQDN\":\"dns1bd3ee26-0744-40da-a6e9-7bc4a9d45e8a-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:55:50 GMT'] - request-id: [bbbd360d-d3e4-4376-baed-42838b1123f3] + date: ['Fri, 24 Aug 2018 07:08:40 GMT'] + request-id: [1679a368-3a34-434a-ac88-2ca3c09fcddd] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -173,23 +167,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:56:00 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:08:50 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t070741z\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T07:07:41.7112825Z\",\"allocationTime\":\"2018-08-24T07:07:41.5833159Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.44.52\",\"publicFQDN\":\"dns1bd3ee26-0744-40da-a6e9-7bc4a9d45e8a-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:56:01 GMT'] - request-id: [6c75f5e9-df8f-4170-ada2-0cf592295999] + date: ['Fri, 24 Aug 2018 07:08:51 GMT'] + request-id: [70815dbb-3e97-4ca1-9d37-26562e1b1477] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -201,191 +194,23 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:56:11 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:01 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:56:11 GMT'] - request-id: [9cbb1635-9365-4c85-a4ea-f85fa9f69106] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:56:21 GMT'] - method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:56:22 GMT'] - request-id: [3d6fccfb-1ab1-4b1a-a22e-6dccbe41deba] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:56:32 GMT'] - method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:56:32 GMT'] - request-id: [2c9a7a19-2814-495d-a050-1ee45b94d4a4] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:56:43 GMT'] - method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:56:43 GMT'] - request-id: [36382460-722c-4b3b-bfb5-0bbf03087c47] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:56:53 GMT'] - method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:56:54 GMT'] - request-id: [07fc50ae-0fda-488f-9f50-8499415b9f7d] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:04 GMT'] - method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:54:50.2518081Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:04 GMT'] - request-id: [00409a2b-6657-47a2-afd8-7fcd4e91f777] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:14 GMT'] - method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3840119875_1-20180313t065450z\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T06:57:12.783852Z\",\"lastBootTime\":\"2018-03-13T06:57:12.632145Z\",\"allocationTime\":\"2018-03-13T06:54:50.1867959Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.158.194\",\"publicFQDN\":\"dns0d371bf4-5e9d-40c2-a652-fd1ba1062209-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n - \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t070741z\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"state\":\"idle\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T07:08:57.621283Z\",\"lastBootTime\":\"2018-08-24T07:08:56.933932Z\",\"allocationTime\":\"2018-08-24T07:07:41.5833159Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"totalTasksSucceeded\":0,\"runningTasksCount\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.44.52\",\"publicFQDN\":\"dns1bd3ee26-0744-40da-a6e9-7bc4a9d45e8a-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + \ }\r\n ]\r\n },\"nodeAgentInfo\":{\r\n \"lastUpdateTime\":\"2018-08-24T07:08:56.933932Z\",\"version\":\"1.3.0.8\"\r\n + \ }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:15 GMT'] - request-id: [99c73966-4305-453e-91b1-b6efbd6d59bb] + date: ['Fri, 24 Aug 2018 07:09:02 GMT'] + request-id: [d5598806-e80d-4dab-940e-fce4ed4c99c2] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -399,22 +224,22 @@ interactions: Connection: [keep-alive] Content-Length: ['65'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:15 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:02 GMT'] method: POST - uri: https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task'] + dataserviceid: ['https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:15 GMT'] - etag: ['0x8D588AFA7C4208D'] - last-modified: ['Tue, 13 Mar 2018 06:57:15 GMT'] - location: ['https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task'] - request-id: [7203aebc-aad0-43df-922a-f3b20745345d] + date: ['Fri, 24 Aug 2018 07:09:02 GMT'] + etag: ['0x8D60990793F0503'] + last-modified: ['Fri, 24 Aug 2018 07:09:03 GMT'] + location: ['https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task'] + request-id: [235b1b8b-1043-4988-b3cf-90e39389ff15] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -426,15 +251,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:15 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:03 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"test_task\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task\",\"eTag\":\"0x8D588AFA7C4208D\",\"creationTime\":\"2018-03-13T06:57:15.8096013Z\",\"lastModified\":\"2018-03-13T06:57:15.8096013Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T06:57:15.8096013Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"test_task\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task\",\"eTag\":\"0x8D60990793F0503\",\"creationTime\":\"2018-08-24T07:09:03.3617667Z\",\"lastModified\":\"2018-08-24T07:09:03.3617667Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T07:09:03.3617667Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n @@ -442,10 +266,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:16 GMT'] - etag: ['0x8D588AFA7C4208D'] - last-modified: ['Tue, 13 Mar 2018 06:57:15 GMT'] - request-id: [07e8f19c-56ea-4a8f-a674-da80723ace35] + date: ['Fri, 24 Aug 2018 07:09:03 GMT'] + etag: ['0x8D60990793F0503'] + last-modified: ['Fri, 24 Aug 2018 07:09:03 GMT'] + request-id: [d035f76a-9953-4970-a1a1-791d6df438b2] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -457,32 +281,31 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:09 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"test_task\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task\",\"eTag\":\"0x8D588AFA7C4208D\",\"creationTime\":\"2018-03-13T06:57:15.8096013Z\",\"lastModified\":\"2018-03-13T06:57:15.8096013Z\",\"state\":\"completed\",\"stateTransitionTime\":\"2018-03-13T06:57:17.830504Z\",\"previousState\":\"running\",\"previousStateTransitionTime\":\"2018-03-13T06:57:17.520385Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"test_task\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task\",\"eTag\":\"0x8D60990793F0503\",\"creationTime\":\"2018-08-24T07:09:03.3617667Z\",\"lastModified\":\"2018-08-24T07:09:03.3617667Z\",\"state\":\"completed\",\"stateTransitionTime\":\"2018-08-24T07:09:04.900273Z\",\"previousState\":\"running\",\"previousStateTransitionTime\":\"2018-08-24T07:09:04.720208Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n - \ },\"executionInfo\":{\r\n \"startTime\":\"2018-03-13T06:57:17.520475Z\",\"endTime\":\"2018-03-13T06:57:17.830504Z\",\"failureInfo\":{\r\n + \ },\"executionInfo\":{\r\n \"startTime\":\"2018-08-24T07:09:04.720305Z\",\"endTime\":\"2018-08-24T07:09:04.900273Z\",\"failureInfo\":{\r\n \ \"category\":\"UserError\",\"code\":\"CommandProgramNotFound\",\"message\":\"The specified command program is not found\",\"details\":[\r\n {\r\n \"name\":\"CommandLine\",\"value\":\"cmd /c \\\"echo hello world\\\"\"\r\n },{\r\n \"name\":\"Message\",\"value\":\"The system cannot find the file specified\"\r\n }\r\n ]\r\n },\"result\":\"Failure\",\"retryCount\":0,\"requeueCount\":0\r\n - \ },\"nodeInfo\":{\r\n \"affinityId\":\"TVM:tvm-3840119875_1-20180313t065450z\",\"nodeUrl\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z\",\"poolId\":\"test_batch_test_batch_files98930ae3\",\"nodeId\":\"tvm-3840119875_1-20180313t065450z\",\"taskRootDirectory\":\"workitems/batch98930ae3/job-1/test_task\",\"taskRootDirectoryUrl\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems/batch98930ae3/job-1/test_task\"\r\n + \ },\"nodeInfo\":{\r\n \"affinityId\":\"TVM:tvm-3257026573_1-20180824t070741z\",\"nodeUrl\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z\",\"poolId\":\"test_batch_test_batch_files98930ae3\",\"nodeId\":\"tvm-3257026573_1-20180824t070741z\",\"taskRootDirectory\":\"workitems/batch98930ae3/job-1/test_task\",\"taskRootDirectoryUrl\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems/batch98930ae3/job-1/test_task\"\r\n \ }\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:21 GMT'] - etag: ['0x8D588AFA7C4208D'] - last-modified: ['Tue, 13 Mar 2018 06:57:15 GMT'] - request-id: [fca6c95e-d32c-4d3e-b9dc-a36fe3d4b273] + date: ['Fri, 24 Aug 2018 07:09:09 GMT'] + etag: ['0x8D60990793F0503'] + last-modified: ['Fri, 24 Aug 2018 07:09:03 GMT'] + request-id: [f6d7e240-fd5c-481c-853d-544ed7746965] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -494,34 +317,35 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:10 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files?api-version=2018-03-01.6.1&recursive=true + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files?api-version=2018-08-01.7.0&recursive=true response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#files\",\"value\":[\r\n - \ {\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems/batch98930ae3/job-1/test_task\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"apppackages\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/apppackages\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems/batch98930ae3/job-1\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"workitems/batch98930ae3\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems/batch98930ae3\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task/certs\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems/batch98930ae3/job-1/test_task/certs\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"shared\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/shared\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"workitems\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task/wd\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems/batch98930ae3/job-1/test_task/wd\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task/stdout.txt\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems/batch98930ae3/job-1/test_task/stdout.txt\",\"isDirectory\":false,\"properties\":{\r\n - \ \"lastModified\":\"2018-03-13T06:57:17.748152Z\",\"contentLength\":\"0\",\"contentType\":\"text/plain\",\"fileMode\":\"0o100644\"\r\n - \ }\r\n },{\r\n \"name\":\"startup\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/startup\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task/stderr.txt\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems/batch98930ae3/job-1/test_task/stderr.txt\",\"isDirectory\":false,\"properties\":{\r\n - \ \"lastModified\":\"2018-03-13T06:57:17.748152Z\",\"contentLength\":\"0\",\"contentType\":\"text/plain\",\"fileMode\":\"0o100644\"\r\n - \ }\r\n }\r\n ]\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#files\",\"value\":[\r\n + \ {\r\n \"name\":\"apppackages\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/apppackages\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"volatile/startup\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/volatile/startup\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task/wd\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems/batch98930ae3/job-1/test_task/wd\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"workitems/batch98930ae3\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems/batch98930ae3\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"shared\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/shared\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task/stdout.txt\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems/batch98930ae3/job-1/test_task/stdout.txt\",\"isDirectory\":false,\"properties\":{\r\n + \ \"lastModified\":\"2018-08-24T07:09:04.830959Z\",\"contentLength\":\"0\",\"contentType\":\"text/plain\",\"fileMode\":\"0o100644\"\r\n + \ }\r\n },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task/stderr.txt\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems/batch98930ae3/job-1/test_task/stderr.txt\",\"isDirectory\":false,\"properties\":{\r\n + \ \"lastModified\":\"2018-08-24T07:09:04.830959Z\",\"contentLength\":\"0\",\"contentType\":\"text/plain\",\"fileMode\":\"0o100644\"\r\n + \ }\r\n },{\r\n \"name\":\"workitems/batch98930ae3/job-1\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems/batch98930ae3/job-1\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"workitems\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"volatile\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/volatile\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems/batch98930ae3/job-1/test_task\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"workitems/batch98930ae3/job-1/test_task/certs\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems/batch98930ae3/job-1/test_task/certs\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"startup\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/startup\",\"isDirectory\":true\r\n + \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:22 GMT'] - request-id: [eff67554-67d0-4142-8ec1-61184070d2f1] + date: ['Fri, 24 Aug 2018 07:09:10 GMT'] + request-id: [3ebc9b47-8c5d-4363-95a3-ab4863f4f061] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -533,25 +357,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:22 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:11 GMT'] method: HEAD - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-length: ['0'] content-type: [text/plain] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:22 GMT'] - last-modified: ['Tue, 13 Mar 2018 06:57:17 GMT'] + date: ['Fri, 24 Aug 2018 07:09:12 GMT'] + last-modified: ['Fri, 24 Aug 2018 07:09:04 GMT'] ocp-batch-file-isdirectory: ['False'] ocp-batch-file-mode: [0o100644] - ocp-batch-file-url: [https%3A%2F%2Fbatch498930ae3.westcentralus.batch.azure.com%2Fpools%2Ftest_batch_test_batch_files98930ae3%2Fnodes%2Ftvm-3840119875_1-20180313t065450z%2Ffiles%2Fworkitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt] - request-id: [a147eebd-3d96-4965-9f8a-c36e4b654d56] + ocp-batch-file-url: [https%3A%2F%2Fbatch498930ae3.eastus.batch.azure.com%2Fpools%2Ftest_batch_test_batch_files98930ae3%2Fnodes%2Ftvm-3257026573_1-20180824t070741z%2Ffiles%2Fworkitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt] + request-id: [34b3348e-d5c2-427e-b0ad-3e07484452ae] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] @@ -562,24 +385,23 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:23 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:12 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-type: [text/plain] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:24 GMT'] - last-modified: ['Tue, 13 Mar 2018 06:57:17 GMT'] + date: ['Fri, 24 Aug 2018 07:09:13 GMT'] + last-modified: ['Fri, 24 Aug 2018 07:09:04 GMT'] ocp-batch-file-isdirectory: ['False'] ocp-batch-file-mode: [0o100644] - ocp-batch-file-url: [https%3A%2F%2Fbatch498930ae3.westcentralus.batch.azure.com%2Fpools%2Ftest_batch_test_batch_files98930ae3%2Fnodes%2Ftvm-3840119875_1-20180313t065450z%2Ffiles%2Fworkitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt] - request-id: [e285d359-1ac1-4dae-bf24-3879c3cedd03] + ocp-batch-file-url: [https%3A%2F%2Fbatch498930ae3.eastus.batch.azure.com%2Fpools%2Ftest_batch_test_batch_files98930ae3%2Fnodes%2Ftvm-3257026573_1-20180824t070741z%2Ffiles%2Fworkitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt] + request-id: [05c54ed2-781b-4803-878e-9044298b25d3] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -592,19 +414,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:24 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:13 GMT'] method: DELETE - uri: https://batch498930ae3.westcentralus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3840119875_1-20180313t065450z/files/workitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/pools/test_batch_test_batch_files98930ae3/nodes/tvm-3257026573_1-20180824t070741z/files/workitems%2Fbatch98930ae3%2Fjob-1%2Ftest_task%2Fstdout.txt?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:24 GMT'] - request-id: [443984ff-e723-43b2-b376-84a6d8dc9d4b] + date: ['Fri, 24 Aug 2018 07:09:14 GMT'] + request-id: [ff358a61-3cab-4f6c-bd9e-d73285c04831] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -616,25 +437,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:25 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:14 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.westcentralus.batch.azure.com/$metadata#files\",\"value\":[\r\n - \ {\r\n \"name\":\"certs\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/certs\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"wd\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/wd\",\"isDirectory\":true\r\n - \ },{\r\n \"name\":\"stderr.txt\",\"url\":\"https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/stderr.txt\",\"isDirectory\":false,\"properties\":{\r\n - \ \"lastModified\":\"2018-03-13T06:57:17.748152Z\",\"contentLength\":\"0\",\"contentType\":\"text/plain\",\"fileMode\":\"0o100644\"\r\n - \ }\r\n }\r\n ]\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batch498930ae3.eastus.batch.azure.com/$metadata#files\",\"value\":[\r\n + \ {\r\n \"name\":\"wd\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/wd\",\"isDirectory\":true\r\n + \ },{\r\n \"name\":\"stderr.txt\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/stderr.txt\",\"isDirectory\":false,\"properties\":{\r\n + \ \"lastModified\":\"2018-08-24T07:09:04.830959Z\",\"contentLength\":\"0\",\"contentType\":\"text/plain\",\"fileMode\":\"0o100644\"\r\n + \ }\r\n },{\r\n \"name\":\"certs\",\"url\":\"https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/certs\",\"isDirectory\":true\r\n + \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:25 GMT'] - request-id: [b80af518-0f70-48f0-92db-9404e5912dc2] + date: ['Fri, 24 Aug 2018 07:09:15 GMT'] + request-id: [d0231a6c-2b40-4b08-b72c-23cd16e827e7] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -646,25 +466,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:25 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:15 GMT'] method: HEAD - uri: https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/stderr.txt?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/stderr.txt?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-length: ['0'] content-type: [text/plain] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:26 GMT'] - last-modified: ['Tue, 13 Mar 2018 06:57:17 GMT'] + date: ['Fri, 24 Aug 2018 07:09:15 GMT'] + last-modified: ['Fri, 24 Aug 2018 07:09:04 GMT'] ocp-batch-file-isdirectory: ['False'] ocp-batch-file-mode: [0o100644] - ocp-batch-file-url: [https%3A%2F%2Fbatch498930ae3.westcentralus.batch.azure.com%2Fjobs%2Fbatch98930ae3%2Ftasks%2Ftest_task%2Ffiles%2Fstderr.txt] - request-id: [01d1ba9a-709c-4b0c-b2e9-c110f99907d9] + ocp-batch-file-url: [https%3A%2F%2Fbatch498930ae3.eastus.batch.azure.com%2Fjobs%2Fbatch98930ae3%2Ftasks%2Ftest_task%2Ffiles%2Fstderr.txt] + request-id: [43e7c099-950e-4479-92ba-ae07f871020b] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] @@ -675,24 +494,23 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:26 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:16 GMT'] method: GET - uri: https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/stderr.txt?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/stderr.txt?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-type: [text/plain] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:27 GMT'] - last-modified: ['Tue, 13 Mar 2018 06:57:17 GMT'] + date: ['Fri, 24 Aug 2018 07:09:16 GMT'] + last-modified: ['Fri, 24 Aug 2018 07:09:04 GMT'] ocp-batch-file-isdirectory: ['False'] ocp-batch-file-mode: [0o100644] - ocp-batch-file-url: [https%3A%2F%2Fbatch498930ae3.westcentralus.batch.azure.com%2Fjobs%2Fbatch98930ae3%2Ftasks%2Ftest_task%2Ffiles%2Fstderr.txt] - request-id: [ea3cbbd2-901c-44bf-9250-9e3a6412930b] + ocp-batch-file-url: [https%3A%2F%2Fbatch498930ae3.eastus.batch.azure.com%2Fjobs%2Fbatch98930ae3%2Ftasks%2Ftest_task%2Ffiles%2Fstderr.txt] + request-id: [810e109f-c1db-4bf6-ab5b-633741993897] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -705,19 +523,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 06:57:27 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:09:17 GMT'] method: DELETE - uri: https://batch498930ae3.westcentralus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/stderr.txt?api-version=2018-03-01.6.1 + uri: https://batch498930ae3.eastus.batch.azure.com/jobs/batch98930ae3/tasks/test_task/files/stderr.txt?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 06:57:27 GMT'] - request-id: [21a6707b-f6c4-4fba-99fa-a9454ad6ae92] + date: ['Fri, 24 Aug 2018 07:09:17 GMT'] + request-id: [0d74427b-68b2-4565-a8d5-df0eb32d04d4] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_job_schedules.yaml b/azure-batch/tests/recordings/test_batch.test_batch_job_schedules.yaml index 8d37c15de75b..ee3f33f995f9 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_job_schedules.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_job_schedules.yaml @@ -1,30 +1,30 @@ interactions: - request: - body: '{"id": "batch_schedule_fe140e2a", "jobSpecification": {"poolInfo": {"poolId": - "pool_id"}, "constraints": {"maxTaskRetryCount": 2}, "onAllTasksComplete": "terminatejob"}, - "schedule": {"recurrenceInterval": "P1D", "startWindow": "PT1H"}}' + body: '{"schedule": {"recurrenceInterval": "P1D", "startWindow": "PT1H"}, "jobSpecification": + {"poolInfo": {"poolId": "pool_id"}, "onAllTasksComplete": "terminatejob", "constraints": + {"maxTaskRetryCount": 2}}, "id": "batch_schedule_fe140e2a"}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['235'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:18 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:09 GMT'] method: POST - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a'] + dataserviceid: ['https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:18 GMT'] - etag: ['0x8D5891F6BCAE2B5'] - last-modified: ['Tue, 13 Mar 2018 20:17:18 GMT'] - location: ['https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a'] - request-id: [1fbac776-9d66-42a7-944f-818508398830] + date: ['Fri, 24 Aug 2018 20:15:10 GMT'] + etag: ['0x8D609FE4AE9EC6F'] + last-modified: ['Fri, 24 Aug 2018 20:15:10 GMT'] + location: ['https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a'] + request-id: [80d789a7-4665-42be-b8bd-8e34809db19b] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -36,28 +36,27 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:19 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:10 GMT'] method: GET - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchfe140e2a.westcentralus.batch.azure.com/$metadata#jobschedules\",\"value\":[\r\n - \ {\r\n \"id\":\"batch_schedule_fe140e2a\",\"url\":\"https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a\",\"eTag\":\"0x8D5891F6BCAE2B5\",\"lastModified\":\"2018-03-13T20:17:18.8243125Z\",\"creationTime\":\"2018-03-13T20:17:18.8243125Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:17:18.8243125Z\",\"schedule\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchfe140e2a.eastus.batch.azure.com/$metadata#jobschedules\",\"value\":[\r\n + \ {\r\n \"id\":\"batch_schedule_fe140e2a\",\"url\":\"https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a\",\"eTag\":\"0x8D609FE4AE9EC6F\",\"lastModified\":\"2018-08-24T20:15:10.2691439Z\",\"creationTime\":\"2018-08-24T20:15:10.2691439Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:15:10.2691439Z\",\"schedule\":{\r\n \ \"startWindow\":\"PT1H\",\"recurrenceInterval\":\"P1D\"\r\n },\"jobSpecification\":{\r\n \ \"priority\":0,\"usesTaskDependencies\":false,\"onAllTasksComplete\":\"terminatejob\",\"onTaskFailure\":\"noaction\",\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":2\r\n \ },\"poolInfo\":{\r\n \"poolId\":\"pool_id\"\r\n }\r\n - \ },\"executionInfo\":{\r\n \"nextRunTime\":\"2018-03-14T20:17:18.8243125Z\",\"recentJob\":{\r\n - \ \"url\":\"https://batchfe140e2a.westcentralus.batch.azure.com/jobs/batch_schedule_fe140e2a:job-1\",\"id\":\"batch_schedule_fe140e2a:job-1\"\r\n + \ },\"executionInfo\":{\r\n \"nextRunTime\":\"2018-08-25T20:15:10.2691439Z\",\"recentJob\":{\r\n + \ \"url\":\"https://batchfe140e2a.eastus.batch.azure.com/jobs/batch_schedule_fe140e2a:job-1\",\"id\":\"batch_schedule_fe140e2a:job-1\"\r\n \ }\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:19 GMT'] - request-id: [a5c36eae-6c99-4550-9cfc-4907654a0817] + date: ['Fri, 24 Aug 2018 20:15:11 GMT'] + request-id: [3d80513e-8182-4674-94d5-66d904e8dabd] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -69,28 +68,27 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:19 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:11 GMT'] method: GET - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchfe140e2a.westcentralus.batch.azure.com/$metadata#jobschedules/@Element\",\"id\":\"batch_schedule_fe140e2a\",\"url\":\"https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a\",\"eTag\":\"0x8D5891F6BCAE2B5\",\"lastModified\":\"2018-03-13T20:17:18.8243125Z\",\"creationTime\":\"2018-03-13T20:17:18.8243125Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:17:18.8243125Z\",\"schedule\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchfe140e2a.eastus.batch.azure.com/$metadata#jobschedules/@Element\",\"id\":\"batch_schedule_fe140e2a\",\"url\":\"https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a\",\"eTag\":\"0x8D609FE4AE9EC6F\",\"lastModified\":\"2018-08-24T20:15:10.2691439Z\",\"creationTime\":\"2018-08-24T20:15:10.2691439Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:15:10.2691439Z\",\"schedule\":{\r\n \ \"startWindow\":\"PT1H\",\"recurrenceInterval\":\"P1D\"\r\n },\"jobSpecification\":{\r\n \ \"priority\":0,\"usesTaskDependencies\":false,\"onAllTasksComplete\":\"terminatejob\",\"onTaskFailure\":\"noaction\",\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":2\r\n \ },\"poolInfo\":{\r\n \"poolId\":\"pool_id\"\r\n }\r\n },\"executionInfo\":{\r\n - \ \"nextRunTime\":\"2018-03-14T20:17:18.8243125Z\",\"recentJob\":{\r\n \"url\":\"https://batchfe140e2a.westcentralus.batch.azure.com/jobs/batch_schedule_fe140e2a:job-1\",\"id\":\"batch_schedule_fe140e2a:job-1\"\r\n + \ \"nextRunTime\":\"2018-08-25T20:15:10.2691439Z\",\"recentJob\":{\r\n \"url\":\"https://batchfe140e2a.eastus.batch.azure.com/jobs/batch_schedule_fe140e2a:job-1\",\"id\":\"batch_schedule_fe140e2a:job-1\"\r\n \ }\r\n }\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:20 GMT'] - etag: ['0x8D5891F6BCAE2B5'] - last-modified: ['Tue, 13 Mar 2018 20:17:18 GMT'] - request-id: [4c805e6f-9f4c-48c9-a8ef-d82e3e02ff96] + date: ['Fri, 24 Aug 2018 20:15:12 GMT'] + etag: ['0x8D609FE4AE9EC6F'] + last-modified: ['Fri, 24 Aug 2018 20:15:10 GMT'] + request-id: [d129308e-918e-484d-a394-bf273ae8c1c7] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -102,21 +100,20 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:20 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:12 GMT'] method: HEAD - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:19 GMT'] - etag: ['0x8D5891F6BCAE2B5'] - last-modified: ['Tue, 13 Mar 2018 20:17:18 GMT'] - request-id: [6fa79b22-d168-46e4-a378-1a5eeb352616] + date: ['Fri, 24 Aug 2018 20:15:13 GMT'] + etag: ['0x8D609FE4AE9EC6F'] + last-modified: ['Fri, 24 Aug 2018 20:15:10 GMT'] + request-id: [9d84da2e-c219-4e14-9822-4ed2b901ae33] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -128,26 +125,25 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:20 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:13 GMT'] method: GET - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/jobs?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/jobs?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchfe140e2a.westcentralus.batch.azure.com/$metadata#jobs\",\"value\":[\r\n - \ {\r\n \"id\":\"batch_schedule_fe140e2a:job-1\",\"url\":\"https://batchfe140e2a.westcentralus.batch.azure.com/jobs/batch_schedule_fe140e2a:job-1\",\"eTag\":\"0x8D5891F6BD28426\",\"lastModified\":\"2018-03-13T20:17:18.8743206Z\",\"creationTime\":\"2018-03-13T20:17:18.8583077Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:17:18.8743206Z\",\"priority\":0,\"usesTaskDependencies\":false,\"constraints\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchfe140e2a.eastus.batch.azure.com/$metadata#jobs\",\"value\":[\r\n + \ {\r\n \"id\":\"batch_schedule_fe140e2a:job-1\",\"url\":\"https://batchfe140e2a.eastus.batch.azure.com/jobs/batch_schedule_fe140e2a:job-1\",\"eTag\":\"0x8D609FE4B058F9C\",\"lastModified\":\"2018-08-24T20:15:10.4502684Z\",\"creationTime\":\"2018-08-24T20:15:10.3481453Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:15:10.4502684Z\",\"priority\":0,\"usesTaskDependencies\":false,\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":2\r\n \ },\"poolInfo\":{\r\n \"poolId\":\"pool_id\"\r\n },\"executionInfo\":{\r\n - \ \"startTime\":\"2018-03-13T20:17:18.8743206Z\",\"poolId\":\"pool_id\"\r\n + \ \"startTime\":\"2018-08-24T20:15:10.4502684Z\",\"poolId\":\"pool_id\"\r\n \ },\"onAllTasksComplete\":\"terminatejob\",\"onTaskFailure\":\"noaction\"\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:21 GMT'] - request-id: [a7b6f41b-36df-4258-bab1-c4455fd8f9aa] + date: ['Fri, 24 Aug 2018 20:15:13 GMT'] + request-id: [727e2de4-0732-482d-b8eb-c7f533666e69] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -160,23 +156,22 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:14 GMT'] method: POST - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/disable?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/disable?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-length: ['0'] - dataserviceid: ['https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/disable'] + dataserviceid: ['https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/disable'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:21 GMT'] - etag: ['0x8D5891F6D8BCD45'] - last-modified: ['Tue, 13 Mar 2018 20:17:21 GMT'] - request-id: [5241acc8-3761-4f82-97f1-85f9e0d7dfc5] + date: ['Fri, 24 Aug 2018 20:15:14 GMT'] + etag: ['0x8D609FE4DE22B24'] + last-modified: ['Fri, 24 Aug 2018 20:15:15 GMT'] + request-id: [9b39e901-facc-4ec3-bbaf-56d8d582de8d] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] @@ -188,51 +183,50 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:22 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:15 GMT'] method: POST - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/enable?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/enable?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-length: ['0'] - dataserviceid: ['https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/enable'] + dataserviceid: ['https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/enable'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:22 GMT'] - etag: ['0x8D5891F6DE3577E'] - last-modified: ['Tue, 13 Mar 2018 20:17:22 GMT'] - request-id: [bf884503-4fa9-4244-8f4b-5e35f2a77420] + date: ['Fri, 24 Aug 2018 20:15:16 GMT'] + etag: ['0x8D609FE4E77AA58'] + last-modified: ['Fri, 24 Aug 2018 20:15:16 GMT'] + request-id: [463eed24-8a43-4f87-9a81-4f8543d3a733] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] status: {code: 204, message: No Content} - request: - body: '{"jobSpecification": {"poolInfo": {"poolId": "pool_id"}}, "schedule": {"recurrenceInterval": - "PT10H"}}' + body: '{"schedule": {"recurrenceInterval": "PT10H"}, "jobSpecification": {"poolInfo": + {"poolId": "pool_id"}}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['102'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:22 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:16 GMT'] method: PUT - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a'] + dataserviceid: ['https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:22 GMT'] - etag: ['0x8D5891F6E3A17AF'] - last-modified: ['Tue, 13 Mar 2018 20:17:22 GMT'] - request-id: [09e64fbd-e420-4681-8b91-b307c3a90fae] + date: ['Fri, 24 Aug 2018 20:15:16 GMT'] + etag: ['0x8D609FE4F11FF16'] + last-modified: ['Fri, 24 Aug 2018 20:15:17 GMT'] + request-id: [7f7fc05a-23c6-4fc0-8342-abe0228ab8c4] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -246,21 +240,21 @@ interactions: Connection: [keep-alive] Content-Length: ['44'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:23 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:17 GMT'] method: PATCH - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a'] + dataserviceid: ['https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:23 GMT'] - etag: ['0x8D5891F6E8BF4DD'] - last-modified: ['Tue, 13 Mar 2018 20:17:23 GMT'] - request-id: [a670d092-8eaa-46f0-8f3a-4a36c09e3130] + date: ['Fri, 24 Aug 2018 20:15:18 GMT'] + etag: ['0x8D609FE4FB6072C'] + last-modified: ['Fri, 24 Aug 2018 20:15:18 GMT'] + request-id: [ca12195e-c970-4865-a13c-d0a625e517b4] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -273,22 +267,21 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:23 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:18 GMT'] method: POST - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/terminate?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/terminate?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/terminate'] + dataserviceid: ['https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a/terminate'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:24 GMT'] - etag: ['0x8D5891F6EDEB41F'] - last-modified: ['Tue, 13 Mar 2018 20:17:23 GMT'] - request-id: [08e3cefd-4fde-4e36-a5ea-032eb9624c29] + date: ['Fri, 24 Aug 2018 20:15:18 GMT'] + etag: ['0x8D609FE503C4974'] + last-modified: ['Fri, 24 Aug 2018 20:15:19 GMT'] + request-id: [a01d364c-0d15-4b9d-944a-42313cc73867] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -301,19 +294,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:17:24 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:15:19 GMT'] method: DELETE - uri: https://batchfe140e2a.westcentralus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-03-01.6.1 + uri: https://batchfe140e2a.eastus.batch.azure.com/jobschedules/batch_schedule_fe140e2a?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:17:24 GMT'] - request-id: [b0f4ebfe-913e-44d2-9409-7115c5640746] + date: ['Fri, 24 Aug 2018 20:15:19 GMT'] + request-id: [910a578b-f2c7-41d0-afe0-b93b8e3e1a5a] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_jobs.yaml b/azure-batch/tests/recordings/test_batch.test_batch_jobs.yaml index 337b1d7a6b99..9b05726c1bb4 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_jobs.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_jobs.yaml @@ -1,61 +1,61 @@ interactions: - request: - body: '{"poolInfo": {"autoPoolSpecification": {"pool": {"vmSize": "small", "cloudServiceConfiguration": - {"osFamily": "5"}}, "poolLifetimeOption": "job"}}, "jobReleaseTask": {"commandLine": - "cmd /c \"echo goodbye world\""}, "jobPreparationTask": {"commandLine": "cmd - /c \"echo hello world\""}, "id": "batch_job1_8dcc0a7e"}' + body: '{"jobReleaseTask": {"commandLine": "cmd /c \"echo goodbye world\""}, "poolInfo": + {"autoPoolSpecification": {"pool": {"cloudServiceConfiguration": {"osFamily": + "5"}, "vmSize": "small"}, "poolLifetimeOption": "job"}}, "id": "batch_job1_8dcc0a7e", + "jobPreparationTask": {"commandLine": "cmd /c \"echo hello world\""}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['314'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:50 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:51 GMT'] method: POST - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/job-1'] + dataserviceid: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/job-1'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:50 GMT'] - etag: ['0x8D588B0B73BDBA5'] - last-modified: ['Tue, 13 Mar 2018 07:04:51 GMT'] - location: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/job-1'] - request-id: [a50e269a-dead-4bb7-95c1-0ff5d8eb61f3] + date: ['Fri, 24 Aug 2018 07:25:52 GMT'] + etag: ['0x8D60992D2D2508E'] + last-modified: ['Fri, 24 Aug 2018 07:25:52 GMT'] + location: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/job-1'] + request-id: [86c97fb7-53b9-4b30-8f04-e4412fff8487] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 201, message: Created} - request: - body: '{"poolInfo": {"autoPoolSpecification": {"pool": {"vmSize": "small", "cloudServiceConfiguration": - {"osFamily": "5"}}, "poolLifetimeOption": "job"}}, "constraints": {"maxTaskRetryCount": - 3}, "priority": 500}' + body: '{"poolInfo": {"autoPoolSpecification": {"pool": {"cloudServiceConfiguration": + {"osFamily": "5"}, "vmSize": "small"}, "poolLifetimeOption": "job"}}, "priority": + 500, "constraints": {"maxTaskRetryCount": 3}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['205'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:51 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:52 GMT'] method: PUT - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e'] + dataserviceid: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:52 GMT'] - etag: ['0x8D588B0B7AEBA10'] - last-modified: ['Tue, 13 Mar 2018 07:04:52 GMT'] - request-id: [2829dd40-0a65-4d22-ae5b-c1a78f53c337] + date: ['Fri, 24 Aug 2018 07:25:53 GMT'] + etag: ['0x8D60992D359B762'] + last-modified: ['Fri, 24 Aug 2018 07:25:53 GMT'] + request-id: [bf05005a-17ec-438e-8850-c12542b0c932] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -69,21 +69,21 @@ interactions: Connection: [keep-alive] Content-Length: ['17'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:52 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:53 GMT'] method: PATCH - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e'] + dataserviceid: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:52 GMT'] - etag: ['0x8D588B0B81B3FF1'] - last-modified: ['Tue, 13 Mar 2018 07:04:52 GMT'] - request-id: [f634b1a2-2e51-4bd9-9628-1ab215bc2817] + date: ['Fri, 24 Aug 2018 07:25:53 GMT'] + etag: ['0x8D60992D3C9FE7A'] + last-modified: ['Fri, 24 Aug 2018 07:25:54 GMT'] + request-id: [760df734-6e6e-4ebf-8a88-4c49acb6edde] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -95,15 +95,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:52 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:54 GMT'] method: GET - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/$metadata#jobs/@Element\",\"id\":\"batch_job1_8dcc0a7e\",\"url\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e\",\"eTag\":\"0x8D588B0B81B3FF1\",\"lastModified\":\"2018-03-13T07:04:52.7208433Z\",\"creationTime\":\"2018-03-13T07:04:51.2398732Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:04:51.2568229Z\",\"priority\":900,\"usesTaskDependencies\":false,\"constraints\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.eastus.batch.azure.com/$metadata#jobs/@Element\",\"id\":\"batch_job1_8dcc0a7e\",\"url\":\"https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e\",\"eTag\":\"0x8D60992D3C9FE7A\",\"lastModified\":\"2018-08-24T07:25:54.260953Z\",\"creationTime\":\"2018-08-24T07:25:52.5461111Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T07:25:52.6377614Z\",\"priority\":900,\"usesTaskDependencies\":false,\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":3\r\n \ },\"jobPreparationTask\":{\r\n \"id\":\"jobpreparation\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n @@ -116,46 +115,47 @@ interactions: \ \"vmSize\":\"small\",\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"resizeTimeout\":\"PT15M\",\"targetDedicatedNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"cloudServiceConfiguration\":{\r\n \ \"osFamily\":\"5\",\"targetOSVersion\":\"*\"\r\n }\r\n }\r\n - \ }\r\n },\"executionInfo\":{\r\n \"startTime\":\"2018-03-13T07:04:51.2568229Z\",\"poolId\":\"44822E5D-9333-4DE8-B357-138B922D74C7\"\r\n + \ }\r\n },\"executionInfo\":{\r\n \"startTime\":\"2018-08-24T07:25:52.6377614Z\",\"poolId\":\"F1998748-A9F3-4162-8B53-2E40DBFC4F7D\"\r\n \ },\"onAllTasksComplete\":\"noaction\",\"onTaskFailure\":\"noaction\"\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:53 GMT'] - etag: ['0x8D588B0B81B3FF1'] - last-modified: ['Tue, 13 Mar 2018 07:04:52 GMT'] - request-id: [12a49510-d20a-4896-95be-cb637578f478] + date: ['Fri, 24 Aug 2018 07:25:54 GMT'] + etag: ['0x8D60992D3C9FE7A'] + last-modified: ['Fri, 24 Aug 2018 07:25:54 GMT'] + request-id: [bf5cedce-ffa1-4b0e-aa25-d51ef78cd4ac] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"poolInfo": {"autoPoolSpecification": {"pool": {"vmSize": "small", "cloudServiceConfiguration": - {"osFamily": "5"}}, "poolLifetimeOption": "job"}}, "id": "batch_job2_8dcc0a7e", - "onTaskFailure": "performexitoptionsjobaction", "onAllTasksComplete": "terminatejob"}' + body: '{"poolInfo": {"autoPoolSpecification": {"pool": {"cloudServiceConfiguration": + {"osFamily": "5"}, "vmSize": "small"}, "poolLifetimeOption": "job"}}, "onTaskFailure": + "performexitoptionsjobaction", "id": "batch_job2_8dcc0a7e", "onAllTasksComplete": + "terminatejob"}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['262'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:53 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:55 GMT'] method: POST - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/job-1'] + dataserviceid: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/job-1'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:54 GMT'] - etag: ['0x8D588B0B90FF974'] - last-modified: ['Tue, 13 Mar 2018 07:04:54 GMT'] - location: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/job-1'] - request-id: [4527a5fb-b38a-47cb-9857-80517094ecac] + date: ['Fri, 24 Aug 2018 07:25:55 GMT'] + etag: ['0x8D60992D4C4DD2E'] + last-modified: ['Fri, 24 Aug 2018 07:25:55 GMT'] + location: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/job-1'] + request-id: [1d4ca7d5-55c1-460d-a479-eddb9e831808] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -167,29 +167,28 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:54 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:55 GMT'] method: GET - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job2_8dcc0a7e?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job2_8dcc0a7e?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/$metadata#jobs/@Element\",\"id\":\"batch_job2_8dcc0a7e\",\"url\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job2_8dcc0a7e\",\"eTag\":\"0x8D588B0B90FF974\",\"lastModified\":\"2018-03-13T07:04:54.3246708Z\",\"creationTime\":\"2018-03-13T07:04:54.3116764Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:04:54.3246708Z\",\"priority\":0,\"usesTaskDependencies\":false,\"constraints\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.eastus.batch.azure.com/$metadata#jobs/@Element\",\"id\":\"batch_job2_8dcc0a7e\",\"url\":\"https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job2_8dcc0a7e\",\"eTag\":\"0x8D60992D4C4DD2E\",\"lastModified\":\"2018-08-24T07:25:55.9050542Z\",\"creationTime\":\"2018-08-24T07:25:55.8870069Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T07:25:55.9050542Z\",\"priority\":0,\"usesTaskDependencies\":false,\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"poolInfo\":{\r\n \"autoPoolSpecification\":{\r\n \"poolLifetimeOption\":\"job\",\"keepAlive\":false,\"pool\":{\r\n \ \"vmSize\":\"small\",\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"resizeTimeout\":\"PT15M\",\"targetDedicatedNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"cloudServiceConfiguration\":{\r\n \ \"osFamily\":\"5\",\"targetOSVersion\":\"*\"\r\n }\r\n }\r\n - \ }\r\n },\"executionInfo\":{\r\n \"startTime\":\"2018-03-13T07:04:54.3246708Z\",\"poolId\":\"B7FBF2D5-703B-471E-993D-BE5A218E8140\"\r\n + \ }\r\n },\"executionInfo\":{\r\n \"startTime\":\"2018-08-24T07:25:55.9050542Z\",\"poolId\":\"12314A8C-6F13-440C-B114-EC46A49DB295\"\r\n \ },\"onAllTasksComplete\":\"terminatejob\",\"onTaskFailure\":\"performexitoptionsjobaction\"\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:55 GMT'] - etag: ['0x8D588B0B90FF974'] - last-modified: ['Tue, 13 Mar 2018 07:04:54 GMT'] - request-id: [30a49eea-9dbd-4311-93c1-5414fe9fc79a] + date: ['Fri, 24 Aug 2018 07:25:55 GMT'] + etag: ['0x8D60992D4C4DD2E'] + last-modified: ['Fri, 24 Aug 2018 07:25:55 GMT'] + request-id: [493a1a6e-097f-47b8-9a82-1b1d7bc7fa09] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -201,16 +200,15 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:55 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:56 GMT'] method: GET - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/$metadata#jobs\",\"value\":[\r\n - \ {\r\n \"id\":\"batch_job1_8dcc0a7e\",\"url\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e\",\"eTag\":\"0x8D588B0B81B3FF1\",\"lastModified\":\"2018-03-13T07:04:52.7208433Z\",\"creationTime\":\"2018-03-13T07:04:51.2398732Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:04:51.2568229Z\",\"priority\":900,\"usesTaskDependencies\":false,\"constraints\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.eastus.batch.azure.com/$metadata#jobs\",\"value\":[\r\n + \ {\r\n \"id\":\"batch_job1_8dcc0a7e\",\"url\":\"https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e\",\"eTag\":\"0x8D60992D3C9FE7A\",\"lastModified\":\"2018-08-24T07:25:54.260953Z\",\"creationTime\":\"2018-08-24T07:25:52.5461111Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T07:25:52.6377614Z\",\"priority\":900,\"usesTaskDependencies\":false,\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":3\r\n \ },\"jobPreparationTask\":{\r\n \"id\":\"jobpreparation\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n @@ -224,22 +222,22 @@ interactions: \ \"vmSize\":\"small\",\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"resizeTimeout\":\"PT15M\",\"targetDedicatedNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"cloudServiceConfiguration\":{\r\n \ \"osFamily\":\"5\",\"targetOSVersion\":\"*\"\r\n }\r\n - \ }\r\n }\r\n },\"executionInfo\":{\r\n \"startTime\":\"2018-03-13T07:04:51.2568229Z\",\"poolId\":\"44822E5D-9333-4DE8-B357-138B922D74C7\"\r\n + \ }\r\n }\r\n },\"executionInfo\":{\r\n \"startTime\":\"2018-08-24T07:25:52.6377614Z\",\"poolId\":\"F1998748-A9F3-4162-8B53-2E40DBFC4F7D\"\r\n \ },\"onAllTasksComplete\":\"noaction\",\"onTaskFailure\":\"noaction\"\r\n - \ },{\r\n \"id\":\"batch_job2_8dcc0a7e\",\"url\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job2_8dcc0a7e\",\"eTag\":\"0x8D588B0B90FF974\",\"lastModified\":\"2018-03-13T07:04:54.3246708Z\",\"creationTime\":\"2018-03-13T07:04:54.3116764Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:04:54.3246708Z\",\"priority\":0,\"usesTaskDependencies\":false,\"constraints\":{\r\n + \ },{\r\n \"id\":\"batch_job2_8dcc0a7e\",\"url\":\"https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job2_8dcc0a7e\",\"eTag\":\"0x8D60992D4C4DD2E\",\"lastModified\":\"2018-08-24T07:25:55.9050542Z\",\"creationTime\":\"2018-08-24T07:25:55.8870069Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T07:25:55.9050542Z\",\"priority\":0,\"usesTaskDependencies\":false,\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"poolInfo\":{\r\n \"autoPoolSpecification\":{\r\n \"poolLifetimeOption\":\"job\",\"keepAlive\":false,\"pool\":{\r\n \ \"vmSize\":\"small\",\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"resizeTimeout\":\"PT15M\",\"targetDedicatedNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"cloudServiceConfiguration\":{\r\n \ \"osFamily\":\"5\",\"targetOSVersion\":\"*\"\r\n }\r\n - \ }\r\n }\r\n },\"executionInfo\":{\r\n \"startTime\":\"2018-03-13T07:04:54.3246708Z\",\"poolId\":\"B7FBF2D5-703B-471E-993D-BE5A218E8140\"\r\n + \ }\r\n }\r\n },\"executionInfo\":{\r\n \"startTime\":\"2018-08-24T07:25:55.9050542Z\",\"poolId\":\"12314A8C-6F13-440C-B114-EC46A49DB295\"\r\n \ },\"onAllTasksComplete\":\"terminatejob\",\"onTaskFailure\":\"performexitoptionsjobaction\"\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:55 GMT'] - request-id: [52be57c1-d580-4a01-b611-7c51fc492fc9] + date: ['Fri, 24 Aug 2018 07:25:57 GMT'] + request-id: [cfc71f59-d2d2-4280-95a3-b9d62c784c6d] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -253,21 +251,21 @@ interactions: Connection: [keep-alive] Content-Length: ['27'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:55 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:57 GMT'] method: POST - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e/disable?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e/disable?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e/disable'] + dataserviceid: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e/disable'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:56 GMT'] - etag: ['0x8D588B0BA5317DF'] - last-modified: ['Tue, 13 Mar 2018 07:04:56 GMT'] - request-id: [2527ff94-12de-41b8-87be-142a323ddf74] + date: ['Fri, 24 Aug 2018 07:25:57 GMT'] + etag: ['0x8D60992D63CCB5E'] + last-modified: ['Fri, 24 Aug 2018 07:25:58 GMT'] + request-id: [4e32a6d0-d9f6-451a-b4ad-832992a7f4dd] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -280,22 +278,21 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:56 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:58 GMT'] method: POST - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e/enable?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e/enable?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e/enable'] + dataserviceid: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e/enable'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:57 GMT'] - etag: ['0x8D588B0BAC35DB5'] - last-modified: ['Tue, 13 Mar 2018 07:04:57 GMT'] - request-id: [07c361e1-4790-439b-878a-076bf5298cc2] + date: ['Fri, 24 Aug 2018 07:25:59 GMT'] + etag: ['0x8D60992D6CA973D'] + last-modified: ['Fri, 24 Aug 2018 07:25:59 GMT'] + request-id: [173ddaa8-efeb-4a9e-99a4-d623bb505a64] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -307,21 +304,20 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:57 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:25:59 GMT'] method: GET - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e/jobpreparationandreleasetaskstatus?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e/jobpreparationandreleasetaskstatus?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/$metadata#jobpreparationandreleasetaskstatuslist\",\"value\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.eastus.batch.azure.com/$metadata#jobpreparationandreleasetaskstatuslist\",\"value\":[\r\n \ \r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:57 GMT'] - request-id: [fd2f40ea-ff73-4533-a7ad-c95872f01c3e] + date: ['Fri, 24 Aug 2018 07:25:59 GMT'] + request-id: [b450e14d-714b-441c-a66c-0552f9c25ebb] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -335,21 +331,21 @@ interactions: Connection: [keep-alive] Content-Length: ['0'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:57 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:26:00 GMT'] method: POST - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e/terminate?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e/terminate?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job1_8dcc0a7e/terminate'] + dataserviceid: ['https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job1_8dcc0a7e/terminate'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:58 GMT'] - etag: ['0x8D588B0BB8ADEB6'] - last-modified: ['Tue, 13 Mar 2018 07:04:58 GMT'] - request-id: [dfee7b62-30d4-4a6f-8c65-603072398b80] + date: ['Fri, 24 Aug 2018 07:26:00 GMT'] + etag: ['0x8D60992D7C9E61B'] + last-modified: ['Fri, 24 Aug 2018 07:26:00 GMT'] + request-id: [418de998-c8c6-4684-9dc3-680c58e3b37e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -362,19 +358,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:58 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:26:01 GMT'] method: DELETE - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/jobs/batch_job2_8dcc0a7e?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/jobs/batch_job2_8dcc0a7e?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:59 GMT'] - request-id: [b2ef2a4f-73f4-44ef-a7f6-855740293ea4] + date: ['Fri, 24 Aug 2018 07:26:01 GMT'] + request-id: [b1c894bc-0414-4a1e-a22e-1fc76fa60170] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -386,20 +381,19 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:04:59 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:26:01 GMT'] method: GET - uri: https://batch8dcc0a7e.westcentralus.batch.azure.com/lifetimejobstats?api-version=2018-03-01.6.1 + uri: https://batch8dcc0a7e.eastus.batch.azure.com/lifetimejobstats?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/$metadata#jobstats/@Element\",\"url\":\"https://batch8dcc0a7e.westcentralus.batch.azure.com/lifetimejobstats\",\"startTime\":\"2018-03-13T07:04:33.4629284Z\",\"lastUpdateTime\":\"2018-03-13T07:04:33.4629284Z\",\"userCPUTime\":\"PT0S\",\"kernelCPUTime\":\"PT0S\",\"wallClockTime\":\"PT0S\",\"readIOps\":\"0\",\"writeIOps\":\"0\",\"readIOGiB\":0.0,\"writeIOGiB\":0.0,\"numTaskRetries\":\"0\",\"numSucceededTasks\":\"0\",\"numFailedTasks\":\"0\",\"waitTime\":\"PT0S\"\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batch8dcc0a7e.eastus.batch.azure.com/$metadata#jobstats/@Element\",\"url\":\"https://batch8dcc0a7e.eastus.batch.azure.com/lifetimejobstats\",\"startTime\":\"2018-08-24T07:25:33.4420121Z\",\"lastUpdateTime\":\"2018-08-24T07:25:33.4420121Z\",\"userCPUTime\":\"PT0S\",\"kernelCPUTime\":\"PT0S\",\"wallClockTime\":\"PT0S\",\"readIOps\":\"0\",\"writeIOps\":\"0\",\"readIOGiB\":0.0,\"writeIOGiB\":0.0,\"numTaskRetries\":\"0\",\"numSucceededTasks\":\"0\",\"numFailedTasks\":\"0\",\"waitTime\":\"PT0S\"\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:04:59 GMT'] - request-id: [edc92503-a9d9-4588-b2e7-ebaa31c35e88] + date: ['Fri, 24 Aug 2018 07:26:02 GMT'] + request-id: [3e68d07d-1ee0-4950-8487-bb5ce3063931] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_network_configuration.yaml b/azure-batch/tests/recordings/test_batch.test_batch_network_configuration.yaml index bd2b5ded31e4..1b5d1c67c0b1 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_network_configuration.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_network_configuration.yaml @@ -1,34 +1,34 @@ interactions: - request: - body: '{"id": "batch_network_814e11b1", "virtualMachineConfiguration": {"nodeAgentSKUId": - "batch.node.ubuntu 16.04", "imageReference": {"publisher": "Canonical", "sku": - "16.04-LTS", "offer": "UbuntuServer"}}, "targetDedicatedNodes": 1, "networkConfiguration": - {"endpointConfiguration": {"inboundNATPools": [{"networkSecurityGroupRules": - [{"access": "allow", "sourceAddressPrefix": "*", "priority": 150}], "frontendPortRangeEnd": - 61000, "protocol": "udp", "backendPort": 64444, "name": "TestEndpointConfig", - "frontendPortRangeStart": 60000}]}}, "vmSize": "Standard_A1"}' + body: '{"networkConfiguration": {"endpointConfiguration": {"inboundNATPools": + [{"name": "TestEndpointConfig", "frontendPortRangeStart": 60000, "protocol": + "udp", "networkSecurityGroupRules": [{"priority": 150, "access": "allow", "sourceAddressPrefix": + "*"}], "backendPort": 64444, "frontendPortRangeEnd": 61000}]}}, "virtualMachineConfiguration": + {"nodeAgentSKUId": "batch.node.ubuntu 16.04", "imageReference": {"sku": "16.04-LTS", + "publisher": "Canonical", "offer": "UbuntuServer"}}, "id": "batch_network_814e11b1", + "vmSize": "Standard_A1", "targetDedicatedNodes": 1}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['561'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:18:03 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:16:03 GMT'] method: POST - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1'] + dataserviceid: ['https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:18:03 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - location: ['https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1'] - request-id: [7932911c-0c07-4b85-9249-774ddee06d27] + date: ['Fri, 24 Aug 2018 20:16:04 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + location: ['https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1'] + request-id: [f7611808-717f-4743-aaec-426c0180b126] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -40,15 +40,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:18:04 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:16:04 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -59,10 +58,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:18:05 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [d29a4219-071d-4228-bee0-d937d1b97204] + date: ['Fri, 24 Aug 2018 20:16:05 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [f83455c5-38d6-419a-ade9-b99fe46b5e2c] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -74,15 +73,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:18:15 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:16:15 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -93,10 +91,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:18:15 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [bc14be14-54f3-4908-b091-bb48cda5a2f3] + date: ['Fri, 24 Aug 2018 20:16:16 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [a292565c-2200-48b5-b0f3-8e8fdd3fa7a5] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -108,15 +106,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:18:25 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:16:26 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -127,10 +124,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:18:26 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [079f902d-058a-4057-98f0-f612203279ff] + date: ['Fri, 24 Aug 2018 20:16:27 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [9067ca07-0074-4da1-b80b-fc7e6a69bc49] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -142,15 +139,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:18:36 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:16:37 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -161,10 +157,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:18:36 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [fd48ce63-720c-4f65-9aa3-ff253c6fdb82] + date: ['Fri, 24 Aug 2018 20:16:37 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [3de36f76-ad61-40d1-b383-c447d0ddf870] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -176,15 +172,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:18:47 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:16:48 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -195,10 +190,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:18:47 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [568cb179-29d4-4497-8591-256072f096c0] + date: ['Fri, 24 Aug 2018 20:16:48 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [d01b40e8-ebfb-4d0b-b431-c91c23cd8ea2] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -210,15 +205,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:18:58 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:16:59 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -229,10 +223,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:18:58 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [e5241049-d2cb-41e5-aef8-56d05377d0f8] + date: ['Fri, 24 Aug 2018 20:17:00 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [2facff88-7105-48fc-b011-05595c6ca073] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -244,15 +238,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:19:08 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:17:10 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -263,10 +256,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:19:09 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [70111b13-713b-48de-9de8-e9b29d9da914] + date: ['Fri, 24 Aug 2018 20:17:10 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [229d3392-668f-4b96-9aba-7f0992fe0579] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -278,15 +271,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:19:19 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:17:21 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":1,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -297,10 +289,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:19:20 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [df1e2585-5ab5-4d9a-9626-af2388036a25] + date: ['Fri, 24 Aug 2018 20:17:21 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [de98a84e-343f-4ff8-bd27-dfaffcda3dc5] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -312,15 +304,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:19:30 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:17:32 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D609FE6B4A66EA\",\"lastModified\":\"2018-08-24T20:16:04.5885162Z\",\"creationTime\":\"2018-08-24T20:16:04.5885162Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:16:04.5885162Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T20:17:22.8679984Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":1,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n @@ -331,10 +322,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:19:30 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [2fe58443-dff6-44c1-a602-53c557eaa2ad] + date: ['Fri, 24 Aug 2018 20:17:32 GMT'] + etag: ['0x8D609FE6B4A66EA'] + last-modified: ['Fri, 24 Aug 2018 20:16:04 GMT'] + request-id: [b1aabfa2-7ceb-43b7-8fe8-e5813673da57] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -346,92 +337,23 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:19:41 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:17:33 GMT'] method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 + uri: https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1/nodes?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"resizing\",\"allocationStateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n - \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n - \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n - \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n - \ \"endpointConfiguration\":{\r\n \"inboundNATPools\":[\r\n {\r\n - \ \"name\":\"TestEndpointConfig\",\"protocol\":\"udp\",\"backendPort\":64444,\"frontendPortRangeStart\":60000,\"frontendPortRangeEnd\":61000,\"networkSecurityGroupRules\":[\r\n - \ {\r\n \"priority\":150,\"access\":\"allow\",\"sourceAddressPrefix\":\"*\"\r\n - \ }\r\n ]\r\n }\r\n ]\r\n }\r\n }\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:19:41 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [2a380b0e-877a-469a-9a18-9ea286351580] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:19:51 GMT'] - method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_network_814e11b1\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1\",\"eTag\":\"0x8D5891F86F1F862\",\"lastModified\":\"2018-03-13T20:18:04.378941Z\",\"creationTime\":\"2018-03-13T20:18:04.378941Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T20:18:04.378941Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T20:19:47.4556644Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":1,\"targetDedicatedNodes\":1,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n - \ \"nodeFillType\":\"Spread\"\r\n },\"virtualMachineConfiguration\":{\r\n - \ \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n - \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n },\"networkConfiguration\":{\r\n - \ \"endpointConfiguration\":{\r\n \"inboundNATPools\":[\r\n {\r\n - \ \"name\":\"TestEndpointConfig\",\"protocol\":\"udp\",\"backendPort\":64444,\"frontendPortRangeStart\":60000,\"frontendPortRangeEnd\":61000,\"networkSecurityGroupRules\":[\r\n - \ {\r\n \"priority\":150,\"access\":\"allow\",\"sourceAddressPrefix\":\"*\"\r\n - \ }\r\n ]\r\n }\r\n ]\r\n }\r\n }\r\n}"} - headers: - content-type: [application/json;odata=minimalmetadata] - dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:19:52 GMT'] - etag: ['0x8D5891F86F1F862'] - last-modified: ['Tue, 13 Mar 2018 20:18:04 GMT'] - request-id: [aea5d4ba-432b-4a38-90ec-1354633431c8] - server: [Microsoft-HTTPAPI/2.0] - strict-transport-security: [max-age=31536000; includeSubDomains] - transfer-encoding: [chunked] - x-content-type-options: [nosniff] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: [application/json] - Accept-Encoding: ['gzip, deflate'] - Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] - accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 20:19:52 GMT'] - method: GET - uri: https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1/nodes?api-version=2018-03-01.6.1 - response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.westcentralus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n - \ {\r\n \"id\":\"tvm-3687402588_1-20180313t201945z\",\"url\":\"https://batch814e11b1.westcentralus.batch.azure.com/pools/batch_network_814e11b1/nodes/tvm-3687402588_1-20180313t201945z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-03-13T20:19:46.0478554Z\",\"allocationTime\":\"2018-03-13T20:19:45.9328619Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3687402588_1-20180313t201945z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n - \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"TestEndpointConfig.0\",\"protocol\":\"udp\",\"publicIPAddress\":\"52.161.165.180\",\"publicFQDN\":\"dnsf7f05a77-7745-483b-a022-6e4f4ed8fc36-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":60000,\"backendPort\":64444\r\n - \ },{\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"52.161.165.180\",\"publicFQDN\":\"dnsf7f05a77-7745-483b-a022-6e4f4ed8fc36-azurebatch-cloudservice.westcentralus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch814e11b1.eastus.batch.azure.com/$metadata#nodes\",\"value\":[\r\n + \ {\r\n \"id\":\"tvm-3257026573_1-20180824t201721z\",\"url\":\"https://batch814e11b1.eastus.batch.azure.com/pools/batch_network_814e11b1/nodes/tvm-3257026573_1-20180824t201721z\",\"state\":\"starting\",\"schedulingState\":\"enabled\",\"stateTransitionTime\":\"2018-08-24T20:17:21.4396866Z\",\"allocationTime\":\"2018-08-24T20:17:21.3916858Z\",\"ipAddress\":\"10.0.0.4\",\"affinityId\":\"TVM:tvm-3257026573_1-20180824t201721z\",\"vmSize\":\"standard_a1\",\"totalTasksRun\":0,\"isDedicated\":true,\"endpointConfiguration\":{\r\n + \ \"inboundEndpoints\":[\r\n {\r\n \"name\":\"TestEndpointConfig.0\",\"protocol\":\"udp\",\"publicIPAddress\":\"40.87.86.71\",\"publicFQDN\":\"dns2e9c387d-61c2-4235-aaac-d44ac5298785-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":60000,\"backendPort\":64444\r\n + \ },{\r\n \"name\":\"SSHRule.0\",\"protocol\":\"tcp\",\"publicIPAddress\":\"40.87.86.71\",\"publicFQDN\":\"dns2e9c387d-61c2-4235-aaac-d44ac5298785-azurebatch-cloudservice.eastus.cloudapp.azure.com\",\"frontendPort\":50000,\"backendPort\":22\r\n \ }\r\n ]\r\n }\r\n }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 20:19:52 GMT'] - request-id: [adbd27f6-dc38-4698-b58a-e65766333d41] + date: ['Fri, 24 Aug 2018 20:17:33 GMT'] + request-id: [752cace0-852e-4fee-b0cc-6fb67355e203] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_scale_pools.yaml b/azure-batch/tests/recordings/test_batch.test_batch_scale_pools.yaml index a3663e4c4391..d3d3cfaede31 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_scale_pools.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_scale_pools.yaml @@ -7,21 +7,21 @@ interactions: Connection: [keep-alive] Content-Length: ['86'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:36:56 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:44:42 GMT'] method: POST - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/enableautoscale?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/enableautoscale?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/enableautoscale'] + dataserviceid: ['https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/enableautoscale'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:36:56 GMT'] - etag: ['0x8D58919C88075BC'] - last-modified: ['Tue, 13 Mar 2018 19:36:57 GMT'] - request-id: [e7c64e52-b2f5-4302-9bac-6ad3a6973ba8] + date: ['Fri, 24 Aug 2018 20:44:43 GMT'] + etag: ['0x8D60A026BD62AAD'] + last-modified: ['Fri, 24 Aug 2018 20:44:43 GMT'] + request-id: [c33d295e-3e29-4304-8bea-8d19e1fc3a1e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -35,20 +35,20 @@ interactions: Connection: [keep-alive] Content-Length: ['47'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:36:57 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:44:43 GMT'] method: POST - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/evaluateautoscale?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/evaluateautoscale?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.westcentralus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.AutoScaleRun\",\"timestamp\":\"2018-03-13T19:36:58.1241258Z\",\"results\":\"$TargetDedicatedNodes=3;$TargetLowPriorityNodes=0;$NodeDeallocationOption=requeue\"\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.eastus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.AutoScaleRun\",\"timestamp\":\"2018-08-24T20:44:44.2335554Z\",\"results\":\"$TargetDedicatedNodes=3;$TargetLowPriorityNodes=0;$NodeDeallocationOption=requeue\"\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] - dataserviceid: ['https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/evaluateautoscale'] + dataserviceid: ['https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/evaluateautoscale'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:36:58 GMT'] - request-id: [85563fca-bd08-4228-967d-37666cc74c09] + date: ['Fri, 24 Aug 2018 20:44:43 GMT'] + request-id: [b4499393-2d33-4256-84d8-311c24c79a5f] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -61,22 +61,21 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:36:58 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:44:44 GMT'] method: POST - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/disableautoscale?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/disableautoscale?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/disableautoscale'] + dataserviceid: ['https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/disableautoscale'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:36:58 GMT'] - etag: ['0x8D58919C93D1047'] - last-modified: ['Tue, 13 Mar 2018 19:36:58 GMT'] - request-id: [ebecf632-dc00-4d08-805f-c21a713ce4c8] + date: ['Fri, 24 Aug 2018 20:44:45 GMT'] + etag: ['0x8D60A026CCB4EB3'] + last-modified: ['Fri, 24 Aug 2018 20:44:45 GMT'] + request-id: [823b52f4-d2b1-477a-a258-c2e7cdcda5ef] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -88,15 +87,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:36:58 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:44:45 GMT'] method: GET - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D58919C93D1047\",\"lastModified\":\"2018-03-13T19:36:58.6203207Z\",\"creationTime\":\"2018-03-13T19:36:56.7133662Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T19:36:56.7133662Z\",\"allocationState\":\"stopping\",\"allocationStateTransitionTime\":\"2018-03-13T19:36:58.6203207Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"userAccounts\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D60A026CCB4EB3\",\"lastModified\":\"2018-08-24T20:44:45.0979507Z\",\"creationTime\":\"2018-08-24T20:44:42.4496124Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:44:42.4496124Z\",\"allocationState\":\"stopping\",\"allocationStateTransitionTime\":\"2018-08-24T20:44:45.0979507Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"userAccounts\":[\r\n \ {\r\n \"name\":\"task-user\",\"elevationLevel\":\"admin\"\r\n }\r\n \ ],\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \"nodeFillType\":\"Spread\"\r\n \ },\"virtualMachineConfiguration\":{\r\n \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n @@ -104,10 +102,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:36:58 GMT'] - etag: ['0x8D58919C93D1047'] - last-modified: ['Tue, 13 Mar 2018 19:36:58 GMT'] - request-id: [38d60718-04b8-4e28-81bb-54f925abf768] + date: ['Fri, 24 Aug 2018 20:44:46 GMT'] + etag: ['0x8D60A026CCB4EB3'] + last-modified: ['Fri, 24 Aug 2018 20:44:45 GMT'] + request-id: [59b8926b-2490-486a-a32d-68c0462462ff] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -119,15 +117,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:37:19 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:45:06 GMT'] method: GET - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D58919C93D1047\",\"lastModified\":\"2018-03-13T19:36:58.6203207Z\",\"creationTime\":\"2018-03-13T19:36:56.7133662Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T19:36:56.7133662Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T19:37:09.3463141Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"resizeErrors\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D60A026CCB4EB3\",\"lastModified\":\"2018-08-24T20:44:45.0979507Z\",\"creationTime\":\"2018-08-24T20:44:42.4496124Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:44:42.4496124Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T20:44:57.4198238Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"resizeErrors\":[\r\n \ {\r\n \"code\":\"ResizeStopped\",\"message\":\"Desired number of dedicated nodes could not be allocated due to a stop resize operation\"\r\n \ }\r\n ],\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"userAccounts\":[\r\n @@ -138,38 +135,38 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:37:19 GMT'] - etag: ['0x8D58919C93D1047'] - last-modified: ['Tue, 13 Mar 2018 19:36:58 GMT'] - request-id: [78ecedfd-c9bc-4701-a66f-4e3644e4054e] + date: ['Fri, 24 Aug 2018 20:45:06 GMT'] + etag: ['0x8D60A026CCB4EB3'] + last-modified: ['Fri, 24 Aug 2018 20:44:45 GMT'] + request-id: [37228ed7-9a60-4932-954a-9eb99fe1e29c] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"targetDedicatedNodes": 0, "targetLowPriorityNodes": 2}' + body: '{"targetLowPriorityNodes": 2, "targetDedicatedNodes": 0}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['56'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:37:19 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:45:07 GMT'] method: POST - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/resize?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/resize?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/resize'] + dataserviceid: ['https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/resize'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:37:20 GMT'] - etag: ['0x8D58919D60AB15A'] - last-modified: ['Tue, 13 Mar 2018 19:37:20 GMT'] - request-id: [6824bcd0-117d-4462-90f8-2eff080e4de5] + date: ['Fri, 24 Aug 2018 20:45:07 GMT'] + etag: ['0x8D60A027A4FF116'] + last-modified: ['Fri, 24 Aug 2018 20:45:07 GMT'] + request-id: [e54c798c-4a77-46f1-bacc-682337708946] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -182,22 +179,21 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:37:20 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:45:07 GMT'] method: POST - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/stopresize?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/stopresize?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/stopresize'] + dataserviceid: ['https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64/stopresize'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:37:19 GMT'] - etag: ['0x8D58919D657B031'] - last-modified: ['Tue, 13 Mar 2018 19:37:20 GMT'] - request-id: [4b457d24-cca4-4b8f-bc61-8ddb8fb0ae8f] + date: ['Fri, 24 Aug 2018 20:45:08 GMT'] + etag: ['0x8D60A027AD3E02F'] + last-modified: ['Fri, 24 Aug 2018 20:45:08 GMT'] + request-id: [d3a9644c-3b3a-4a83-b137-21e6b8f131a5] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -209,15 +205,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:37:20 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:45:08 GMT'] method: GET - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D58919D657B031\",\"lastModified\":\"2018-03-13T19:37:20.6051889Z\",\"creationTime\":\"2018-03-13T19:36:56.7133662Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T19:36:56.7133662Z\",\"allocationState\":\"stopping\",\"allocationStateTransitionTime\":\"2018-03-13T19:37:20.6051889Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":2,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"userAccounts\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D60A027AD3E02F\",\"lastModified\":\"2018-08-24T20:45:08.6422063Z\",\"creationTime\":\"2018-08-24T20:44:42.4496124Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:44:42.4496124Z\",\"allocationState\":\"stopping\",\"allocationStateTransitionTime\":\"2018-08-24T20:45:08.6422063Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":2,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"userAccounts\":[\r\n \ {\r\n \"name\":\"task-user\",\"elevationLevel\":\"admin\"\r\n }\r\n \ ],\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \"nodeFillType\":\"Spread\"\r\n \ },\"virtualMachineConfiguration\":{\r\n \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n @@ -225,10 +220,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:37:21 GMT'] - etag: ['0x8D58919D657B031'] - last-modified: ['Tue, 13 Mar 2018 19:37:20 GMT'] - request-id: [fff6e422-b6ce-495e-9871-b7b2da0eebe2] + date: ['Fri, 24 Aug 2018 20:45:08 GMT'] + etag: ['0x8D60A027AD3E02F'] + last-modified: ['Fri, 24 Aug 2018 20:45:08 GMT'] + request-id: [ad4db1ba-d439-484c-b9d2-ced469a28f85] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -240,15 +235,44 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:37:41 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:45:29 GMT'] method: GET - uri: https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.westcentralus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D58919D657B031\",\"lastModified\":\"2018-03-13T19:37:20.6051889Z\",\"creationTime\":\"2018-03-13T19:36:56.7133662Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T19:36:56.7133662Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T19:37:29.3685714Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":2,\"resizeErrors\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D60A027AD3E02F\",\"lastModified\":\"2018-08-24T20:45:08.6422063Z\",\"creationTime\":\"2018-08-24T20:44:42.4496124Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:44:42.4496124Z\",\"allocationState\":\"stopping\",\"allocationStateTransitionTime\":\"2018-08-24T20:45:08.6422063Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":2,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"userAccounts\":[\r\n + \ {\r\n \"name\":\"task-user\",\"elevationLevel\":\"admin\"\r\n }\r\n + \ ],\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \"nodeFillType\":\"Spread\"\r\n + \ },\"virtualMachineConfiguration\":{\r\n \"imageReference\":{\r\n \"publisher\":\"Canonical\",\"offer\":\"UbuntuServer\",\"sku\":\"16.04-LTS\",\"version\":\"latest\"\r\n + \ },\"nodeAgentSKUId\":\"batch.node.ubuntu 16.04\"\r\n }\r\n}"} + headers: + content-type: [application/json;odata=minimalmetadata] + dataserviceversion: ['3.0'] + date: ['Fri, 24 Aug 2018 20:45:30 GMT'] + etag: ['0x8D60A027AD3E02F'] + last-modified: ['Fri, 24 Aug 2018 20:45:08 GMT'] + request-id: [7bbf47fe-aa5c-4f8e-9dd2-f7500f351599] + server: [Microsoft-HTTPAPI/2.0] + strict-transport-security: [max-age=31536000; includeSubDomains] + transfer-encoding: [chunked] + x-content-type-options: [nosniff] + status: {code: 200, message: OK} +- request: + body: null + headers: + Accept: [application/json] + Accept-Encoding: ['gzip, deflate'] + Connection: [keep-alive] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] + accept-language: [en-US] + ocp-date: ['Fri, 24 Aug 2018 20:45:50 GMT'] + method: GET + uri: https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64?api-version=2018-08-01.7.0 + response: + body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"test_batch_test_batch_scale_poolse2690d64\",\"url\":\"https://batche2690d64.eastus.batch.azure.com/pools/test_batch_test_batch_scale_poolse2690d64\",\"eTag\":\"0x8D60A027AD3E02F\",\"lastModified\":\"2018-08-24T20:45:08.6422063Z\",\"creationTime\":\"2018-08-24T20:44:42.4496124Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T20:44:42.4496124Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T20:45:47.498314Z\",\"vmSize\":\"standard_a1\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":2,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":2,\"resizeErrors\":[\r\n \ {\r\n \"code\":\"ResizeStopped\",\"message\":\"Desired number of dedicated nodes could not be allocated due to a stop resize operation\"\r\n \ },{\r\n \"code\":\"ResizeStopped\",\"message\":\"Desired number of @@ -261,10 +285,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:37:41 GMT'] - etag: ['0x8D58919D657B031'] - last-modified: ['Tue, 13 Mar 2018 19:37:20 GMT'] - request-id: [9a6dbd9e-bdc3-4c7a-a66a-04724d949c81] + date: ['Fri, 24 Aug 2018 20:45:50 GMT'] + etag: ['0x8D60A027AD3E02F'] + last-modified: ['Fri, 24 Aug 2018 20:45:08 GMT'] + request-id: [3f077bb1-a13c-4078-bce5-1e3bfd34abd6] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -276,23 +300,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:37:41 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:45:51 GMT'] method: GET - uri: https://batche2690d64.westcentralus.batch.azure.com/lifetimepoolstats?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/lifetimepoolstats?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.westcentralus.batch.azure.com/$metadata#poolstats/@Element\",\"url\":\"https://batche2690d64.westcentralus.batch.azure.com/lifetimepoolstats\",\"usageStats\":{\r\n - \ \"startTime\":\"2018-03-13T19:36:38.590799Z\",\"lastUpdateTime\":\"2018-03-13T19:36:38.590799Z\",\"dedicatedCoreTime\":\"PT0S\"\r\n - \ },\"resourceStats\":{\r\n \"startTime\":\"2018-03-13T19:36:38.590799Z\",\"diskReadIOps\":\"0\",\"diskWriteIOps\":\"0\",\"lastUpdateTime\":\"2018-03-13T19:36:38.590799Z\",\"avgCPUPercentage\":0.0,\"avgMemoryGiB\":0.0,\"peakMemoryGiB\":0.0,\"avgDiskGiB\":0.0,\"peakDiskGiB\":0.0,\"diskReadGiB\":0.0,\"diskWriteGiB\":0.0,\"networkReadGiB\":0.0,\"networkWriteGiB\":0.0\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.eastus.batch.azure.com/$metadata#poolstats/@Element\",\"url\":\"https://batche2690d64.eastus.batch.azure.com/lifetimepoolstats\",\"usageStats\":{\r\n + \ \"startTime\":\"2018-08-24T20:44:22.9780495Z\",\"lastUpdateTime\":\"2018-08-24T20:44:22.9780495Z\",\"dedicatedCoreTime\":\"PT0S\"\r\n + \ },\"resourceStats\":{\r\n \"startTime\":\"2018-08-24T20:44:22.9780495Z\",\"diskReadIOps\":\"0\",\"diskWriteIOps\":\"0\",\"lastUpdateTime\":\"2018-08-24T20:44:22.9780495Z\",\"avgCPUPercentage\":0.0,\"avgMemoryGiB\":0.0,\"peakMemoryGiB\":0.0,\"avgDiskGiB\":0.0,\"peakDiskGiB\":0.0,\"diskReadGiB\":0.0,\"diskWriteGiB\":0.0,\"networkReadGiB\":0.0,\"networkWriteGiB\":0.0\r\n \ }\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:37:42 GMT'] - request-id: [2dc933e5-fe2f-4ac6-a8ab-019bdec3d9fe] + date: ['Fri, 24 Aug 2018 20:45:51 GMT'] + request-id: [5db8cd60-cc01-4646-a46e-faf20751d7d8] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -304,21 +327,20 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 19:37:42 GMT'] + ocp-date: ['Fri, 24 Aug 2018 20:45:52 GMT'] method: GET - uri: https://batche2690d64.westcentralus.batch.azure.com/poolusagemetrics?api-version=2018-03-01.6.1 + uri: https://batche2690d64.eastus.batch.azure.com/poolusagemetrics?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.westcentralus.batch.azure.com/$metadata#poolusagemetrics\",\"value\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batche2690d64.eastus.batch.azure.com/$metadata#poolusagemetrics\",\"value\":[\r\n \ \r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 19:37:42 GMT'] - request-id: [337b01ec-c5d6-4aa7-bd3d-0a2d1b26af9f] + date: ['Fri, 24 Aug 2018 20:45:53 GMT'] + request-id: [57d88dc0-44e8-4ad9-a40b-c1ce71a564ea] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_tasks.yaml b/azure-batch/tests/recordings/test_batch.test_batch_tasks.yaml index f03e47e10417..2a034712ab4a 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_tasks.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_tasks.yaml @@ -1,31 +1,31 @@ interactions: - request: - body: '{"id": "batch_task1_98da0af6", "exitConditions": {"exitCodeRanges": [{"exitOptions": - {"jobAction": "disable"}, "start": 2, "end": 4}], "exitCodes": [{"exitOptions": - {"jobAction": "terminate"}, "code": 1}], "default": {"jobAction": "none"}}, - "commandLine": "cmd /c \"echo hello world\""}' + body: '{"id": "batch_task1_98da0af6", "exitConditions": {"exitCodes": [{"exitOptions": + {"jobAction": "terminate"}, "code": 1}], "default": {"jobAction": "none"}, "exitCodeRanges": + [{"exitOptions": {"jobAction": "disable"}, "start": 2, "end": 4}]}, "commandLine": + "cmd /c \"echo hello world\""}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['286'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:20 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:10 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6'] + dataserviceid: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:21 GMT'] - etag: ['0x8D588B2BD987D15'] - last-modified: ['Tue, 13 Mar 2018 07:19:20 GMT'] - location: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6'] - request-id: [1be57010-0f2e-4f73-9f86-b16cd1e19da0] + date: ['Fri, 24 Aug 2018 19:05:11 GMT'] + etag: ['0x8D609F4845DC881'] + last-modified: ['Fri, 24 Aug 2018 19:05:11 GMT'] + location: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6'] + request-id: [b9126cc2-219f-440f-bce9-03fd511ffbf4] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -37,15 +37,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:11 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task1_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6\",\"eTag\":\"0x8D588B2BD987D15\",\"creationTime\":\"2018-03-13T07:19:20.9236757Z\",\"lastModified\":\"2018-03-13T07:19:20.9236757Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:20.9236757Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task1_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6\",\"eTag\":\"0x8D609F4845DC881\",\"creationTime\":\"2018-08-24T19:05:11.6912769Z\",\"lastModified\":\"2018-08-24T19:05:11.6912769Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:11.6912769Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"exitConditions\":{\r\n \ \"exitCodes\":[\r\n {\r\n \"code\":1,\"exitOptions\":{\r\n @@ -57,44 +56,45 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:20 GMT'] - etag: ['0x8D588B2BD987D15'] - last-modified: ['Tue, 13 Mar 2018 07:19:20 GMT'] - request-id: [ca3c6262-3d27-4dce-8bf1-412c9b910866] + date: ['Fri, 24 Aug 2018 19:05:11 GMT'] + etag: ['0x8D609F4845DC881'] + last-modified: ['Fri, 24 Aug 2018 19:05:11 GMT'] + request-id: [1a0d5b95-78e1-49ed-9e74-26afd9462fe0] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"outputFiles": [{"destination": {"container": {"path": "taskLogs/output.txt", - "containerUrl": "https://test.blob.core.windows.net:443/test-container"}}, "filePattern": - "../stdout.txt", "uploadOptions": {"uploadCondition": "taskcompletion"}}, {"destination": - {"container": {"path": "taskLogs/error.txt", "containerUrl": "https://test.blob.core.windows.net:443/test-container"}}, - "filePattern": "../stderr.txt", "uploadOptions": {"uploadCondition": "taskfailure"}}], - "id": "batch_task2_98da0af6", "commandLine": "cmd /c \"echo hello world\""}' + body: '{"outputFiles": [{"uploadOptions": {"uploadCondition": "taskcompletion"}, + "filePattern": "../stdout.txt", "destination": {"container": {"containerUrl": + "https://test.blob.core.windows.net:443/test-container", "path": "taskLogs/output.txt"}}}, + {"uploadOptions": {"uploadCondition": "taskfailure"}, "filePattern": "../stderr.txt", + "destination": {"container": {"containerUrl": "https://test.blob.core.windows.net:443/test-container", + "path": "taskLogs/error.txt"}}}], "id": "batch_task2_98da0af6", "commandLine": + "cmd /c \"echo hello world\""}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['541'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:21 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:12 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6'] + dataserviceid: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:22 GMT'] - etag: ['0x8D588B2BE6D7D4C'] - last-modified: ['Tue, 13 Mar 2018 07:19:22 GMT'] - location: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6'] - request-id: [77287e1d-c92b-4c84-bb66-b8606427b335] + date: ['Fri, 24 Aug 2018 19:05:13 GMT'] + etag: ['0x8D609F4857AAFDF'] + last-modified: ['Fri, 24 Aug 2018 19:05:13 GMT'] + location: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6'] + request-id: [c22396f4-6181-47f2-b41b-fd10ce0c3f0e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -106,15 +106,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:22 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:13 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task2_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6\",\"eTag\":\"0x8D588B2BE6D7D4C\",\"creationTime\":\"2018-03-13T07:19:22.319598Z\",\"lastModified\":\"2018-03-13T07:19:22.319598Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:22.319598Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task2_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6\",\"eTag\":\"0x8D609F4857AAFDF\",\"creationTime\":\"2018-08-24T19:05:13.5584223Z\",\"lastModified\":\"2018-08-24T19:05:13.5584223Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:13.5584223Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"outputFiles\":[\r\n {\r\n \"filePattern\":\"../stdout.txt\",\"destination\":{\r\n \ \"container\":{\r\n \"containerUrl\":\"https://test.blob.core.windows.net:443/test-container\",\"path\":\"taskLogs/output.txt\"\r\n \ }\r\n },\"uploadOptions\":{\r\n \"uploadCondition\":\"TaskCompletion\"\r\n @@ -127,10 +126,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:22 GMT'] - etag: ['0x8D588B2BE6D7D4C'] - last-modified: ['Tue, 13 Mar 2018 07:19:22 GMT'] - request-id: [7c5b30da-1bac-4e3a-acd6-b07316a559a4] + date: ['Fri, 24 Aug 2018 19:05:14 GMT'] + etag: ['0x8D609F4857AAFDF'] + last-modified: ['Fri, 24 Aug 2018 19:05:13 GMT'] + request-id: [4a090c55-2cd3-41b7-9fa3-c2addca8dcd7] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -145,22 +144,22 @@ interactions: Connection: [keep-alive] Content-Length: ['152'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:23 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:14 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6'] + dataserviceid: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:23 GMT'] - etag: ['0x8D588B2BF377EFE'] - last-modified: ['Tue, 13 Mar 2018 07:19:23 GMT'] - location: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6'] - request-id: [abd37af1-1bd3-43f9-954f-29e87f9df750] + date: ['Fri, 24 Aug 2018 19:05:14 GMT'] + etag: ['0x8D609F4867C422C'] + last-modified: ['Fri, 24 Aug 2018 19:05:15 GMT'] + location: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6'] + request-id: [6d474cf6-d113-41c2-b1d6-353ca295d642] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -172,15 +171,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:23 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:15 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task3_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6\",\"eTag\":\"0x8D588B2BF377EFE\",\"creationTime\":\"2018-03-13T07:19:23.6434686Z\",\"lastModified\":\"2018-03-13T07:19:23.6434686Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:23.6434686Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task3_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6\",\"eTag\":\"0x8D609F4867C422C\",\"creationTime\":\"2018-08-24T19:05:15.2464428Z\",\"lastModified\":\"2018-08-24T19:05:15.2464428Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:15.2464428Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"scope\":\"task\",\"elevationLevel\":\"admin\"\r\n }\r\n },\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n @@ -188,40 +186,40 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:24 GMT'] - etag: ['0x8D588B2BF377EFE'] - last-modified: ['Tue, 13 Mar 2018 07:19:23 GMT'] - request-id: [68d7abe8-ea7d-45c7-9273-f660710f8d52] + date: ['Fri, 24 Aug 2018 19:05:15 GMT'] + etag: ['0x8D609F4867C422C'] + last-modified: ['Fri, 24 Aug 2018 19:05:15 GMT'] + request-id: [18732242-b5de-45d6-a3b1-5370633b8cea] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"authenticationTokenSettings": {"access": ["job"]}, "id": "batch_task4_98da0af6", - "commandLine": "cmd /c \"echo hello world\""}' + body: '{"id": "batch_task4_98da0af6", "commandLine": "cmd /c \"echo hello world\"", + "authenticationTokenSettings": {"access": ["job"]}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['128'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:24 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:16 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6'] + dataserviceid: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:24 GMT'] - etag: ['0x8D588B2BFE96388'] - last-modified: ['Tue, 13 Mar 2018 07:19:24 GMT'] - location: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6'] - request-id: [b2853a10-57c3-480d-81a9-cff30ffe6aa6] + date: ['Fri, 24 Aug 2018 19:05:16 GMT'] + etag: ['0x8D609F4876B4136'] + last-modified: ['Fri, 24 Aug 2018 19:05:16 GMT'] + location: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6'] + request-id: [87822724-0237-4e9d-90bb-0747485a3b96] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -233,15 +231,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:24 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:17 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task4_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6\",\"eTag\":\"0x8D588B2BFE96388\",\"creationTime\":\"2018-03-13T07:19:24.8093064Z\",\"lastModified\":\"2018-03-13T07:19:24.8093064Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:24.8093064Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task4_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6\",\"eTag\":\"0x8D609F4876B4136\",\"creationTime\":\"2018-08-24T19:05:16.8127286Z\",\"lastModified\":\"2018-08-24T19:05:16.8127286Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:16.8127286Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"authenticationTokenSettings\":{\r\n \ \"access\":[\r\n \"job\"\r\n ]\r\n },\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n @@ -249,41 +246,41 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:25 GMT'] - etag: ['0x8D588B2BFE96388'] - last-modified: ['Tue, 13 Mar 2018 07:19:24 GMT'] - request-id: [1383fbb0-2b40-4ee7-bb83-1caf68ba4ca4] + date: ['Fri, 24 Aug 2018 19:05:16 GMT'] + etag: ['0x8D609F4876B4136'] + last-modified: ['Fri, 24 Aug 2018 19:05:16 GMT'] + request-id: [828b9ee4-85d6-429a-b062-0c0453136891] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] x-content-type-options: [nosniff] status: {code: 200, message: OK} - request: - body: '{"id": "batch_task5_98da0af6", "commandLine": "cmd /c \"echo hello world\"", - "containerSettings": {"registry": {"password": "password", "username": "username"}, - "imageName": "windows_container:latest"}}' + body: '{"containerSettings": {"imageName": "windows_container:latest", "registry": + {"password": "password", "username": "username"}}, "id": "batch_task5_98da0af6", + "commandLine": "cmd /c \"echo hello world\""}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['202'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:25 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:17 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6'] + dataserviceid: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:25 GMT'] - etag: ['0x8D588B2C07CDB26'] - last-modified: ['Tue, 13 Mar 2018 07:19:25 GMT'] - location: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6'] - request-id: [3a5d380e-66fb-4e22-871e-d8fe1589ed9c] + date: ['Fri, 24 Aug 2018 19:05:18 GMT'] + etag: ['0x8D609F488533EEE'] + last-modified: ['Fri, 24 Aug 2018 19:05:18 GMT'] + location: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6'] + request-id: [649731c8-44e5-40c9-bbcf-263720d091c3] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -295,15 +292,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:25 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:18 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task5_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6\",\"eTag\":\"0x8D588B2C07CDB26\",\"creationTime\":\"2018-03-13T07:19:25.7757478Z\",\"lastModified\":\"2018-03-13T07:19:25.7757478Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:25.7757478Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task5_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6\",\"eTag\":\"0x8D609F488533EEE\",\"creationTime\":\"2018-08-24T19:05:18.3331054Z\",\"lastModified\":\"2018-08-24T19:05:18.3331054Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:18.3331054Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"containerSettings\":{\r\n \"imageName\":\"windows_container:latest\",\"registry\":{\r\n \ \"username\":\"username\"\r\n }\r\n },\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"constraints\":{\r\n @@ -312,10 +308,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:26 GMT'] - etag: ['0x8D588B2C07CDB26'] - last-modified: ['Tue, 13 Mar 2018 07:19:25 GMT'] - request-id: [d64d30d1-1e74-4b45-96ab-06326abd9652] + date: ['Fri, 24 Aug 2018 19:05:19 GMT'] + etag: ['0x8D609F488533EEE'] + last-modified: ['Fri, 24 Aug 2018 19:05:18 GMT'] + request-id: [4a316047-0898-43ef-839c-969fd10470fa] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -330,22 +326,22 @@ interactions: Connection: [keep-alive] Content-Length: ['119'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:26 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:19 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6'] + dataserviceid: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:26 GMT'] - etag: ['0x8D588B2C114BD85'] - last-modified: ['Tue, 13 Mar 2018 07:19:26 GMT'] - location: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6'] - request-id: [846f8242-76a1-4b9e-99c0-76bcb9f15af9] + date: ['Fri, 24 Aug 2018 19:05:19 GMT'] + etag: ['0x8D609F4895089E4'] + last-modified: ['Fri, 24 Aug 2018 19:05:19 GMT'] + location: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6'] + request-id: [2fd6d331-25d9-44e3-bbbd-1bee85271ae0] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -357,25 +353,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:26 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:20 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task6_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6\",\"eTag\":\"0x8D588B2C114BD85\",\"creationTime\":\"2018-03-13T07:19:26.7711365Z\",\"lastModified\":\"2018-03-13T07:19:26.7711365Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:26.7711365Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task6_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6\",\"eTag\":\"0x8D609F4895089E4\",\"creationTime\":\"2018-08-24T19:05:19.9930852Z\",\"lastModified\":\"2018-08-24T19:05:19.9930852Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:19.9930852Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"username\":\"task-user\"\r\n \ },\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n }\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:27 GMT'] - etag: ['0x8D588B2C114BD85'] - last-modified: ['Tue, 13 Mar 2018 07:19:26 GMT'] - request-id: [e4dc402f-65d5-4560-8604-0faaaf19938a] + date: ['Fri, 24 Aug 2018 19:05:20 GMT'] + etag: ['0x8D609F4895089E4'] + last-modified: ['Fri, 24 Aug 2018 19:05:19 GMT'] + request-id: [92a86774-6598-4c21-9c5a-b165068f30e3] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -392,23 +387,23 @@ interactions: Connection: [keep-alive] Content-Length: ['245'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:27 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:20 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/addtaskcollection?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/addtaskcollection?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#taskaddresult\",\"value\":[\r\n - \ {\r\n \"status\":\"Success\",\"taskId\":\"batch_task7_98da0af6\",\"eTag\":\"0x8D588B2C1CB7401\",\"lastModified\":\"2018-03-13T07:19:27.9685633Z\",\"location\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task7_98da0af6\"\r\n - \ },{\r\n \"status\":\"Success\",\"taskId\":\"batch_task9_98da0af6\",\"eTag\":\"0x8D588B2C1CF1D7A\",\"lastModified\":\"2018-03-13T07:19:27.9925626Z\",\"location\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task9_98da0af6\"\r\n - \ },{\r\n \"status\":\"Success\",\"taskId\":\"batch_task8_98da0af6\",\"eTag\":\"0x8D588B2C1D030B3\",\"lastModified\":\"2018-03-13T07:19:27.9996083Z\",\"location\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task8_98da0af6\"\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#taskaddresult\",\"value\":[\r\n + \ {\r\n \"status\":\"Success\",\"taskId\":\"batch_task7_98da0af6\",\"eTag\":\"0x8D609F48A3DFD27\",\"lastModified\":\"2018-08-24T19:05:21.5492391Z\",\"location\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task7_98da0af6\"\r\n + \ },{\r\n \"status\":\"Success\",\"taskId\":\"batch_task8_98da0af6\",\"eTag\":\"0x8D609F48A3FFA0D\",\"lastModified\":\"2018-08-24T19:05:21.5622669Z\",\"location\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task8_98da0af6\"\r\n + \ },{\r\n \"status\":\"Success\",\"taskId\":\"batch_task9_98da0af6\",\"eTag\":\"0x8D609F48A40473F\",\"lastModified\":\"2018-08-24T19:05:21.5642431Z\",\"location\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task9_98da0af6\"\r\n \ }\r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:28 GMT'] - request-id: [bca1cd40-6c7c-4222-8953-c126668f3aca] + date: ['Fri, 24 Aug 2018 19:05:20 GMT'] + request-id: [7c88fba9-94d8-4e04-a2f4-fe7c4edb5121] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -420,16 +415,15 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:28 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:21 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks\",\"value\":[\r\n - \ {\r\n \"id\":\"batch_task1_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6\",\"eTag\":\"0x8D588B2BD987D15\",\"creationTime\":\"2018-03-13T07:19:20.9236757Z\",\"lastModified\":\"2018-03-13T07:19:20.9236757Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:20.9236757Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks\",\"value\":[\r\n + \ {\r\n \"id\":\"batch_task1_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task1_98da0af6\",\"eTag\":\"0x8D609F4845DC881\",\"creationTime\":\"2018-08-24T19:05:11.6912769Z\",\"lastModified\":\"2018-08-24T19:05:11.6912769Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:11.6912769Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"exitConditions\":{\r\n \ \"exitCodes\":[\r\n {\r\n \"code\":1,\"exitOptions\":{\r\n @@ -439,7 +433,7 @@ interactions: \ ],\"default\":{\r\n \"jobAction\":\"none\"\r\n }\r\n \ },\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n - \ }\r\n },{\r\n \"id\":\"batch_task2_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6\",\"eTag\":\"0x8D588B2BE6D7D4C\",\"creationTime\":\"2018-03-13T07:19:22.319598Z\",\"lastModified\":\"2018-03-13T07:19:22.319598Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:22.319598Z\",\"commandLine\":\"cmd + \ }\r\n },{\r\n \"id\":\"batch_task2_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task2_98da0af6\",\"eTag\":\"0x8D609F4857AAFDF\",\"creationTime\":\"2018-08-24T19:05:13.5584223Z\",\"lastModified\":\"2018-08-24T19:05:13.5584223Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:13.5584223Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"outputFiles\":[\r\n {\r\n \"filePattern\":\"../stdout.txt\",\"destination\":{\r\n \ \"container\":{\r\n \"containerUrl\":\"https://test.blob.core.windows.net:443/test-container\",\"path\":\"taskLogs/output.txt\"\r\n \ }\r\n },\"uploadOptions\":{\r\n \"uploadCondition\":\"TaskCompletion\"\r\n @@ -450,38 +444,38 @@ interactions: \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n - \ }\r\n },{\r\n \"id\":\"batch_task3_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6\",\"eTag\":\"0x8D588B2BF377EFE\",\"creationTime\":\"2018-03-13T07:19:23.6434686Z\",\"lastModified\":\"2018-03-13T07:19:23.6434686Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:23.6434686Z\",\"commandLine\":\"cmd + \ }\r\n },{\r\n \"id\":\"batch_task3_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task3_98da0af6\",\"eTag\":\"0x8D609F4867C422C\",\"creationTime\":\"2018-08-24T19:05:15.2464428Z\",\"lastModified\":\"2018-08-24T19:05:15.2464428Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:15.2464428Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"scope\":\"task\",\"elevationLevel\":\"admin\"\r\n }\r\n \ },\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n - \ }\r\n },{\r\n \"id\":\"batch_task4_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6\",\"eTag\":\"0x8D588B2BFE96388\",\"creationTime\":\"2018-03-13T07:19:24.8093064Z\",\"lastModified\":\"2018-03-13T07:19:24.8093064Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:24.8093064Z\",\"commandLine\":\"cmd + \ }\r\n },{\r\n \"id\":\"batch_task4_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task4_98da0af6\",\"eTag\":\"0x8D609F4876B4136\",\"creationTime\":\"2018-08-24T19:05:16.8127286Z\",\"lastModified\":\"2018-08-24T19:05:16.8127286Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:16.8127286Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"authenticationTokenSettings\":{\r\n \ \"access\":[\r\n \"job\"\r\n ]\r\n },\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n - \ }\r\n },{\r\n \"id\":\"batch_task5_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6\",\"eTag\":\"0x8D588B2C07CDB26\",\"creationTime\":\"2018-03-13T07:19:25.7757478Z\",\"lastModified\":\"2018-03-13T07:19:25.7757478Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:25.7757478Z\",\"commandLine\":\"cmd + \ }\r\n },{\r\n \"id\":\"batch_task5_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task5_98da0af6\",\"eTag\":\"0x8D609F488533EEE\",\"creationTime\":\"2018-08-24T19:05:18.3331054Z\",\"lastModified\":\"2018-08-24T19:05:18.3331054Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:18.3331054Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"containerSettings\":{\r\n \"imageName\":\"windows_container:latest\",\"registry\":{\r\n \ \"username\":\"username\"\r\n }\r\n },\"userIdentity\":{\r\n \ \"autoUser\":{\r\n \"elevationLevel\":\"nonadmin\"\r\n }\r\n \ },\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n - \ }\r\n },{\r\n \"id\":\"batch_task6_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6\",\"eTag\":\"0x8D588B2C114BD85\",\"creationTime\":\"2018-03-13T07:19:26.7711365Z\",\"lastModified\":\"2018-03-13T07:19:26.7711365Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:26.7711365Z\",\"commandLine\":\"cmd + \ }\r\n },{\r\n \"id\":\"batch_task6_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6\",\"eTag\":\"0x8D609F4895089E4\",\"creationTime\":\"2018-08-24T19:05:19.9930852Z\",\"lastModified\":\"2018-08-24T19:05:19.9930852Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:19.9930852Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"username\":\"task-user\"\r\n \ },\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n - \ }\r\n },{\r\n \"id\":\"batch_task7_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task7_98da0af6\",\"eTag\":\"0x8D588B2C1CB7401\",\"creationTime\":\"2018-03-13T07:19:27.9685633Z\",\"lastModified\":\"2018-03-13T07:19:27.9685633Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:27.9685633Z\",\"commandLine\":\"cmd + \ }\r\n },{\r\n \"id\":\"batch_task7_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task7_98da0af6\",\"eTag\":\"0x8D609F48A3DFD27\",\"creationTime\":\"2018-08-24T19:05:21.5492391Z\",\"lastModified\":\"2018-08-24T19:05:21.5492391Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:21.5492391Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n - \ }\r\n },{\r\n \"id\":\"batch_task8_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task8_98da0af6\",\"eTag\":\"0x8D588B2C1D030B3\",\"creationTime\":\"2018-03-13T07:19:27.9996083Z\",\"lastModified\":\"2018-03-13T07:19:27.9996083Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:27.9996083Z\",\"commandLine\":\"cmd + \ }\r\n },{\r\n \"id\":\"batch_task8_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task8_98da0af6\",\"eTag\":\"0x8D609F48A3FFA0D\",\"creationTime\":\"2018-08-24T19:05:21.5622669Z\",\"lastModified\":\"2018-08-24T19:05:21.5622669Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:21.5622669Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n - \ }\r\n },{\r\n \"id\":\"batch_task9_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task9_98da0af6\",\"eTag\":\"0x8D588B2C1CF1D7A\",\"creationTime\":\"2018-03-13T07:19:27.9925626Z\",\"lastModified\":\"2018-03-13T07:19:27.9925626Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:27.9925626Z\",\"commandLine\":\"cmd + \ }\r\n },{\r\n \"id\":\"batch_task9_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task9_98da0af6\",\"eTag\":\"0x8D609F48A40473F\",\"creationTime\":\"2018-08-24T19:05:21.5642431Z\",\"lastModified\":\"2018-08-24T19:05:21.5642431Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:21.5642431Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"autoUser\":{\r\n \ \"elevationLevel\":\"nonadmin\"\r\n }\r\n },\"constraints\":{\r\n \ \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n @@ -490,8 +484,8 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:28 GMT'] - request-id: [5debcfbc-c2f5-44fd-8de4-a1b24b826fa0] + date: ['Fri, 24 Aug 2018 19:05:22 GMT'] + request-id: [4022aa80-b7f6-4dde-811f-c906754ae108] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -503,20 +497,19 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:28 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:22 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/taskcounts?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/taskcounts?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#taskcounts/@Element\",\"active\":6,\"running\":0,\"completed\":0,\"succeeded\":0,\"failed\":0,\"validationStatus\":\"Validated\"\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#taskcounts/@Element\",\"active\":6,\"running\":0,\"completed\":0,\"succeeded\":0,\"failed\":0\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:29 GMT'] - request-id: [3edb30bb-7f14-4b10-aae0-a9d45b57e34c] + date: ['Fri, 24 Aug 2018 19:05:23 GMT'] + request-id: [d6b1a454-e039-4920-b951-f28802329b5b] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -529,23 +522,22 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:29 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:23 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6/terminate?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6/terminate?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-length: ['0'] - dataserviceid: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6/terminate'] + dataserviceid: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6/terminate'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:29 GMT'] - etag: ['0x8D588B2C2C1A1A9'] - last-modified: ['Tue, 13 Mar 2018 07:19:29 GMT'] - request-id: [c2294589-cf25-428c-92f5-2c7723d253f5] + date: ['Fri, 24 Aug 2018 19:05:24 GMT'] + etag: ['0x8D609F48BCA6916'] + last-modified: ['Fri, 24 Aug 2018 19:05:24 GMT'] + request-id: [9bf8bdaa-543d-437e-a726-682c679aa258] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] @@ -556,28 +548,27 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:29 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:24 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task6_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6\",\"eTag\":\"0x8D588B2C2C1A1A9\",\"creationTime\":\"2018-03-13T07:19:26.7711365Z\",\"lastModified\":\"2018-03-13T07:19:29.5819177Z\",\"state\":\"completed\",\"stateTransitionTime\":\"2018-03-13T07:19:29.5819177Z\",\"previousState\":\"active\",\"previousStateTransitionTime\":\"2018-03-13T07:19:26.7711365Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task6_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6\",\"eTag\":\"0x8D609F48BCA6916\",\"creationTime\":\"2018-08-24T19:05:19.9930852Z\",\"lastModified\":\"2018-08-24T19:05:24.1472278Z\",\"state\":\"completed\",\"stateTransitionTime\":\"2018-08-24T19:05:24.1472278Z\",\"previousState\":\"active\",\"previousStateTransitionTime\":\"2018-08-24T19:05:19.9930852Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"username\":\"task-user\"\r\n \ },\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n - \ },\"executionInfo\":{\r\n \"endTime\":\"2018-03-13T07:19:29.5819177Z\",\"failureInfo\":{\r\n + \ },\"executionInfo\":{\r\n \"endTime\":\"2018-08-24T19:05:24.1472278Z\",\"failureInfo\":{\r\n \ \"category\":\"UserError\",\"code\":\"TaskEnded\",\"message\":\"Task Was Ended by User Request\"\r\n },\"result\":\"Failure\",\"retryCount\":0,\"requeueCount\":0\r\n \ },\"nodeInfo\":{\r\n \r\n }\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:30 GMT'] - etag: ['0x8D588B2C2C1A1A9'] - last-modified: ['Tue, 13 Mar 2018 07:19:29 GMT'] - request-id: [0f751eb3-1e94-4af6-a189-d923253e5e9a] + date: ['Fri, 24 Aug 2018 19:05:24 GMT'] + etag: ['0x8D609F48BCA6916'] + last-modified: ['Fri, 24 Aug 2018 19:05:24 GMT'] + request-id: [2ee2a963-6c38-4772-a880-df1ade25acd7] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -590,22 +581,21 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:30 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:25 GMT'] method: POST - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6/reactivate?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6/reactivate?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-length: ['0'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:30 GMT'] - etag: ['0x8D588B2C35AEE16'] - last-modified: ['Tue, 13 Mar 2018 07:19:30 GMT'] - request-id: [99ac959f-a057-47ef-98db-361d38e9f839] + date: ['Fri, 24 Aug 2018 19:05:25 GMT'] + etag: ['0x8D609F48CD2BCDA'] + last-modified: ['Fri, 24 Aug 2018 19:05:25 GMT'] + request-id: [856bc631-c1af-46bb-bd52-dda713f7c096] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] @@ -616,25 +606,24 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:30 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:26 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task6_98da0af6\",\"url\":\"https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6\",\"eTag\":\"0x8D588B2C35AEE16\",\"creationTime\":\"2018-03-13T07:19:26.7711365Z\",\"lastModified\":\"2018-03-13T07:19:30.586575Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:19:30.586575Z\",\"previousState\":\"completed\",\"previousStateTransitionTime\":\"2018-03-13T07:19:29.5819177Z\",\"commandLine\":\"cmd + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#tasks/@Element\",\"id\":\"batch_task6_98da0af6\",\"url\":\"https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6\",\"eTag\":\"0x8D609F48CD2BCDA\",\"creationTime\":\"2018-08-24T19:05:19.9930852Z\",\"lastModified\":\"2018-08-24T19:05:25.8795226Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T19:05:25.8795226Z\",\"previousState\":\"completed\",\"previousStateTransitionTime\":\"2018-08-24T19:05:24.1472278Z\",\"commandLine\":\"cmd /c \\\"echo hello world\\\"\",\"userIdentity\":{\r\n \"username\":\"task-user\"\r\n \ },\"constraints\":{\r\n \"maxWallClockTime\":\"P10675199DT2H48M5.4775807S\",\"retentionTime\":\"P10675199DT2H48M5.4775807S\",\"maxTaskRetryCount\":0\r\n \ },\"executionInfo\":{\r\n \"retryCount\":0,\"requeueCount\":0\r\n }\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:31 GMT'] - etag: ['0x8D588B2C35AEE16'] - last-modified: ['Tue, 13 Mar 2018 07:19:30 GMT'] - request-id: [13be93dc-6ebf-46a5-a9d8-07e58a2a09c4] + date: ['Fri, 24 Aug 2018 19:05:26 GMT'] + etag: ['0x8D609F48CD2BCDA'] + last-modified: ['Fri, 24 Aug 2018 19:05:25 GMT'] + request-id: [068cbb41-f282-4b28-b6f4-9b23754811df] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -648,21 +637,21 @@ interactions: Connection: [keep-alive] Content-Length: ['41'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:31 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:27 GMT'] method: PUT - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6'] + dataserviceid: ['https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:31 GMT'] - etag: ['0x8D588B2C42D84D6'] - last-modified: ['Tue, 13 Mar 2018 07:19:31 GMT'] - request-id: [04fd974e-5374-4563-bb32-d51816c76663] + date: ['Fri, 24 Aug 2018 19:05:27 GMT'] + etag: ['0x8D609F48DF0FE35'] + last-modified: ['Fri, 24 Aug 2018 19:05:27 GMT'] + request-id: [8ed8f53e-641b-4527-91c1-b6ec98e041b5] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -674,21 +663,20 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:32 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:27 GMT'] method: GET - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6/subtasksinfo?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6/subtasksinfo?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.westcentralus.batch.azure.com/$metadata#subtaskinfo\",\"value\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batch98da0af6.eastus.batch.azure.com/$metadata#subtaskinfo\",\"value\":[\r\n \ \r\n ]\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:31 GMT'] - request-id: [af385765-b3b8-4a49-9805-f33b301deb3f] + date: ['Fri, 24 Aug 2018 19:05:28 GMT'] + request-id: [bce94654-6b70-45f8-be8c-c4a3192d00af] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -701,19 +689,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:19:32 GMT'] + ocp-date: ['Fri, 24 Aug 2018 19:05:28 GMT'] method: DELETE - uri: https://batch98da0af6.westcentralus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-03-01.6.1 + uri: https://batch98da0af6.eastus.batch.azure.com/jobs/batch98da0af6/tasks/batch_task6_98da0af6?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:19:32 GMT'] - request-id: [b77a91f8-b93e-4b73-afaa-5d0432b24731] + date: ['Fri, 24 Aug 2018 19:05:29 GMT'] + request-id: [1a5ef46b-6b9f-4f84-9ea4-890213c525d2] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/recordings/test_batch.test_batch_update_pools.yaml b/azure-batch/tests/recordings/test_batch.test_batch_update_pools.yaml index 40a68e9e1abd..ede9ffd11b32 100644 --- a/azure-batch/tests/recordings/test_batch.test_batch_update_pools.yaml +++ b/azure-batch/tests/recordings/test_batch.test_batch_update_pools.yaml @@ -1,32 +1,32 @@ interactions: - request: - body: '{"vmSize": "small", "id": "batch_paas_f0de0ddf", "cloudServiceConfiguration": - {"osFamily": "5"}, "startTask": {"userIdentity": {"autoUser": {"elevationLevel": - "admin"}}, "resourceFiles": [{"blobSource": "https://blobsource.com", "filePath": - "filename.txt"}], "commandLine": "cmd.exe /c \"echo hello world\"", "environmentSettings": - [{"name": "ENV_VAR", "value": "env_value"}]}}' + body: '{"cloudServiceConfiguration": {"osFamily": "5"}, "id": "batch_paas_f0de0ddf", + "vmSize": "small", "startTask": {"commandLine": "cmd.exe /c \"echo hello world\"", + "environmentSettings": [{"value": "env_value", "name": "ENV_VAR"}], "resourceFiles": + [{"filePath": "filename.txt", "blobSource": "https://blobsource.com"}], "userIdentity": + {"autoUser": {"elevationLevel": "admin"}}}}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['377'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:25:42 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:46:46 GMT'] method: POST - uri: https://batchf0de0ddf.westcentralus.batch.azure.com/pools?api-version=2018-03-01.6.1 + uri: https://batchf0de0ddf.eastus.batch.azure.com/pools?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf'] + dataserviceid: ['https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:25:42 GMT'] - etag: ['0x8D588B3A12845B4'] - last-modified: ['Tue, 13 Mar 2018 07:25:42 GMT'] - location: ['https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf'] - request-id: [055b144b-cd94-4fdf-8e49-0b44fd4cf4e2] + date: ['Fri, 24 Aug 2018 07:46:47 GMT'] + etag: ['0x8D60995BECB095E'] + last-modified: ['Fri, 24 Aug 2018 07:46:47 GMT'] + location: ['https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf'] + request-id: [971d586f-ad84-44ce-8c5d-1b4c8a99c94f] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -40,78 +40,78 @@ interactions: Connection: [keep-alive] Content-Length: ['24'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:25:42 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:46:47 GMT'] method: POST - uri: https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf/upgradeos?api-version=2018-03-01.6.1 + uri: https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf/upgradeos?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0de0ddf.westcentralus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"PoolVersionEqualsUpgradeVersion\",\"message\":{\r\n - \ \"lang\":\"en-US\",\"value\":\"The pool is already with the given version.\\nRequestId:29c00649-88e8-490f-9555-627af60b989b\\nTime:2018-03-13T07:25:43.3588061Z\"\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0de0ddf.eastus.batch.azure.com/$metadata#Microsoft.Azure.Batch.Protocol.Entities.Container.errors/@Element\",\"code\":\"PoolVersionEqualsUpgradeVersion\",\"message\":{\r\n + \ \"lang\":\"en-US\",\"value\":\"The pool is already with the given version.\\nRequestId:7776ea45-a731-4723-b85c-5676cfc6e475\\nTime:2018-08-24T07:46:48.3436665Z\"\r\n \ }\r\n}"} headers: - content-length: ['369'] + content-length: ['362'] content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:25:43 GMT'] - request-id: [29c00649-88e8-490f-9555-627af60b989b] + date: ['Fri, 24 Aug 2018 07:46:48 GMT'] + request-id: [7776ea45-a731-4723-b85c-5676cfc6e475] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] status: {code: 400, message: The pool is already with the given version.} - request: - body: '{"metadata": [{"name": "foo", "value": "bar"}], "certificateReferences": - [], "applicationPackageReferences": []}' + body: '{"metadata": [{"value": "bar", "name": "foo"}], "applicationPackageReferences": + [], "certificateReferences": []}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['112'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:25:43 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:46:48 GMT'] method: POST - uri: https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf/updateproperties?api-version=2018-03-01.6.1 + uri: https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf/updateproperties?api-version=2018-08-01.7.0 response: body: {string: ''} headers: content-length: ['0'] - dataserviceid: ['https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf/updateproperties'] + dataserviceid: ['https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf/updateproperties'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:25:43 GMT'] - etag: ['0x8D588B3A1EAE01A'] - last-modified: ['Tue, 13 Mar 2018 07:25:43 GMT'] - request-id: [52c464eb-2d18-40fe-a431-7f2340c827ad] + date: ['Fri, 24 Aug 2018 07:46:48 GMT'] + etag: ['0x8D60995BFB11E84'] + last-modified: ['Fri, 24 Aug 2018 07:46:49 GMT'] + request-id: [880d2254-99a9-4dcf-96be-e22914eeed6e] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] x-content-type-options: [nosniff] status: {code: 204, message: No Content} - request: - body: '{"metadata": [{"name": "foo2", "value": "bar2"}]}' + body: '{"metadata": [{"value": "bar2", "name": "foo2"}]}' headers: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['49'] Content-Type: [application/json; odata=minimalmetadata; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:25:44 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:46:49 GMT'] method: PATCH - uri: https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf?api-version=2018-03-01.6.1 + uri: https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf?api-version=2018-08-01.7.0 response: body: {string: ''} headers: - dataserviceid: ['https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf'] + dataserviceid: ['https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf'] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:25:44 GMT'] - etag: ['0x8D588B3A250B559'] - last-modified: ['Tue, 13 Mar 2018 07:25:44 GMT'] - request-id: [fc098ca9-b518-447f-b089-6860097c6537] + date: ['Fri, 24 Aug 2018 07:46:49 GMT'] + etag: ['0x8D60995C01AF5EA'] + last-modified: ['Fri, 24 Aug 2018 07:46:49 GMT'] + request-id: [c31a2b2b-9731-4431-871c-4b1bfc11f113] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -123,21 +123,20 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:25:44 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:46:49 GMT'] method: HEAD - uri: https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf?api-version=2018-03-01.6.1 + uri: https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:25:45 GMT'] - etag: ['0x8D588B3A250B559'] - last-modified: ['Tue, 13 Mar 2018 07:25:44 GMT'] - request-id: [6807da83-52d9-487b-baa7-ce2f53b07320] + date: ['Fri, 24 Aug 2018 07:46:50 GMT'] + etag: ['0x8D60995C01AF5EA'] + last-modified: ['Fri, 24 Aug 2018 07:46:49 GMT'] + request-id: [e095cb5c-cd8d-43c7-a86e-841680b1f937] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -149,15 +148,14 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:25:45 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:46:50 GMT'] method: GET - uri: https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf?api-version=2018-03-01.6.1 + uri: https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf?api-version=2018-08-01.7.0 response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0de0ddf.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_paas_f0de0ddf\",\"url\":\"https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf\",\"eTag\":\"0x8D588B3A250B559\",\"lastModified\":\"2018-03-13T07:25:44.6515033Z\",\"creationTime\":\"2018-03-13T07:25:42.7087796Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-03-13T07:25:42.7087796Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-03-13T07:25:42.8006022Z\",\"vmSize\":\"small\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"metadata\":[\r\n + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0de0ddf.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_paas_f0de0ddf\",\"url\":\"https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf\",\"eTag\":\"0x8D60995C01AF5EA\",\"lastModified\":\"2018-08-24T07:46:49.7273322Z\",\"creationTime\":\"2018-08-24T07:46:47.5258206Z\",\"state\":\"active\",\"stateTransitionTime\":\"2018-08-24T07:46:47.5258206Z\",\"allocationState\":\"steady\",\"allocationStateTransitionTime\":\"2018-08-24T07:46:47.6959132Z\",\"vmSize\":\"small\",\"resizeTimeout\":\"PT15M\",\"currentDedicatedNodes\":0,\"targetDedicatedNodes\":0,\"currentLowPriorityNodes\":0,\"targetLowPriorityNodes\":0,\"enableAutoScale\":false,\"enableInterNodeCommunication\":false,\"metadata\":[\r\n \ {\r\n \"name\":\"foo2\",\"value\":\"bar2\"\r\n }\r\n ],\"maxTasksPerNode\":1,\"taskSchedulingPolicy\":{\r\n \ \"nodeFillType\":\"Spread\"\r\n },\"cloudServiceConfiguration\":{\r\n \ \"osFamily\":\"5\",\"targetOSVersion\":\"*\",\"currentOSVersion\":\"*\"\r\n @@ -165,10 +163,10 @@ interactions: headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:25:45 GMT'] - etag: ['0x8D588B3A250B559'] - last-modified: ['Tue, 13 Mar 2018 07:25:44 GMT'] - request-id: [fab3fae7-4a9a-4cfd-befb-799cc430993a] + date: ['Fri, 24 Aug 2018 07:46:50 GMT'] + etag: ['0x8D60995C01AF5EA'] + last-modified: ['Fri, 24 Aug 2018 07:46:49 GMT'] + request-id: [90c87348-e562-48fc-834f-29f57b7ab543] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -180,23 +178,22 @@ interactions: Accept: [application/json] Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:25:45 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:46:51 GMT'] return-client-request-id: ['false'] method: GET - uri: https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf?$select=id%2Cstate&timeout=30&api-version=2018-03-01.6.1&$expand=stats + uri: https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf?$expand=stats&api-version=2018-08-01.7.0&timeout=30&$select=id%2Cstate response: - body: {string: "{\r\n \"odata.metadata\":\"https://batchf0de0ddf.westcentralus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_paas_f0de0ddf\",\"state\":\"active\"\r\n}"} + body: {string: "{\r\n \"odata.metadata\":\"https://batchf0de0ddf.eastus.batch.azure.com/$metadata#pools/@Element\",\"id\":\"batch_paas_f0de0ddf\",\"state\":\"active\"\r\n}"} headers: content-type: [application/json;odata=minimalmetadata] dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:25:46 GMT'] - etag: ['0x8D588B3A250B559'] - last-modified: ['Tue, 13 Mar 2018 07:25:44 GMT'] - request-id: [53ed9b19-9c3b-4b9b-8f69-b99561d7ccb4] + date: ['Fri, 24 Aug 2018 07:46:51 GMT'] + etag: ['0x8D60995C01AF5EA'] + last-modified: ['Fri, 24 Aug 2018 07:46:49 GMT'] + request-id: [8b883890-0ff4-4dc6-9983-6604709cbdb1] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] @@ -209,19 +206,18 @@ interactions: Accept-Encoding: ['gzip, deflate'] Connection: [keep-alive] Content-Length: ['0'] - Content-Type: [application/json; charset=utf-8] - User-Agent: [python/3.5.0 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.18.4 - msrest/0.4.27 msrest_azure/0.4.22 batchserviceclient/5.0.0 Azure-SDK-For-Python] + User-Agent: [python/3.5.4 (Windows-2008ServerR2-6.1.7601-SP1) requests/2.19.1 + msrest/0.5.4 msrest_azure/0.4.34 azure-batch/5.0.0 Azure-SDK-For-Python] accept-language: [en-US] - ocp-date: ['Tue, 13 Mar 2018 07:25:46 GMT'] + ocp-date: ['Fri, 24 Aug 2018 07:46:51 GMT'] method: DELETE - uri: https://batchf0de0ddf.westcentralus.batch.azure.com/pools/batch_paas_f0de0ddf?api-version=2018-03-01.6.1 + uri: https://batchf0de0ddf.eastus.batch.azure.com/pools/batch_paas_f0de0ddf?api-version=2018-08-01.7.0 response: body: {string: ''} headers: dataserviceversion: ['3.0'] - date: ['Tue, 13 Mar 2018 07:25:45 GMT'] - request-id: [247f8ff2-b073-4e48-9533-2b2906a5c3ec] + date: ['Fri, 24 Aug 2018 07:46:52 GMT'] + request-id: [e8600515-49ca-4ff4-ba1c-33dfa14bd778] server: [Microsoft-HTTPAPI/2.0] strict-transport-security: [max-age=31536000; includeSubDomains] transfer-encoding: [chunked] diff --git a/azure-batch/tests/test_batch.py b/azure-batch/tests/test_batch.py index c004d8d7f04c..d2bedc8a0347 100644 --- a/azure-batch/tests/test_batch.py +++ b/azure-batch/tests/test_batch.py @@ -28,7 +28,7 @@ ) -AZURE_LOCATION = 'westcentralus' +AZURE_LOCATION = 'eastus' BATCH_RESOURCE = 'https://batch.core.windows.net/' @@ -94,9 +94,9 @@ def test_batch_applications(self, batch_job, **kwargs): # Test Create Task with Application Package task_id = 'python_task_with_app_package' task = models.TaskAddParameter( - task_id, - 'cmd /c "echo hello world"', - application_package_references=[models.ApplicationPackageReference('application_id', 'v1.0')] + id=task_id, + command_line='cmd /c "echo hello world"', + application_package_references=[models.ApplicationPackageReference(application_id='application_id', version='v1.0')] ) response = client.task.add(batch_job.id, task) self.assertIsNone(response) @@ -159,8 +159,8 @@ def test_batch_create_pools(self, **kwargs): # Test Create Iaas Pool users = [ - models.UserAccount('test-user-1', 'kt#_gahr!@aGERDXA'), - models.UserAccount('test-user-2', 'kt#_gahr!@aGERDXA', models.ElevationLevel.admin) + models.UserAccount(name='test-user-1', password='kt#_gahr!@aGERDXA'), + models.UserAccount(name='test-user-2', password='kt#_gahr!@aGERDXA', elevation_level=models.ElevationLevel.admin) ] test_iaas_pool = models.PoolAddParameter( id=self.get_resource_name('batch_iaas_'), @@ -172,8 +172,8 @@ def test_batch_create_pools(self, **kwargs): sku='2016-Datacenter-smalldisk' ), node_agent_sku_id='batch.node.windows amd64', - windows_configuration=models.WindowsConfiguration(True)), - task_scheduling_policy=models.TaskSchedulingPolicy(models.ComputeNodeFillType.pack), + windows_configuration=models.WindowsConfiguration(enable_automatic_updates=True)), + task_scheduling_policy=models.TaskSchedulingPolicy(node_fill_type=models.ComputeNodeFillType.pack), user_accounts=users ) response = client.pool.add(test_iaas_pool) @@ -190,7 +190,7 @@ def test_batch_create_pools(self, **kwargs): self.assertEqual(counts[0].low_priority.total, 0) # Test Create Pool with Network Configuration - network_config = models.NetworkConfiguration('/subscriptions/00000000-0000-0000-0000-000000000000' + network_config = models.NetworkConfiguration(subnet_id='/subscriptions/00000000-0000-0000-0000-000000000000' '/resourceGroups/test' '/providers/Microsoft.Network' '/virtualNetworks/vnet1' @@ -314,8 +314,8 @@ def test_batch_update_pools(self, **kwargs): ), start_task=models.StartTask( command_line="cmd.exe /c \"echo hello world\"", - resource_files=[models.ResourceFile('https://blobsource.com', 'filename.txt')], - environment_settings=[models.EnvironmentSetting('ENV_VAR', 'env_value')], + resource_files=[models.ResourceFile(blob_source='https://blobsource.com', file_path='filename.txt')], + environment_settings=[models.EnvironmentSetting(name='ENV_VAR', value='env_value')], user_identity=models.UserIdentity( auto_user=models.AutoUserSpecification( elevation_level=models.ElevationLevel.admin @@ -335,12 +335,15 @@ def test_batch_update_pools(self, **kwargs): ) # Test Update Pool Parameters - params = models.PoolUpdatePropertiesParameter([], [], [models.MetadataItem('foo', 'bar')]) + params = models.PoolUpdatePropertiesParameter( + certificate_references=[], + application_package_references=[], + metadata=[models.MetadataItem(name='foo', value='bar')]) response = client.pool.update_properties(test_paas_pool.id, params) self.assertIsNone(response) # Test Patch Pool Parameters - params = models.PoolPatchParameter(metadata=[models.MetadataItem('foo2', 'bar2')]) + params = models.PoolPatchParameter(metadata=[models.MetadataItem(name='foo2', value='bar2')]) response = client.pool.patch(test_paas_pool.id, params) self.assertIsNone(response) @@ -434,11 +437,11 @@ def test_batch_scale_pools(self, batch_pool, **kwargs): @ResourceGroupPreparer(location=AZURE_LOCATION) @AccountPreparer(location=AZURE_LOCATION) def test_batch_job_schedules(self, **kwargs): - client = self.create_aad_client(**kwargs) + client = self.create_sharedkey_client(**kwargs) # Test Create Job Schedule schedule_id = self.get_resource_name('batch_schedule_') job_spec = models.JobSpecification( - pool_info=models.PoolInformation("pool_id"), + pool_info=models.PoolInformation(pool_id="pool_id"), constraints=models.JobConstraints(max_task_retry_count=2), on_all_tasks_complete=models.OnAllTasksComplete.terminate_job ) @@ -447,9 +450,9 @@ def test_batch_job_schedules(self, **kwargs): recurrence_interval=datetime.timedelta(days=1) ) params = models.JobScheduleAddParameter( - schedule_id, - schedule, - job_spec + id=schedule_id, + schedule=schedule, + job_specification=job_spec ) response = client.job_schedule.add(params) self.assertIsNone(response) @@ -482,12 +485,12 @@ def test_batch_job_schedules(self, **kwargs): # Test Update Job Schedule job_spec = models.JobSpecification( - pool_info=models.PoolInformation('pool_id') + pool_info=models.PoolInformation(pool_id='pool_id') ) schedule = models.Schedule( recurrence_interval=datetime.timedelta(hours=10) ) - params = models.JobScheduleUpdateParameter(schedule, job_spec) + params = models.JobScheduleUpdateParameter(schedule=schedule, job_specification=job_spec) response = client.job_schedule.update(schedule_id, params) self.assertIsNone(response) @@ -495,7 +498,7 @@ def test_batch_job_schedules(self, **kwargs): schedule = models.Schedule( recurrence_interval=datetime.timedelta(hours=5) ) - params = models.JobSchedulePatchParameter(schedule) + params = models.JobSchedulePatchParameter(schedule=schedule) response = client.job_schedule.patch(schedule_id, params) self.assertIsNone(response) @@ -510,7 +513,7 @@ def test_batch_job_schedules(self, **kwargs): @ResourceGroupPreparer(location=AZURE_LOCATION) @AccountPreparer(location=AZURE_LOCATION) def test_batch_network_configuration(self, **kwargs): - client = self.create_aad_client(**kwargs) + client = self.create_sharedkey_client(**kwargs) # Test Create Pool with Network Config network_config = models.NetworkConfiguration( endpoint_configuration=models.PoolEndpointConfiguration( @@ -578,6 +581,8 @@ def test_batch_compute_nodes(self, batch_pool, **kwargs): self.assertIsInstance(node, models.ComputeNode) self.assertEqual(node.scheduling_state, models.SchedulingState.enabled) self.assertTrue(node.is_dedicated) + self.assertIsNotNone(node.node_agent_info) + self.assertIsNotNone(node.node_agent_info.version) # Test Upload Log config = models.UploadBatchServiceLogsConfiguration( @@ -602,12 +607,14 @@ def test_batch_compute_nodes(self, batch_pool, **kwargs): self.assertIsNone(response) # Test Reimage Node - response = client.compute_node.reimage( - batch_pool.name, nodes[1].id, node_reimage_option=models.ComputeNodeReimageOption.terminate) - self.assertIsNone(response) + self.assertBatchError('OperationNotValidOnNode', + client.compute_node.reimage, + batch_pool.name, + nodes[1].id, + node_reimage_option=models.ComputeNodeReimageOption.terminate) # Test Remove Nodes - options = models.NodeRemoveParameter([n.id for n in nodes]) + options = models.NodeRemoveParameter(node_list=[n.id for n in nodes]) response = client.pool.remove_nodes(batch_pool.name, options) self.assertIsNone(response) @@ -624,7 +631,7 @@ def test_batch_compute_node_user(self, batch_pool, **kwargs): # Test Add User user_name = 'BatchPythonSDKUser' nodes = list(client.compute_node.list(batch_pool.name)) - user = models.ComputeNodeUser(user_name, password='kt#_gahr!@aGERDXA', is_admin=False) + user = models.ComputeNodeUser(name=user_name, password='kt#_gahr!@aGERDXA', is_admin=False) response = client.compute_node.add_user(batch_pool.name, nodes[0].id, user) self.assertIsNone(response) @@ -659,7 +666,7 @@ def test_batch_files(self, batch_pool, batch_job, **kwargs): nodes = list(client.compute_node.list(batch_pool.name)) node = nodes[0].id task_id = 'test_task' - task_param = models.TaskAddParameter(task_id, 'cmd /c "echo hello world"') + task_param = models.TaskAddParameter(id=task_id, command_line='cmd /c "echo hello world"') response = client.task.add(batch_job.id, task_param) self.assertIsNone(response) task = client.task.get(batch_job.id, task_id) @@ -721,9 +728,9 @@ def test_batch_tasks(self, batch_job, **kwargs): # Test Create Task with Auto Complete exit_conditions = models.ExitConditions( - exit_codes=[models.ExitCodeMapping(1, models.ExitOptions(models.JobAction.terminate))], - exit_code_ranges=[models.ExitCodeRangeMapping(2, 4, models.ExitOptions(models.JobAction.disable))], - default=models.ExitOptions(models.JobAction.none)) + exit_codes=[models.ExitCodeMapping(code=1, exit_options=models.ExitOptions(job_action=models.JobAction.terminate))], + exit_code_ranges=[models.ExitCodeRangeMapping(start=2, end=4, exit_options=models.ExitOptions(job_action=models.JobAction.disable))], + default=models.ExitOptions(job_action=models.JobAction.none)) task_param = models.TaskAddParameter( id=self.get_resource_name('batch_task1_'), command_line='cmd /c "echo hello world"', @@ -803,7 +810,7 @@ def test_batch_tasks(self, batch_job, **kwargs): command_line='cmd /c "echo hello world"', container_settings=models.TaskContainerSettings( image_name='windows_container:latest', - registry=models.ContainerRegistry('username', 'password')) + registry=models.ContainerRegistry(user_name='username', password='password')) ) client.task.add(batch_job.id, task_param) task = client.task.get(batch_job.id, task_param.id) @@ -826,7 +833,8 @@ def test_batch_tasks(self, batch_job, **kwargs): tasks = [] for i in range(7, 10): tasks.append(models.TaskAddParameter( - self.get_resource_name('batch_task{}_'.format(i)), 'cmd /c "echo hello world"')) + id=self.get_resource_name('batch_task{}_'.format(i)), + command_line='cmd /c "echo hello world"')) result = client.task.add_collection(batch_job.id, tasks) self.assertIsInstance(result, models.TaskAddCollectionResult) self.assertEqual(len(result.value), 3) @@ -841,7 +849,6 @@ def test_batch_tasks(self, batch_job, **kwargs): self.assertIsInstance(task_counts, models.TaskCounts) self.assertEqual(task_counts.completed, 0) self.assertEqual(task_counts.succeeded, 0) - self.assertEqual(task_counts.validation_status, models.TaskCountValidationStatus.validated) # Test Terminate Task response = client.task.terminate(batch_job.id, task_param.id)