[AutoPR containerinstance/resource-manager] Adding June Swagger Update - Azure Container Instance (#2676)

* Generated from dd1d82ca6db8078870ccf13fe430a75a1ebe90d7

updating api version

* Generated from 2988a6ef3f5b633295691d3c0bacdd5cce3fb651

updating basic information to point at correct tag

Author: AutorestCI

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)
 

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',

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)

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)

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

azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/container_exec_response.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):
         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)

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

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)

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)

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