apply new version again

Azure · Oct 26, 2020 · bea2bbd · bea2bbd
1 parent 90cd90b
commit bea2bbd
Show file tree

Hide file tree

Showing 45 changed files with 175 additions and 52 deletions.
diff --git a/...ger/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/desktopvirtualization.json b/...ger/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/desktopvirtualization.json
@@ -1,7 +1,7 @@
 {
   "swagger": "2.0",
   "info": {
-    "version": "2020-09-21-preview",
+    "version": "2020-10-19-preview",
     "title": "Desktop Virtualization API Client"
   },
   "schemes": [
@@ -2483,6 +2483,33 @@
           "type": "string",
           "description": "Path to keyvault containing ssoContext secret."
         },
+        "ssoadfsAuthority": {
+          "type": "string",
+          "description": "URL to customer ADFS server for signing WVD SSO certificates."
+        },
+        "ssoClientId": {
+          "type": "string",
+          "description": "ClientId for the registered Relying Party used to issue WVD SSO certificates."
+        },
+        "ssoClientSecretKeyVaultPath": {
+          "type": "string",
+          "description": "Path to Azure KeyVault storing the secret used for communication to ADFS."
+        },
+        "ssoSecretType": {
+          "enum": [
+            "SharedKey",
+            "Certificate",
+            "SharedKeyInKeyVault",
+            "CertificateInKeyVault"
+          ],
+          "x-ms-enum": {
+            "name": "SSOSecretType",
+            "modelAsString": true
+          },
+          "type": "string",
+          "description": "The type of single sign on Secret Type.",
+          "x-nullable": false
+        },
         "preferredAppGroupType": {
           "enum": [
             "None",
@@ -2579,10 +2606,41 @@
           "$ref": "#/definitions/RegistrationInfoPatch",
           "description": "The registration info of HostPool."
         },
+        "vmTemplate": {
+          "type": "string",
+          "description": "VM template for sessionhosts configuration within hostpool."
+        },
         "ssoContext": {
           "type": "string",
           "description": "Path to keyvault containing ssoContext secret."
         },
+        "ssoadfsAuthority": {
+          "type": "string",
+          "description": "URL to customer ADFS server for signing WVD SSO certificates."
+        },
+        "ssoClientId": {
+          "type": "string",
+          "description": "ClientId for the registered Relying Party used to issue WVD SSO certificates."
+        },
+        "ssoClientSecretKeyVaultPath": {
+          "type": "string",
+          "description": "Path to Azure KeyVault storing the secret used for communication to ADFS."
+        },
+        "ssoSecretType": {
+          "enum": [
+            "SharedKey",
+            "Certificate",
+            "SharedKeyInKeyVault",
+            "CertificateInKeyVault"
+          ],
+          "x-ms-enum": {
+            "name": "SSOSecretType",
+            "modelAsString": true
+          },
+          "type": "string",
+          "description": "The type of single sign on Secret Type.",
+          "x-nullable": false
+        },
         "preferredAppGroupType": {
           "enum": [
             "None",
@@ -3492,6 +3550,11 @@
         "updateErrorMessage": {
           "type": "string",
           "description": "The error message."
+        },
+        "sessionHostHealthCheckResult": {
+          "readOnly": true,
+          "type": "string",
+          "description": "The health check info of the sessionHost."
         }
       }
     },

diff --git a/...ft.DesktopVirtualization/preview/2020-10-19-preview/examples/ApplicationGroup_Create.json b/...ft.DesktopVirtualization/preview/2020-10-19-preview/examples/ApplicationGroup_Create.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "applicationGroup": {
       "location": "centralus",
       "tags": {

diff --git a/...ft.DesktopVirtualization/preview/2020-10-19-preview/examples/ApplicationGroup_Delete.json b/...ft.DesktopVirtualization/preview/2020-10-19-preview/examples/ApplicationGroup_Delete.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {

diff --git a/...osoft.DesktopVirtualization/preview/2020-10-19-preview/examples/ApplicationGroup_Get.json b/...osoft.DesktopVirtualization/preview/2020-10-19-preview/examples/ApplicationGroup_Get.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {

diff --git a/...tualization/preview/2020-10-19-preview/examples/ApplicationGroup_ListByResourceGroup.json b/...tualization/preview/2020-10-19-preview/examples/ApplicationGroup_ListByResourceGroup.json
@@ -2,7 +2,7 @@
   "parameters": {
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "$filter": "applicationGroupType eq 'RailApplication'"
   },
   "responses": {

diff --git a/...rtualization/preview/2020-10-19-preview/examples/ApplicationGroup_ListBySubscription.json b/...rtualization/preview/2020-10-19-preview/examples/ApplicationGroup_ListBySubscription.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "$filter": "applicationGroupType eq 'RailApplication'"
   },
   "responses": {

diff --git a/...ft.DesktopVirtualization/preview/2020-10-19-preview/examples/ApplicationGroup_Update.json b/...ft.DesktopVirtualization/preview/2020-10-19-preview/examples/ApplicationGroup_Update.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "applicationGroup": {
       "tags": {
         "tag1": "value1",

diff --git a/...crosoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_Create.json b/...crosoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_Create.json
@@ -4,7 +4,7 @@
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
     "applicationName": "application1",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "application": {
       "properties": {
         "description": "des1",

diff --git a/...crosoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_Delete.json b/...crosoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_Delete.json
@@ -4,7 +4,7 @@
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
     "applicationName": "application1",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {

diff --git a/.../Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_Get.json b/.../Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_Get.json
@@ -4,7 +4,7 @@
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
     "applicationName": "application1",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {

diff --git a/...Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_List.json b/...Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_List.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {

diff --git a/...crosoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_Update.json b/...crosoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Application_Update.json
@@ -4,7 +4,7 @@
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
     "applicationName": "application1",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "application": {
       "properties": {
         "description": "des1",

diff --git a/...ager/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Desktop_Get.json b/...ager/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Desktop_Get.json
@@ -4,7 +4,7 @@
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
     "desktopName": "SessionDesktop",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {

diff --git a/...ger/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Desktop_List.json b/...ger/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Desktop_List.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {

diff --git a/...r/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Desktop_Update.json b/...r/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/Desktop_Update.json
@@ -4,7 +4,7 @@
     "resourceGroupName": "resourceGroup1",
     "applicationGroupName": "applicationGroup1",
     "desktopName": "SessionDesktop",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "desktop": {
       "properties": {
         "description": "des1",

diff --git a/.../Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/HostPool_Create.json b/.../Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/HostPool_Create.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "hostPoolName": "hostPool1",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "hostPool": {
       "location": "centralus",
       "tags": {
@@ -22,7 +22,12 @@
           "expirationTime": "2020-10-01T14:01:54.9571247Z",
           "registrationTokenOperation": "Update"
         },
+        "vmTemplate": "{json:json}",
         "ssoContext": "KeyVaultPath",
+        "ssoadfsAuthority": "https://adfs",
+        "ssoClientId": "client",
+        "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+        "ssoSecretType": "SharedKey",
         "preferredAppGroupType": "Desktop"
       }
     }
@@ -53,7 +58,12 @@
             "token": "token",
             "registrationTokenOperation": "Update"
           },
+          "vmTemplate": "{json:json}",
           "ssoContext": "KeyVaultPath",
+          "ssoadfsAuthority": "https://adfs",
+          "ssoClientId": "client",
+          "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+          "ssoSecretType": "SharedKey",
           "preferredAppGroupType": "Desktop"
         }
       }
@@ -83,7 +93,12 @@
             "token": "token",
             "registrationTokenOperation": "Update"
           },
+          "vmTemplate": "{json:json}",
           "ssoContext": "KeyVaultPath",
+          "ssoadfsAuthority": "https://adfs",
+          "ssoClientId": "client",
+          "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+          "ssoSecretType": "SharedKey",
           "preferredAppGroupType": "Desktop"
         }
       }

diff --git a/.../Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/HostPool_Delete.json b/.../Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/HostPool_Delete.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "hostPoolName": "hostPool1",
-    "api-version": "2020-09-21-preview",
+    "api-version": "2020-10-19-preview",
     "force": true
   },
   "responses": {
@@ -31,7 +31,12 @@
           "token": "token",
           "registrationTokenOperation": "Update"
         },
-        "ssoContext": "KeyVaultPath"
+        "vmTemplate": "{json:json}",
+        "ssoContext": "KeyVaultPath",
+        "ssoadfsAuthority": "https://adfs",
+        "ssoClientId": "client",
+        "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+        "ssoSecretType": "SharedKey"
       }
     },
     "204": {}

diff --git a/...ger/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/HostPool_Get.json b/...ger/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/HostPool_Get.json
@@ -3,7 +3,7 @@
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
     "hostPoolName": "hostPool1",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {
@@ -31,7 +31,12 @@
             "token": "token",
             "registrationTokenOperation": "Update"
           },
+          "vmTemplate": "{json:json}",
           "ssoContext": "KeyVaultPath",
+          "ssoadfsAuthority": "https://adfs",
+          "ssoClientId": "client",
+          "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+          "ssoSecretType": "SharedKey",
           "preferredAppGroupType": "Desktop"
         }
       }

diff --git a/...er/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/HostPool_List.json b/...er/Microsoft.DesktopVirtualization/preview/2020-10-19-preview/examples/HostPool_List.json
@@ -1,7 +1,7 @@
 {
   "parameters": {
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {
@@ -31,7 +31,12 @@
                 "token": "token",
                 "registrationTokenOperation": "Update"
               },
+              "vmTemplate": "{json:json}",
               "ssoContext": "KeyVaultPath",
+              "ssoadfsAuthority": "https://adfs",
+              "ssoClientId": "client",
+              "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+              "ssoSecretType": "SharedKey",
               "preferredAppGroupType": "Desktop"
             }
           },
@@ -59,7 +64,12 @@
                 "token": "token",
                 "registrationTokenOperation": "Update"
               },
+              "vmTemplate": "{json:json}",
               "ssoContext": "KeyVaultPath",
+              "ssoadfsAuthority": "https://adfs",
+              "ssoClientId": "client",
+              "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+              "ssoSecretType": "SharedKey",
               "preferredAppGroupType": "Desktop"
             }
           }

diff --git a/...sktopVirtualization/preview/2020-10-19-preview/examples/HostPool_ListByResourceGroup.json b/...sktopVirtualization/preview/2020-10-19-preview/examples/HostPool_ListByResourceGroup.json
@@ -2,7 +2,7 @@
   "parameters": {
     "subscriptionId": "daefabc0-95b4-48b3-b645-8a753a63c4fa",
     "resourceGroupName": "resourceGroup1",
-    "api-version": "2020-09-21-preview"
+    "api-version": "2020-10-19-preview"
   },
   "responses": {
     "200": {
@@ -32,7 +32,12 @@
                 "token": "token",
                 "registrationTokenOperation": "Update"
               },
+              "vmTemplate": "{json:json}",
               "ssoContext": "KeyVaultPath",
+              "ssoadfsAuthority": "https://adfs",
+              "ssoClientId": "client",
+              "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+              "ssoSecretType": "SharedKey",
               "preferredAppGroupType": "Desktop"
             }
           },
@@ -60,7 +65,12 @@
                 "token": "token",
                 "registrationTokenOperation": "Update"
               },
+              "vmTemplate": "{json:json}",
               "ssoContext": "KeyVaultPath",
+              "ssoadfsAuthority": "https://adfs",
+              "ssoClientId": "client",
+              "ssoClientSecretKeyVaultPath": "https://keyvault/secret",
+              "ssoSecretType": "SharedKey",
               "preferredAppGroupType": "Desktop"
             }
           }