From d8aa5bd7a020717e3e2a5910dd16d6816decedca Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 8 Mar 2018 20:04:11 +0000 Subject: [PATCH 1/2] Generated from 618de80a1454153967c1b0f065cb270ccd7f60fd Add more enum values for Identity/type in generic resource swagger Resource types like "Microsoft.Compute/VirtualMachines" have more than one enum value for Identity/type. Updating generic resource swagger so it is up-to-date. --- .../mgmt/resource/resources/v2017_05_10/models/identity.py | 3 ++- .../v2017_05_10/models/resource_management_client_enums.py | 3 +++ .../mgmt/resource/resources/v2018_02_01/models/identity.py | 3 ++- .../v2018_02_01/models/resource_management_client_enums.py | 3 +++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/identity.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/identity.py index af86d8024588..bdcd7723228e 100644 --- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/identity.py +++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/identity.py @@ -22,7 +22,8 @@ class Identity(Model): :vartype principal_id: str :ivar tenant_id: The tenant ID of resource. :vartype tenant_id: str - :param type: The identity type. Possible values include: 'SystemAssigned' + :param type: The identity type. Possible values include: 'SystemAssigned', + 'UserAssigned', 'SystemAssigned, UserAssigned', 'None' :type type: str or ~azure.mgmt.resource.resources.v2017_05_10.models.ResourceIdentityType """ diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/resource_management_client_enums.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/resource_management_client_enums.py index 011ae3609d77..bbb900a4673c 100644 --- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/resource_management_client_enums.py +++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/resource_management_client_enums.py @@ -21,3 +21,6 @@ class DeploymentMode(Enum): class ResourceIdentityType(Enum): system_assigned = "SystemAssigned" + user_assigned = "UserAssigned" + system_assigned_user_assigned = "SystemAssigned, UserAssigned" + none = "None" diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity.py index 253a8dc02c24..ff0da548daff 100644 --- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity.py +++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/identity.py @@ -22,7 +22,8 @@ class Identity(Model): :vartype principal_id: str :ivar tenant_id: The tenant ID of resource. :vartype tenant_id: str - :param type: The identity type. Possible values include: 'SystemAssigned' + :param type: The identity type. Possible values include: 'SystemAssigned', + 'UserAssigned', 'SystemAssigned, UserAssigned', 'None' :type type: str or ~azure.mgmt.resource.resources.v2018_02_01.models.ResourceIdentityType """ diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/resource_management_client_enums.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/resource_management_client_enums.py index fa9c8c732e6c..76f4a25765d0 100644 --- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/resource_management_client_enums.py +++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2018_02_01/models/resource_management_client_enums.py @@ -27,3 +27,6 @@ class OnErrorDeploymentType(Enum): class ResourceIdentityType(Enum): system_assigned = "SystemAssigned" + user_assigned = "UserAssigned" + system_assigned_user_assigned = "SystemAssigned, UserAssigned" + none = "None" From d2fa0addc40608ccc1024c0c4452e43d1d47ef5b Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Sat, 10 Mar 2018 00:05:50 +0000 Subject: [PATCH 2/2] Generated from f7fb396c7887e1d61eb7e92133fc1c1fab3ae941 Revert changes in swagger spec for 2017 API Version --- .../mgmt/resource/resources/v2017_05_10/models/identity.py | 3 +-- .../v2017_05_10/models/resource_management_client_enums.py | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/identity.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/identity.py index bdcd7723228e..af86d8024588 100644 --- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/identity.py +++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/identity.py @@ -22,8 +22,7 @@ class Identity(Model): :vartype principal_id: str :ivar tenant_id: The tenant ID of resource. :vartype tenant_id: str - :param type: The identity type. Possible values include: 'SystemAssigned', - 'UserAssigned', 'SystemAssigned, UserAssigned', 'None' + :param type: The identity type. Possible values include: 'SystemAssigned' :type type: str or ~azure.mgmt.resource.resources.v2017_05_10.models.ResourceIdentityType """ diff --git a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/resource_management_client_enums.py b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/resource_management_client_enums.py index bbb900a4673c..011ae3609d77 100644 --- a/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/resource_management_client_enums.py +++ b/azure-mgmt-resource/azure/mgmt/resource/resources/v2017_05_10/models/resource_management_client_enums.py @@ -21,6 +21,3 @@ class DeploymentMode(Enum): class ResourceIdentityType(Enum): system_assigned = "SystemAssigned" - user_assigned = "UserAssigned" - system_assigned_user_assigned = "SystemAssigned, UserAssigned" - none = "None"