From aa872f39ea1a99a5cd18f4182ba4218475638782 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 11 Jun 2019 20:52:49 +0000 Subject: [PATCH] Generated from c8a6e11b9709530706ef5117cc9de237298cf0a6 chore: jsonfmt scheduler Ran `jsonfmt -w "specification/scheduler/**/*.json"` --- .../operations/job_collections_operations.py | 47 +++++++--------- .../scheduler/operations/jobs_operations.py | 42 +++++++------- .../azure/mgmt/scheduler/patch.py | 55 ------------------- .../scheduler/scheduler_management_client.py | 3 - .../azure/mgmt/scheduler/version.py | 2 +- 5 files changed, 41 insertions(+), 108 deletions(-) delete mode 100644 sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/patch.py diff --git a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/operations/job_collections_operations.py b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/operations/job_collections_operations.py index ae105960fdea..ae18042a7818 100644 --- a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/operations/job_collections_operations.py +++ b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/operations/job_collections_operations.py @@ -73,7 +73,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['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -82,9 +82,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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]: exp = CloudError(response) @@ -141,7 +140,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['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -150,9 +149,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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]: exp = CloudError(response) @@ -205,7 +203,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['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -214,8 +212,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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]: exp = CloudError(response) @@ -270,6 +268,7 @@ def create_or_update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -282,9 +281,8 @@ def create_or_update( body_content = self._serialize.body(job_collection, 'JobCollectionDefinition') # 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, 201]: exp = CloudError(response) @@ -341,6 +339,7 @@ def patch( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -353,9 +352,8 @@ def patch( body_content = self._serialize.body(job_collection, 'JobCollectionDefinition') # 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]: exp = CloudError(response) @@ -392,7 +390,6 @@ def _delete_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -401,8 +398,8 @@ def _delete_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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, 202]: exp = CloudError(response) @@ -472,7 +469,6 @@ def _enable_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -481,8 +477,8 @@ def _enable_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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, 202]: exp = CloudError(response) @@ -552,7 +548,6 @@ def _disable_initial( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -561,8 +556,8 @@ def _disable_initial( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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, 202]: exp = CloudError(response) diff --git a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/operations/jobs_operations.py b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/operations/jobs_operations.py index 9a25fdbae7a2..dae435822aea 100644 --- a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/operations/jobs_operations.py +++ b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/operations/jobs_operations.py @@ -73,7 +73,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['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -82,8 +82,8 @@ def get( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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]: exp = CloudError(response) @@ -142,6 +142,7 @@ def create_or_update( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -154,9 +155,8 @@ def create_or_update( body_content = self._serialize.body(job, 'JobDefinition') # 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, 201]: exp = CloudError(response) @@ -217,6 +217,7 @@ def patch( # Construct headers header_parameters = {} + header_parameters['Accept'] = 'application/json' header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) @@ -229,9 +230,8 @@ def patch( body_content = self._serialize.body(job, 'JobDefinition') # 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]: exp = CloudError(response) @@ -285,7 +285,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['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -294,8 +293,8 @@ def delete( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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]: exp = CloudError(response) @@ -342,7 +341,6 @@ def run( # Construct headers header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' if self.config.generate_client_request_id: header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -351,8 +349,8 @@ def run( header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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]: exp = CloudError(response) @@ -418,7 +416,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['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -427,9 +425,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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]: exp = CloudError(response) @@ -506,7 +503,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['x-ms-client-request-id'] = str(uuid.uuid1()) if custom_headers: @@ -515,9 +512,8 @@ def internal_paging(next_link=None, raw=False): header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') # 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]: exp = CloudError(response) diff --git a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/patch.py b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/patch.py deleted file mode 100644 index 31b17803f148..000000000000 --- a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/patch.py +++ /dev/null @@ -1,55 +0,0 @@ -# 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. -# -------------------------------------------------------------------------- - -# Retry policy -# 20 seconds => "retryType": "fixed", "retryInterval": "00:00:20", -# 20 minutes => "retryType": "fixed", "retryInterval": "00:20:00", -# 1 hours => "retryType": "fixed", "retryInterval": "01:00:00", -# 2 days => "retryType": "fixed", "retryInterval": "60.00:00:00", -# default => "retryType": "fixed" -# none => "retryType": "none" -import datetime -import re -import isodate -import msrest.serialization - -_TIMESPAN_MATCHER = re.compile(r"([\d]+\.)?(\d\d):(\d\d):(\d\d)") - -def from_timespan_to_iso8601(timespan_str): - match = _TIMESPAN_MATCHER.match(timespan_str) - groups = match.groups() - int_groups = [int(groups[0][:-1]) if groups[0] else 0] - int_groups += [int(v) for v in groups[1:]] - - return "P{}DT{}H{}M{}S".format( - int(int_groups[0] / 30), - int_groups[1], - int_groups[2], - int_groups[3] - ) - -def from_iso8601_to_timespan(iso_str): - # Be sure to handle str + isodate.Duration + timedelta - iso_str = msrest.serialization.Serializer.serialize_duration(iso_str) - iso_obj = isodate.parse_duration(iso_str) - hours_str = "{:02d}:{:02d}:{:02d}".format( - iso_obj.seconds // 3600, # hours - iso_obj.seconds % 3600 // 60, # minutes - iso_obj.seconds % 3600 % 60 # seconds - ) - return "{}.{}".format(iso_obj.days * 30, hours_str) if iso_obj.days else hours_str - -def serialize_scheduler_duration(attr, **kwargs): - return from_iso8601_to_timespan(attr) - -def deserialize_scheduler_duration(attr, **kwargs): - value = from_timespan_to_iso8601(attr) - return msrest.serialization.Deserializer.deserialize_duration(value) - -def patch_client(client): - client._serialize.serialize_type['duration'] = serialize_scheduler_duration - client._deserialize.deserialize_type ['duration'] = deserialize_scheduler_duration diff --git a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/scheduler_management_client.py b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/scheduler_management_client.py index d2b479f5e98b..da7337c65586 100644 --- a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/scheduler_management_client.py +++ b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/scheduler_management_client.py @@ -16,7 +16,6 @@ from .operations.job_collections_operations import JobCollectionsOperations from .operations.jobs_operations import JobsOperations from . import models -from .patch import patch_client class SchedulerManagementClientConfiguration(AzureConfiguration): @@ -85,5 +84,3 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.jobs = JobsOperations( self._client, self.config, self._serialize, self._deserialize) - - patch_client(self) diff --git a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/version.py b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/version.py index 53c4c7ea05e8..8c52a31098fd 100644 --- a/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/version.py +++ b/sdk/scheduler/azure-mgmt-scheduler/azure/mgmt/scheduler/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "2.0.0" +VERSION = "2016-03-01"