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 index 63d72f9bcaf9..e935d07f7f1c 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/container_instance_management_client.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.service_client import ServiceClient +from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION @@ -55,7 +55,7 @@ def __init__( self.subscription_id = subscription_id -class ContainerInstanceManagementClient(object): +class ContainerInstanceManagementClient(SDKClient): """ContainerInstanceManagementClient :ivar config: Configuration for client. @@ -86,10 +86,10 @@ def __init__( self, credentials, subscription_id, base_url=None): self.config = ContainerInstanceManagementClientConfiguration(credentials, subscription_id, base_url) - self._client = ServiceClient(self.config.credentials, self.config) + 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-04-01' + self.api_version = '2018-06-01' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py index bf283a05231f..1ba2cf55de82 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py @@ -19,6 +19,9 @@ from .resource_limits_py3 import ResourceLimits from .resource_requirements_py3 import ResourceRequirements from .volume_mount_py3 import VolumeMount + from .container_exec_py3 import ContainerExec + from .container_http_get_py3 import ContainerHttpGet + from .container_probe_py3 import ContainerProbe from .container_py3 import Container from .azure_file_volume_py3 import AzureFileVolume from .git_repo_volume_py3 import GitRepoVolume @@ -27,6 +30,8 @@ from .port_py3 import Port from .ip_address_py3 import IpAddress from .container_group_properties_instance_view_py3 import ContainerGroupPropertiesInstanceView + from .log_analytics_py3 import LogAnalytics + from .container_group_diagnostics_py3 import ContainerGroupDiagnostics from .container_group_py3 import ContainerGroup from .operation_display_py3 import OperationDisplay from .operation_py3 import Operation @@ -49,6 +54,9 @@ from .resource_limits import ResourceLimits from .resource_requirements import ResourceRequirements from .volume_mount import VolumeMount + from .container_exec import ContainerExec + from .container_http_get import ContainerHttpGet + from .container_probe import ContainerProbe from .container import Container from .azure_file_volume import AzureFileVolume from .git_repo_volume import GitRepoVolume @@ -57,6 +65,8 @@ from .port import Port from .ip_address import IpAddress from .container_group_properties_instance_view import ContainerGroupPropertiesInstanceView + from .log_analytics import LogAnalytics + from .container_group_diagnostics import ContainerGroupDiagnostics from .container_group import ContainerGroup from .operation_display import OperationDisplay from .operation import Operation @@ -88,6 +98,9 @@ 'ResourceLimits', 'ResourceRequirements', 'VolumeMount', + 'ContainerExec', + 'ContainerHttpGet', + 'ContainerProbe', 'Container', 'AzureFileVolume', 'GitRepoVolume', @@ -96,6 +109,8 @@ 'Port', 'IpAddress', 'ContainerGroupPropertiesInstanceView', + 'LogAnalytics', + 'ContainerGroupDiagnostics', 'ContainerGroup', 'OperationDisplay', 'Operation', diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container.py index c1669d5148c3..98768c78ed4d 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container.py @@ -45,6 +45,10 @@ class Container(Model): instance. :type volume_mounts: list[~azure.mgmt.containerinstance.models.VolumeMount] + :param liveness_probe: The liveness probe. + :type liveness_probe: ~azure.mgmt.containerinstance.models.ContainerProbe + :param readiness_probe: The readiness probe. + :type readiness_probe: ~azure.mgmt.containerinstance.models.ContainerProbe """ _validation = { @@ -63,6 +67,8 @@ class Container(Model): 'instance_view': {'key': 'properties.instanceView', 'type': 'ContainerPropertiesInstanceView'}, 'resources': {'key': 'properties.resources', 'type': 'ResourceRequirements'}, 'volume_mounts': {'key': 'properties.volumeMounts', 'type': '[VolumeMount]'}, + 'liveness_probe': {'key': 'properties.livenessProbe', 'type': 'ContainerProbe'}, + 'readiness_probe': {'key': 'properties.readinessProbe', 'type': 'ContainerProbe'}, } def __init__(self, **kwargs): @@ -75,3 +81,5 @@ def __init__(self, **kwargs): self.instance_view = None self.resources = kwargs.get('resources', None) self.volume_mounts = kwargs.get('volume_mounts', None) + self.liveness_probe = kwargs.get('liveness_probe', None) + self.readiness_probe = kwargs.get('readiness_probe', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec.py new file mode 100644 index 000000000000..2fe3dabdd9d9 --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec.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 ContainerExec(Model): + """The container execution command, for liveness or readiness probe. + + :param command: The commands to execute within the container. + :type command: list[str] + """ + + _attribute_map = { + 'command': {'key': 'command', 'type': '[str]'}, + } + + def __init__(self, **kwargs): + super(ContainerExec, self).__init__(**kwargs) + self.command = kwargs.get('command', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_py3.py new file mode 100644 index 000000000000..6e6d96e30374 --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_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 ContainerExec(Model): + """The container execution command, for liveness or readiness probe. + + :param command: The commands to execute within the container. + :type command: list[str] + """ + + _attribute_map = { + 'command': {'key': 'command', 'type': '[str]'}, + } + + def __init__(self, *, command=None, **kwargs) -> None: + super(ContainerExec, self).__init__(**kwargs) + self.command = command diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.py index 62af20771c0b..a894399a1d96 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.py @@ -15,20 +15,12 @@ class ContainerExecResponse(Model): """The information for the container exec command. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar web_socket_uri: The uri for the exec websocket. - :vartype web_socket_uri: str - :ivar password: The password to start the exec command. - :vartype password: str + :param web_socket_uri: The uri for the exec websocket. + :type web_socket_uri: str + :param password: The password to start the exec command. + :type password: str """ - _validation = { - 'web_socket_uri': {'readonly': True}, - 'password': {'readonly': True}, - } - _attribute_map = { 'web_socket_uri': {'key': 'webSocketUri', 'type': 'str'}, 'password': {'key': 'password', 'type': 'str'}, @@ -36,5 +28,5 @@ class ContainerExecResponse(Model): def __init__(self, **kwargs): super(ContainerExecResponse, self).__init__(**kwargs) - self.web_socket_uri = None - self.password = None + self.web_socket_uri = kwargs.get('web_socket_uri', None) + self.password = kwargs.get('password', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response_py3.py index 599f5ad654c6..9318680514a4 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response_py3.py @@ -15,26 +15,18 @@ class ContainerExecResponse(Model): """The information for the container exec command. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar web_socket_uri: The uri for the exec websocket. - :vartype web_socket_uri: str - :ivar password: The password to start the exec command. - :vartype password: str + :param web_socket_uri: The uri for the exec websocket. + :type web_socket_uri: str + :param password: The password to start the exec command. + :type password: str """ - _validation = { - 'web_socket_uri': {'readonly': True}, - 'password': {'readonly': True}, - } - _attribute_map = { 'web_socket_uri': {'key': 'webSocketUri', 'type': 'str'}, 'password': {'key': 'password', 'type': 'str'}, } - def __init__(self, **kwargs) -> None: + def __init__(self, *, web_socket_uri: str=None, password: str=None, **kwargs) -> None: super(ContainerExecResponse, self).__init__(**kwargs) - self.web_socket_uri = None - self.password = None + self.web_socket_uri = web_socket_uri + self.password = password diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py index b2ff8579927e..fa4a94d911e0 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group.py @@ -61,6 +61,9 @@ class ContainerGroup(Resource): in response. :vartype instance_view: ~azure.mgmt.containerinstance.models.ContainerGroupPropertiesInstanceView + :param diagnostics: The diagnostic information for a container group. + :type diagnostics: + ~azure.mgmt.containerinstance.models.ContainerGroupDiagnostics """ _validation = { @@ -87,6 +90,7 @@ class ContainerGroup(Resource): 'os_type': {'key': 'properties.osType', 'type': 'str'}, 'volumes': {'key': 'properties.volumes', 'type': '[Volume]'}, 'instance_view': {'key': 'properties.instanceView', 'type': 'ContainerGroupPropertiesInstanceView'}, + 'diagnostics': {'key': 'properties.diagnostics', 'type': 'ContainerGroupDiagnostics'}, } def __init__(self, **kwargs): @@ -99,3 +103,4 @@ def __init__(self, **kwargs): self.os_type = kwargs.get('os_type', None) self.volumes = kwargs.get('volumes', None) self.instance_view = None + self.diagnostics = kwargs.get('diagnostics', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics.py new file mode 100644 index 000000000000..c393dde8f7b8 --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics.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 ContainerGroupDiagnostics(Model): + """Container group diagnostic information. + + :param log_analytics: Container group log analytics information. + :type log_analytics: ~azure.mgmt.containerinstance.models.LogAnalytics + """ + + _attribute_map = { + 'log_analytics': {'key': 'logAnalytics', 'type': 'LogAnalytics'}, + } + + def __init__(self, **kwargs): + super(ContainerGroupDiagnostics, self).__init__(**kwargs) + self.log_analytics = kwargs.get('log_analytics', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics_py3.py new file mode 100644 index 000000000000..fb5fee21a034 --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_diagnostics_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 ContainerGroupDiagnostics(Model): + """Container group diagnostic information. + + :param log_analytics: Container group log analytics information. + :type log_analytics: ~azure.mgmt.containerinstance.models.LogAnalytics + """ + + _attribute_map = { + 'log_analytics': {'key': 'logAnalytics', 'type': 'LogAnalytics'}, + } + + def __init__(self, *, log_analytics=None, **kwargs) -> None: + super(ContainerGroupDiagnostics, self).__init__(**kwargs) + self.log_analytics = log_analytics diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py index 921e92c2d7e3..da93f1668143 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_group_py3.py @@ -9,7 +9,7 @@ # regenerated. # -------------------------------------------------------------------------- -from .resource import Resource +from .resource_py3 import Resource class ContainerGroup(Resource): @@ -61,6 +61,9 @@ class ContainerGroup(Resource): in response. :vartype instance_view: ~azure.mgmt.containerinstance.models.ContainerGroupPropertiesInstanceView + :param diagnostics: The diagnostic information for a container group. + :type diagnostics: + ~azure.mgmt.containerinstance.models.ContainerGroupDiagnostics """ _validation = { @@ -87,9 +90,10 @@ class ContainerGroup(Resource): 'os_type': {'key': 'properties.osType', 'type': 'str'}, 'volumes': {'key': 'properties.volumes', 'type': '[Volume]'}, 'instance_view': {'key': 'properties.instanceView', 'type': 'ContainerGroupPropertiesInstanceView'}, + 'diagnostics': {'key': 'properties.diagnostics', 'type': 'ContainerGroupDiagnostics'}, } - def __init__(self, *, containers, os_type, location: str=None, tags=None, image_registry_credentials=None, restart_policy=None, ip_address=None, volumes=None, **kwargs) -> None: + def __init__(self, *, containers, os_type, location: str=None, tags=None, image_registry_credentials=None, restart_policy=None, ip_address=None, volumes=None, diagnostics=None, **kwargs) -> None: super(ContainerGroup, self).__init__(location=location, tags=tags, **kwargs) self.provisioning_state = None self.containers = containers @@ -99,3 +103,4 @@ def __init__(self, *, containers, os_type, location: str=None, tags=None, image_ self.os_type = os_type self.volumes = volumes self.instance_view = None + self.diagnostics = diagnostics diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get.py new file mode 100644 index 000000000000..1823b1a315fb --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ContainerHttpGet(Model): + """The container Http Get settings, for liveness or readiness probe. + + All required parameters must be populated in order to send to Azure. + + :param path: The path to probe. + :type path: str + :param port: Required. The port number to probe. + :type port: int + :param scheme: The scheme. Possible values include: 'http', 'https' + :type scheme: str or ~azure.mgmt.containerinstance.models.enum + """ + + _validation = { + 'port': {'required': True}, + } + + _attribute_map = { + 'path': {'key': 'path', 'type': 'str'}, + 'port': {'key': 'port', 'type': 'int'}, + 'scheme': {'key': 'scheme', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ContainerHttpGet, self).__init__(**kwargs) + self.path = kwargs.get('path', None) + self.port = kwargs.get('port', None) + self.scheme = kwargs.get('scheme', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get_py3.py new file mode 100644 index 000000000000..d9ca73f63818 --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_http_get_py3.py @@ -0,0 +1,42 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ContainerHttpGet(Model): + """The container Http Get settings, for liveness or readiness probe. + + All required parameters must be populated in order to send to Azure. + + :param path: The path to probe. + :type path: str + :param port: Required. The port number to probe. + :type port: int + :param scheme: The scheme. Possible values include: 'http', 'https' + :type scheme: str or ~azure.mgmt.containerinstance.models.enum + """ + + _validation = { + 'port': {'required': True}, + } + + _attribute_map = { + 'path': {'key': 'path', 'type': 'str'}, + 'port': {'key': 'port', 'type': 'int'}, + 'scheme': {'key': 'scheme', 'type': 'str'}, + } + + def __init__(self, *, port: int, path: str=None, scheme=None, **kwargs) -> None: + super(ContainerHttpGet, self).__init__(**kwargs) + self.path = path + self.port = port + self.scheme = scheme diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe.py new file mode 100644 index 000000000000..884447e44a81 --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ContainerProbe(Model): + """The container probe, for liveness or readiness. + + :param exec_property: The execution command to probe + :type exec_property: ~azure.mgmt.containerinstance.models.ContainerExec + :param http_get: The Http Get settings to probe + :type http_get: ~azure.mgmt.containerinstance.models.ContainerHttpGet + :param initial_delay_seconds: The initial delay seconds. + :type initial_delay_seconds: int + :param period_seconds: The period seconds. + :type period_seconds: int + :param failure_threshold: The failure threshold. + :type failure_threshold: int + :param success_threshold: The success threshold. + :type success_threshold: int + :param timeout_seconds: The timeout seconds. + :type timeout_seconds: int + """ + + _attribute_map = { + 'exec_property': {'key': 'exec', 'type': 'ContainerExec'}, + 'http_get': {'key': 'httpGet', 'type': 'ContainerHttpGet'}, + 'initial_delay_seconds': {'key': 'initialDelaySeconds', 'type': 'int'}, + 'period_seconds': {'key': 'periodSeconds', 'type': 'int'}, + 'failure_threshold': {'key': 'failureThreshold', 'type': 'int'}, + 'success_threshold': {'key': 'successThreshold', 'type': 'int'}, + 'timeout_seconds': {'key': 'timeoutSeconds', 'type': 'int'}, + } + + def __init__(self, **kwargs): + super(ContainerProbe, self).__init__(**kwargs) + self.exec_property = kwargs.get('exec_property', None) + self.http_get = kwargs.get('http_get', None) + self.initial_delay_seconds = kwargs.get('initial_delay_seconds', None) + self.period_seconds = kwargs.get('period_seconds', None) + self.failure_threshold = kwargs.get('failure_threshold', None) + self.success_threshold = kwargs.get('success_threshold', None) + self.timeout_seconds = kwargs.get('timeout_seconds', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe_py3.py new file mode 100644 index 000000000000..67d0046da16f --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_probe_py3.py @@ -0,0 +1,52 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ContainerProbe(Model): + """The container probe, for liveness or readiness. + + :param exec_property: The execution command to probe + :type exec_property: ~azure.mgmt.containerinstance.models.ContainerExec + :param http_get: The Http Get settings to probe + :type http_get: ~azure.mgmt.containerinstance.models.ContainerHttpGet + :param initial_delay_seconds: The initial delay seconds. + :type initial_delay_seconds: int + :param period_seconds: The period seconds. + :type period_seconds: int + :param failure_threshold: The failure threshold. + :type failure_threshold: int + :param success_threshold: The success threshold. + :type success_threshold: int + :param timeout_seconds: The timeout seconds. + :type timeout_seconds: int + """ + + _attribute_map = { + 'exec_property': {'key': 'exec', 'type': 'ContainerExec'}, + 'http_get': {'key': 'httpGet', 'type': 'ContainerHttpGet'}, + 'initial_delay_seconds': {'key': 'initialDelaySeconds', 'type': 'int'}, + 'period_seconds': {'key': 'periodSeconds', 'type': 'int'}, + 'failure_threshold': {'key': 'failureThreshold', 'type': 'int'}, + 'success_threshold': {'key': 'successThreshold', 'type': 'int'}, + 'timeout_seconds': {'key': 'timeoutSeconds', 'type': 'int'}, + } + + def __init__(self, *, exec_property=None, http_get=None, initial_delay_seconds: int=None, period_seconds: int=None, failure_threshold: int=None, success_threshold: int=None, timeout_seconds: int=None, **kwargs) -> None: + super(ContainerProbe, self).__init__(**kwargs) + self.exec_property = exec_property + self.http_get = http_get + self.initial_delay_seconds = initial_delay_seconds + self.period_seconds = period_seconds + self.failure_threshold = failure_threshold + self.success_threshold = success_threshold + self.timeout_seconds = timeout_seconds diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_py3.py index 54f0b8a2bd0f..cdcc92593f9b 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_py3.py @@ -45,6 +45,10 @@ class Container(Model): instance. :type volume_mounts: list[~azure.mgmt.containerinstance.models.VolumeMount] + :param liveness_probe: The liveness probe. + :type liveness_probe: ~azure.mgmt.containerinstance.models.ContainerProbe + :param readiness_probe: The readiness probe. + :type readiness_probe: ~azure.mgmt.containerinstance.models.ContainerProbe """ _validation = { @@ -63,9 +67,11 @@ class Container(Model): 'instance_view': {'key': 'properties.instanceView', 'type': 'ContainerPropertiesInstanceView'}, 'resources': {'key': 'properties.resources', 'type': 'ResourceRequirements'}, 'volume_mounts': {'key': 'properties.volumeMounts', 'type': '[VolumeMount]'}, + 'liveness_probe': {'key': 'properties.livenessProbe', 'type': 'ContainerProbe'}, + 'readiness_probe': {'key': 'properties.readinessProbe', 'type': 'ContainerProbe'}, } - def __init__(self, *, name: str, image: str, resources, command=None, ports=None, environment_variables=None, volume_mounts=None, **kwargs) -> None: + def __init__(self, *, name: str, image: str, resources, command=None, ports=None, environment_variables=None, volume_mounts=None, liveness_probe=None, readiness_probe=None, **kwargs) -> None: super(Container, self).__init__(**kwargs) self.name = name self.image = image @@ -75,3 +81,5 @@ def __init__(self, *, name: str, image: str, resources, command=None, ports=None self.instance_view = None self.resources = resources self.volume_mounts = volume_mounts + self.liveness_probe = liveness_probe + self.readiness_probe = readiness_probe diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state.py index 1f29eb566eaa..8b70058cc3ad 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state.py @@ -15,32 +15,22 @@ class ContainerState(Model): """The container instance state. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar state: The state of the container instance. - :vartype state: str - :ivar start_time: The date-time when the container instance state started. - :vartype start_time: datetime - :ivar exit_code: The container instance exit codes correspond to those + :param state: The state of the container instance. + :type state: str + :param start_time: The date-time when the container instance state + started. + :type start_time: datetime + :param exit_code: The container instance exit codes correspond to those from the `docker run` command. - :vartype exit_code: int - :ivar finish_time: The date-time when the container instance state + :type exit_code: int + :param finish_time: The date-time when the container instance state finished. - :vartype finish_time: datetime - :ivar detail_status: The human-readable status of the container instance + :type finish_time: datetime + :param detail_status: The human-readable status of the container instance state. - :vartype detail_status: str + :type detail_status: str """ - _validation = { - 'state': {'readonly': True}, - 'start_time': {'readonly': True}, - 'exit_code': {'readonly': True}, - 'finish_time': {'readonly': True}, - 'detail_status': {'readonly': True}, - } - _attribute_map = { 'state': {'key': 'state', 'type': 'str'}, 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, @@ -51,8 +41,8 @@ class ContainerState(Model): def __init__(self, **kwargs): super(ContainerState, self).__init__(**kwargs) - self.state = None - self.start_time = None - self.exit_code = None - self.finish_time = None - self.detail_status = None + self.state = kwargs.get('state', None) + self.start_time = kwargs.get('start_time', None) + self.exit_code = kwargs.get('exit_code', None) + self.finish_time = kwargs.get('finish_time', None) + self.detail_status = kwargs.get('detail_status', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state_py3.py index 433a0483c9a8..34aa05a015d3 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_state_py3.py @@ -15,32 +15,22 @@ class ContainerState(Model): """The container instance state. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar state: The state of the container instance. - :vartype state: str - :ivar start_time: The date-time when the container instance state started. - :vartype start_time: datetime - :ivar exit_code: The container instance exit codes correspond to those + :param state: The state of the container instance. + :type state: str + :param start_time: The date-time when the container instance state + started. + :type start_time: datetime + :param exit_code: The container instance exit codes correspond to those from the `docker run` command. - :vartype exit_code: int - :ivar finish_time: The date-time when the container instance state + :type exit_code: int + :param finish_time: The date-time when the container instance state finished. - :vartype finish_time: datetime - :ivar detail_status: The human-readable status of the container instance + :type finish_time: datetime + :param detail_status: The human-readable status of the container instance state. - :vartype detail_status: str + :type detail_status: str """ - _validation = { - 'state': {'readonly': True}, - 'start_time': {'readonly': True}, - 'exit_code': {'readonly': True}, - 'finish_time': {'readonly': True}, - 'detail_status': {'readonly': True}, - } - _attribute_map = { 'state': {'key': 'state', 'type': 'str'}, 'start_time': {'key': 'startTime', 'type': 'iso-8601'}, @@ -49,10 +39,10 @@ class ContainerState(Model): 'detail_status': {'key': 'detailStatus', 'type': 'str'}, } - def __init__(self, **kwargs) -> None: + def __init__(self, *, state: str=None, start_time=None, exit_code: int=None, finish_time=None, detail_status: str=None, **kwargs) -> None: super(ContainerState, self).__init__(**kwargs) - self.state = None - self.start_time = None - self.exit_code = None - self.finish_time = None - self.detail_status = None + self.state = state + self.start_time = start_time + self.exit_code = exit_code + self.finish_time = finish_time + self.detail_status = detail_status diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable.py index 1f279361192a..d92e7d8bb730 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable.py @@ -19,21 +19,24 @@ class EnvironmentVariable(Model): :param name: Required. The name of the environment variable. :type name: str - :param value: Required. The value of the environment variable. + :param value: The value of the environment variable. :type value: str + :param secure_value: The value of the secure environment variable. + :type secure_value: str """ _validation = { 'name': {'required': True}, - 'value': {'required': True}, } _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'value': {'key': 'value', 'type': 'str'}, + 'secure_value': {'key': 'secureValue', 'type': 'str'}, } def __init__(self, **kwargs): super(EnvironmentVariable, self).__init__(**kwargs) self.name = kwargs.get('name', None) self.value = kwargs.get('value', None) + self.secure_value = kwargs.get('secure_value', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable_py3.py index 790db3327d03..49d6f145b134 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/environment_variable_py3.py @@ -19,21 +19,24 @@ class EnvironmentVariable(Model): :param name: Required. The name of the environment variable. :type name: str - :param value: Required. The value of the environment variable. + :param value: The value of the environment variable. :type value: str + :param secure_value: The value of the secure environment variable. + :type secure_value: str """ _validation = { 'name': {'required': True}, - 'value': {'required': True}, } _attribute_map = { 'name': {'key': 'name', 'type': 'str'}, 'value': {'key': 'value', 'type': 'str'}, + 'secure_value': {'key': 'secureValue', 'type': 'str'}, } - def __init__(self, *, name: str, value: str, **kwargs) -> None: + def __init__(self, *, name: str, value: str=None, secure_value: str=None, **kwargs) -> None: super(EnvironmentVariable, self).__init__(**kwargs) self.name = name self.value = value + self.secure_value = secure_value diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event.py index f8daff9cedb6..003d325e358a 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event.py @@ -15,32 +15,20 @@ class Event(Model): """A container group or container instance event. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar count: The count of the event. - :vartype count: int - :ivar first_timestamp: The date-time of the earliest logged event. - :vartype first_timestamp: datetime - :ivar last_timestamp: The date-time of the latest logged event. - :vartype last_timestamp: datetime - :ivar name: The event name. - :vartype name: str - :ivar message: The event message. - :vartype message: str - :ivar type: The event type. - :vartype type: str + :param count: The count of the event. + :type count: int + :param first_timestamp: The date-time of the earliest logged event. + :type first_timestamp: datetime + :param last_timestamp: The date-time of the latest logged event. + :type last_timestamp: datetime + :param name: The event name. + :type name: str + :param message: The event message. + :type message: str + :param type: The event type. + :type type: str """ - _validation = { - 'count': {'readonly': True}, - 'first_timestamp': {'readonly': True}, - 'last_timestamp': {'readonly': True}, - 'name': {'readonly': True}, - 'message': {'readonly': True}, - 'type': {'readonly': True}, - } - _attribute_map = { 'count': {'key': 'count', 'type': 'int'}, 'first_timestamp': {'key': 'firstTimestamp', 'type': 'iso-8601'}, @@ -52,9 +40,9 @@ class Event(Model): def __init__(self, **kwargs): super(Event, self).__init__(**kwargs) - self.count = None - self.first_timestamp = None - self.last_timestamp = None - self.name = None - self.message = None - self.type = None + self.count = kwargs.get('count', None) + self.first_timestamp = kwargs.get('first_timestamp', None) + self.last_timestamp = kwargs.get('last_timestamp', None) + self.name = kwargs.get('name', None) + self.message = kwargs.get('message', None) + self.type = kwargs.get('type', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event_py3.py index ba3b1deeee4f..43aa706c89ca 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/event_py3.py @@ -15,32 +15,20 @@ class Event(Model): """A container group or container instance event. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar count: The count of the event. - :vartype count: int - :ivar first_timestamp: The date-time of the earliest logged event. - :vartype first_timestamp: datetime - :ivar last_timestamp: The date-time of the latest logged event. - :vartype last_timestamp: datetime - :ivar name: The event name. - :vartype name: str - :ivar message: The event message. - :vartype message: str - :ivar type: The event type. - :vartype type: str + :param count: The count of the event. + :type count: int + :param first_timestamp: The date-time of the earliest logged event. + :type first_timestamp: datetime + :param last_timestamp: The date-time of the latest logged event. + :type last_timestamp: datetime + :param name: The event name. + :type name: str + :param message: The event message. + :type message: str + :param type: The event type. + :type type: str """ - _validation = { - 'count': {'readonly': True}, - 'first_timestamp': {'readonly': True}, - 'last_timestamp': {'readonly': True}, - 'name': {'readonly': True}, - 'message': {'readonly': True}, - 'type': {'readonly': True}, - } - _attribute_map = { 'count': {'key': 'count', 'type': 'int'}, 'first_timestamp': {'key': 'firstTimestamp', 'type': 'iso-8601'}, @@ -50,11 +38,11 @@ class Event(Model): 'type': {'key': 'type', 'type': 'str'}, } - def __init__(self, **kwargs) -> None: + def __init__(self, *, count: int=None, first_timestamp=None, last_timestamp=None, name: str=None, message: str=None, type: str=None, **kwargs) -> None: super(Event, self).__init__(**kwargs) - self.count = None - self.first_timestamp = None - self.last_timestamp = None - self.name = None - self.message = None - self.type = None + self.count = count + self.first_timestamp = first_timestamp + self.last_timestamp = last_timestamp + self.name = name + self.message = message + self.type = type diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics.py new file mode 100644 index 000000000000..7179478dda9d --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class LogAnalytics(Model): + """Container group log analytics information. + + All required parameters must be populated in order to send to Azure. + + :param workspace_id: Required. The workspace id for log analytics + :type workspace_id: str + :param workspace_key: Required. The workspace key for log analytics + :type workspace_key: str + """ + + _validation = { + 'workspace_id': {'required': True}, + 'workspace_key': {'required': True}, + } + + _attribute_map = { + 'workspace_id': {'key': 'workspaceId', 'type': 'str'}, + 'workspace_key': {'key': 'workspaceKey', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(LogAnalytics, self).__init__(**kwargs) + self.workspace_id = kwargs.get('workspace_id', None) + self.workspace_key = kwargs.get('workspace_key', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics_py3.py new file mode 100644 index 000000000000..a628d09e0d45 --- /dev/null +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/log_analytics_py3.py @@ -0,0 +1,39 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class LogAnalytics(Model): + """Container group log analytics information. + + All required parameters must be populated in order to send to Azure. + + :param workspace_id: Required. The workspace id for log analytics + :type workspace_id: str + :param workspace_key: Required. The workspace key for log analytics + :type workspace_key: str + """ + + _validation = { + 'workspace_id': {'required': True}, + 'workspace_key': {'required': True}, + } + + _attribute_map = { + 'workspace_id': {'key': 'workspaceId', 'type': 'str'}, + 'workspace_key': {'key': 'workspaceKey', 'type': 'str'}, + } + + def __init__(self, *, workspace_id: str, workspace_key: str, **kwargs) -> None: + super(LogAnalytics, self).__init__(**kwargs) + self.workspace_id = workspace_id + self.workspace_key = workspace_key diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs.py index 5575e908d8ec..5d39e27a2a7d 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs.py @@ -15,21 +15,14 @@ class Logs(Model): """The logs. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar content: The content of the log. - :vartype content: str + :param content: The content of the log. + :type content: str """ - _validation = { - 'content': {'readonly': True}, - } - _attribute_map = { 'content': {'key': 'content', 'type': 'str'}, } def __init__(self, **kwargs): super(Logs, self).__init__(**kwargs) - self.content = None + self.content = kwargs.get('content', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs_py3.py index b801c11ff202..02985d4324d7 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/logs_py3.py @@ -15,21 +15,14 @@ class Logs(Model): """The logs. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar content: The content of the log. - :vartype content: str + :param content: The content of the log. + :type content: str """ - _validation = { - 'content': {'readonly': True}, - } - _attribute_map = { 'content': {'key': 'content', 'type': 'str'}, } - def __init__(self, **kwargs) -> None: + def __init__(self, *, content: str=None, **kwargs) -> None: super(Logs, self).__init__(**kwargs) - self.content = None + self.content = content diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py index 537572376e28..80c154e22d77 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation.py @@ -15,22 +15,21 @@ class Operation(Model): """An operation for Azure Container Instance service. - Variables are only populated by the server, and will be ignored when - sending a request. + All required parameters must be populated in order to send to Azure. - :ivar name: The name of the operation. - :vartype name: str - :param display: The display information of the operation. + :param name: Required. The name of the operation. + :type name: str + :param display: Required. The display information of the operation. :type display: ~azure.mgmt.containerinstance.models.OperationDisplay - :ivar origin: The intended executor of the operation. Possible values + :param origin: The intended executor of the operation. Possible values include: 'User', 'System' - :vartype origin: str or + :type origin: str or ~azure.mgmt.containerinstance.models.ContainerInstanceOperationsOrigin """ _validation = { - 'name': {'readonly': True}, - 'origin': {'readonly': True}, + 'name': {'required': True}, + 'display': {'required': True}, } _attribute_map = { @@ -41,6 +40,6 @@ class Operation(Model): def __init__(self, **kwargs): super(Operation, self).__init__(**kwargs) - self.name = None + self.name = kwargs.get('name', None) self.display = kwargs.get('display', None) - self.origin = None + self.origin = kwargs.get('origin', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display.py index a21c8853724b..430c7517e8b1 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display.py @@ -15,26 +15,16 @@ class OperationDisplay(Model): """The display information of the operation. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar provider: The name of the provider of the operation. - :vartype provider: str - :ivar resource: The name of the resource type of the operation. - :vartype resource: str - :ivar operation: The friendly name of the operation. - :vartype operation: str - :ivar description: The description of the operation. - :vartype description: str + :param provider: The name of the provider of the operation. + :type provider: str + :param resource: The name of the resource type of the operation. + :type resource: str + :param operation: The friendly name of the operation. + :type operation: str + :param description: The description of the operation. + :type description: str """ - _validation = { - 'provider': {'readonly': True}, - 'resource': {'readonly': True}, - 'operation': {'readonly': True}, - 'description': {'readonly': True}, - } - _attribute_map = { 'provider': {'key': 'provider', 'type': 'str'}, 'resource': {'key': 'resource', 'type': 'str'}, @@ -44,7 +34,7 @@ class OperationDisplay(Model): def __init__(self, **kwargs): super(OperationDisplay, self).__init__(**kwargs) - self.provider = None - self.resource = None - self.operation = None - self.description = None + self.provider = kwargs.get('provider', None) + self.resource = kwargs.get('resource', None) + self.operation = kwargs.get('operation', None) + self.description = kwargs.get('description', None) diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display_py3.py index ad7dd6f153aa..7e7b32e54ecc 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_display_py3.py @@ -15,26 +15,16 @@ class OperationDisplay(Model): """The display information of the operation. - Variables are only populated by the server, and will be ignored when - sending a request. - - :ivar provider: The name of the provider of the operation. - :vartype provider: str - :ivar resource: The name of the resource type of the operation. - :vartype resource: str - :ivar operation: The friendly name of the operation. - :vartype operation: str - :ivar description: The description of the operation. - :vartype description: str + :param provider: The name of the provider of the operation. + :type provider: str + :param resource: The name of the resource type of the operation. + :type resource: str + :param operation: The friendly name of the operation. + :type operation: str + :param description: The description of the operation. + :type description: str """ - _validation = { - 'provider': {'readonly': True}, - 'resource': {'readonly': True}, - 'operation': {'readonly': True}, - 'description': {'readonly': True}, - } - _attribute_map = { 'provider': {'key': 'provider', 'type': 'str'}, 'resource': {'key': 'resource', 'type': 'str'}, @@ -42,9 +32,9 @@ class OperationDisplay(Model): 'description': {'key': 'description', 'type': 'str'}, } - def __init__(self, **kwargs) -> None: + def __init__(self, *, provider: str=None, resource: str=None, operation: str=None, description: str=None, **kwargs) -> None: super(OperationDisplay, self).__init__(**kwargs) - self.provider = None - self.resource = None - self.operation = None - self.description = None + self.provider = provider + self.resource = resource + self.operation = operation + self.description = description diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py index 2547ea4acc1d..bf808f78f281 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/operation_py3.py @@ -15,22 +15,21 @@ class Operation(Model): """An operation for Azure Container Instance service. - Variables are only populated by the server, and will be ignored when - sending a request. + All required parameters must be populated in order to send to Azure. - :ivar name: The name of the operation. - :vartype name: str - :param display: The display information of the operation. + :param name: Required. The name of the operation. + :type name: str + :param display: Required. The display information of the operation. :type display: ~azure.mgmt.containerinstance.models.OperationDisplay - :ivar origin: The intended executor of the operation. Possible values + :param origin: The intended executor of the operation. Possible values include: 'User', 'System' - :vartype origin: str or + :type origin: str or ~azure.mgmt.containerinstance.models.ContainerInstanceOperationsOrigin """ _validation = { - 'name': {'readonly': True}, - 'origin': {'readonly': True}, + 'name': {'required': True}, + 'display': {'required': True}, } _attribute_map = { @@ -39,8 +38,8 @@ class Operation(Model): 'origin': {'key': 'origin', 'type': 'str'}, } - def __init__(self, *, display=None, **kwargs) -> None: + def __init__(self, *, name: str, display, origin=None, **kwargs) -> None: super(Operation, self).__init__(**kwargs) - self.name = None + self.name = name self.display = display - self.origin = None + self.origin = origin diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py index 4239d0d25065..42b2710e9d49 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_group_usage_operations.py @@ -23,7 +23,7 @@ class ContainerGroupUsageOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API version. Constant value: "2018-04-01". + :ivar api_version: Client API version. Constant value: "2018-06-01". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-04-01" + self.api_version = "2018-06-01" self.config = config diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_groups_operations.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_groups_operations.py index 422190a20fc3..2c5e3b6647f3 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_groups_operations.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_groups_operations.py @@ -25,7 +25,7 @@ class ContainerGroupsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API version. Constant value: "2018-04-01". + :ivar api_version: Client API version. Constant value: "2018-06-01". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-04-01" + self.api_version = "2018-06-01" self.config = config diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_logs_operations.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_logs_operations.py index aee663de18a2..8d5da3bc6ee1 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_logs_operations.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/container_logs_operations.py @@ -23,7 +23,7 @@ class ContainerLogsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API version. Constant value: "2018-04-01". + :ivar api_version: Client API version. Constant value: "2018-06-01". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-04-01" + self.api_version = "2018-06-01" self.config = config diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/operations.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/operations.py index fdc3d1f5baf2..9de4177e731e 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/operations.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/operations.py @@ -23,7 +23,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API version. Constant value: "2018-04-01". + :ivar api_version: Client API version. Constant value: "2018-06-01". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-04-01" + self.api_version = "2018-06-01" self.config = config diff --git a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/start_container_operations.py b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/start_container_operations.py index bc5aa41493e1..8cda5a8fc06c 100644 --- a/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/start_container_operations.py +++ b/azure-mgmt-containerinstance/azure/mgmt/containerinstance/operations/start_container_operations.py @@ -23,7 +23,7 @@ class StartContainerOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client API version. Constant value: "2018-04-01". + :ivar api_version: Client API version. Constant value: "2018-06-01". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2018-04-01" + self.api_version = "2018-06-01" self.config = config