Generated from 771a3b26df8ce4602832c92223eda0cf71129355

Update from latest master

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_07_01/models/__init__.py

@@ -47,6 +47,7 @@
     from ._models_py3 import DiskSku
     from ._models_py3 import DiskUpdate
     from ._models_py3 import Encryption
+    from ._models_py3 import EncryptionSetIdentity
     from ._models_py3 import EncryptionSettingsCollection
     from ._models_py3 import EncryptionSettingsElement
     from ._models_py3 import Gallery
@@ -104,7 +105,6 @@
     from ._models_py3 import ReplicationStatus
     from ._models_py3 import RequestRateByIntervalInput
     from ._models_py3 import Resource
-    from ._models_py3 import ResourceIdentity
     from ._models_py3 import ResourceRange
     from ._models_py3 import RollbackStatusInfo
     from ._models_py3 import RollingUpgradePolicy
@@ -245,6 +245,7 @@
     from ._models import DiskSku
     from ._models import DiskUpdate
     from ._models import Encryption
+    from ._models import EncryptionSetIdentity
     from ._models import EncryptionSettingsCollection
     from ._models import EncryptionSettingsElement
     from ._models import Gallery
@@ -302,7 +303,6 @@
     from ._models import ReplicationStatus
     from ._models import RequestRateByIntervalInput
     from ._models import Resource
-    from ._models import ResourceIdentity
     from ._models import ResourceRange
     from ._models import RollbackStatusInfo
     from ._models import RollingUpgradePolicy
@@ -513,6 +513,7 @@
     'DiskSku',
     'DiskUpdate',
     'Encryption',
+    'EncryptionSetIdentity',
     'EncryptionSettingsCollection',
     'EncryptionSettingsElement',
     'Gallery',
@@ -570,7 +571,6 @@
     'ReplicationStatus',
     'RequestRateByIntervalInput',
     'Resource',
-    'ResourceIdentity',
     'ResourceRange',
     'RollbackStatusInfo',
     'RollingUpgradePolicy',

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_07_01/models/_models.py

@@ -1361,7 +1361,8 @@ class DiskEncryptionSet(Resource):
     :param tags: Resource tags
     :type tags: dict[str, str]
     :param identity:
-    :type identity: ~azure.mgmt.compute.v2019_07_01.models.ResourceIdentity
+    :type identity:
+     ~azure.mgmt.compute.v2019_07_01.models.EncryptionSetIdentity
     :param active_key: The key vault key which is currently used by this disk
      encryption set.
     :type active_key:
