From ff541d84da3e56318de42e92222e9501a9ccb632 Mon Sep 17 00:00:00 2001 From: datr93 <43795914+datr93@users.noreply.github.com> Date: Wed, 10 Mar 2021 19:23:02 -0800 Subject: [PATCH] Datr/live validation correctness (#13189) * kind and objectid * migration requets properties * readonly objectid and enum * cloudPcResource * operation fix * fix comma * fix operation * unhide * serviceSpect try again * try again operation * add objectId * cloudPcResource example * add migration example * update doesn't have migration * migration changes * make 2021-01-14-preview match 2021-02-01-preview * custom word --- custom-words.txt | 1 + .../desktopvirtualization.json | 434 ++++++++++++++++-- .../examples/ApplicationGroup_Create.json | 22 +- .../examples/ApplicationGroup_Delete.json | 4 +- .../examples/ApplicationGroup_Get.json | 4 +- .../ApplicationGroup_ListByResourceGroup.json | 8 +- .../ApplicationGroup_ListBySubscription.json | 8 +- .../examples/ApplicationGroup_Update.json | 4 +- .../examples/Application_Create.json | 2 + .../examples/Application_Delete.json | 1 + .../examples/Application_Get.json | 1 + .../examples/Application_List.json | 2 + .../examples/Application_Update.json | 1 + .../examples/Desktop_Get.json | 1 + .../examples/Desktop_List.json | 1 + .../examples/Desktop_Update.json | 1 + .../examples/HostPool_Create.json | 22 +- .../examples/HostPool_Delete.json | 4 +- .../examples/HostPool_Get.json | 4 +- .../examples/HostPool_List.json | 8 +- .../HostPool_ListByResourceGroup.json | 8 +- .../examples/HostPool_Update.json | 4 +- ...tPools_RetrieveRegistrationToken_Post.json | 17 + .../examples/OperationDescription_List.json | 24 +- .../examples/ScalingPlan_Create.json | 5 + .../examples/ScalingPlan_Delete.json | 2 + .../examples/ScalingPlan_Get.json | 2 + .../examples/ScalingPlan_ListByHostPool.json | 2 + .../ScalingPlan_ListByResourceGroup.json | 4 + .../ScalingPlan_ListBySubscription.json | 4 + .../examples/ScalingPlan_Update.json | 3 + .../examples/SessionHost_Delete.json | 1 + .../examples/SessionHost_Get.json | 1 + .../examples/SessionHost_List.json | 2 + .../examples/SessionHost_Update.json | 1 + .../examples/UserSession_Delete.json | 1 + .../examples/UserSession_Get.json | 1 + .../examples/UserSession_List.json | 2 + .../examples/UserSession_ListByHostPool.json | 2 + .../examples/Workspace_Create.json | 8 +- .../examples/Workspace_Delete.json | 4 +- .../examples/Workspace_Get.json | 4 +- .../Workspace_ListByResourceGroup.json | 8 +- .../Workspace_ListBySubscription.json | 8 +- .../examples/Workspace_Update.json | 4 +- .../desktopvirtualization.json | 175 ++++++- .../examples/ApplicationGroup_Create.json | 22 +- .../examples/ApplicationGroup_Delete.json | 4 +- .../examples/ApplicationGroup_Get.json | 4 +- .../ApplicationGroup_ListByResourceGroup.json | 8 +- .../ApplicationGroup_ListBySubscription.json | 8 +- .../examples/ApplicationGroup_Update.json | 4 +- .../examples/Application_Create.json | 2 + .../examples/Application_Delete.json | 1 + .../examples/Application_Get.json | 1 + .../examples/Application_List.json | 2 + .../examples/Application_Update.json | 1 + .../examples/Desktop_Get.json | 1 + .../examples/Desktop_List.json | 1 + .../examples/Desktop_Update.json | 1 + .../examples/HostPool_Create.json | 22 +- .../examples/HostPool_Delete.json | 4 +- .../examples/HostPool_Get.json | 4 +- .../examples/HostPool_List.json | 8 +- .../HostPool_ListByResourceGroup.json | 8 +- .../examples/HostPool_Update.json | 4 +- .../examples/OperationDescription_List.json | 24 +- .../examples/ScalingPlan_Create.json | 2 + .../examples/ScalingPlan_Delete.json | 1 + .../examples/ScalingPlan_Get.json | 1 + .../examples/ScalingPlan_ListByHostPool.json | 1 + .../ScalingPlan_ListByResourceGroup.json | 2 + .../ScalingPlan_ListBySubscription.json | 2 + .../examples/ScalingPlan_Update.json | 1 + .../examples/SessionHost_Delete.json | 1 + .../examples/SessionHost_Get.json | 1 + .../examples/SessionHost_List.json | 2 + .../examples/SessionHost_Update.json | 1 + .../examples/UserSession_Delete.json | 1 + .../examples/UserSession_Get.json | 1 + .../examples/UserSession_List.json | 2 + .../examples/UserSession_ListByHostPool.json | 2 + .../examples/Workspace_Create.json | 8 +- .../examples/Workspace_Delete.json | 4 +- .../examples/Workspace_Get.json | 4 +- .../Workspace_ListByResourceGroup.json | 8 +- .../Workspace_ListBySubscription.json | 8 +- .../examples/Workspace_Update.json | 4 +- 88 files changed, 918 insertions(+), 103 deletions(-) create mode 100644 specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPools_RetrieveRegistrationToken_Post.json diff --git a/custom-words.txt b/custom-words.txt index 7162a473d2f4..00b83dbe4fae 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -2130,6 +2130,7 @@ Checkfeature lifecycles backuptype FSLogix +unhide privatelinkservice natgateway defanged diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/desktopvirtualization.json index 14ecb8de9949..2a682bd19c46 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/desktopvirtualization.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/desktopvirtualization.json @@ -1569,6 +1569,48 @@ } } }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DesktopVirtualization/hostPools/{hostPoolName}/retrieveRegistrationToken": { + "post": { + "tags": [ + "HostPool" + ], + "operationId": "HostPools_RetrieveRegistrationToken", + "description": "Registration token of the host pool.", + "x-ms-examples": { + "HostPools_RetrieveRegistrationToken_Post": { + "$ref": "./examples/HostPools_RetrieveRegistrationToken_Post.json" + } + }, + "parameters": [ + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "../../../../../common-types/resource-management/v1/types.json#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/HostPoolNameParameter" + } + ], + "responses": { + "200": { + "description": "Successfully retrieved host pool in resource group.", + "schema": { + "$ref": "#/definitions/RegistrationInfo" + } + }, + "default": { + "description": "Automation error response describing why the operation failed.", + "schema": { + "$ref": "#/definitions/CloudError" + } + } + } + } + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DesktopVirtualization/hostPools/{hostPoolName}/userSessions": { "get": { "tags": [ @@ -2467,6 +2509,54 @@ "type": "string" } } + }, + "isDataAction": { + "description": "Is a data action.", + "type": "boolean" + }, + "properties": { + "$ref": "#/definitions/OperationProperties" + } + } + }, + "OperationProperties": { + "description": "Properties of the operation", + "type": "object", + "properties": { + "serviceSpecification": { + "$ref": "#/definitions/ServiceSpecification" + } + } + }, + "ServiceSpecification": { + "description": "Service specification payload", + "type": "object", + "properties": { + "logSpecifications": { + "description": "Specifications of the Log for Azure Monitoring", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/LogSpecification" + } + } + } + }, + "LogSpecification": { + "description": "Specifications of the Log for Azure Monitoring", + "type": "object", + "properties": { + "name": { + "description": "Name of the log", + "type": "string" + }, + "displayName": { + "description": "Localized friendly display name of the log", + "type": "string" + }, + "blobDuration": { + "description": "Blob duration of the log", + "type": "string" } } }, @@ -2475,7 +2565,7 @@ "description": "Represents a Workspace definition.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ResourceModelWithAllowedPropertySet" } ], "properties": { @@ -2490,6 +2580,11 @@ "description": "Schema for Workspace properties.", "type": "object", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of Workspace. (internal use)", + "readOnly": true + }, "description": { "type": "string", "description": "Description of Workspace." @@ -2504,6 +2599,11 @@ "items": { "type": "string" } + }, + "cloudPcResource": { + "type": "boolean", + "description": "Is cloud pc resource.", + "readOnly": true } } }, @@ -2570,7 +2670,7 @@ "description": "Represents a ApplicationGroup definition.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ResourceModelWithAllowedPropertySet" } ], "required": [ @@ -2593,6 +2693,11 @@ "applicationGroupType" ], "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of ApplicationGroup. (internal use)", + "readOnly": true + }, "description": { "type": "string", "description": "Description of ApplicationGroup." @@ -2623,6 +2728,15 @@ "type": "string", "description": "Resource Type of ApplicationGroup.", "x-nullable": false + }, + "migrationRequest": { + "$ref": "#/definitions/MigrationRequestProperties", + "description": "The registration info of HostPool." + }, + "cloudPcResource": { + "type": "boolean", + "description": "Is cloud pc resource.", + "readOnly": true } } }, @@ -2687,7 +2801,7 @@ "description": "Represents a HostPool definition.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ResourceModelWithAllowedPropertySet" } ], "required": [ @@ -2711,6 +2825,11 @@ "preferredAppGroupType" ], "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of HostPool. (internal use)", + "readOnly": true + }, "friendlyName": { "type": "string", "description": "Friendly name of HostPool." @@ -2722,11 +2841,26 @@ "hostPoolType": { "enum": [ "Personal", - "Pooled" + "Pooled", + "BYODesktop" ], "x-ms-enum": { "name": "HostPoolType", - "modelAsString": true + "modelAsString": true, + "values": [ + { + "value": "Personal", + "description": "Users will be assigned a SessionHost either by administrators (PersonalDesktopAssignmentType = Direct) or upon connecting to the pool (PersonalDesktopAssignmentType = Automatic). They will always be redirected to their assigned SessionHost." + }, + { + "value": "Pooled", + "description": "Users get a new (random) SessionHost every time it connects to the HostPool." + }, + { + "value": "BYODesktop", + "description": "Users assign their own machines, load balancing logic remains the same as Personal. PersonalDesktopAssignmentType must be Direct." + } + ] }, "type": "string", "description": "HostPool type for desktop.", @@ -2742,8 +2876,7 @@ "modelAsString": true }, "type": "string", - "description": "PersonalDesktopAssignment type for HostPool.", - "x-nullable": false + "description": "PersonalDesktopAssignment type for HostPool." }, "customRdpProperty": { "type": "string", @@ -2815,8 +2948,7 @@ "modelAsString": true }, "type": "string", - "description": "The type of single sign on Secret Type.", - "x-nullable": false + "description": "The type of single sign on Secret Type." }, "preferredAppGroupType": { "enum": [ @@ -2835,6 +2967,15 @@ "startVMOnConnect": { "type": "boolean", "description": "The flag to turn on/off StartVMOnConnect feature." + }, + "migrationRequest": { + "$ref": "#/definitions/MigrationRequestProperties", + "description": "The registration info of HostPool." + }, + "cloudPcResource": { + "type": "boolean", + "description": "Is cloud pc resource.", + "readOnly": true } } }, @@ -2946,8 +3087,7 @@ "modelAsString": true }, "type": "string", - "description": "The type of single sign on Secret Type.", - "x-nullable": false + "description": "The type of single sign on Secret Type." }, "preferredAppGroupType": { "enum": [ @@ -3283,6 +3423,11 @@ "commandLineSetting" ], "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of Application. (internal use)", + "readOnly": true + }, "description": { "type": "string", "description": "Description of Application." @@ -3498,6 +3643,11 @@ "description": "Schema for Desktop properties.", "type": "object", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of Desktop. (internal use)", + "readOnly": true + }, "description": { "type": "string", "description": "Description of Desktop." @@ -3773,6 +3923,11 @@ "description": "Schema for SessionHost properties.", "type": "object", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of SessionHost. (internal use)", + "readOnly": true + }, "lastHeartBeat": { "format": "date-time", "type": "string", @@ -3811,14 +3966,70 @@ "Shutdown", "Disconnected", "Upgrading", - "UpgradeFailed" + "UpgradeFailed", + "NoHeartbeat", + "NotJoinedToDomain", + "DomainTrustRelationshipLost", + "SxSStackListenerNotReady", + "FSLogixNotHealthy", + "NeedsAssistance" ], "x-ms-enum": { "name": "Status", - "modelAsString": true - }, - "type": "string", - "description": "Status for a SessionHost. Available - Session Host has passed all the health checks and is available to handle connections. Unavailable - Session Host is either turned off or has failed critical health checks which is causing service not to be able to route connections to this session host. Note this replaces previous 'NoHeartBeat' status. Shutdown - Session Host is shutdown - RD Agent reported session host to be stopped or deallocated. Disconnected - The Session Host is unavailable because it is currently disconnected. Upgrading - Session Host is unavailable because currently an upgrade of RDAgent/side-by-side stack is in progress. Note: this state will be removed once the upgrade completes and the host is able to accept connections. UpgradeFailed - Session Host is unavailable because the critical component upgrade (agent, side-by-side stack, etc.) failed." + "modelAsString": true, + "values": [ + { + "value": "Available", + "description": "Session Host has passed all the health checks and is available to handle connections." + }, + { + "value": "Unavailable", + "description": "Session Host is either turned off or has failed critical health checks which is causing service not to be able to route connections to this session host. Note this replaces previous 'NoHeartBeat' status." + }, + { + "value": "Shutdown", + "description": "Session Host is shutdown - RD Agent reported session host to be stopped or deallocated." + }, + { + "value": "Disconnected", + "description": "The Session Host is unavailable because it is currently disconnected." + }, + { + "value": "Upgrading", + "description": "Session Host is unavailable because currently an upgrade of RDAgent/side-by-side stack is in progress. Note: this state will be removed once the upgrade completes and the host is able to accept connections." + }, + { + "value": "UpgradeFailed", + "description": "Session Host is unavailable because the critical component upgrade (agent, side-by-side stack, etc.) failed." + }, + { + "value": "NoHeartbeat", + "description": "The Session Host is not heart beating." + }, + { + "value": "NotJoinedToDomain", + "description": "SessionHost is not joined to domain." + }, + { + "value": "DomainTrustRelationshipLost", + "description": "SessionHost's domain trust relationship lost" + }, + { + "value": "SxSStackListenerNotReady", + "description": "SxS stack installed on the SessionHost is not ready to receive connections." + }, + { + "value": "FSLogixNotHealthy", + "description": "FSlogix is in an unhealthy state on the session host." + }, + { + "value": "NeedsAssistance", + "description": "New status to inform admins that the health on their endpoint needs to be fixed. The connections might not fail, as these issues are not fatal." + } + ] + }, + "type": "string", + "description": "Status for a SessionHost." }, "statusTimestamp": { "format": "date-time", @@ -3889,10 +4100,56 @@ ], "x-ms-enum": { "name": "HealthCheckName", - "modelAsString": true - }, - "type": "string", - "description": "Represents the name of the health check operation performed. DomainJoinedCheck - Verifies the SessionHost is joined to a domain. If this check fails is classified as fatal as no connection can succeed if the SessionHost is not joined to the domain. DomainTrustCheck - Verifies the SessionHost is not experiencing domain trust issues that will prevent authentication on SessionHost at connection time when session is created. If this check fails is classified as fatal as no connection can succeed if we cannot reach the domain for authentication on the SessionHost. FSLogixHealthCheck - Verifies the FSLogix service is up and running to make sure users' profiles are loaded in the session. If this check fails is classified as fatal as even if the connection can succeed, user experience is bad as the user profile cannot be loaded and user will get a temporary profile in the session. SxSStackListenerCheck - Verifies that the SxS stack is up and running so connections can succeed. If this check fails is classified as fatal as no connection can succeed if the SxS stack is not ready. UrlsAccessibleCheck - Verifies that the required WVD service and Geneva URLs are reachable from the SessionHost. These URLs are: RdTokenUri, RdBrokerURI, RdDiagnosticsUri and storage blob URLs for agent monitoring (geneva). If this check fails, it is non fatal and the machine still can service connections, main issue may be that monitoring agent is unable to store warm path data (logs, operations ...). MonitoringAgentCheck - Verifies that the required Geneva agent is running. If this check fails, it is non fatal and the machine still can service connections, main issue may be that monitoring agent is missing or running (possibly) older version. DomainReachable - Verifies the domain the SessionHost is joined to is still reachable. If this check fails is classified as fatal as no connection can succeed if the domain the SessionHost is joined is not reachable at the time of connection. WebRTCRedirectorCheck - Verifies whether the WebRTCRedirector component is healthy. The WebRTCRedirector component is used to optimize video and audio performance in Microsoft Teams. This checks whether the component is still running, and whether there is a higher version available. If this check fails, it is non fatal and the machine still can service connections, main issue may be the WebRTCRedirector component has to be restarted or updated. SupportedEncryptionCheck - Verifies the value of SecurityLayer registration key. If the value is 0 (SecurityLayer.RDP) this check fails with Error code = NativeMethodErrorCode.E_FAIL and is fatal. If the value is 1 (SecurityLayer.Negotiate) this check fails with Error code = NativeMethodErrorCode.ERROR_SUCCESS and is non fatal. MetaDataServiceCheck - Verifies the metadata service is accessible and return compute properties. AppAttachHealthCheck - Verifies that the AppAttachService is healthy (there were no issues during package staging). The AppAttachService is used to enable the staging/registration (and eventual deregistration/destaging) of MSIX apps that have been set up by the tenant admin. This checks whether the component had any failures during package staging. Failures in staging will prevent some MSIX apps from working properly for the end user. If this check fails, it is non fatal and the machine still can service connections, main issue may be certain apps will not work for end-users.", + "modelAsString": true, + "values": [ + { + "value": "DomainJoinedCheck", + "description": "Verifies the SessionHost is joined to a domain. If this check fails is classified as fatal as no connection can succeed if the SessionHost is not joined to the domain." + }, + { + "value": "DomainTrustCheck", + "description": "Verifies the SessionHost is not experiencing domain trust issues that will prevent authentication on SessionHost at connection time when session is created. If this check fails is classified as fatal as no connection can succeed if we cannot reach the domain for authentication on the SessionHost." + }, + { + "value": "FSLogixHealthCheck", + "description": "Verifies the FSLogix service is up and running to make sure users' profiles are loaded in the session. If this check fails is classified as fatal as even if the connection can succeed, user experience is bad as the user profile cannot be loaded and user will get a temporary profile in the session." + }, + { + "value": "SxSStackListenerCheck", + "description": "Verifies that the SxS stack is up and running so connections can succeed. If this check fails is classified as fatal as no connection can succeed if the SxS stack is not ready." + }, + { + "value": "UrlsAccessibleCheck", + "description": "Verifies that the required WVD service and Geneva URLs are reachable from the SessionHost. These URLs are: RdTokenUri, RdBrokerURI, RdDiagnosticsUri and storage blob URLs for agent monitoring (geneva). If this check fails, it is non fatal and the machine still can service connections, main issue may be that monitoring agent is unable to store warm path data (logs, operations ...)." + }, + { + "value": "MonitoringAgentCheck", + "description": "Verifies that the required Geneva agent is running. If this check fails, it is non fatal and the machine still can service connections, main issue may be that monitoring agent is missing or running (possibly) older version." + }, + { + "value": "DomainReachable", + "description": "Verifies the domain the SessionHost is joined to is still reachable. If this check fails is classified as fatal as no connection can succeed if the domain the SessionHost is joined is not reachable at the time of connection." + }, + { + "value": "WebRTCRedirectorCheck", + "description": "Verifies whether the WebRTCRedirector component is healthy. The WebRTCRedirector component is used to optimize video and audio performance in Microsoft Teams. This checks whether the component is still running, and whether there is a higher version available. If this check fails, it is non fatal and the machine still can service connections, main issue may be the WebRTCRedirector component has to be restarted or updated." + }, + { + "value": "SupportedEncryptionCheck", + "description": "Verifies the value of SecurityLayer registration key. If the value is 0 (SecurityLayer.RDP) this check fails with Error code = NativeMethodErrorCode.E_FAIL and is fatal. If the value is 1 (SecurityLayer.Negotiate) this check fails with Error code = NativeMethodErrorCode.ERROR_SUCCESS and is non fatal." + }, + { + "value": "MetaDataServiceCheck", + "description": "Verifies the metadata service is accessible and return compute properties." + }, + { + "value": "AppAttachHealthCheck", + "description": "Verifies that the AppAttachService is healthy (there were no issues during package staging). The AppAttachService is used to enable the staging/registration (and eventual deregistration/destaging) of MSIX apps that have been set up by the tenant admin. This checks whether the component had any failures during package staging. Failures in staging will prevent some MSIX apps from working properly for the end user. If this check fails, it is non fatal and the machine still can service connections, main issue may be certain apps will not work for end-users." + } + ] + }, + "type": "string", + "description": "Represents the name of the health check operation performed.", "readOnly": true }, "healthCheckResult": { @@ -3904,10 +4161,28 @@ ], "x-ms-enum": { "name": "HealthCheckResult", - "modelAsString": true - }, - "type": "string", - "description": "Represents the Health state of the health check we performed. Unknown - Health check result is not currently known. HealthCheckSucceeded - Health check passed. HealthCheckFailed - Health check failed. SessionHostShutdown - We received a Shutdown notification.", + "modelAsString": true, + "values": [ + { + "value": "Unknown", + "description": "Health check result is not currently known." + }, + { + "value": "HealthCheckSucceeded", + "description": "Health check passed." + }, + { + "value": "HealthCheckFailed", + "description": "Health check failed." + }, + { + "value": "SessionHostShutdown", + "description": "We received a Shutdown notification." + } + ] + }, + "type": "string", + "description": "Represents the Health state of the health check we performed.", "readOnly": true }, "additionalFailureDetails": { @@ -4009,6 +4284,11 @@ "description": "Schema for UserSession properties.", "type": "object", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of user session. (internal use)", + "readOnly": true + }, "userPrincipalName": { "type": "string", "description": "The user principal name." @@ -4077,7 +4357,7 @@ "description": "Represents a scaling plan definition.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ResourceModelWithAllowedPropertySet" } ], "properties": { @@ -4092,6 +4372,16 @@ "type": "object", "description": "Scaling plan properties.", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of scaling plan. (internal use)", + "readOnly": true + }, + "ring": { + "type": "integer", + "format": "int32", + "description": "The ring number of scaling plan." + }, "description": { "type": "string", "description": "Description of scaling plan." @@ -4107,14 +4397,29 @@ "hostPoolType": { "enum": [ "Personal", - "Pooled" + "Pooled", + "BYODesktop" ], "x-ms-enum": { "name": "HostPoolType", - "modelAsString": true + "modelAsString": true, + "values": [ + { + "value": "Personal", + "description": "Users will be assigned a SessionHost either by administrators (PersonalDesktopAssignmentType = Direct) or upon connecting to the pool (PersonalDesktopAssignmentType = Automatic). They will always be redirected to their assigned SessionHost." + }, + { + "value": "Pooled", + "description": "Users get a new (random) SessionHost every time it connects to the HostPool." + }, + { + "value": "BYODesktop", + "description": "Users assign their own machines, load balancing logic remains the same as Personal. PersonalDesktopAssignmentType must be Direct." + } + ] }, "type": "string", - "description": "HostPool type for scaling plan.", + "description": "HostPool type for desktop.", "x-nullable": false }, "exclusionTag": { @@ -4339,6 +4644,11 @@ "type": "object", "description": "Scaling plan properties.", "properties": { + "ring": { + "type": "integer", + "format": "int32", + "description": "The ring number of scaling plan." + }, "description": { "type": "string", "description": "Description of scaling plan." @@ -4354,14 +4664,29 @@ "hostPoolType": { "enum": [ "Personal", - "Pooled" + "Pooled", + "BYODesktop" ], "x-ms-enum": { "name": "HostPoolType", - "modelAsString": true + "modelAsString": true, + "values": [ + { + "value": "Personal", + "description": "Users will be assigned a SessionHost either by administrators (PersonalDesktopAssignmentType = Direct) or upon connecting to the pool (PersonalDesktopAssignmentType = Automatic). They will always be redirected to their assigned SessionHost." + }, + { + "value": "Pooled", + "description": "Users get a new (random) SessionHost every time it connects to the HostPool." + }, + { + "value": "BYODesktop", + "description": "Users assign their own machines, load balancing logic remains the same as Personal. PersonalDesktopAssignmentType must be Direct." + } + ] }, "type": "string", - "description": "HostPool type for scaling plan.", + "description": "HostPool type for desktop.", "x-nullable": false }, "exclusionTag": { @@ -4383,6 +4708,53 @@ } } } + }, + "MigrationRequestProperties": { + "type": "object", + "description": "Properties for arm migration.", + "properties": { + "operation": { + "enum": [ + "Start", + "Revoke", + "Complete", + "Hide", + "Unhide" + ], + "x-ms-enum": { + "name": "Operation", + "modelAsString": true, + "values": [ + { + "value": "Start", + "description": "Start the migration." + }, + { + "value": "Revoke", + "description": "Revoke the migration." + }, + { + "value": "Complete", + "description": "Complete the migration." + }, + { + "value": "Hide", + "description": "Hide the hostpool." + }, + { + "value": "Unhide", + "description": "Unhide the hostpool." + } + ] + }, + "type": "string", + "description": "The type of operation for migration." + }, + "migrationPath": { + "type": "string", + "description": "The path to the legacy object to migrate." + } + } } }, "parameters": { diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Create.json index 59d7f296a3db..56cb31c2aabe 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Create.json @@ -14,7 +14,11 @@ "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } }, @@ -30,11 +34,17 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } }, @@ -49,11 +59,17 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Delete.json index 996edc433528..4aa3ffce4fe6 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Delete.json @@ -16,11 +16,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } }, "204": {} diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Get.json index 876c85e5acf1..653181baa12f 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Get.json @@ -17,11 +17,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListByResourceGroup.json index 5cdf0556f9ec..2559a1278b24 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListByResourceGroup.json @@ -19,11 +19,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } }, { @@ -36,11 +38,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListBySubscription.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListBySubscription.json index d63c79179c1b..0da34711aecf 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListBySubscription.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_ListBySubscription.json @@ -18,11 +18,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } }, { @@ -35,11 +37,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Update.json index 317e6afa24d6..c5da4223a6ca 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ApplicationGroup_Update.json @@ -27,11 +27,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Create.json index 1c926d5de50d..c9c8f5c41271 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Create.json @@ -25,6 +25,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", @@ -47,6 +48,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Delete.json index 607324c8ee16..aafaaae0dac1 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Delete.json @@ -12,6 +12,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Get.json index ec978a3c19e3..d00714ad747b 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Get.json @@ -13,6 +13,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_List.json index fbcca5309bd1..002465538456 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_List.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", @@ -34,6 +35,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application2", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des2", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Update.json index f664c43812ba..3bb818dc6ca3 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Application_Update.json @@ -28,6 +28,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Get.json index fe772e59a189..240b82dad51d 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Get.json @@ -13,6 +13,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/SessionDesktop", "type": "Microsoft.DesktopVirtualization/applicationGroups/desktops", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_List.json index fe6ecb8401ce..d992e8b7af4d 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_List.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/SessionDesktop", "type": "Microsoft.DesktopVirtualization/applicationGroups/desktops", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Update.json index 0665d96af66f..81b546561e9c 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Desktop_Update.json @@ -19,6 +19,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/desktops/SessionDesktop", "type": "Microsoft.DesktopVirtualization/applicationGroups/desktops", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Create.json index 7f8545bcc2eb..ebaa75731b2c 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Create.json @@ -28,7 +28,11 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } }, @@ -44,6 +48,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -64,7 +69,12 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } }, @@ -79,6 +89,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -99,7 +110,12 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Delete.json index ce628fff5bed..ee4e58708145 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Delete.json @@ -17,6 +17,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -36,7 +37,8 @@ "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } }, "204": {} diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Get.json index 92fcb9450348..7cdba6fe4e8a 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Get.json @@ -17,6 +17,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -37,7 +38,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_List.json index c9bfbd9a466a..de406eb5ad91 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_List.json @@ -17,6 +17,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -37,7 +38,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } }, { @@ -50,6 +52,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -70,7 +73,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_ListByResourceGroup.json index 68d390ae9fe8..311e3d5109d2 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_ListByResourceGroup.json @@ -18,6 +18,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -38,7 +39,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } }, { @@ -51,6 +53,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -71,7 +74,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Update.json index 2350e3e81a87..33a6163f16eb 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPool_Update.json @@ -41,6 +41,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -61,7 +62,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPools_RetrieveRegistrationToken_Post.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPools_RetrieveRegistrationToken_Post.json new file mode 100644 index 000000000000..011b5e35eb6e --- /dev/null +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/HostPools_RetrieveRegistrationToken_Post.json @@ -0,0 +1,17 @@ +{ + "parameters": { + "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa", + "resourceGroupName": "resourceGroup1", + "hostPoolName": "hostPool1", + "api-version": "2021-01-14-preview" + }, + "responses": { + "200": { + "body": { + "expirationTime": "2008-09-22T14:01:54.9571247Z", + "token": "token", + "registrationTokenOperation": "Update" + } + } + } +} diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/OperationDescription_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/OperationDescription_List.json index 50d528feeaa3..ccf598bf466f 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/OperationDescription_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/OperationDescription_List.json @@ -13,7 +13,8 @@ "resource": "hostpools", "operation": "Read hostpool", "description": "Read hostpool" - } + }, + "isDataAction": false }, { "name": "Microsoft.DesktopVirtualization/hostpools/write", @@ -22,7 +23,26 @@ "resource": "hostpools", "operation": "Write hostpool", "description": "Write hostpool" - } + }, + "properties": { + "serviceSpecification": { + "logSpecifications": [ + { + "name": "", + "displayName": "" + }, + { + "name": "", + "displayName": "" + }, + { + "name": "", + "displayName": "" + } + ] + } + }, + "isDataAction": false } ] } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Create.json index fde467541f07..ded3869076db 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Create.json @@ -11,6 +11,7 @@ "tag2": "value2" }, "properties": { + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", @@ -64,6 +65,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", @@ -116,6 +119,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Delete.json index e4e27348d82f..4846fbcb3bfc 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Delete.json @@ -16,6 +16,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Get.json index 0b706b31b031..4256753a7a31 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Get.json @@ -17,6 +17,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListByHostPool.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListByHostPool.json index cfa4a23405df..c6772f2322b6 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListByHostPool.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListByHostPool.json @@ -19,6 +19,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListByResourceGroup.json index a6f864b31b31..820590a37563 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListByResourceGroup.json @@ -18,6 +18,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", @@ -68,6 +70,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListBySubscription.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListBySubscription.json index 039b77893c7d..f1b1d73b2e53 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListBySubscription.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_ListBySubscription.json @@ -17,6 +17,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", @@ -67,6 +69,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Update.json index 946eddacdf8f..a05fd90e380f 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/ScalingPlan_Update.json @@ -10,6 +10,7 @@ "tag2": "value2" }, "properties": { + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", @@ -63,6 +64,8 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", + "ring": 1, "description": "des1", "friendlyName": "friendly", "timeZone": "", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Delete.json index 73580ea229fe..b4527e561962 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Delete.json @@ -13,6 +13,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2008-09-22T14:01:54.9571247Z", "sessions": 1, "agentVersion": "1.0.0.1391", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Get.json index 0f314b788390..e8e0aed65042 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Get.json @@ -13,6 +13,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2008-09-22T14:01:54.9571247Z", "sessions": 1, "agentVersion": "1.0.0.1391", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_List.json index f39c673e8b2c..bb0ea624091f 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_List.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionhosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2008-09-22T14:01:54.9571247Z", "sessions": 1, "agentVersion": "1.0.0.1391", @@ -46,6 +47,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost2microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionhosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2008-09-22T14:01:54.9571247Z", "sessions": 1, "agentVersion": "1.0.0.1391", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Update.json index 796ae0690e22..401574198fee 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/SessionHost_Update.json @@ -19,6 +19,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionhosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2019-01-11T19:27:13.6108027Z", "sessions": 1, "agentVersion": "1.0.0.1391", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_Delete.json index 3efc91fd3728..365105be80ce 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_Delete.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/1", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_Get.json index 701295a295bd..a04460ab0338 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_Get.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/1", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_List.json index e86bdb3ab58f..e900a70c55bf 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_List.json @@ -15,6 +15,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/1", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", @@ -27,6 +28,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/2", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_ListByHostPool.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_ListByHostPool.json index e200eb8bea09..155261020e79 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_ListByHostPool.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/UserSession_ListByHostPool.json @@ -15,6 +15,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/1", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", @@ -27,6 +28,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/2", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Create.json index a9a71c384240..ea6948c08621 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Create.json @@ -28,8 +28,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } }, @@ -44,8 +46,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Delete.json index 25b8e8ec5aea..6ccf55c17c18 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Delete.json @@ -16,8 +16,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } }, "204": {} diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Get.json index 9f159521a518..51793b41e06c 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Get.json @@ -17,8 +17,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_ListByResourceGroup.json index cdd585851a9c..42254a9a528f 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_ListByResourceGroup.json @@ -18,8 +18,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } }, { @@ -32,8 +34,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_ListBySubscription.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_ListBySubscription.json index 563a26472ab9..06a7629a60eb 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_ListBySubscription.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_ListBySubscription.json @@ -17,8 +17,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } }, { @@ -31,8 +33,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Update.json index cbe86c1f7944..57ebfc264619 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-01-14-preview/examples/Workspace_Update.json @@ -27,8 +27,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/desktopvirtualization.json index cf288edc5a8d..877afde7b757 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/desktopvirtualization.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/desktopvirtualization.json @@ -2509,6 +2509,54 @@ "type": "string" } } + }, + "isDataAction": { + "description": "Is a data action.", + "type": "boolean" + }, + "properties": { + "$ref": "#/definitions/OperationProperties" + } + } + }, + "OperationProperties": { + "description": "Properties of the operation", + "type": "object", + "properties": { + "serviceSpecification": { + "$ref": "#/definitions/ServiceSpecification" + } + } + }, + "ServiceSpecification": { + "description": "Service specification payload", + "type": "object", + "properties": { + "logSpecifications": { + "description": "Specifications of the Log for Azure Monitoring", + "uniqueItems": false, + "type": "array", + "items": { + "$ref": "#/definitions/LogSpecification" + } + } + } + }, + "LogSpecification": { + "description": "Specifications of the Log for Azure Monitoring", + "type": "object", + "properties": { + "name": { + "description": "Name of the log", + "type": "string" + }, + "displayName": { + "description": "Localized friendly display name of the log", + "type": "string" + }, + "blobDuration": { + "description": "Blob duration of the log", + "type": "string" } } }, @@ -2517,7 +2565,7 @@ "description": "Represents a Workspace definition.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ResourceModelWithAllowedPropertySet" } ], "properties": { @@ -2532,6 +2580,11 @@ "description": "Schema for Workspace properties.", "type": "object", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of Workspace. (internal use)", + "readOnly": true + }, "description": { "type": "string", "description": "Description of Workspace." @@ -2546,6 +2599,11 @@ "items": { "type": "string" } + }, + "cloudPcResource": { + "type": "boolean", + "description": "Is cloud pc resource.", + "readOnly": true } } }, @@ -2612,7 +2670,7 @@ "description": "Represents a ApplicationGroup definition.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ResourceModelWithAllowedPropertySet" } ], "required": [ @@ -2635,6 +2693,11 @@ "applicationGroupType" ], "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of ApplicationGroup. (internal use)", + "readOnly": true + }, "description": { "type": "string", "description": "Description of ApplicationGroup." @@ -2665,6 +2728,15 @@ "type": "string", "description": "Resource Type of ApplicationGroup.", "x-nullable": false + }, + "migrationRequest": { + "$ref": "#/definitions/MigrationRequestProperties", + "description": "The registration info of HostPool." + }, + "cloudPcResource": { + "type": "boolean", + "description": "Is cloud pc resource.", + "readOnly": true } } }, @@ -2729,7 +2801,7 @@ "description": "Represents a HostPool definition.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ResourceModelWithAllowedPropertySet" } ], "required": [ @@ -2753,6 +2825,11 @@ "preferredAppGroupType" ], "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of HostPool. (internal use)", + "readOnly": true + }, "friendlyName": { "type": "string", "description": "Friendly name of HostPool." @@ -2799,8 +2876,7 @@ "modelAsString": true }, "type": "string", - "description": "PersonalDesktopAssignment type for HostPool.", - "x-nullable": false + "description": "PersonalDesktopAssignment type for HostPool." }, "customRdpProperty": { "type": "string", @@ -2872,8 +2948,7 @@ "modelAsString": true }, "type": "string", - "description": "The type of single sign on Secret Type.", - "x-nullable": false + "description": "The type of single sign on Secret Type." }, "preferredAppGroupType": { "enum": [ @@ -2892,6 +2967,15 @@ "startVMOnConnect": { "type": "boolean", "description": "The flag to turn on/off StartVMOnConnect feature." + }, + "migrationRequest": { + "$ref": "#/definitions/MigrationRequestProperties", + "description": "The registration info of HostPool." + }, + "cloudPcResource": { + "type": "boolean", + "description": "Is cloud pc resource.", + "readOnly": true } } }, @@ -3003,8 +3087,7 @@ "modelAsString": true }, "type": "string", - "description": "The type of single sign on Secret Type.", - "x-nullable": false + "description": "The type of single sign on Secret Type." }, "preferredAppGroupType": { "enum": [ @@ -3340,6 +3423,11 @@ "commandLineSetting" ], "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of Application. (internal use)", + "readOnly": true + }, "description": { "type": "string", "description": "Description of Application." @@ -3555,6 +3643,11 @@ "description": "Schema for Desktop properties.", "type": "object", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of Desktop. (internal use)", + "readOnly": true + }, "description": { "type": "string", "description": "Description of Desktop." @@ -3830,6 +3923,11 @@ "description": "Schema for SessionHost properties.", "type": "object", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of SessionHost. (internal use)", + "readOnly": true + }, "lastHeartBeat": { "format": "date-time", "type": "string", @@ -4186,6 +4284,11 @@ "description": "Schema for UserSession properties.", "type": "object", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of user session. (internal use)", + "readOnly": true + }, "userPrincipalName": { "type": "string", "description": "The user principal name." @@ -4254,7 +4357,7 @@ "description": "Represents a scaling plan definition.", "allOf": [ { - "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/TrackedResource" + "$ref": "../../../../../common-types/resource-management/v1/types.json#/definitions/ResourceModelWithAllowedPropertySet" } ], "properties": { @@ -4269,6 +4372,11 @@ "type": "object", "description": "Scaling plan properties.", "properties": { + "objectId": { + "type": "string", + "description": "ObjectId of scaling plan. (internal use)", + "readOnly": true + }, "ring": { "type": "integer", "format": "int32", @@ -4600,6 +4708,53 @@ } } } + }, + "MigrationRequestProperties": { + "type": "object", + "description": "Properties for arm migration.", + "properties": { + "operation": { + "enum": [ + "Start", + "Revoke", + "Complete", + "Hide", + "Unhide" + ], + "x-ms-enum": { + "name": "Operation", + "modelAsString": true, + "values": [ + { + "value": "Start", + "description": "Start the migration." + }, + { + "value": "Revoke", + "description": "Revoke the migration." + }, + { + "value": "Complete", + "description": "Complete the migration." + }, + { + "value": "Hide", + "description": "Hide the hostpool." + }, + { + "value": "Unhide", + "description": "Unhide the hostpool." + } + ] + }, + "type": "string", + "description": "The type of operation for migration." + }, + "migrationPath": { + "type": "string", + "description": "The path to the legacy object to migrate." + } + } } }, "parameters": { diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Create.json index ca78e352bd3d..7df8ce75ec21 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Create.json @@ -14,7 +14,11 @@ "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } }, @@ -30,11 +34,17 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } }, @@ -49,11 +59,17 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Delete.json index 100a00b34dde..e34657717d27 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Delete.json @@ -16,11 +16,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } }, "204": {} diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Get.json index 914daddb11d8..11345dd2cea4 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Get.json @@ -17,11 +17,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_ListByResourceGroup.json index cd92f6947d4d..4a55ca10e86d 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_ListByResourceGroup.json @@ -19,11 +19,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } }, { @@ -36,11 +38,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_ListBySubscription.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_ListBySubscription.json index 85160ee1f226..e3a9a8ee95e5 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_ListBySubscription.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_ListBySubscription.json @@ -18,11 +18,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } }, { @@ -35,11 +37,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Update.json index 890fa337525d..fe563297bb3c 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ApplicationGroup_Update.json @@ -27,11 +27,13 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "hostPoolArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1", "workspaceArmPath": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/workspaces/workspace1", - "applicationGroupType": "RemoteApp" + "applicationGroupType": "RemoteApp", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Create.json index c7f06700e155..5b8bcf812742 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Create.json @@ -25,6 +25,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", @@ -47,6 +48,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Delete.json index 50ec5b0fe699..9fda9ad75f95 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Delete.json @@ -12,6 +12,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Get.json index b5a16d26ceb8..64b946701aeb 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Get.json @@ -13,6 +13,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_List.json index 6167cbf1276a..786f19fb6d66 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_List.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", @@ -34,6 +35,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application2", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des2", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Update.json index dfcbdc539aeb..74dbb1327728 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Application_Update.json @@ -28,6 +28,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/application1", "type": "Microsoft.DesktopVirtualization/applicationGroups/applications", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "filePath": "path", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_Get.json index 2ac2079bb2f6..6f8f70f14d24 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_Get.json @@ -13,6 +13,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/SessionDesktop", "type": "Microsoft.DesktopVirtualization/applicationGroups/desktops", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_List.json index b31bcd1ccbe4..7744918c9d54 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_List.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/applications/SessionDesktop", "type": "Microsoft.DesktopVirtualization/applicationGroups/desktops", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_Update.json index 6ad9c671d7ce..01dc223693e0 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Desktop_Update.json @@ -19,6 +19,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/applicationGroups/applicationGroup1/desktops/SessionDesktop", "type": "Microsoft.DesktopVirtualization/applicationGroups/desktops", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", "friendlyName": "friendly", "iconHash": "bEQ1n2HysrGxCDvgt4bfOtkET8ydzh5SXGM0KGTBPVc", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Create.json index 0ccb51e468d7..538124916250 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Create.json @@ -28,7 +28,11 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } }, @@ -44,6 +48,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -64,7 +69,12 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } }, @@ -79,6 +89,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -99,7 +110,12 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false, + "migrationRequest": { + "migrationPath": "TenantGroups/{defaultV1TenantGroup.Name}/Tenants/{defaultV1Tenant.Name}/HostPools/{sessionHostPool.Name}", + "operation": "Start" + } } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Delete.json index b9fd5b273097..287afad085cd 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Delete.json @@ -17,6 +17,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -36,7 +37,8 @@ "ssoClientId": "client", "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } }, "204": {} diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Get.json index d2ebdb32105d..21de55ae5323 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Get.json @@ -17,6 +17,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -37,7 +38,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_List.json index 75c5f2d635c0..d219199ebedf 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_List.json @@ -17,6 +17,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -37,7 +38,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } }, { @@ -50,6 +52,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -70,7 +73,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_ListByResourceGroup.json index 19258d0508e5..3edb147c6cf6 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_ListByResourceGroup.json @@ -18,6 +18,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -38,7 +39,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } }, { @@ -51,6 +53,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -71,7 +74,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Update.json index d58707e9da4d..6d4a51270c28 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/HostPool_Update.json @@ -41,6 +41,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "friendlyName": "friendly", "description": "des1", "hostPoolType": "Pooled", @@ -61,7 +62,8 @@ "ssoClientSecretKeyVaultPath": "https://keyvault/secret", "ssoSecretType": "SharedKey", "preferredAppGroupType": "Desktop", - "startVMOnConnect": false + "startVMOnConnect": false, + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/OperationDescription_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/OperationDescription_List.json index c55afc9e2505..e3cef4c29b97 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/OperationDescription_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/OperationDescription_List.json @@ -13,7 +13,8 @@ "resource": "hostpools", "operation": "Read hostpool", "description": "Read hostpool" - } + }, + "isDataAction": false }, { "name": "Microsoft.DesktopVirtualization/hostpools/write", @@ -22,7 +23,26 @@ "resource": "hostpools", "operation": "Write hostpool", "description": "Write hostpool" - } + }, + "properties": { + "serviceSpecification": { + "logSpecifications": [ + { + "name": "", + "displayName": "" + }, + { + "name": "", + "displayName": "" + }, + { + "name": "", + "displayName": "" + } + ] + } + }, + "isDataAction": false } ] } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Create.json index dc0676835b4d..d1d32c8c573b 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Create.json @@ -65,6 +65,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", @@ -118,6 +119,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Delete.json index 27cbcb4e4645..6bd7638a8462 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Delete.json @@ -16,6 +16,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Get.json index 909860b26af3..cd966e704b41 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Get.json @@ -17,6 +17,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListByHostPool.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListByHostPool.json index e08924997bba..c6314d74d9cd 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListByHostPool.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListByHostPool.json @@ -19,6 +19,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListByResourceGroup.json index dd168b8925bd..487f27013326 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListByResourceGroup.json @@ -18,6 +18,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", @@ -69,6 +70,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListBySubscription.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListBySubscription.json index e45ae7fc2558..b63cac44cef3 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListBySubscription.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_ListBySubscription.json @@ -17,6 +17,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", @@ -68,6 +69,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Update.json index 46e05659b1a8..39fe5df2be16 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/ScalingPlan_Update.json @@ -64,6 +64,7 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "ring": 1, "description": "des1", "friendlyName": "friendly", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Delete.json index 5aeae0bcce09..486ddb944026 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Delete.json @@ -13,6 +13,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2008-09-22T14:01:54.9571247Z", "sessions": 1, "agentVersion": "1.0.0.1391", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Get.json index 8088708df38b..d3efdfe3e2b2 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Get.json @@ -13,6 +13,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2008-09-22T14:01:54.9571247Z", "sessions": 1, "agentVersion": "1.0.0.1391", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_List.json index 715775baa1d3..509c58d43591 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_List.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionhosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2008-09-22T14:01:54.9571247Z", "sessions": 1, "agentVersion": "1.0.0.1391", @@ -46,6 +47,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost2microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionhosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2008-09-22T14:01:54.9571247Z", "sessions": 1, "agentVersion": "1.0.0.1391", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Update.json index ad113a5fc3da..ddb9727c002a 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/SessionHost_Update.json @@ -19,6 +19,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com", "type": "Microsoft.DesktopVirtualization/hostPools/sessionhosts", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "lastHeartBeat": "2019-01-11T19:27:13.6108027Z", "sessions": 1, "agentVersion": "1.0.0.1391", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_Delete.json index 51acbc18e558..1776bae8db50 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_Delete.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/1", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_Get.json index bca154dd6282..4425a7307034 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_Get.json @@ -14,6 +14,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/1", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_List.json index 5c3f458e468b..46056241ce25 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_List.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_List.json @@ -15,6 +15,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/1", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", @@ -27,6 +28,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/2", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_ListByHostPool.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_ListByHostPool.json index 9717ae20c704..581c4773326a 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_ListByHostPool.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/UserSession_ListByHostPool.json @@ -15,6 +15,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/1", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", @@ -27,6 +28,7 @@ "id": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.DesktopVirtualization/hostPools/hostPool1/sessionHosts/sessionHost1.microsoft.com/userSessions/2", "type": "Microsoft.DesktopVirtualization/hostPools/sessionHosts/userSessions", "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "userPrincipalName": "user1@microsoft.com", "applicationType": "Desktop", "sessionState": "Active", diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Create.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Create.json index c6fbeff5ada4..b987147ffa47 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Create.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Create.json @@ -28,8 +28,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } }, @@ -44,8 +46,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Delete.json index 5a107ba7df89..4f1e5835a6d9 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Delete.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Delete.json @@ -16,8 +16,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } }, "204": {} diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Get.json index 8e2fc8229fd7..767c089d0091 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Get.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Get.json @@ -17,8 +17,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } } diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_ListByResourceGroup.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_ListByResourceGroup.json index 017e97d7b336..cf97ad6bac0e 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_ListByResourceGroup.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_ListByResourceGroup.json @@ -18,8 +18,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } }, { @@ -32,8 +34,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_ListBySubscription.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_ListBySubscription.json index 305125d5995b..dd662450843a 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_ListBySubscription.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_ListBySubscription.json @@ -17,8 +17,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } }, { @@ -31,8 +33,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } ] diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Update.json index 053596dcb09f..78d574312c79 100644 --- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Update.json +++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2021-02-01-preview/examples/Workspace_Update.json @@ -27,8 +27,10 @@ "key2": "value2" }, "properties": { + "objectId": "7877fb31-4bde-49fd-9df3-c046e0ec5325", "description": "des1", - "friendlyName": "friendly" + "friendlyName": "friendly", + "cloudPcResource": false } } }