Skip to content

Commit

Permalink
Merge remote-tracking branch 'Azure/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@lmazuel
lmazuel committed Mar 25, 2016
2 parents 39e21bb + 1040b72 commit 8b83c03
Show file tree
Hide file tree
Showing 34 changed files with 732 additions and 551 deletions.
28 changes: 16 additions & 12 deletions azure-mgmt-cdn/azure/mgmt/cdn/operations/custom_domains_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,14 +205,12 @@ def create(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return :class:`CustomDomain
<azure.mgmt.cdn.models.CustomDomain>` or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns :class:`CustomDomain
<azure.mgmt.cdn.models.CustomDomain>`
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
custom_domain_properties = models.CustomDomainParameters(host_name=host_name)

Expand Down Expand Up @@ -276,6 +274,10 @@ def get_long_running_output(response):

return deserialized

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand Down Expand Up @@ -372,14 +374,12 @@ def delete_if_exists(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return :class:`CustomDomain
<azure.mgmt.cdn.models.CustomDomain>` or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns :class:`CustomDomain
<azure.mgmt.cdn.models.CustomDomain>`
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/customDomains/{customDomainName}'
Expand Down Expand Up @@ -435,6 +435,10 @@ def get_long_running_output(response):

return deserialized

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand Down
88 changes: 51 additions & 37 deletions azure-mgmt-cdn/azure/mgmt/cdn/operations/endpoints_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,12 @@ def create(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return :class:`Endpoint
<azure.mgmt.cdn.models.Endpoint>` or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns :class:`Endpoint
<azure.mgmt.cdn.models.Endpoint>`
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}'
Expand Down Expand Up @@ -262,6 +260,10 @@ def get_long_running_output(response):

return deserialized

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand Down Expand Up @@ -291,14 +293,12 @@ def update(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return :class:`Endpoint
<azure.mgmt.cdn.models.Endpoint>` or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns :class:`Endpoint
<azure.mgmt.cdn.models.Endpoint>`
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}'
Expand Down Expand Up @@ -359,6 +359,10 @@ def get_long_running_output(response):

return deserialized

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand All @@ -382,13 +386,11 @@ def delete_if_exists(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return None or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns None
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}'
Expand Down Expand Up @@ -436,6 +438,10 @@ def get_long_running_output(response):
client_raw_response = ClientRawResponse(None, response)
return client_raw_response

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand All @@ -459,13 +465,11 @@ def start(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return None or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns None
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/start'
Expand Down Expand Up @@ -513,6 +517,10 @@ def get_long_running_output(response):
client_raw_response = ClientRawResponse(None, response)
return client_raw_response

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand All @@ -536,13 +544,11 @@ def stop(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return None or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns None
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/stop'
Expand Down Expand Up @@ -590,6 +596,10 @@ def get_long_running_output(response):
client_raw_response = ClientRawResponse(None, response)
return client_raw_response

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand All @@ -616,13 +626,11 @@ def purge_content(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return None or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns None
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
content_file_paths = models.PurgeParameters(content_paths=content_paths)

Expand Down Expand Up @@ -676,6 +684,10 @@ def get_long_running_output(response):
client_raw_response = ClientRawResponse(None, response)
return client_raw_response

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand All @@ -702,13 +714,11 @@ def load_content(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return None or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns None
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
content_file_paths = models.LoadParameters(content_paths=content_paths)

Expand Down Expand Up @@ -762,6 +772,10 @@ def get_long_running_output(response):
client_raw_response = ClientRawResponse(None, response)
return client_raw_response

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand Down
39 changes: 21 additions & 18 deletions azure-mgmt-cdn/azure/mgmt/cdn/operations/origins_operations.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,11 @@ def create(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return :class:`Origin
<azure.mgmt.cdn.models.Origin>` or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns :class:`Origin <azure.mgmt.cdn.models.Origin>`
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/origins/{originName}'
Expand Down Expand Up @@ -273,6 +270,10 @@ def get_long_running_output(response):

return deserialized

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand Down Expand Up @@ -302,14 +303,11 @@ def update(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return :class:`Origin
<azure.mgmt.cdn.models.Origin>` or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns :class:`Origin <azure.mgmt.cdn.models.Origin>`
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/origins/{originName}'
Expand Down Expand Up @@ -371,6 +369,10 @@ def get_long_running_output(response):

return deserialized

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand All @@ -397,14 +399,11 @@ def delete_if_exists(
:param dict custom_headers: headers that will be added to the request
:param bool raw: returns the direct response alongside the
deserialized response
:param operation_config: :ref:`Operation configuration
overrides<msrest:optionsforoperations>`.
:rtype:
:class:`AzureOperationPoller<msrestazure.azure_operation.AzureOperationPoller>`
:return: A poller object which can return :class:`Origin
<azure.mgmt.cdn.models.Origin>` or
:class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>` if
raw=true
instance that returns :class:`Origin <azure.mgmt.cdn.models.Origin>`
:rtype: :class:`ClientRawResponse<msrest.pipeline.ClientRawResponse>`
if raw=true
"""
# Construct URL
url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Cdn/profiles/{profileName}/endpoints/{endpointName}/origins/{originName}'
Expand Down Expand Up @@ -460,6 +459,10 @@ def get_long_running_output(response):

return deserialized

if raw:
response = long_running_send()
return get_long_running_output(response)

long_running_operation_timeout = operation_config.get(
'long_running_operation_timeout',
self.config.long_running_operation_timeout)
Expand Down
Loading

0 comments on commit 8b83c03

Please sign in to comment.