@@ -1390,7 +1391,7 @@ class DiskEncryptionSet(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
+        'identity': {'key': 'identity', 'type': 'EncryptionSetIdentity'},
         'active_key': {'key': 'properties.activeKey', 'type': 'KeyVaultAndKeyReference'},
         'previous_keys': {'key': 'properties.previousKeys', 'type': '[KeyVaultAndKeyReference]'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
@@ -1627,6 +1628,46 @@ def __init__(self, **kwargs):
         self.type = kwargs.get('type', None)
 
 
+class EncryptionSetIdentity(Model):
+    """The managed identity for the disk encryption set. It should be given
+    permission on the key vault before it can be used to encrypt disks.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param type: The type of Managed Identity used by the DiskEncryptionSet.
+     Only SystemAssigned is supported. Possible values include:
+     'SystemAssigned'
+    :type type: str or
+     ~azure.mgmt.compute.v2019_07_01.models.DiskEncryptionSetIdentityType
+    :ivar principal_id: The object id of the Managed Identity Resource. This
+     will be sent to the RP from ARM via the x-ms-identity-principal-id header
+     in the PUT request if the resource has a systemAssigned(implicit) identity
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id of the Managed Identity Resource. This will
+     be sent to the RP from ARM via the x-ms-client-tenant-id header in the PUT
+     request if the resource has a systemAssigned(implicit) identity
+    :vartype tenant_id: str
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(EncryptionSetIdentity, self).__init__(**kwargs)
+        self.type = kwargs.get('type', None)
+        self.principal_id = None
+        self.tenant_id = None
+
+
 class EncryptionSettingsCollection(Model):
     """Encryption settings for disk or snapshot.
 
@@ -3953,46 +3994,6 @@ def __init__(self, **kwargs):
         self.interval_length = kwargs.get('interval_length', None)
 
 
-class ResourceIdentity(Model):
-    """The managed identity for the disk encryption set. It should be given
-    permission on the key vault before it can be used to encrypt disks.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param type: The type of Managed Identity used by the DiskEncryptionSet.
-     Only SystemAssigned is supported. Possible values include:
-     'SystemAssigned'
-    :type type: str or
-     ~azure.mgmt.compute.v2019_07_01.models.DiskEncryptionSetIdentityType
-    :ivar principal_id: The object id of the Managed Identity Resource. This
-     will be sent to the RP from ARM via the x-ms-identity-principal-id header
-     in the PUT request if the resource has a systemAssigned(implicit) identity
-    :vartype principal_id: str
-    :ivar tenant_id: The tenant id of the Managed Identity Resource. This will
-     be sent to the RP from ARM via the x-ms-client-tenant-id header in the PUT
-     request if the resource has a systemAssigned(implicit) identity
-    :vartype tenant_id: str
-    """
-
-    _validation = {
-        'principal_id': {'readonly': True},
-        'tenant_id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'type': {'key': 'type', 'type': 'str'},
-        'principal_id': {'key': 'principalId', 'type': 'str'},
-        'tenant_id': {'key': 'tenantId', 'type': 'str'},
-    }
-
-    def __init__(self, **kwargs):
-        super(ResourceIdentity, self).__init__(**kwargs)
-        self.type = kwargs.get('type', None)
-        self.principal_id = None
-        self.tenant_id = None
-
-
 class ResourceRange(Model):
     """Describes the resource range.
 

sdk/compute/azure-mgmt-compute/azure/mgmt/compute/v2019_07_01/models/_models_py3.py

@@ -1361,7 +1361,8 @@ class DiskEncryptionSet(Resource):
     :param tags: Resource tags
     :type tags: dict[str, str]
     :param identity:
-    :type identity: ~azure.mgmt.compute.v2019_07_01.models.ResourceIdentity
+    :type identity:
+     ~azure.mgmt.compute.v2019_07_01.models.EncryptionSetIdentity
     :param active_key: The key vault key which is currently used by this disk
      encryption set.
     :type active_key:
@@ -1390,7 +1391,7 @@ class DiskEncryptionSet(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'identity': {'key': 'identity', 'type': 'ResourceIdentity'},
+        'identity': {'key': 'identity', 'type': 'EncryptionSetIdentity'},
         'active_key': {'key': 'properties.activeKey', 'type': 'KeyVaultAndKeyReference'},
         'previous_keys': {'key': 'properties.previousKeys', 'type': '[KeyVaultAndKeyReference]'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
@@ -1627,6 +1628,46 @@ def __init__(self, *, type, disk_encryption_set_id: str=None, **kwargs) -> None:
         self.type = type
 
 
+class EncryptionSetIdentity(Model):
+    """The managed identity for the disk encryption set. It should be given
+    permission on the key vault before it can be used to encrypt disks.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :param type: The type of Managed Identity used by the DiskEncryptionSet.
+     Only SystemAssigned is supported. Possible values include:
+     'SystemAssigned'
+    :type type: str or
+     ~azure.mgmt.compute.v2019_07_01.models.DiskEncryptionSetIdentityType
+    :ivar principal_id: The object id of the Managed Identity Resource. This
+     will be sent to the RP from ARM via the x-ms-identity-principal-id header
+     in the PUT request if the resource has a systemAssigned(implicit) identity
+    :vartype principal_id: str
+    :ivar tenant_id: The tenant id of the Managed Identity Resource. This will
+     be sent to the RP from ARM via the x-ms-client-tenant-id header in the PUT
+     request if the resource has a systemAssigned(implicit) identity
+    :vartype tenant_id: str
+    """
+
+    _validation = {
+        'principal_id': {'readonly': True},
+        'tenant_id': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'type': {'key': 'type', 'type': 'str'},
+        'principal_id': {'key': 'principalId', 'type': 'str'},
+        'tenant_id': {'key': 'tenantId', 'type': 'str'},
+    }
+
+    def __init__(self, *, type=None, **kwargs) -> None:
+        super(EncryptionSetIdentity, self).__init__(**kwargs)
+        self.type = type
+        self.principal_id = None
+        self.tenant_id = None
+
+
 class EncryptionSettingsCollection(Model):
     """Encryption settings for disk or snapshot.
 
@@ -3953,46 +3994,6 @@ def __init__(self, *, blob_container_sas_uri: str, from_time, to_time, interval_
         self.interval_length = interval_length
 
 
-class ResourceIdentity(Model):
-    """The managed identity for the disk encryption set. It should be given
-    permission on the key vault before it can be used to encrypt disks.
-
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
-    :param type: The type of Managed Identity used by the DiskEncryptionSet.
-     Only SystemAssigned is supported. Possible values include:
-     'SystemAssigned'
-    :type type: str or
-     ~azure.mgmt.compute.v2019_07_01.models.DiskEncryptionSetIdentityType
-    :ivar principal_id: The object id of the Managed Identity Resource. This
-     will be sent to the RP from ARM via the x-ms-identity-principal-id header
-     in the PUT request if the resource has a systemAssigned(implicit) identity
-    :vartype principal_id: str
-    :ivar tenant_id: The tenant id of the Managed Identity Resource. This will
-     be sent to the RP from ARM via the x-ms-client-tenant-id header in the PUT
-     request if the resource has a systemAssigned(implicit) identity
-    :vartype tenant_id: str
-    """
-
-    _validation = {
-        'principal_id': {'readonly': True},
-        'tenant_id': {'readonly': True},
-    }
-
-    _attribute_map = {
-        'type': {'key': 'type', 'type': 'str'},
-        'principal_id': {'key': 'principalId', 'type': 'str'},
-        'tenant_id': {'key': 'tenantId', 'type': 'str'},
-    }
-
-    def __init__(self, *, type=None, **kwargs) -> None:
-        super(ResourceIdentity, self).__init__(**kwargs)
-        self.type = type
-        self.principal_id = None
-        self.tenant_id = None
-
-
 class ResourceRange(Model):
     """Describes the resource range.