From 4695b42ffff46dab6918d764daaabb5fccc4797f Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Fri, 15 Jan 2021 08:36:36 +0000 Subject: [PATCH] CodeGen from PR 12317 in Azure/azure-rest-api-specs Correct swagger spec for error responses. (#12317) * Correct swagger spec for error responses. * Fix example file for SAP monitor create to use the correct casing. * Remove read-only setting from most of HanaInstance properties. * Fix remaining model validation failures. * One more property to fix * Resource object should have read-only properties. Must fix the example code. * Remove read-only properties from example file * Fix error from prettier --- .../Microsoft.HanaOnAzure.json | 193 +++++++++++++++++- .../Microsoft.HanaOnAzure.json | 2 +- 2 files changed, 192 insertions(+), 3 deletions(-) diff --git a/schemas/2017-11-03-preview/Microsoft.HanaOnAzure.json b/schemas/2017-11-03-preview/Microsoft.HanaOnAzure.json index 1f10cad6ad..5b2aa2dd6a 100644 --- a/schemas/2017-11-03-preview/Microsoft.HanaOnAzure.json +++ b/schemas/2017-11-03-preview/Microsoft.HanaOnAzure.json @@ -32,6 +32,21 @@ ], "description": "Describes the properties of a HANA instance." }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags" + }, "type": { "type": "string", "enum": [ @@ -75,6 +90,21 @@ ], "description": "Describes the properties of a SAP monitor." }, + "tags": { + "oneOf": [ + { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "properties": {} + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource tags" + }, "type": { "type": "string", "enum": [ @@ -116,6 +146,10 @@ "HanaInstanceProperties": { "type": "object", "properties": { + "hanaInstanceId": { + "type": "string", + "description": "Specifies the HANA instance unique ID." + }, "hardwareProfile": { "oneOf": [ { @@ -127,6 +161,10 @@ ], "description": "Specifies the hardware settings for the HANA instance." }, + "hwRevision": { + "type": "string", + "description": "Hardware revision of a HANA instance" + }, "networkProfile": { "oneOf": [ { @@ -153,6 +191,49 @@ "type": "string", "description": "ARM ID of another HanaInstance that will share a network with this HanaInstance" }, + "powerState": { + "oneOf": [ + { + "type": "string", + "enum": [ + "starting", + "started", + "stopping", + "stopped", + "restarting", + "unknown" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Resource power state." + }, + "provisioningState": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Accepted", + "Creating", + "Updating", + "Failed", + "Succeeded", + "Deleting", + "Migrating" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "State of provisioning of the HanaInstance." + }, + "proximityPlacementGroup": { + "type": "string", + "description": "Resource proximity placement group" + }, "storageProfile": { "oneOf": [ { @@ -169,7 +250,79 @@ }, "HardwareProfile": { "type": "object", - "properties": {}, + "properties": { + "hanaInstanceSize": { + "oneOf": [ + { + "type": "string", + "enum": [ + "S72m", + "S144m", + "S72", + "S144", + "S192", + "S192m", + "S192xm", + "S96", + "S112", + "S224", + "S224m", + "S224om", + "S224oo", + "S224oom", + "S224ooo", + "S384", + "S384m", + "S384xm", + "S384xxm", + "S448", + "S448m", + "S448om", + "S448oo", + "S448oom", + "S448ooo", + "S576m", + "S576xm", + "S672", + "S672m", + "S672om", + "S672oo", + "S672oom", + "S672ooo", + "S768", + "S768m", + "S768xm", + "S896", + "S896m", + "S896om", + "S896oo", + "S896oom", + "S896ooo", + "S960m" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Specifies the HANA instance SKU." + }, + "hardwareType": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Cisco_UCS", + "HPE" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "Name of the hardware type (vendor and/or their product name)." + } + }, "description": "Specifies the hardware settings for the HANA instance." }, "IpAddress": { @@ -185,6 +338,10 @@ "NetworkProfile": { "type": "object", "properties": { + "circuitId": { + "type": "string", + "description": "Specifies the circuit id for connecting to express route." + }, "networkInterfaces": { "oneOf": [ { @@ -209,9 +366,17 @@ "type": "string", "description": "Specifies the host OS name of the HANA instance." }, + "osType": { + "type": "string", + "description": "This property allows you to specify the type of the OS." + }, "sshPublicKey": { "type": "string", "description": "Specifies the SSH public key used to access the operating system." + }, + "version": { + "type": "string", + "description": "Specifies version of operating system." } }, "description": "Specifies the operating system settings for the HANA instance." @@ -284,6 +449,26 @@ "logAnalyticsWorkspaceSharedKey": { "type": "string", "description": "The shared key of the log analytics workspace that is used for monitoring" + }, + "provisioningState": { + "oneOf": [ + { + "type": "string", + "enum": [ + "Accepted", + "Creating", + "Updating", + "Failed", + "Succeeded", + "Deleting", + "Migrating" + ] + }, + { + "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression" + } + ], + "description": "State of provisioning of the HanaInstance." } }, "description": "Describes the properties of a SAP monitor." @@ -291,6 +476,10 @@ "StorageProfile": { "type": "object", "properties": { + "nfsIpAddress": { + "type": "string", + "description": "IP Address to connect to storage." + }, "osDisks": { "oneOf": [ { @@ -309,4 +498,4 @@ "description": "Specifies the storage settings for the HANA instance disks." } } -} \ No newline at end of file +} diff --git a/schemas/2020-02-07-preview/Microsoft.HanaOnAzure.json b/schemas/2020-02-07-preview/Microsoft.HanaOnAzure.json index 080e64311a..b2b6b44bf2 100644 --- a/schemas/2020-02-07-preview/Microsoft.HanaOnAzure.json +++ b/schemas/2020-02-07-preview/Microsoft.HanaOnAzure.json @@ -205,4 +205,4 @@ "description": "Microsoft.HanaOnAzure/sapMonitors/providerInstances" } } -} \ No newline at end of file +}