From 0f1d34cbf8d9df70572ea398a48c29d40cf4912a Mon Sep 17 00:00:00 2001
From: datr93 <43795914+datr93@users.noreply.github.com>
Date: Thu, 25 Jun 2020 23:50:28 -0700
Subject: [PATCH] add resource id (#9955)

* add resource id

* examples backwards

* fix prettier
---
 .../preview/2019-01-23-preview/desktopvirtualization.json | 5 +++++
 .../2019-01-23-preview/examples/SessionHost_Delete.json   | 3 ++-
 .../2019-01-23-preview/examples/SessionHost_Get.json      | 3 ++-
 .../2019-01-23-preview/examples/SessionHost_List.json     | 6 ++++--
 .../2019-01-23-preview/examples/SessionHost_Update.json   | 3 ++-
 .../preview/2019-09-24-preview/desktopvirtualization.json | 5 +++++
 .../2019-09-24-preview/examples/SessionHost_Delete.json   | 4 +++-
 .../2019-09-24-preview/examples/SessionHost_Get.json      | 4 +++-
 .../2019-09-24-preview/examples/SessionHost_List.json     | 8 ++++++--
 .../2019-09-24-preview/examples/SessionHost_Update.json   | 4 +++-
 .../preview/2019-12-10-preview/desktopvirtualization.json | 5 +++++
 .../2019-12-10-preview/examples/SessionHost_Delete.json   | 3 ++-
 .../2019-12-10-preview/examples/SessionHost_Get.json      | 3 ++-
 .../2019-12-10-preview/examples/SessionHost_List.json     | 6 ++++--
 .../2019-12-10-preview/examples/SessionHost_Update.json   | 3 ++-
 15 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/desktopvirtualization.json
index 35d3387dcbf0..9057fd8119ba 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/desktopvirtualization.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/desktopvirtualization.json
@@ -2700,6 +2700,11 @@
           "description": "Allow a new session."
         },
         "virtualMachineId": {
+          "type": "string",
+          "description": "Virtual Machine Id of SessionHost's underlying virtual machine.",
+          "readOnly": true
+        },
+        "resourceId": {
           "type": "string",
           "description": "Resource Id of SessionHost's underlying virtual machine.",
           "readOnly": true
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Delete.json
index 864b4679d0dd..a0fb8de17874 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Delete.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Delete.json
@@ -25,7 +25,8 @@
         "updateState": "Succeeded",
         "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
         "updateErrorMessage": "",
-        "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
+        "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+        "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
       }
     },
     "204": {}
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Get.json
index b7479a52e40c..cdf7f8c1d3a2 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Get.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Get.json
@@ -25,7 +25,8 @@
           "updateState": "Succeeded",
           "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
           "updateErrorMessage": "",
-          "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
+          "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+          "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
         }
       }
     }
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_List.json
index d3785e2a04da..4dffe5b95b7f 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_List.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_List.json
@@ -26,7 +26,8 @@
               "updateState": "Succeeded",
               "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
               "updateErrorMessage": "",
-              "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
+              "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+              "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
             }
           },
           {
@@ -46,7 +47,8 @@
               "updateState": "Succeeded",
               "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
               "updateErrorMessage": "",
-              "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost2"
+              "virtualMachineId": "39491b54-c033-4dec-b09a-18bf0ebafaef",
+              "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost2"
             }
           }
         ]
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Update.json
index 199ee8fb5420..fa38d983465f 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Update.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-01-23-preview/examples/SessionHost_Update.json
@@ -31,7 +31,8 @@
           "updateState": "Succeeded",
           "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
           "updateErrorMessage": "",
-          "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
+          "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+          "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
         }
       }
     }
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/desktopvirtualization.json
index ebef3d61d55a..57941b12e443 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/desktopvirtualization.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/desktopvirtualization.json
@@ -2719,6 +2719,11 @@
           "description": "Allow a new session."
         },
         "virtualMachineId": {
+          "type": "string",
+          "description": "Virtual Machine Id of SessionHost's underlying virtual machine.",
+          "readOnly": true
+        },
+        "resourceId": {
           "type": "string",
           "description": "Resource Id of SessionHost's underlying virtual machine.",
           "readOnly": true
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Delete.json
index 1b0c26c20792..9a8b84e064d4 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Delete.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Delete.json
@@ -24,7 +24,9 @@
         "sxSStackVersion": "rdp-sxs190816002",
         "updateState": "Succeeded",
         "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
-        "updateErrorMessage": ""
+        "updateErrorMessage": "",
+        "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+        "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
       }
     },
     "204": {}
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Get.json
index 9b1c5f90bf63..4ebf983e1b15 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Get.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Get.json
@@ -24,7 +24,9 @@
           "sxSStackVersion": "rdp-sxs190816002",
           "updateState": "Succeeded",
           "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
