diff --git a/sdk/maps/azure-mgmt-maps/MANIFEST.in b/sdk/maps/azure-mgmt-maps/MANIFEST.in index bb37a2723dae..e4884efef41b 100644 --- a/sdk/maps/azure-mgmt-maps/MANIFEST.in +++ b/sdk/maps/azure-mgmt-maps/MANIFEST.in @@ -1 +1,5 @@ +recursive-include tests *.py *.yaml include *.rst +include azure/__init__.py +include azure/mgmt/__init__.py + diff --git a/sdk/maps/azure-mgmt-maps/README.rst b/sdk/maps/azure-mgmt-maps/README.rst index 3b598249b1d0..2b0f1c661cf2 100644 --- a/sdk/maps/azure-mgmt-maps/README.rst +++ b/sdk/maps/azure-mgmt-maps/README.rst @@ -14,25 +14,6 @@ For the older Azure Service Management (ASM) libraries, see For a more complete set of Azure libraries, see the `azure `__ bundle package. -Compatibility -============= - -**IMPORTANT**: If you have an earlier version of the azure package -(version < 1.0), you should uninstall it before installing this package. - -You can check the version using pip: - -.. code:: shell - - pip freeze - -If you see azure==0.11.0 (or any version below 1.0), uninstall it first: - -.. code:: shell - - pip uninstall azure - - Usage ===== diff --git a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/__init__.py b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/__init__.py index 4bdf8309fed0..75ede417009d 100644 --- a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/__init__.py +++ b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/__init__.py @@ -14,6 +14,7 @@ from .error_py3 import Error, ErrorException from .resource_py3 import Resource from .sku_py3 import Sku + from .maps_account_properties_py3 import MapsAccountProperties from .maps_account_py3 import MapsAccount from .maps_account_create_parameters_py3 import MapsAccountCreateParameters from .maps_account_update_parameters_py3 import MapsAccountUpdateParameters @@ -27,6 +28,7 @@ from .error import Error, ErrorException from .resource import Resource from .sku import Sku + from .maps_account_properties import MapsAccountProperties from .maps_account import MapsAccount from .maps_account_create_parameters import MapsAccountCreateParameters from .maps_account_update_parameters import MapsAccountUpdateParameters @@ -46,6 +48,7 @@ 'Error', 'ErrorException', 'Resource', 'Sku', + 'MapsAccountProperties', 'MapsAccount', 'MapsAccountCreateParameters', 'MapsAccountUpdateParameters', diff --git a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account.py b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account.py index 74524c9d67c4..3ae3438d3fc2 100644 --- a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account.py +++ b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account.py @@ -35,6 +35,8 @@ class MapsAccount(Resource): :vartype tags: dict[str, str] :ivar sku: The SKU of this account. :vartype sku: ~azure.mgmt.maps.models.Sku + :ivar properties: The map account properties. + :vartype properties: ~azure.mgmt.maps.models.MapsAccountProperties """ _validation = { @@ -44,6 +46,7 @@ class MapsAccount(Resource): 'location': {'readonly': True}, 'tags': {'readonly': True}, 'sku': {'readonly': True}, + 'properties': {'readonly': True}, } _attribute_map = { @@ -53,6 +56,7 @@ class MapsAccount(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'Sku'}, + 'properties': {'key': 'properties', 'type': 'MapsAccountProperties'}, } def __init__(self, **kwargs): @@ -60,3 +64,4 @@ def __init__(self, **kwargs): self.location = None self.tags = None self.sku = None + self.properties = None diff --git a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_properties.py b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_properties.py new file mode 100644 index 000000000000..990eaf7dc1e3 --- /dev/null +++ b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_properties.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 MapsAccountProperties(Model): + """Additional Map account properties. + + :param x_ms_client_id: A unique identifier for the maps account + :type x_ms_client_id: str + """ + + _attribute_map = { + 'x_ms_client_id': {'key': 'x-ms-client-id', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(MapsAccountProperties, self).__init__(**kwargs) + self.x_ms_client_id = kwargs.get('x_ms_client_id', None) diff --git a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_properties_py3.py b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_properties_py3.py new file mode 100644 index 000000000000..825ff9f09e5b --- /dev/null +++ b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_properties_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 MapsAccountProperties(Model): + """Additional Map account properties. + + :param x_ms_client_id: A unique identifier for the maps account + :type x_ms_client_id: str + """ + + _attribute_map = { + 'x_ms_client_id': {'key': 'x-ms-client-id', 'type': 'str'}, + } + + def __init__(self, *, x_ms_client_id: str=None, **kwargs) -> None: + super(MapsAccountProperties, self).__init__(**kwargs) + self.x_ms_client_id = x_ms_client_id diff --git a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_py3.py b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_py3.py index 96745b19eadc..481eee13c473 100644 --- a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_py3.py +++ b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/models/maps_account_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class MapsAccount(Resource): @@ -35,6 +35,8 @@ class MapsAccount(Resource): :vartype tags: dict[str, str] :ivar sku: The SKU of this account. :vartype sku: ~azure.mgmt.maps.models.Sku + :ivar properties: The map account properties. + :vartype properties: ~azure.mgmt.maps.models.MapsAccountProperties """ _validation = { @@ -44,6 +46,7 @@ class MapsAccount(Resource): 'location': {'readonly': True}, 'tags': {'readonly': True}, 'sku': {'readonly': True}, + 'properties': {'readonly': True}, } _attribute_map = { @@ -53,6 +56,7 @@ class MapsAccount(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'sku': {'key': 'sku', 'type': 'Sku'}, + 'properties': {'key': 'properties', 'type': 'MapsAccountProperties'}, } def __init__(self, **kwargs) -> None: @@ -60,3 +64,4 @@ def __init__(self, **kwargs) -> None: self.location = None self.tags = None self.sku = None + self.properties = None diff --git a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/operations/accounts_operations.py b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/operations/accounts_operations.py index cebc41e84ae6..0081e429c897 100644 --- a/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/operations/accounts_operations.py +++ b/sdk/maps/azure-mgmt-maps/azure/mgmt/maps/operations/accounts_operations.py @@ -75,6 +75,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()) @@ -87,9 +88,8 @@ def create_or_update( body_content = self._serialize.body(maps_account_create_parameters, 'MapsAccountCreateParameters') # 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]: raise models.ErrorException(self._deserialize, response) @@ -153,6 +153,7 @@ def 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()) @@ -165,9 +166,8 @@ def update( body_content = self._serialize.body(maps_account_update_parameters, 'MapsAccountUpdateParameters') # 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, 404]: raise models.ErrorException(self._deserialize, response) @@ -217,7 +217,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: @@ -226,8 +225,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, 204]: raise models.ErrorException(self._deserialize, response) @@ -271,7 +270,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: @@ -280,8 +279,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, 404]: raise models.ErrorException(self._deserialize, response) @@ -336,7 +335,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: @@ -345,9 +344,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]: raise models.ErrorException(self._deserialize, response) @@ -400,7 +398,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: @@ -409,9 +407,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]: raise models.ErrorException(self._deserialize, response) @@ -481,9 +478,8 @@ def move( body_content = self._serialize.body(move_request, 'MapsAccountsMoveRequest') # 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.ErrorException(self._deserialize, response) @@ -529,7 +525,7 @@ def list_keys( # 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: @@ -538,8 +534,8 @@ def list_keys( 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, 404]: raise models.ErrorException(self._deserialize, response) @@ -596,6 +592,7 @@ def regenerate_keys( # 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()) @@ -608,9 +605,8 @@ def regenerate_keys( body_content = self._serialize.body(key_specification, 'MapsKeySpecification') # 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, 404]: raise models.ErrorException(self._deserialize, response) @@ -658,7 +654,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: @@ -667,9 +663,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]: raise models.ErrorException(self._deserialize, response) diff --git a/sdk/maps/azure-mgmt-maps/setup.py b/sdk/maps/azure-mgmt-maps/setup.py index b2a19d8b995d..86f8161eb197 100644 --- a/sdk/maps/azure-mgmt-maps/setup.py +++ b/sdk/maps/azure-mgmt-maps/setup.py @@ -53,6 +53,7 @@ version=version, description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com',