Skip to content

Commit 807ff5b

Browse files
ruowankayousef
ruowan
authored and
kayousef
committed
Revert "Revert "ACSS Swagger Changes in PUT SVI API and child resources (Azure#21604)" (Azure#21662)" (Azure#21663)
This reverts commit 495363b.
1 parent aead900 commit 807ff5b

17 files changed

+3345
-10
lines changed

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/SAPVirtualInstance.json‎

Lines changed: 252 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,15 @@
287287
"Create Infrastructure only for Single Server System": {
288288
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_SingleServer.json"
289289
},
290+
"Create Infrastructure without SAP Trans Fileshare": {
291+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_Distributed_SkipTransMount.json"
292+
},
293+
"Create Infrastructure with a new SAP Trans Fileshare": {
294+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_Distributed_CreateTrans.json"
295+
},
296+
"Create Infrastructure with an existing SAP Trans Fileshare": {
297+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_Distributed_MountTrans.json"
298+
},
290299
"Detect SAP Software Installation on a Single Server System": {
291300
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_SingleServer.json"
292301
},
@@ -304,6 +313,18 @@
304313
},
305314
"Install SAP Software on Distributed System": {
306315
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Install_Distributed.json"
316+
},
317+
"Create Infrastructure with Disk and OS configurations for Single Server System (Recommended)": {
318+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_DiskDetails_SingleServer.json"
319+
},
320+
"Create Infrastructure with Disk and OS configuration for Distributed System (Recommended)": {
321+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_DiskDetails_Distributed.json"
322+
},
323+
"Create Infrastructure with Disk and OS configuration for HA System with Availability Set (Recommended)": {
324+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_DiskDetails_HA_AvSet.json"
325+
},
326+
"Create Infrastructure with Disk and OS configuration for HA System with Availability Zone (Recommended)": {
327+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_DiskDetails_HA_AvZone.json"
307328
}
308329
},
309330
"description": "Creates a Virtual Instance for SAP solutions (VIS) resource",
@@ -632,6 +653,9 @@
632653
"x-ms-examples": {
633654
"SAPCentralInstances_Create": {
634655
"$ref": "./examples/sapvirtualinstances/SAPCentralInstances_Create.json"
656+
},
657+
"Create SAP Central Instances for HA System with Availability Set": {
658+
"$ref": "./examples/sapvirtualinstances/SAPCentralInstances_Create_HA_AvSet.json"
635659
}
636660
},
637661
"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.",
@@ -906,6 +930,9 @@
906930
"x-ms-examples": {
907931
"SAPDatabaseInstances_Create": {
908932
"$ref": "./examples/sapvirtualinstances/SAPDatabaseInstances_Create.json"
933+
},
934+
"Create SAP Database Instances for HA System with Availability Set": {
935+
"$ref": "./examples/sapvirtualinstances/SAPDatabaseInstances_Create_HA_AvSet.json"
909936
}
910937
},
911938
"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.",
@@ -1180,6 +1207,9 @@
11801207
"x-ms-examples": {
11811208
"SAPApplicationServerInstances_Create": {
11821209
"$ref": "./examples/sapvirtualinstances/SAPApplicationServerInstances_Create.json"
1210+
},
1211+
"Create SAP Application Server Instances for HA System with Availability Set": {
1212+
"$ref": "./examples/sapvirtualinstances/SAPApplicationServerInstances_Create_HA_AvSet.json"
11831213
}
11841214
},
11851215
"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.",
@@ -1744,6 +1774,23 @@
17441774
"modelAsString": true
17451775
}
17461776
},
1777+
"DiskSkuName": {
1778+
"description": "Defines the disk sku name.",
1779+
"enum": [
1780+
"Standard_LRS",
1781+
"Premium_LRS",
1782+
"StandardSSD_LRS",
1783+
"UltraSSD_LRS",
1784+
"Premium_ZRS",
1785+
"StandardSSD_ZRS",
1786+
"PremiumV2_LRS"
1787+
],
1788+
"type": "string",
1789+
"x-ms-enum": {
1790+
"name": "DiskSkuName",
1791+
"modelAsString": true
1792+
}
1793+
},
17471794
"SAPVirtualInstanceError": {
17481795
"type": "object",
17491796
"properties": {
@@ -2271,6 +2318,48 @@
22712318
}
22722319
}
22732320
},
2321+
"DiskSku": {
2322+
"description": "The disk sku.",
2323+
"type": "object",
2324+
"properties": {
2325+
"name": {
2326+
"$ref": "#/definitions/DiskSkuName"
2327+
}
2328+
}
2329+
},
2330+
"DiskVolumeConfiguration": {
2331+
"description": "The disk configuration required for the selected volume.",
2332+
"type": "object",
2333+
"properties": {
2334+
"count": {
2335+
"description": "The total number of disks required for the concerned volume.",
2336+
"type": "integer",
2337+
"format": "int64"
2338+
},
2339+
"sizeGB": {
2340+
"description": "The disk size in GB.",
2341+
"type": "integer",
2342+
"format": "int64"
2343+
},
2344+
"sku": {
2345+
"description": "The disk SKU details.",
2346+
"$ref": "#/definitions/DiskSku"
2347+
}
2348+
}
2349+
},
2350+
"DiskConfiguration": {
2351+
"description": "The Disk Configuration Details.",
2352+
"type": "object",
2353+
"properties": {
2354+
"diskVolumeConfigurations": {
2355+
"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'].",
2356+
"type": "object",
2357+
"additionalProperties": {
2358+
"$ref": "#/definitions/DiskVolumeConfiguration"
2359+
}
2360+
}
2361+
}
2362+
},
22742363
"VirtualMachineConfiguration": {
22752364
"description": "Defines the virtual machine configuration.",
22762365
"type": "object",
@@ -2319,6 +2408,10 @@
23192408
"virtualMachineConfiguration": {
23202409
"description": "Gets or sets the virtual machine configuration.",
23212410
"$ref": "#/definitions/VirtualMachineConfiguration"
2411+
},
2412+
"dbDiskConfiguration": {
2413+
"description": "Gets or sets the disk configuration.",
2414+
"$ref": "#/definitions/DiskConfiguration"
23222415
}
23232416
},
23242417
"required": [
@@ -2370,6 +2463,10 @@
23702463
"description": "The number of database VMs.",
23712464
"type": "integer",
23722465
"format": "int64"
2466+
},
2467+
"diskConfiguration": {
2468+
"description": "Gets or sets the disk configuration.",
2469+
"$ref": "#/definitions/DiskConfiguration"
23732470
}
23742471
},
23752472
"required": [
@@ -2415,6 +2512,100 @@
24152512
"highAvailabilityType"
24162513
]
24172514
},
2515+
"FileShareConfigurationType": {
2516+
"description": "The type of file share config.",
2517+
"enum": [
2518+
"Skip",
2519+
"CreateAndMount",
2520+
"Mount"
2521+
],
2522+
"type": "string",
2523+
"x-ms-enum": {
2524+
"name": "configurationType",
2525+
"modelAsString": true
2526+
},
2527+
"x-ms-mutability": [
2528+
"create",
2529+
"read"
2530+
]
2531+
},
2532+
"SkipFileShareConfiguration": {
2533+
"x-ms-discriminator-value": "Skip",
2534+
"description": "Gets or sets the skip file share configuration",
2535+
"type": "object",
2536+
"allOf": [
2537+
{
2538+
"$ref": "#/definitions/FileShareConfiguration"
2539+
}
2540+
]
2541+
},
2542+
"CreateAndMountFileShareConfiguration": {
2543+
"x-ms-discriminator-value": "CreateAndMount",
2544+
"description": "Gets or sets the file share configuration for file share created with the VIS case.",
2545+
"type": "object",
2546+
"allOf": [
2547+
{
2548+
"$ref": "#/definitions/FileShareConfiguration"
2549+
}
2550+
],
2551+
"properties": {
2552+
"resourceGroup": {
2553+
"type": "string",
2554+
"description": "The name of file share resource group. The app rg is used in case of missing input."
2555+
},
2556+
"storageAccountName": {
2557+
"type": "string",
2558+
"description": "The name of file share storage account name . A custom name is used in case of missing input."
2559+
}
2560+
}
2561+
},
2562+
"MountFileShareConfiguration": {
2563+
"x-ms-discriminator-value": "Mount",
2564+
"description": "Gets or sets the file share configuration for externally mounted cases.",
2565+
"type": "object",
2566+
"allOf": [
2567+
{
2568+
"$ref": "#/definitions/FileShareConfiguration"
2569+
}
2570+
],
2571+
"properties": {
2572+
"id": {
2573+
"type": "string",
2574+
"description": "The fileshare resource ID"
2575+
},
2576+
"privateEndpointId": {
2577+
"type": "string",
2578+
"description": "The private endpoint resource ID"
2579+
}
2580+
},
2581+
"required": [
2582+
"id",
2583+
"privateEndpointId"
2584+
]
2585+
},
2586+
"FileShareConfiguration": {
2587+
"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.",
2588+
"type": "object",
2589+
"properties": {
2590+
"configurationType": {
2591+
"$ref": "#/definitions/FileShareConfigurationType"
2592+
}
2593+
},
2594+
"discriminator": "configurationType",
2595+
"required": [
2596+
"configurationType"
2597+
]
2598+
},
2599+
"StorageConfiguration": {
2600+
"description": "Gets or sets the storage configuration.",
2601+
"type": "object",
2602+
"properties": {
2603+
"transportFileShareConfiguration": {
2604+
"description": "The properties of the transport directory attached to the VIS. The default for transportFileShareConfiguration is the createAndMount flow if storage configuration is missing.",
2605+
"$ref": "#/definitions/FileShareConfiguration"
2606+
}
2607+
}
2608+
},
24182609
"ThreeTierConfiguration": {
24192610
"x-ms-discriminator-value": "ThreeTier",
24202611
"x-ms-client-flatten": true,
@@ -2445,6 +2636,10 @@
24452636
"highAvailabilityConfig": {
24462637
"description": "The high availability configuration.",
24472638
"$ref": "#/definitions/HighAvailabilityConfiguration"
2639+
},
2640+
"storageConfiguration": {
2641+
"description": "The storage configuration.",
2642+
"$ref": "#/definitions/StorageConfiguration"
24482643
}
24492644
},
24502645
"required": [
@@ -2737,6 +2932,26 @@
27372932
},
27382933
"discriminator": "configurationType"
27392934
},
2935+
"LoadBalancerDetails": {
2936+
"description": "The Load Balancer details such as Load Balancer ID.",
2937+
"type": "object",
2938+
"properties": {
2939+
"id": {
2940+
"type": "string",
2941+
"readOnly": true
2942+
}
2943+
}
2944+
},
2945+
"StorageInformation": {
2946+
"description": "Storage details of all the Storage accounts attached to the VM. For e.g. NFS on AFS Shared Storage. ",
2947+
"type": "object",
2948+
"properties": {
2949+
"id": {
2950+
"type": "string",
2951+
"readOnly": true
2952+
}
2953+
}
2954+
},
27402955
"CentralServerVmDetails": {
27412956
"description": "The SAP Central Services Instance VM details.",
27422957
"type": "object",
@@ -2748,6 +2963,15 @@
27482963
"virtualMachineId": {
27492964
"type": "string",
27502965
"readOnly": true
2966+
},
2967+
"storageDetails": {
2968+
"description": "Storage details of all the Storage Accounts attached to the ASCS Virtual Machine. For e.g. NFS on AFS Shared Storage.",
2969+
"type": "array",
2970+
"items": {
2971+
"$ref": "#/definitions/StorageInformation"
2972+
},
2973+
"x-ms-identifiers": [],
2974+
"readOnly": true
27512975
}
27522976
}
27532977
},
@@ -2762,6 +2986,15 @@
27622986
"status": {
27632987
"$ref": "#/definitions/SAPVirtualInstanceStatus",
27642988
"readOnly": true
2989+
},
2990+
"storageDetails": {
2991+
"description": "Storage details of all the Storage Accounts attached to the Database Virtual Machine. For e.g. NFS on AFS Shared Storage.",
2992+
"type": "array",
2993+
"items": {
2994+
"$ref": "#/definitions/StorageInformation"
2995+
},
2996+
"x-ms-identifiers": [],
2997+
"readOnly": true
27652998
}
27662999
}
27673000
},
@@ -2986,6 +3219,15 @@
29863219
"$ref": "#/definitions/SAPVirtualInstanceStatus",
29873220
"readOnly": true
29883221
},
3222+
"storageDetails": {
3223+
"description": "Storage details of all the Storage Accounts attached to the App Virtual Machine. For e.g. NFS on AFS Shared Storage.",
3224+
"type": "array",
3225+
"items": {
3226+
"$ref": "#/definitions/StorageInformation"
3227+
},
3228+
"x-ms-identifiers": [],
3229+
"readOnly": true
3230+
},
29893231
"health": {
29903232
"$ref": "#/definitions/HealthState",
29913233
"readOnly": true
@@ -3185,6 +3427,11 @@
31853427
"readOnly": true,
31863428
"x-nullable": true
31873429
},
3430+
"loadBalancerDetails": {
3431+
"description": "The Load Balancer details such as LoadBalancer ID attached to ASCS Virtual Machines",
3432+
"$ref": "#/definitions/LoadBalancerDetails",
3433+
"readOnly": true
3434+
},
31883435
"vmDetails": {
31893436
"description": "The list of virtual machines corresponding to the Central Services instance.",
31903437
"type": "array",
@@ -3252,6 +3499,11 @@
32523499
"description": "Database IP Address.",
32533500
"readOnly": true
32543501
},
3502+
"loadBalancerDetails": {
3503+
"description": "The Load Balancer details such as LoadBalancer ID attached to Database Virtual Machines",
3504+
"$ref": "#/definitions/LoadBalancerDetails",
3505+
"readOnly": true
3506+
},
32553507
"vmDetails": {
32563508
"description": "The list of virtual machines corresponding to the Database resource.",
32573509
"type": "array",

0 commit comments

Comments
 (0)