CodeGen from PR 15721 in Azure/azure-rest-api-specs

Merge edd482a9fdeeb93885b9d7bae0dde88806f187a0 into 4dc3917

Author: SDKAuto

sdk/containerinstance/azure-mgmt-containerinstance/_meta.json

@@ -1,7 +1,7 @@
 {
   "autorest": "V2",
   "use": "@microsoft.azure/autorest.python@~4.0.71",
-  "commit": "09d35de8dd3318687eee441d7ddc54a33bf1a9fa",
+  "commit": "126d9c646f43afb64bf034e7b9b219123c20675f",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
   "autorest_command": "autorest specification/containerinstance/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk [email protected]/autorest.python@~4.0.71 --version=V2",
   "readme": "specification/containerinstance/resource-manager/readme.md"

sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/_container_instance_management_client.py

@@ -52,7 +52,7 @@ def __init__(
         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 = '2021-03-01'
+        self.api_version = '2021-07-01'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/__init__.py

@@ -24,8 +24,8 @@
     from ._models_py3 import ContainerGroupDiagnostics
     from ._models_py3 import ContainerGroupIdentity
     from ._models_py3 import ContainerGroupIdentityUserAssignedIdentitiesValue
-    from ._models_py3 import ContainerGroupNetworkProfile
     from ._models_py3 import ContainerGroupPropertiesInstanceView
+    from ._models_py3 import ContainerGroupSubnetId
     from ._models_py3 import ContainerHttpGet
     from ._models_py3 import ContainerPort
     from ._models_py3 import ContainerProbe
@@ -37,7 +37,7 @@
     from ._models_py3 import Event
     from ._models_py3 import GitRepoVolume
     from ._models_py3 import GpuResource
-    from ._models_py3 import HttpHeaders
+    from ._models_py3 import HttpHeader
     from ._models_py3 import ImageRegistryCredential
     from ._models_py3 import InitContainerDefinition
     from ._models_py3 import InitContainerPropertiesDefinitionInstanceView
@@ -70,8 +70,8 @@
     from ._models import ContainerGroupDiagnostics
     from ._models import ContainerGroupIdentity
     from ._models import ContainerGroupIdentityUserAssignedIdentitiesValue
-    from ._models import ContainerGroupNetworkProfile
     from ._models import ContainerGroupPropertiesInstanceView
+    from ._models import ContainerGroupSubnetId
     from ._models import ContainerHttpGet
     from ._models import ContainerPort
     from ._models import ContainerProbe
@@ -83,7 +83,7 @@
     from ._models import Event
     from ._models import GitRepoVolume
     from ._models import GpuResource
-    from ._models import HttpHeaders
+    from ._models import HttpHeader
     from ._models import ImageRegistryCredential
     from ._models import InitContainerDefinition
     from ._models import InitContainerPropertiesDefinitionInstanceView
@@ -135,8 +135,8 @@
     'ContainerGroupDiagnostics',
     'ContainerGroupIdentity',
     'ContainerGroupIdentityUserAssignedIdentitiesValue',
-    'ContainerGroupNetworkProfile',
     'ContainerGroupPropertiesInstanceView',
+    'ContainerGroupSubnetId',
     'ContainerHttpGet',
     'ContainerPort',
     'ContainerProbe',
@@ -148,7 +148,7 @@
     'Event',
     'GitRepoVolume',
     'GpuResource',
-    'HttpHeaders',
+    'HttpHeader',
     'ImageRegistryCredential',
     'InitContainerDefinition',
     'InitContainerPropertiesDefinitionInstanceView',

sdk/containerinstance/azure-mgmt-containerinstance/azure/mgmt/containerinstance/models/_models.py

@@ -488,10 +488,9 @@ class ContainerGroup(Resource):
     :param diagnostics: The diagnostic information for a container group.
     :type diagnostics:
      ~azure.mgmt.containerinstance.models.ContainerGroupDiagnostics
-    :param network_profile: The network profile information for a container
-     group.
-    :type network_profile:
-     ~azure.mgmt.containerinstance.models.ContainerGroupNetworkProfile
+    :param subnet_ids: The subnet resource IDs for a container group.
+    :type subnet_ids:
+     list[~azure.mgmt.containerinstance.models.ContainerGroupSubnetId]
     :param dns_config: The DNS config information for a container group.
     :type dns_config: ~azure.mgmt.containerinstance.models.DnsConfiguration
     :param sku: The SKU for a container group. Possible values include:
@@ -532,7 +531,7 @@ class ContainerGroup(Resource):
         'volumes': {'key': 'properties.volumes', 'type': '[Volume]'},
         'instance_view': {'key': 'properties.instanceView', 'type': 'ContainerGroupPropertiesInstanceView'},
         'diagnostics': {'key': 'properties.diagnostics', 'type': 'ContainerGroupDiagnostics'},
-        'network_profile': {'key': 'properties.networkProfile', 'type': 'ContainerGroupNetworkProfile'},
+        'subnet_ids': {'key': 'properties.subnetIds', 'type': '[ContainerGroupSubnetId]'},
         'dns_config': {'key': 'properties.dnsConfig', 'type': 'DnsConfiguration'},
         'sku': {'key': 'properties.sku', 'type': 'str'},
         'encryption_properties': {'key': 'properties.encryptionProperties', 'type': 'EncryptionProperties'},
@@ -551,7 +550,7 @@ def __init__(self, **kwargs):
         self.volumes = kwargs.get('volumes', None)
         self.instance_view = None
         self.diagnostics = kwargs.get('diagnostics', None)
-        self.network_profile = kwargs.get('network_profile', None)
+        self.subnet_ids = kwargs.get('subnet_ids', None)
         self.dns_config = kwargs.get('dns_config', None)
         self.sku = kwargs.get('sku', None)
         self.encryption_properties = kwargs.get('encryption_properties', None)
@@ -649,28 +648,6 @@ def __init__(self, **kwargs):
         self.client_id = None
 
 
-class ContainerGroupNetworkProfile(Model):
-    """Container group network profile information.
-
-    All required parameters must be populated in order to send to Azure.
-
-    :param id: Required. The identifier for a network profile.
-    :type id: str
-    """
-
-    _validation = {
-        'id': {'required': True},
-    }
-
-    _attribute_map = {
-        'id': {'key': 'id', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ContainerGroupNetworkProfile, self).__init__(**kwargs)
-        self.id = kwargs.get('id', None)
-
-
 class ContainerGroupPropertiesInstanceView(Model):
     """The instance view of the container group. Only valid in response.
 
@@ -699,6 +676,32 @@ def __init__(self, **kwargs):
         self.state = None
 
 
+class ContainerGroupSubnetId(Model):
+    """Container group subnet information.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param id: Required. Resource ID of virtual network and subnet.
+    :type id: str
+    :param name: Friendly name for the subnet.
+    :type name: str
+    """
+
+    _validation = {
+        'id': {'required': True},
+    }
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContainerGroupSubnetId, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
+        self.name = kwargs.get('name', None)
+
+
 class ContainerHttpGet(Model):
     """The container Http Get settings, for liveness or readiness probe.
 
@@ -711,7 +714,7 @@ class ContainerHttpGet(Model):
     :param scheme: The scheme. Possible values include: 'http', 'https'
     :type scheme: str or ~azure.mgmt.containerinstance.models.Scheme
     :param http_headers: The HTTP headers.
-    :type http_headers: ~azure.mgmt.containerinstance.models.HttpHeaders
+    :type http_headers: list[~azure.mgmt.containerinstance.models.HttpHeader]
     """
 
     _validation = {
@@ -722,7 +725,7 @@ class ContainerHttpGet(Model):
         'path': {'key': 'path', 'type': 'str'},
         'port': {'key': 'port', 'type': 'int'},
         'scheme': {'key': 'scheme', 'type': 'str'},
-        'http_headers': {'key': 'httpHeaders', 'type': 'HttpHeaders'},
+        'http_headers': {'key': 'httpHeaders', 'type': '[HttpHeader]'},
     }
 
     def __init__(self, **kwargs):
@@ -1091,8 +1094,8 @@ def __init__(self, **kwargs):
         self.sku = kwargs.get('sku', None)
 
 
-class HttpHeaders(Model):
-    """The HTTP headers.
+class HttpHeader(Model):
+    """The HTTP header.
 
     :param name: The header name.
     :type name: str
@@ -1106,7 +1109,7 @@ class HttpHeaders(Model):
     }
 
     def __init__(self, **kwargs):
-        super(HttpHeaders, self).__init__(**kwargs)
+        super(HttpHeader, self).__init__(**kwargs)
         self.name = kwargs.get('name', None)
         self.value = kwargs.get('value', None)
 
@@ -1123,6 +1126,10 @@ class ImageRegistryCredential(Model):
     :type username: str
     :param password: The password for the private registry.
     :type password: str
+    :param identity: The identity for the private registry.
+    :type identity: str
+    :param identity_url: The identity URL for the private registry.
+    :type identity_url: str
     """
 
     _validation = {
@@ -1134,13 +1141,17 @@ class ImageRegistryCredential(Model):
         'server': {'key': 'server', 'type': 'str'},
         'username': {'key': 'username', 'type': 'str'},
         'password': {'key': 'password', 'type': 'str'},
+        'identity': {'key': 'identity', 'type': 'str'},
+        'identity_url': {'key': 'identityUrl', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
         super(ImageRegistryCredential, self).__init__(**kwargs)
         self.server = kwargs.get('server', None)
         self.username = kwargs.get('username', None)
         self.password = kwargs.get('password', None)
+        self.identity = kwargs.get('identity', None)
+        self.identity_url = kwargs.get('identity_url', None)
 
 
 class InitContainerDefinition(Model):
@@ -1297,7 +1308,7 @@ class LogAnalytics(Model):
     :param metadata: Metadata for log analytics.
     :type metadata: dict[str, str]
     :param workspace_resource_id: The workspace resource id for log analytics
-    :type workspace_resource_id: dict[str, str]
+    :type workspace_resource_id: str
     """
 
     _validation = {
@@ -1310,7 +1321,7 @@ class LogAnalytics(Model):
         'workspace_key': {'key': 'workspaceKey', 'type': 'str'},
         'log_type': {'key': 'logType', 'type': 'str'},
         'metadata': {'key': 'metadata', 'type': '{str}'},
-        'workspace_resource_id': {'key': 'workspaceResourceId', 'type': '{str}'},
+        'workspace_resource_id': {'key': 'workspaceResourceId', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):