diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py deleted file mode 100644 index 63040e0a0149..000000000000 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py +++ /dev/null @@ -1,105 +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. -# -# Code generated by Microsoft (R) AutoRest Code Generator. -# Changes may cause incorrect behavior and will be lost if the code is -# regenerated. -# -------------------------------------------------------------------------- - -from msrest.service_client import SDKClient -from msrest import Serializer, Deserializer -from msrestazure import AzureConfiguration -from .version import VERSION -from .operations.container_groups_operations import ContainerGroupsOperations -from .operations.operations import Operations -from .operations.container_group_usage_operations import ContainerGroupUsageOperations -from .operations.container_operations import ContainerOperations -from .operations.service_association_link_operations import ServiceAssociationLinkOperations -from . import models - - -class ContainerInstanceManagementClientConfiguration(AzureConfiguration): - """Configuration for ContainerInstanceManagementClient - Note that all parameters used to create this instance are saved as instance - attributes. - - :param credentials: Credentials needed for the client to connect to Azure. - :type credentials: :mod:`A msrestazure Credentials - object` - :param subscription_id: Subscription credentials which uniquely identify - Microsoft Azure subscription. The subscription ID forms part of the URI - for every service call. - :type subscription_id: str - :param str base_url: Service URL - """ - - def __init__( - self, credentials, subscription_id, base_url=None): - - if credentials is None: - raise ValueError("Parameter 'credentials' must not be None.") - if subscription_id is None: - raise ValueError("Parameter 'subscription_id' must not be None.") - if not base_url: - base_url = 'https://management.azure.com' - - super(ContainerInstanceManagementClientConfiguration, self).__init__(base_url) - - self.add_user_agent('azure-mgmt-containerinstance/{}'.format(VERSION)) - self.add_user_agent('Azure-SDK-For-Python') - - self.credentials = credentials - self.subscription_id = subscription_id - - -class ContainerInstanceManagementClient(SDKClient): - """ContainerInstanceManagementClient - - :ivar config: Configuration for client. - :vartype config: ContainerInstanceManagementClientConfiguration - - :ivar container_groups: ContainerGroups operations - :vartype container_groups: azure.mgmt.containerinstance.operations.ContainerGroupsOperations - :ivar operations: Operations operations - :vartype operations: azure.mgmt.containerinstance.operations.Operations - :ivar container_group_usage: ContainerGroupUsage operations - :vartype container_group_usage: azure.mgmt.containerinstance.operations.ContainerGroupUsageOperations - :ivar container: Container operations - :vartype container: azure.mgmt.containerinstance.operations.ContainerOperations - :ivar service_association_link: ServiceAssociationLink operations - :vartype service_association_link: azure.mgmt.containerinstance.operations.ServiceAssociationLinkOperations - - :param credentials: Credentials needed for the client to connect to Azure. - :type credentials: :mod:`A msrestazure Credentials - object` - :param subscription_id: Subscription credentials which uniquely identify - Microsoft Azure subscription. The subscription ID forms part of the URI - for every service call. - :type subscription_id: str - :param str base_url: Service URL - """ - - def __init__( - self, credentials, subscription_id, base_url=None): - - self.config = ContainerInstanceManagementClientConfiguration(credentials, subscription_id, base_url) - super(ContainerInstanceManagementClient, 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-10-01' - self._serialize = Serializer(client_models) - self._deserialize = Deserializer(client_models) - - self.container_groups = ContainerGroupsOperations( - self._client, self.config, self._serialize, self._deserialize) - self.operations = Operations( - self._client, self.config, self._serialize, self._deserialize) - self.container_group_usage = ContainerGroupUsageOperations( - self._client, self.config, self._serialize, self._deserialize) - self.container = ContainerOperations( - self._client, self.config, self._serialize, self._deserialize) - self.service_association_link = ServiceAssociationLinkOperations( - self._client, self.config, self._serialize, self._deserialize) diff --git a/azure-mgmt-containerinstance/dev_requirements.txt b/azure-mgmt-containerinstance/dev_requirements.txt deleted file mode 100644 index 331cfed8ea26..000000000000 --- a/azure-mgmt-containerinstance/dev_requirements.txt +++ /dev/null @@ -1 +0,0 @@ --e ../azure-sdk-tools diff --git a/azure-mgmt-containerinstance/HISTORY.rst b/sdk/containerinstance/azure-mgmt-containerinstance/HISTORY.rst similarity index 97% rename from azure-mgmt-containerinstance/HISTORY.rst rename to sdk/containerinstance/azure-mgmt-containerinstance/HISTORY.rst index d88b93354f0f..63c86f1a7ac1 100644 --- a/azure-mgmt-containerinstance/HISTORY.rst +++ b/sdk/containerinstance/azure-mgmt-containerinstance/HISTORY.rst @@ -3,6 +3,13 @@ Release History =============== +1.5.0 (2019-05-22) +++++++++++++++++++ + +**Features** + +- Add client level operations list_cached_images and list_capabilities + 1.4.1 (2019-04-01) ++++++++++++++++++ diff --git a/azure-mgmt-containerinstance/MANIFEST.in b/sdk/containerinstance/azure-mgmt-containerinstance/MANIFEST.in similarity index 100% rename from azure-mgmt-containerinstance/MANIFEST.in rename to sdk/containerinstance/azure-mgmt-containerinstance/MANIFEST.in diff --git a/azure-mgmt-containerinstance/README.rst b/sdk/containerinstance/azure-mgmt-containerinstance/README.rst similarity index 100% rename from azure-mgmt-containerinstance/README.rst rename to sdk/containerinstance/azure-mgmt-containerinstance/README.rst diff --git a/azure-mgmt-containerinstance/azure/__init__.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/__init__.py similarity index 100% rename from azure-mgmt-containerinstance/azure/__init__.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/__init__.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/__init__.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/__init__.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/__init__.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/__init__.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/__init__.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/__init__.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/__init__.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/__init__.py diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py new file mode 100644 index 000000000000..3de375593227 --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py @@ -0,0 +1,233 @@ +# 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.service_client import SDKClient +from msrest import Serializer, Deserializer +from msrestazure import AzureConfiguration +from .version import VERSION +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling +import uuid +from .operations.container_groups_operations import ContainerGroupsOperations +from .operations.operations import Operations +from .operations.container_group_usage_operations import ContainerGroupUsageOperations +from .operations.container_operations import ContainerOperations +from .operations.service_association_link_operations import ServiceAssociationLinkOperations +from . import models + + +class ContainerInstanceManagementClientConfiguration(AzureConfiguration): + """Configuration for ContainerInstanceManagementClient + Note that all parameters used to create this instance are saved as instance + attributes. + + :param credentials: Credentials needed for the client to connect to Azure. + :type credentials: :mod:`A msrestazure Credentials + object` + :param subscription_id: Subscription credentials which uniquely identify + Microsoft Azure subscription. The subscription ID forms part of the URI + for every service call. + :type subscription_id: str + :param str base_url: Service URL + """ + + def __init__( + self, credentials, subscription_id, base_url=None): + + if credentials is None: + raise ValueError("Parameter 'credentials' must not be None.") + if subscription_id is None: + raise ValueError("Parameter 'subscription_id' must not be None.") + if not base_url: + base_url = 'https://management.azure.com' + + super(ContainerInstanceManagementClientConfiguration, self).__init__(base_url) + + self.add_user_agent('azure-mgmt-containerinstance/{}'.format(VERSION)) + self.add_user_agent('Azure-SDK-For-Python') + + self.credentials = credentials + self.subscription_id = subscription_id + + +class ContainerInstanceManagementClient(SDKClient): + """ContainerInstanceManagementClient + + :ivar config: Configuration for client. + :vartype config: ContainerInstanceManagementClientConfiguration + + :ivar container_groups: ContainerGroups operations + :vartype container_groups: azure.mgmt.containerinstance.operations.ContainerGroupsOperations + :ivar operations: Operations operations + :vartype operations: azure.mgmt.containerinstance.operations.Operations + :ivar container_group_usage: ContainerGroupUsage operations + :vartype container_group_usage: azure.mgmt.containerinstance.operations.ContainerGroupUsageOperations + :ivar container: Container operations + :vartype container: azure.mgmt.containerinstance.operations.ContainerOperations + :ivar service_association_link: ServiceAssociationLink operations + :vartype service_association_link: azure.mgmt.containerinstance.operations.ServiceAssociationLinkOperations + + :param credentials: Credentials needed for the client to connect to Azure. + :type credentials: :mod:`A msrestazure Credentials + object` + :param subscription_id: Subscription credentials which uniquely identify + Microsoft Azure subscription. The subscription ID forms part of the URI + for every service call. + :type subscription_id: str + :param str base_url: Service URL + """ + + def __init__( + self, credentials, subscription_id, base_url=None): + + self.config = ContainerInstanceManagementClientConfiguration(credentials, subscription_id, base_url) + super(ContainerInstanceManagementClient, 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-10-01' + self._serialize = Serializer(client_models) + self._deserialize = Deserializer(client_models) + + self.container_groups = ContainerGroupsOperations( + self._client, self.config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self.config, self._serialize, self._deserialize) + self.container_group_usage = ContainerGroupUsageOperations( + self._client, self.config, self._serialize, self._deserialize) + self.container = ContainerOperations( + self._client, self.config, self._serialize, self._deserialize) + self.service_association_link = ServiceAssociationLinkOperations( + self._client, self.config, self._serialize, self._deserialize) + + def list_cached_images( + self, location, custom_headers=None, raw=False, **operation_config): + """Get the list of cached images. + + Get the list of cached images on specific OS type for a subscription in + a region. + + :param location: The identifier for the physical azure location. + :type location: str + :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`. + :return: CachedImagesListResult or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.containerinstance.models.CachedImagesListResult or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.list_cached_images.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'location': self._serialize.url("location", location, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + 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: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('CachedImagesListResult', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list_cached_images.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.ContainerInstance/locations/{location}/cachedImages'} + + def list_capabilities( + self, location, custom_headers=None, raw=False, **operation_config): + """Get the list of capabilities of the location. + + Get the list of CPU/memory/GPU capabilities of a region. + + :param location: The identifier for the physical azure location. + :type location: str + :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`. + :return: CapabilitiesListResult or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.containerinstance.models.CapabilitiesListResult or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.list_capabilities.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), + 'location': self._serialize.url("location", location, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + 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: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + 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, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('CapabilitiesListResult', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + list_capabilities.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.ContainerInstance/locations/{location}/capabilities'} diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py similarity index 89% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py index 29648c6c4f55..943b8e9964c9 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py @@ -49,6 +49,11 @@ from .container_exec_request_py3 import ContainerExecRequest from .container_exec_response_py3 import ContainerExecResponse from .resource_py3 import Resource + from .cached_images_py3 import CachedImages + from .cached_images_list_result_py3 import CachedImagesListResult + from .capabilities_capabilities_py3 import CapabilitiesCapabilities + from .capabilities_py3 import Capabilities + from .capabilities_list_result_py3 import CapabilitiesListResult except (SyntaxError, ImportError): from .container_port import ContainerPort from .environment_variable import EnvironmentVariable @@ -89,6 +94,11 @@ from .container_exec_request import ContainerExecRequest from .container_exec_response import ContainerExecResponse from .resource import Resource + from .cached_images import CachedImages + from .cached_images_list_result import CachedImagesListResult + from .capabilities_capabilities import CapabilitiesCapabilities + from .capabilities import Capabilities + from .capabilities_list_result import CapabilitiesListResult from .container_group_paged import ContainerGroupPaged from .container_instance_management_client_enums import ( ContainerNetworkProtocol, @@ -142,6 +152,11 @@ 'ContainerExecRequest', 'ContainerExecResponse', 'Resource', + 'CachedImages', + 'CachedImagesListResult', + 'CapabilitiesCapabilities', + 'Capabilities', + 'CapabilitiesListResult', 'ContainerGroupPaged', 'ContainerNetworkProtocol', 'GpuSku', diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/azure_file_volume.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/azure_file_volume.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/azure_file_volume.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/azure_file_volume.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/azure_file_volume_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/azure_file_volume_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/azure_file_volume_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/azure_file_volume_py3.py diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images.py new file mode 100644 index 000000000000..9018c5622062 --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images.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 CachedImages(Model): + """The cached image and OS type. + + All required parameters must be populated in order to send to Azure. + + :param id: The resource Id of the cached image. + :type id: str + :param os_type: Required. The OS type of the cached image. + :type os_type: str + :param image: Required. The cached image name. + :type image: str + """ + + _validation = { + 'os_type': {'required': True}, + 'image': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + 'image': {'key': 'image', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(CachedImages, self).__init__(**kwargs) + self.id = kwargs.get('id', None) + self.os_type = kwargs.get('os_type', None) + self.image = kwargs.get('image', None) diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_list_result.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_list_result.py new file mode 100644 index 000000000000..0f0c26bd8ba0 --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_list_result.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 CachedImagesListResult(Model): + """The response containing cached images. + + :param value: The list of cached images. + :type value: list[~azure.mgmt.containerinstance.models.CachedImages] + :param next_link: The URI to fetch the next page of cached images. + :type next_link: str + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': '[CachedImages]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(CachedImagesListResult, self).__init__(**kwargs) + self.value = kwargs.get('value', None) + self.next_link = kwargs.get('next_link', None) diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_list_result_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_list_result_py3.py new file mode 100644 index 000000000000..7cec9aa2417d --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_list_result_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 CachedImagesListResult(Model): + """The response containing cached images. + + :param value: The list of cached images. + :type value: list[~azure.mgmt.containerinstance.models.CachedImages] + :param next_link: The URI to fetch the next page of cached images. + :type next_link: str + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': '[CachedImages]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__(self, *, value=None, next_link: str=None, **kwargs) -> None: + super(CachedImagesListResult, self).__init__(**kwargs) + self.value = value + self.next_link = next_link diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_py3.py new file mode 100644 index 000000000000..beb9fd972dcc --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/cached_images_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 CachedImages(Model): + """The cached image and OS type. + + All required parameters must be populated in order to send to Azure. + + :param id: The resource Id of the cached image. + :type id: str + :param os_type: Required. The OS type of the cached image. + :type os_type: str + :param image: Required. The cached image name. + :type image: str + """ + + _validation = { + 'os_type': {'required': True}, + 'image': {'required': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + 'image': {'key': 'image', 'type': 'str'}, + } + + def __init__(self, *, os_type: str, image: str, id: str=None, **kwargs) -> None: + super(CachedImages, self).__init__(**kwargs) + self.id = id + self.os_type = os_type + self.image = image diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities.py new file mode 100644 index 000000000000..dd2a197cf38f --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities.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 Capabilities(Model): + """The regional capabilities. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar resource_type: The resource type that this capability describes. + :vartype resource_type: str + :ivar os_type: The OS type that this capability describes. + :vartype os_type: str + :ivar location: The resource location. + :vartype location: str + :ivar ip_address_type: The ip address type that this capability describes. + :vartype ip_address_type: str + :ivar gpu: The GPU sku that this capability describes. + :vartype gpu: str + :ivar capabilities: The supported capabilities. + :vartype capabilities: + ~azure.mgmt.containerinstance.models.CapabilitiesCapabilities + """ + + _validation = { + 'resource_type': {'readonly': True}, + 'os_type': {'readonly': True}, + 'location': {'readonly': True}, + 'ip_address_type': {'readonly': True}, + 'gpu': {'readonly': True}, + 'capabilities': {'readonly': True}, + } + + _attribute_map = { + 'resource_type': {'key': 'resourceType', 'type': 'str'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'ip_address_type': {'key': 'ipAddressType', 'type': 'str'}, + 'gpu': {'key': 'gpu', 'type': 'str'}, + 'capabilities': {'key': 'capabilities', 'type': 'CapabilitiesCapabilities'}, + } + + def __init__(self, **kwargs): + super(Capabilities, self).__init__(**kwargs) + self.resource_type = None + self.os_type = None + self.location = None + self.ip_address_type = None + self.gpu = None + self.capabilities = None diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_capabilities.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_capabilities.py new file mode 100644 index 000000000000..5d07d07995dc --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_capabilities.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 CapabilitiesCapabilities(Model): + """The supported capabilities. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar max_memory_in_gb: The maximum allowed memory request in GB. + :vartype max_memory_in_gb: float + :ivar max_cpu: The maximum allowed CPU request in cores. + :vartype max_cpu: float + :ivar max_gpu_count: The maximum allowed GPU count. + :vartype max_gpu_count: float + """ + + _validation = { + 'max_memory_in_gb': {'readonly': True}, + 'max_cpu': {'readonly': True}, + 'max_gpu_count': {'readonly': True}, + } + + _attribute_map = { + 'max_memory_in_gb': {'key': 'maxMemoryInGB', 'type': 'float'}, + 'max_cpu': {'key': 'maxCpu', 'type': 'float'}, + 'max_gpu_count': {'key': 'maxGpuCount', 'type': 'float'}, + } + + def __init__(self, **kwargs): + super(CapabilitiesCapabilities, self).__init__(**kwargs) + self.max_memory_in_gb = None + self.max_cpu = None + self.max_gpu_count = None diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_capabilities_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_capabilities_py3.py new file mode 100644 index 000000000000..292992d86fdf --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_capabilities_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 CapabilitiesCapabilities(Model): + """The supported capabilities. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar max_memory_in_gb: The maximum allowed memory request in GB. + :vartype max_memory_in_gb: float + :ivar max_cpu: The maximum allowed CPU request in cores. + :vartype max_cpu: float + :ivar max_gpu_count: The maximum allowed GPU count. + :vartype max_gpu_count: float + """ + + _validation = { + 'max_memory_in_gb': {'readonly': True}, + 'max_cpu': {'readonly': True}, + 'max_gpu_count': {'readonly': True}, + } + + _attribute_map = { + 'max_memory_in_gb': {'key': 'maxMemoryInGB', 'type': 'float'}, + 'max_cpu': {'key': 'maxCpu', 'type': 'float'}, + 'max_gpu_count': {'key': 'maxGpuCount', 'type': 'float'}, + } + + def __init__(self, **kwargs) -> None: + super(CapabilitiesCapabilities, self).__init__(**kwargs) + self.max_memory_in_gb = None + self.max_cpu = None + self.max_gpu_count = None diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_list_result.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_list_result.py new file mode 100644 index 000000000000..d11a161fcdc5 --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_list_result.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 CapabilitiesListResult(Model): + """The response containing list of capabilities. + + :param value: The list of capabilities. + :type value: list[~azure.mgmt.containerinstance.models.Capabilities] + :param next_link: The URI to fetch the next page of capabilities. + :type next_link: str + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': '[Capabilities]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(CapabilitiesListResult, self).__init__(**kwargs) + self.value = kwargs.get('value', None) + self.next_link = kwargs.get('next_link', None) diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_list_result_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_list_result_py3.py new file mode 100644 index 000000000000..396a636eca4e --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_list_result_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 CapabilitiesListResult(Model): + """The response containing list of capabilities. + + :param value: The list of capabilities. + :type value: list[~azure.mgmt.containerinstance.models.Capabilities] + :param next_link: The URI to fetch the next page of capabilities. + :type next_link: str + """ + + _attribute_map = { + 'value': {'key': 'value', 'type': '[Capabilities]'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + } + + def __init__(self, *, value=None, next_link: str=None, **kwargs) -> None: + super(CapabilitiesListResult, self).__init__(**kwargs) + self.value = value + self.next_link = next_link diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_py3.py new file mode 100644 index 000000000000..69767a4af6ed --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/capabilities_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 Capabilities(Model): + """The regional capabilities. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar resource_type: The resource type that this capability describes. + :vartype resource_type: str + :ivar os_type: The OS type that this capability describes. + :vartype os_type: str + :ivar location: The resource location. + :vartype location: str + :ivar ip_address_type: The ip address type that this capability describes. + :vartype ip_address_type: str + :ivar gpu: The GPU sku that this capability describes. + :vartype gpu: str + :ivar capabilities: The supported capabilities. + :vartype capabilities: + ~azure.mgmt.containerinstance.models.CapabilitiesCapabilities + """ + + _validation = { + 'resource_type': {'readonly': True}, + 'os_type': {'readonly': True}, + 'location': {'readonly': True}, + 'ip_address_type': {'readonly': True}, + 'gpu': {'readonly': True}, + 'capabilities': {'readonly': True}, + } + + _attribute_map = { + 'resource_type': {'key': 'resourceType', 'type': 'str'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'ip_address_type': {'key': 'ipAddressType', 'type': 'str'}, + 'gpu': {'key': 'gpu', 'type': 'str'}, + 'capabilities': {'key': 'capabilities', 'type': 'CapabilitiesCapabilities'}, + } + + def __init__(self, **kwargs) -> None: + super(Capabilities, self).__init__(**kwargs) + self.resource_type = None + self.os_type = None + self.location = None + self.ip_address_type = None + self.gpu = None + self.capabilities = None diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_terminal_size.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_terminal_size.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_terminal_size.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_terminal_size.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_terminal_size_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_terminal_size_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_terminal_size_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_request_terminal_size_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_user_assigned_identities_value.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_user_assigned_identities_value.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_user_assigned_identities_value.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_user_assigned_identities_value.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_user_assigned_identities_value_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_user_assigned_identities_value_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_user_assigned_identities_value_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_identity_user_assigned_identities_value_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_network_profile_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_paged.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_paged.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_paged.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_paged.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_properties_instance_view.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_properties_instance_view.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_properties_instance_view.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_properties_instance_view.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_properties_instance_view_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_properties_instance_view_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_properties_instance_view_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_properties_instance_view_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_instance_management_client_enums.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_instance_management_client_enums.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_instance_management_client_enums.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_instance_management_client_enums.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_port.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_port.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_port.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_port.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_port_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_port_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_port_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_port_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_properties_instance_view.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_properties_instance_view.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_properties_instance_view.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_properties_instance_view.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_properties_instance_view_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_properties_instance_view_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_properties_instance_view_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_properties_instance_view_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/dns_configuration.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/dns_configuration.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/dns_configuration.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/dns_configuration.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/dns_configuration_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/dns_configuration_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/dns_configuration_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/dns_configuration_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/git_repo_volume.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/git_repo_volume.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/git_repo_volume.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/git_repo_volume.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/git_repo_volume_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/git_repo_volume_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/git_repo_volume_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/git_repo_volume_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/gpu_resource.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/gpu_resource.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/gpu_resource.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/gpu_resource.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/gpu_resource_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/gpu_resource_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/gpu_resource_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/gpu_resource_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/image_registry_credential.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/image_registry_credential.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/image_registry_credential.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/image_registry_credential.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/image_registry_credential_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/image_registry_credential_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/image_registry_credential_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/image_registry_credential_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/ip_address_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py similarity index 89% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py index 80c154e22d77..7954dc8cfc36 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py @@ -21,6 +21,8 @@ class Operation(Model): :type name: str :param display: Required. The display information of the operation. :type display: ~azure.mgmt.containerinstance.models.OperationDisplay + :param properties: The additional properties. + :type properties: object :param origin: The intended executor of the operation. Possible values include: 'User', 'System' :type origin: str or @@ -35,6 +37,7 @@ class Operation(Model): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'display': {'key': 'display', 'type': 'OperationDisplay'}, + 'properties': {'key': 'properties', 'type': 'object'}, 'origin': {'key': 'origin', 'type': 'str'}, } @@ -42,4 +45,5 @@ def __init__(self, **kwargs): super(Operation, self).__init__(**kwargs) self.name = kwargs.get('name', None) self.display = kwargs.get('display', None) + self.properties = kwargs.get('properties', None) self.origin = kwargs.get('origin', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_list_result.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_list_result.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_list_result.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_list_result.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_list_result_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_list_result_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_list_result_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_list_result_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py similarity index 84% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py index bf808f78f281..85b72cc7e0c8 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py @@ -21,6 +21,8 @@ class Operation(Model): :type name: str :param display: Required. The display information of the operation. :type display: ~azure.mgmt.containerinstance.models.OperationDisplay + :param properties: The additional properties. + :type properties: object :param origin: The intended executor of the operation. Possible values include: 'User', 'System' :type origin: str or @@ -35,11 +37,13 @@ class Operation(Model): _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'display': {'key': 'display', 'type': 'OperationDisplay'}, + 'properties': {'key': 'properties', 'type': 'object'}, 'origin': {'key': 'origin', 'type': 'str'}, } - def __init__(self, *, name: str, display, origin=None, **kwargs) -> None: + def __init__(self, *, name: str, display, properties=None, origin=None, **kwargs) -> None: super(Operation, self).__init__(**kwargs) self.name = name self.display = display + self.properties = properties self.origin = origin diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/port.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/port.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/port.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/port.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/port_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/port_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/port_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/port_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_limits.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_limits.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_limits.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_limits.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_limits_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_limits_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_limits_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_limits_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requests.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requests.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requests.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requests.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requests_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requests_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requests_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requests_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requirements.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requirements.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requirements.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requirements.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requirements_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requirements_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requirements_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/resource_requirements_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_list_result.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_list_result.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_list_result.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_list_result.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_list_result_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_list_result_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_list_result_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_list_result_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_name.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_name.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_name.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_name.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_name_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_name_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_name_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_name_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/usage_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_mount.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_mount.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_mount.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_mount.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_mount_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_mount_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_mount_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_mount_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_py3.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_py3.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_py3.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/volume_py3.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/__init__.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/__init__.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/__init__.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/__init__.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_groups_operations.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_groups_operations.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_groups_operations.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_groups_operations.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_operations.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_operations.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_operations.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_operations.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/operations.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/operations.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/operations.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/operations.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/service_association_link_operations.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/service_association_link_operations.py similarity index 100% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/service_association_link_operations.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/service_association_link_operations.py diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/version.py b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/version.py similarity index 96% rename from azure-mgmt-containerinstance/azure/mgmt/containerinstance/version.py rename to sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/version.py index 8b959b9c0726..3729c927f0aa 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/version.py +++ b/sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "1.4.1" +VERSION = "1.5.0" diff --git a/sdk/containerinstance/azure-mgmt-containerinstance/dev_requirements.txt b/sdk/containerinstance/azure-mgmt-containerinstance/dev_requirements.txt new file mode 100644 index 000000000000..1f0e0d86b735 --- /dev/null +++ b/sdk/containerinstance/azure-mgmt-containerinstance/dev_requirements.txt @@ -0,0 +1 @@ +-e ../../../azure-sdk-tools diff --git a/azure-mgmt-containerinstance/sdk_packaging.toml b/sdk/containerinstance/azure-mgmt-containerinstance/sdk_packaging.toml similarity index 100% rename from azure-mgmt-containerinstance/sdk_packaging.toml rename to sdk/containerinstance/azure-mgmt-containerinstance/sdk_packaging.toml diff --git a/azure-mgmt-containerinstance/setup.cfg b/sdk/containerinstance/azure-mgmt-containerinstance/setup.cfg similarity index 100% rename from azure-mgmt-containerinstance/setup.cfg rename to sdk/containerinstance/azure-mgmt-containerinstance/setup.cfg diff --git a/azure-mgmt-containerinstance/setup.py b/sdk/containerinstance/azure-mgmt-containerinstance/setup.py similarity index 98% rename from azure-mgmt-containerinstance/setup.py rename to sdk/containerinstance/azure-mgmt-containerinstance/setup.py index 5d32ceb7f0bc..5ce246eb418d 100644 --- a/azure-mgmt-containerinstance/setup.py +++ b/sdk/containerinstance/azure-mgmt-containerinstance/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', diff --git a/azure-mgmt-containerinstance/tests/recordings/test_mgmt_containerinstance.test_container_instance.yaml b/sdk/containerinstance/azure-mgmt-containerinstance/tests/recordings/test_mgmt_containerinstance.test_container_instance.yaml similarity index 100% rename from azure-mgmt-containerinstance/tests/recordings/test_mgmt_containerinstance.test_container_instance.yaml rename to sdk/containerinstance/azure-mgmt-containerinstance/tests/recordings/test_mgmt_containerinstance.test_container_instance.yaml diff --git a/azure-mgmt-containerinstance/tests/test_mgmt_containerinstance.py b/sdk/containerinstance/azure-mgmt-containerinstance/tests/test_mgmt_containerinstance.py similarity index 100% rename from azure-mgmt-containerinstance/tests/test_mgmt_containerinstance.py rename to sdk/containerinstance/azure-mgmt-containerinstance/tests/test_mgmt_containerinstance.py