Skip to content

Commit

Permalink
ACSS Swagger Changes in PUT SVI API and child resources (Azure#21604)
Browse files Browse the repository at this point in the history 
* @shreyas : SAP Trans Changes for Swagger

* @Divyani: SAP Disk Customization - Adding DiskConfiguration in PUTSVI

* @bharath: Adding LB, Storage details to child resources
  • Loading branch information
@dindurkhya
dindurkhya authored Nov 28, 2022
1 parent 1fefe3f commit 58f076e
Show file tree
Hide file tree
Showing 17 changed files with 3,345 additions and 10 deletions.
252 changes: 252 additions & 0 deletions ...s/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/SAPVirtualInstance.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,15 @@
"Create Infrastructure only for Single Server System": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_SingleServer.json"
},
"Create Infrastructure without SAP Trans Fileshare": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_Distributed_SkipTransMount.json"
},
"Create Infrastructure with a new SAP Trans Fileshare": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_Distributed_CreateTrans.json"
},
"Create Infrastructure with an existing SAP Trans Fileshare": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_Distributed_MountTrans.json"
},
"Detect SAP Software Installation on a Single Server System": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_SingleServer.json"
},
Expand All @@ -304,6 +313,18 @@
},
"Install SAP Software on Distributed System": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Install_Distributed.json"
},
"Create Infrastructure with Disk and OS configurations for Single Server System (Recommended)": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_DiskDetails_SingleServer.json"
},
"Create Infrastructure with Disk and OS configuration for Distributed System (Recommended)": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_DiskDetails_Distributed.json"
},
"Create Infrastructure with Disk and OS configuration for HA System with Availability Set (Recommended)": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_DiskDetails_HA_AvSet.json"
},
"Create Infrastructure with Disk and OS configuration for HA System with Availability Zone (Recommended)": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_DiskDetails_HA_AvZone.json"
}
},
"description": "Creates a Virtual Instance for SAP solutions (VIS) resource",
Expand Down Expand Up @@ -632,6 +653,9 @@
"x-ms-examples": {
"SAPCentralInstances_Create": {
"$ref": "./examples/sapvirtualinstances/SAPCentralInstances_Create.json"
},
"Create SAP Central Instances for HA System with Availability Set": {
"$ref": "./examples/sapvirtualinstances/SAPCentralInstances_Create_HA_AvSet.json"
}
},
"description": "Creates the SAP Central Services Instance resource. <br><br>This will be used by service only. PUT operation on this resource by end user will return a Bad Request error.",
Expand Down Expand Up @@ -906,6 +930,9 @@
"x-ms-examples": {
"SAPDatabaseInstances_Create": {
"$ref": "./examples/sapvirtualinstances/SAPDatabaseInstances_Create.json"
},
"Create SAP Database Instances for HA System with Availability Set": {
"$ref": "./examples/sapvirtualinstances/SAPDatabaseInstances_Create_HA_AvSet.json"
}
},
"description": "Creates the Database resource corresponding to the Virtual Instance for SAP solutions resource. <br><br>This will be used by service only. PUT by end user will return a Bad Request error.",
Expand Down Expand Up @@ -1180,6 +1207,9 @@
"x-ms-examples": {
"SAPApplicationServerInstances_Create": {
"$ref": "./examples/sapvirtualinstances/SAPApplicationServerInstances_Create.json"
},
"Create SAP Application Server Instances for HA System with Availability Set": {
"$ref": "./examples/sapvirtualinstances/SAPApplicationServerInstances_Create_HA_AvSet.json"
}
},
"description": "Puts the SAP Application Server Instance resource. <br><br>This will be used by service only. PUT by end user will return a Bad Request error.",
Expand Down Expand Up @@ -1744,6 +1774,23 @@
"modelAsString": true
}
},
"DiskSkuName": {
"description": "Defines the disk sku name.",
"enum": [
"Standard_LRS",
"Premium_LRS",
"StandardSSD_LRS",
"UltraSSD_LRS",
"Premium_ZRS",
"StandardSSD_ZRS",
"PremiumV2_LRS"
],
"type": "string",
"x-ms-enum": {
"name": "DiskSkuName",
"modelAsString": true
}
},
"SAPVirtualInstanceError": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -2271,6 +2318,48 @@
}
}
},
"DiskSku": {
"description": "The disk sku.",
"type": "object",
"properties": {
"name": {
"$ref": "#/definitions/DiskSkuName"
}
}
},
"DiskVolumeConfiguration": {
"description": "The disk configuration required for the selected volume.",
"type": "object",
"properties": {
"count": {
"description": "The total number of disks required for the concerned volume.",
"type": "integer",
"format": "int64"
},
"sizeGB": {
"description": "The disk size in GB.",
"type": "integer",
"format": "int64"
},
"sku": {
"description": "The disk SKU details.",
"$ref": "#/definitions/DiskSku"
}
}
},
"DiskConfiguration": {
"description": "The Disk Configuration Details.",
"type": "object",
"properties": {
"diskVolumeConfigurations": {
"description": "The disk configuration for the db volume. For HANA, Required volumes are: ['hana/data', 'hana/log', hana/shared', 'usr/sap', 'os'], Optional volume : ['backup'].",
"type": "object",
"additionalProperties": {
"$ref": "#/definitions/DiskVolumeConfiguration"
}
}
}
},
"VirtualMachineConfiguration": {
"description": "Defines the virtual machine configuration.",
"type": "object",
Expand Down Expand Up @@ -2319,6 +2408,10 @@
"virtualMachineConfiguration": {
"description": "Gets or sets the virtual machine configuration.",
"$ref": "#/definitions/VirtualMachineConfiguration"
},
"dbDiskConfiguration": {
"description": "Gets or sets the disk configuration.",
"$ref": "#/definitions/DiskConfiguration"
}
},
"required": [
Expand Down Expand Up @@ -2370,6 +2463,10 @@
"description": "The number of database VMs.",
"type": "integer",
"format": "int64"
},
"diskConfiguration": {
"description": "Gets or sets the disk configuration.",
"$ref": "#/definitions/DiskConfiguration"
}
},
"required": [
Expand Down Expand Up @@ -2415,6 +2512,100 @@
"highAvailabilityType"
]
},
"FileShareConfigurationType": {
"description": "The type of file share config.",
"enum": [
"Skip",
"CreateAndMount",
"Mount"
],
"type": "string",
"x-ms-enum": {
"name": "configurationType",
"modelAsString": true
},
"x-ms-mutability": [
"create",
"read"
]
},
"SkipFileShareConfiguration": {
"x-ms-discriminator-value": "Skip",
"description": "Gets or sets the skip file share configuration",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/FileShareConfiguration"
}
]
},
"CreateAndMountFileShareConfiguration": {
"x-ms-discriminator-value": "CreateAndMount",
"description": "Gets or sets the file share configuration for file share created with the VIS case.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/FileShareConfiguration"
}
],
"properties": {
"resourceGroup": {
"type": "string",
"description": "The name of file share resource group. The app rg is used in case of missing input."
},
"storageAccountName": {
"type": "string",
"description": "The name of file share storage account name . A custom name is used in case of missing input."
}
}
},
"MountFileShareConfiguration": {
"x-ms-discriminator-value": "Mount",
"description": "Gets or sets the file share configuration for externally mounted cases.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/FileShareConfiguration"
}
],
"properties": {
"id": {
"type": "string",
"description": "The fileshare resource ID"
},
"privateEndpointId": {
"type": "string",
"description": "The private endpoint resource ID"
}
},
"required": [
"id",
"privateEndpointId"
]
},
"FileShareConfiguration": {
"description": "File Share configuration details, populated with information on storage configuration mounted on the VIS. The createAndMount option is selected in case of missing input.",
"type": "object",
"properties": {
"configurationType": {
"$ref": "#/definitions/FileShareConfigurationType"
}
},
"discriminator": "configurationType",
"required": [
"configurationType"
]
},
"StorageConfiguration": {
"description": "Gets or sets the storage configuration.",
"type": "object",
"properties": {
"transportFileShareConfiguration": {
"description": "The properties of the transport directory attached to the VIS. The default for transportFileShareConfiguration is the createAndMount flow if storage configuration is missing.",
"$ref": "#/definitions/FileShareConfiguration"
}
}
},
"ThreeTierConfiguration": {
"x-ms-discriminator-value": "ThreeTier",
"x-ms-client-flatten": true,
Expand Down Expand Up @@ -2445,6 +2636,10 @@
"highAvailabilityConfig": {
"description": "The high availability configuration.",
"$ref": "#/definitions/HighAvailabilityConfiguration"
},
"storageConfiguration": {
"description": "The storage configuration.",
"$ref": "#/definitions/StorageConfiguration"
}
},
"required": [
Expand Down Expand Up @@ -2737,6 +2932,26 @@
},
"discriminator": "configurationType"
},
"LoadBalancerDetails": {
"description": "The Load Balancer details such as Load Balancer ID.",
"type": "object",
"properties": {
"id": {
"type": "string",
"readOnly": true
}
}
},
"StorageInformation": {
"description": "Storage details of all the Storage accounts attached to the VM. For e.g. NFS on AFS Shared Storage. ",
"type": "object",
"properties": {
"id": {
"type": "string",
"readOnly": true
}
}
},
"CentralServerVmDetails": {
"description": "The SAP Central Services Instance VM details.",
"type": "object",
Expand All @@ -2748,6 +2963,15 @@
"virtualMachineId": {
"type": "string",
"readOnly": true
},
"storageDetails": {
"description": "Storage details of all the Storage Accounts attached to the ASCS Virtual Machine. For e.g. NFS on AFS Shared Storage.",
"type": "array",
"items": {
"$ref": "#/definitions/StorageInformation"
},
"x-ms-identifiers": [],
"readOnly": true
}
}
},
Expand All @@ -2762,6 +2986,15 @@
"status": {
"$ref": "#/definitions/SAPVirtualInstanceStatus",
"readOnly": true
},
"storageDetails": {
"description": "Storage details of all the Storage Accounts attached to the Database Virtual Machine. For e.g. NFS on AFS Shared Storage.",
"type": "array",
"items": {
"$ref": "#/definitions/StorageInformation"
},
"x-ms-identifiers": [],
"readOnly": true
}
}
},
Expand Down Expand Up @@ -2986,6 +3219,15 @@
"$ref": "#/definitions/SAPVirtualInstanceStatus",
"readOnly": true
},
"storageDetails": {
"description": "Storage details of all the Storage Accounts attached to the App Virtual Machine. For e.g. NFS on AFS Shared Storage.",
"type": "array",
"items": {
"$ref": "#/definitions/StorageInformation"
},
"x-ms-identifiers": [],
"readOnly": true
},
"health": {
"$ref": "#/definitions/HealthState",
"readOnly": true
Expand Down Expand Up @@ -3185,6 +3427,11 @@
"readOnly": true,
"x-nullable": true
},
"loadBalancerDetails": {
"description": "The Load Balancer details such as LoadBalancer ID attached to ASCS Virtual Machines",
"$ref": "#/definitions/LoadBalancerDetails",
"readOnly": true
},
"vmDetails": {
"description": "The list of virtual machines corresponding to the Central Services instance.",
"type": "array",
Expand Down Expand Up @@ -3252,6 +3499,11 @@
"description": "Database IP Address.",
"readOnly": true
},
"loadBalancerDetails": {
"description": "The Load Balancer details such as LoadBalancer ID attached to Database Virtual Machines",
"$ref": "#/definitions/LoadBalancerDetails",
"readOnly": true
},
"vmDetails": {
"description": "The list of virtual machines corresponding to the Database resource.",
"type": "array",
Expand Down
Loading

0 comments on commit 58f076e

Please sign in to comment.