Skip to content

Commit 750ff25

Browse files
ruowankayousef
ruowan
authored and
kayousef
committed
Revert "ACSS Swagger Changes in PUT SVI API and child resources (Azure#21604)" (Azure#21662)
This reverts commit 58f076e.
1 parent 36c4113 commit 750ff25

17 files changed

+10
-3345
lines changed

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

Lines changed: 0 additions & 252 deletions
Original file line numberDiff line numberDiff line change
@@ -287,15 +287,6 @@
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-
},
299290
"Detect SAP Software Installation on a Single Server System": {
300291
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_SingleServer.json"
301292
},
@@ -313,18 +304,6 @@
313304
},
314305
"Install SAP Software on Distributed System": {
315306
"$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"
328307
}
329308
},
330309
"description": "Creates a Virtual Instance for SAP solutions (VIS) resource",
@@ -653,9 +632,6 @@
653632
"x-ms-examples": {
654633
"SAPCentralInstances_Create": {
655634
"$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"
659635
}
660636
},
661637
"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.",
@@ -930,9 +906,6 @@
930906
"x-ms-examples": {
931907
"SAPDatabaseInstances_Create": {
932908
"$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"
936909
}
937910
},
938911
"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.",
@@ -1207,9 +1180,6 @@
12071180
"x-ms-examples": {
12081181
"SAPApplicationServerInstances_Create": {
12091182
"$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"
12131183
}
12141184
},
12151185
"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.",
@@ -1774,23 +1744,6 @@
17741744
"modelAsString": true
17751745
}
17761746
},
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-
},
17941747
"SAPVirtualInstanceError": {
17951748
"type": "object",
17961749
"properties": {
@@ -2318,48 +2271,6 @@
23182271
}
23192272
}
23202273
},
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-
},
23632274
"VirtualMachineConfiguration": {
23642275
"description": "Defines the virtual machine configuration.",
23652276
"type": "object",
@@ -2408,10 +2319,6 @@
24082319
"virtualMachineConfiguration": {
24092320
"description": "Gets or sets the virtual machine configuration.",
24102321
"$ref": "#/definitions/VirtualMachineConfiguration"
2411-
},
2412-
"dbDiskConfiguration": {
2413-
"description": "Gets or sets the disk configuration.",
2414-
"$ref": "#/definitions/DiskConfiguration"
24152322
}
24162323
},
24172324
"required": [
@@ -2463,10 +2370,6 @@
24632370
"description": "The number of database VMs.",
24642371
"type": "integer",
24652372
"format": "int64"
2466-
},
2467-
"diskConfiguration": {
2468-
"description": "Gets or sets the disk configuration.",
2469-
"$ref": "#/definitions/DiskConfiguration"
24702373
}
24712374
},
24722375
"required": [
@@ -2512,100 +2415,6 @@
25122415
"highAvailabilityType"
25132416
]
25142417
},
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-
},
26092418
"ThreeTierConfiguration": {
26102419
"x-ms-discriminator-value": "ThreeTier",
26112420
"x-ms-client-flatten": true,
@@ -2636,10 +2445,6 @@
26362445
"highAvailabilityConfig": {
26372446
"description": "The high availability configuration.",
26382447
"$ref": "#/definitions/HighAvailabilityConfiguration"
2639-
},
2640-
"storageConfiguration": {
2641-
"description": "The storage configuration.",
2642-
"$ref": "#/definitions/StorageConfiguration"
26432448
}
26442449
},
26452450
"required": [
@@ -2932,26 +2737,6 @@
29322737
},
29332738
"discriminator": "configurationType"
29342739
},
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-
},
29552740
"CentralServerVmDetails": {
29562741
"description": "The SAP Central Services Instance VM details.",
29572742
"type": "object",
@@ -2963,15 +2748,6 @@
29632748
"virtualMachineId": {
29642749
"type": "string",
29652750
"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
29752751
}
29762752
}
29772753
},
@@ -2986,15 +2762,6 @@
29862762
"status": {
29872763
"$ref": "#/definitions/SAPVirtualInstanceStatus",
29882764
"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
29982765
}
29992766
}
30002767
},
@@ -3219,15 +2986,6 @@
32192986
"$ref": "#/definitions/SAPVirtualInstanceStatus",
32202987
"readOnly": true
32212988
},
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-
},
32312989
"health": {
32322990
"$ref": "#/definitions/HealthState",
32332991
"readOnly": true
@@ -3427,11 +3185,6 @@
34273185
"readOnly": true,
34283186
"x-nullable": true
34293187
},
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-
},
34353188
"vmDetails": {
34363189
"description": "The list of virtual machines corresponding to the Central Services instance.",
34373190
"type": "array",
@@ -3499,11 +3252,6 @@
34993252
"description": "Database IP Address.",
35003253
"readOnly": true
35013254
},
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-
},
35073255
"vmDetails": {
35083256
"description": "The list of virtual machines corresponding to the Database resource.",
35093257
"type": "array",

0 commit comments

Comments
 (0)