Updates to SAPVirtualInstance swagger to include HA parameters and SC…

…S properties. (#5695) * Update SVI swagger file * Fix pretty issue * Initial commit * Incorporated PHP changes. * Updates. * Updates. * Updates. * Updates. Co-authored-by: Yukta Bajaj <yuktabajaj@microsoft.com> Co-authored-by: Ajay Gupta <ajgupt@microsoft.com>
Azure · Dec 15, 2021 · 9862d91 · 9862d91
1 parent a56c32c
commit 9862d91
Show file tree

Hide file tree

Showing 24 changed files with 479 additions and 269 deletions.
diff --git a/...s/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/SAPVirtualInstance.json b/...s/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/SAPVirtualInstance.json
diff --git a/...rkloads/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_CreateOrUpdate.json b/...rkloads/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_CreateOrUpdate.json
@@ -21,8 +21,8 @@
           "name": "web-server",
           "nodeSku": "Standard_DS2_v2",
           "osImage": {
-            "publisher": "UbuntuServer",
-            "offer": "Canonical",
+            "publisher": "Canonical",
+            "offer": "UbuntuServer",
             "sku": "18.0-LTS",
             "version": "latest"
           },
@@ -36,8 +36,8 @@
           "name": "contoller-vm",
           "nodeSku": "Standard_DS2_v2",
           "osImage": {
-            "publisher": "UbuntuServer",
-            "offer": "Canonical",
+            "publisher": "Canonical",
+            "offer": "UbuntuServer",
             "sku": "18.0-LTS",
             "version": "latest"
           },
@@ -87,8 +87,8 @@
         "searchProfile": {
           "nodeSku": "Standard_DS2_v2",
           "osImage": {
-            "publisher": "UbuntuServer",
-            "offer": "Canonical",
+            "publisher": "Canonical",
+            "offer": "UbuntuServer",
             "sku": "18.0-LTS",
             "version": "latest"
           },
@@ -140,8 +140,8 @@
             "name": "web-server",
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -159,8 +159,8 @@
             "name": "contoller-vm",
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -224,8 +224,8 @@
           "searchProfile": {
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -285,8 +285,8 @@
             "name": "web-server",
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -300,8 +300,8 @@
             "name": "contoller-vm",
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -350,8 +350,8 @@
           "searchProfile": {
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },

diff --git a/...icrosoft.Workloads/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_Get.json b/...icrosoft.Workloads/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_Get.json
@@ -36,8 +36,8 @@
             "name": "web-server",
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -55,8 +55,8 @@
             "name": "contoller-vm",
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -120,8 +120,8 @@
           "searchProfile": {
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },

diff --git a/...ds/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_ListByResourceGroup.json b/...ds/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_ListByResourceGroup.json
@@ -37,8 +37,8 @@
                 "name": "web-server",
                 "nodeSku": "Standard_DS2_v2",
                 "osImage": {
-                  "publisher": "UbuntuServer",
-                  "offer": "Canonical",
+                  "publisher": "Canonical",
+                  "offer": "UbuntuServer",
                   "sku": "18.0-LTS",
                   "version": "latest"
                 },
@@ -56,8 +56,8 @@
                 "name": "contoller-vm",
                 "nodeSku": "Standard_DS2_v2",
                 "osImage": {
-                  "publisher": "UbuntuServer",
-                  "offer": "Canonical",
+                  "publisher": "Canonical",
+                  "offer": "UbuntuServer",
                   "sku": "18.0-LTS",
                   "version": "latest"
                 },
@@ -121,8 +121,8 @@
               "searchProfile": {
                 "nodeSku": "Standard_DS2_v2",
                 "osImage": {
-                  "publisher": "UbuntuServer",
-                  "offer": "Canonical",
+                  "publisher": "Canonical",
+                  "offer": "UbuntuServer",
                   "sku": "18.0-LTS",
                   "version": "latest"
                 },

diff --git a/...ads/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_ListBySubscription.json b/...ads/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_ListBySubscription.json
@@ -36,8 +36,8 @@
                 "name": "web-server",
                 "nodeSku": "Standard_DS2_v2",
                 "osImage": {
-                  "publisher": "UbuntuServer",
-                  "offer": "Canonical",
+                  "publisher": "Canonical",
+                  "offer": "UbuntuServer",
                   "sku": "18.0-LTS",
                   "version": "latest"
                 },
@@ -55,8 +55,8 @@
                 "name": "contoller-vm",
                 "nodeSku": "Standard_DS2_v2",
                 "osImage": {
-                  "publisher": "UbuntuServer",
-                  "offer": "Canonical",
+                  "publisher": "Canonical",
+                  "offer": "UbuntuServer",
                   "sku": "18.0-LTS",
                   "version": "latest"
                 },
@@ -120,8 +120,8 @@
               "searchProfile": {
                 "nodeSku": "Standard_DS2_v2",
                 "osImage": {
-                  "publisher": "UbuntuServer",
-                  "offer": "Canonical",
+                  "publisher": "Canonical",
+                  "offer": "UbuntuServer",
                   "sku": "18.0-LTS",
                   "version": "latest"
                 },

diff --git a/...osoft.Workloads/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_Update.json b/...osoft.Workloads/preview/2021-12-01-preview/examples/phpworkloads/PhpWorkloads_Update.json
@@ -47,8 +47,8 @@
             "name": "web-server",
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -66,8 +66,8 @@
             "name": "contoller-vm",
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },
@@ -131,8 +131,8 @@
           "searchProfile": {
             "nodeSku": "Standard_DS2_v2",
             "osImage": {
-              "publisher": "UbuntuServer",
-              "offer": "Canonical",
+              "publisher": "Canonical",
+              "offer": "UbuntuServer",
               "sku": "18.0-LTS",
               "version": "latest"
             },

diff --git a/...2021-12-01-preview/examples/sapvirtualinstances/SAPApplicationServerInstances_Create.json b/...2021-12-01-preview/examples/sapvirtualinstances/SAPApplicationServerInstances_Create.json
@@ -28,12 +28,17 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
+          "instanceNo": 1,
+          "subnet": null,
+          "hostname": "vh-nw1",
+          "kernelVersion": "777",
+          "kernelPatch": "patch 300",
           "ipAddress": "10.0.0.5",
-          "diaPort": 1234,
-          "httpPort": 3312,
-          "httpsPort": 3313,
+          "gatewayPort": 3300,
+          "icmHttpPort": 3312,
+          "icmHttpsPort": 3313,
           "virtualMachineId": "/subscriptions/6d875e77-e412-4d7d-9af4-8895278b4443/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/app01-vm",
-          "status": "Starting",
+          "status": "Running",
           "health": "Unknown",
           "errors": null,
           "provisioningState": "Succeeded"
@@ -56,12 +61,17 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
+          "instanceNo": 1,
+          "subnet": null,
+          "hostname": "vh-nw1",
+          "kernelVersion": "777",
+          "kernelPatch": "patch 300",
           "ipAddress": "10.0.0.5",
-          "diaPort": 1234,
-          "httpPort": 3312,
-          "httpsPort": 3313,
+          "gatewayPort": 3300,
+          "icmHttpPort": 3312,
+          "icmHttpsPort": 3313,
           "virtualMachineId": "/subscriptions/6d875e77-e412-4d7d-9af4-8895278b4443/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/app01-vm",
-          "status": "Starting",
+          "status": "Running",
           "health": "Unknown",
           "errors": null,
           "provisioningState": "Succeeded"

diff --git a/...ew/2021-12-01-preview/examples/sapvirtualinstances/SAPApplicationServerInstances_Get.json b/...ew/2021-12-01-preview/examples/sapvirtualinstances/SAPApplicationServerInstances_Get.json
@@ -23,12 +23,17 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
+          "instanceNo": 0,
+          "subnet": null,
+          "hostname": "vh-nw1",
+          "kernelVersion": "777",
+          "kernelPatch": "patch 300",
           "ipAddress": "10.0.0.5",
-          "diaPort": 1234,
-          "httpPort": 3312,
-          "httpsPort": 3313,
+          "gatewayPort": 3300,
+          "icmHttpPort": 3312,
+          "icmHttpsPort": 3313,
           "virtualMachineId": "/subscriptions/6d875e77-e412-4d7d-9af4-8895278b4443/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/app01-vm",
-          "status": "Starting",
+          "status": "Unknown",
           "health": "Unknown",
           "errors": null,
           "provisioningState": "Succeeded"

diff --git a/...w/2021-12-01-preview/examples/sapvirtualinstances/SAPApplicationServerInstances_List.json b/...w/2021-12-01-preview/examples/sapvirtualinstances/SAPApplicationServerInstances_List.json
@@ -24,12 +24,17 @@
               "lastModifiedAt": "2021-08-19T15:10:46.196Z"
             },
             "properties": {
+              "instanceNo": 0,
+              "subnet": null,
+              "hostname": "vh-nw1",
+              "kernelVersion": "777",
+              "kernelPatch": "patch 300",
               "ipAddress": "10.0.0.5",
-              "diaPort": 1234,
-              "httpPort": 3312,
-              "httpsPort": 3313,
+              "gatewayPort": 3300,
+              "icmHttpPort": 3312,
+              "icmHttpsPort": 3313,
               "virtualMachineId": "/subscriptions/6d875e77-e412-4d7d-9af4-8895278b4443/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/app01-vm",
-              "status": "Starting",
+              "status": "Unknown",
               "health": "Unknown",
               "errors": null,
               "provisioningState": "Succeeded"
@@ -50,12 +55,17 @@
               "lastModifiedAt": "2021-08-19T15:10:46.196Z"
             },
             "properties": {
+              "instanceNo": 1,
+              "subnet": null,
+              "hostname": "vh-nw1",
+              "kernelVersion": "777",
+              "kernelPatch": "patch 300",
               "ipAddress": "10.0.0.5",
-              "diaPort": 1234,
-              "httpPort": 3312,
-              "httpsPort": 3313,
-              "virtualMachineId": "/subscriptions/6d875e77-e412-4d7d-9af4-8895278b4443/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/app02-vm",
-              "status": "Starting",
+              "gatewayPort": 3300,
+              "icmHttpPort": 3312,
+              "icmHttpsPort": 3313,
+              "virtualMachineId": "/subscriptions/6d875e77-e412-4d7d-9af4-8895278b4443/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/app01-vm",
+              "status": "Unknown",
               "health": "Unknown",
               "errors": null,
               "provisioningState": "Succeeded"

diff --git a/...2021-12-01-preview/examples/sapvirtualinstances/SAPApplicationServerInstances_Update.json b/...2021-12-01-preview/examples/sapvirtualinstances/SAPApplicationServerInstances_Update.json
@@ -30,12 +30,17 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
+          "instanceNo": 1,
+          "subnet": null,
+          "hostname": "vh-nw1",
+          "kernelVersion": "777",
+          "kernelPatch": "patch 300",
           "ipAddress": "10.0.0.5",
-          "diaPort": 1234,
-          "httpPort": 3312,
-          "httpsPort": 3313,
+          "gatewayPort": 3300,
+          "icmHttpPort": 3312,
+          "icmHttpsPort": 3313,
           "virtualMachineId": "/subscriptions/6d875e77-e412-4d7d-9af4-8895278b4443/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/app01-vm",
-          "status": "Starting",
+          "status": "Unknown",
           "health": "Unknown",
           "errors": null,
           "provisioningState": "Succeeded"
@@ -58,12 +63,17 @@
           "lastModifiedAt": "2021-08-19T15:10:46.196Z"
         },
         "properties": {
+          "instanceNo": 1,
+          "subnet": null,
+          "hostname": "vh-nw1",
+          "kernelVersion": "777",
+          "kernelPatch": "patch 300",
           "ipAddress": "10.0.0.5",
-          "diaPort": 1234,
-          "httpPort": 3312,
-          "httpsPort": 3313,
+          "gatewayPort": 3300,
+          "icmHttpPort": 3312,
+          "icmHttpsPort": 3313,
           "virtualMachineId": "/subscriptions/6d875e77-e412-4d7d-9af4-8895278b4443/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/app01-vm",
-          "status": "Starting",
+          "status": "Unknown",
           "health": "Unknown",
           "errors": null,
           "provisioningState": "Succeeded"