-          "updateErrorMessage": ""
+          "updateErrorMessage": "",
+          "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+          "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
         }
       }
     }
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_List.json
index 164fcaccad86..45f5784ec15c 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_List.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_List.json
@@ -25,7 +25,9 @@
               "sxSStackVersion": "rdp-sxs190816002",
               "updateState": "Succeeded",
               "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
-              "updateErrorMessage": ""
+              "updateErrorMessage": "",
+              "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+              "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
             }
           },
           {
@@ -44,7 +46,9 @@
               "sxSStackVersion": "rdp-sxs190816002",
               "updateState": "Succeeded",
               "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
-              "updateErrorMessage": ""
+              "updateErrorMessage": "",
+              "virtualMachineId": "39491b54-c033-4dec-b09a-18bf0ebafaef",
+              "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost2"
             }
           }
         ]
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Update.json
index 379d98bbebcd..42a06c3969a6 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Update.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-09-24-preview/examples/SessionHost_Update.json
@@ -30,7 +30,9 @@
           "sxSStackVersion": "rdp-sxs190816002",
           "updateState": "Succeeded",
           "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
-          "updateErrorMessage": ""
+          "updateErrorMessage": "",
+          "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+          "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
         }
       }
     }
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
index 4e3df1be3b22..8b7462444aea 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/desktopvirtualization.json
@@ -2742,6 +2742,11 @@
           "description": "Allow a new session."
         },
         "virtualMachineId": {
+          "type": "string",
+          "description": "Virtual Machine Id of SessionHost's underlying virtual machine.",
+          "readOnly": true
+        },
+        "resourceId": {
           "type": "string",
           "description": "Resource Id of SessionHost's underlying virtual machine.",
           "readOnly": true
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Delete.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Delete.json
index 38eb21d3c27d..12cae16ead92 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Delete.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Delete.json
@@ -25,7 +25,8 @@
         "updateState": "Succeeded",
         "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
         "updateErrorMessage": "",
-        "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
+        "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+        "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
       }
     },
     "204": {}
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Get.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Get.json
index b573d742ae87..7c4fc2180b4b 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Get.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Get.json
@@ -25,7 +25,8 @@
           "updateState": "Succeeded",
           "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
           "updateErrorMessage": "",
-          "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
+          "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+          "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
         }
       }
     }
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_List.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_List.json
index ccd0e643edf1..12ba5cafb4f2 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_List.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_List.json
@@ -26,7 +26,8 @@
               "updateState": "Succeeded",
               "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
               "updateErrorMessage": "",
-              "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
+              "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+              "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
             }
           },
           {
@@ -46,7 +47,8 @@
               "updateState": "Succeeded",
               "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
               "updateErrorMessage": "",
-              "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost2"
+              "virtualMachineId": "39491b54-c033-4dec-b09a-18bf0ebafaef",
+              "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost2"
             }
           }
         ]
diff --git a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Update.json b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Update.json
index f97b52c68eb4..9353b6accd08 100644
--- a/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Update.json
+++ b/specification/desktopvirtualization/resource-manager/Microsoft.DesktopVirtualization/preview/2019-12-10-preview/examples/SessionHost_Update.json
@@ -31,7 +31,8 @@
           "updateState": "Succeeded",
           "lastUpdateTime": "2008-09-22T14:01:54.9571247Z",
           "updateErrorMessage": "",
-          "virtualMachineId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
+          "virtualMachineId": "29491b54-c033-4dec-b09a-18bf0ebafaef",
+          "resourceId": "/subscriptions/daefabc0-95b4-48b3-b645-8a753a63c4fa/resourceGroups/resourceGroup1/providers/Microsoft.Compute/virtualMachines/sessionHost1"
         }
       }
     }