Skip to content

Commit 6f5e3fc

Browse files
dmadiraju1dmadiraju1
authored
[Workloads - Sap Virtual Instance] (#21284)
-Adds SAP software detection feature on a VIS -Changes were already checked-in to private repo in the PR: Azure/azure-rest-api-specs-pr#8871 The changes were verified. This commit just ports the same to the public repo.
1 parent 9685ef9 commit 6f5e3fc

File tree

5 files changed

+1211
-1
lines changed

5 files changed

+1211
-1
lines changed

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

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,18 @@
287287
"Create Infrastructure only for Single Server System": {
288288
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_SingleServer.json"
289289
},
290+
"Detect SAP Software Installation on a Single Server System": {
291+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_SingleServer.json"
292+
},
293+
"Detect SAP Software Installation on a Distributed System": {
294+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_Distributed.json"
295+
},
296+
"Detect SAP Software Installation on an HA System with Availability Set": {
297+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_HA_AvSet.json"
298+
},
299+
"Detect SAP Software Installation on an HA System with Availability Zone": {
300+
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_HA_AvZone.json"
301+
},
290302
"Install SAP Software on Single Server System": {
291303
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Install_SingleServer.json"
292304
},
@@ -1531,7 +1543,8 @@
15311543
"description": "The SAP software installation Type.",
15321544
"enum": [
15331545
"ServiceInitiated",
1534-
"SAPInstallWithoutOSConfig"
1546+
"SAPInstallWithoutOSConfig",
1547+
"External"
15351548
],
15361549
"type": "string",
15371550
"x-ms-enum": {
@@ -1616,6 +1629,8 @@
16161629
"SoftwareInstallationPending",
16171630
"SoftwareInstallationInProgress",
16181631
"SoftwareInstallationFailed",
1632+
"SoftwareDetectionInProgress",
1633+
"SoftwareDetectionFailed",
16191634
"DiscoveryPending",
16201635
"DiscoveryInProgress",
16211636
"DiscoveryFailed",
@@ -2546,6 +2561,23 @@
25462561
"softwareVersion"
25472562
]
25482563
},
2564+
"ExternalInstallationSoftwareConfiguration": {
2565+
"description": "The SAP Software configuration Input when the software is installed externally outside the service.",
2566+
"type": "object",
2567+
"x-ms-discriminator-value": "External",
2568+
"x-ms-client-flatten": true,
2569+
"allOf": [
2570+
{
2571+
"$ref": "#/definitions/SoftwareConfiguration"
2572+
}
2573+
],
2574+
"properties": {
2575+
"centralServerVmId": {
2576+
"type": "string",
2577+
"description": "The resource ID of the virtual machine containing the central server instance."
2578+
}
2579+
}
2580+
},
25492581
"HighAvailabilitySoftwareConfiguration": {
25502582
"description": "Gets or sets the HA software configuration.",
25512583
"type": "object",

‎specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_Distributed.json

Lines changed: 334 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,334 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "8e17e36c-42e9-4cd5-a078-7b44883414e0",
4+
"resourceGroupName": "test-rg",
5+
"sapVirtualInstanceName": "X00",
6+
"api-version": "2021-12-01-preview",
7+
"body": {
8+
"tags": {
9+
"created by": "azureuser"
10+
},
11+
"location": "eastus2",
12+
"properties": {
13+
"environment": "Prod",
14+
"sapProduct": "S4HANA",
15+
"configuration": {
16+
"configurationType": "DeploymentWithOSConfig",
17+
"appLocation": "eastus",
18+
"infrastructureConfiguration": {
19+
"deploymentType": "ThreeTier",
20+
"appResourceGroup": "{{resourcegrp}}",
21+
"networkConfiguration": {
22+
"isSecondaryIpEnabled": true
23+
},
24+
"centralServer": {
25+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
26+
"virtualMachineConfiguration": {
27+
"vmSize": "Standard_E4ds_v4",
28+
"imageReference": {
29+
"sku": "84sapha-gen2",
30+
"publisher": "RedHat",
31+
"version": "8.4.2021091202",
32+
"offer": "RHEL-SAP-HA"
33+
},
34+
"osProfile": {
35+
"adminUsername": "azureuser",
36+
"osConfiguration": {
37+
"osType": "Linux",
38+
"disablePasswordAuthentication": true,
39+
"sshKeyPair": {
40+
"publicKey": "{{sshkey}}",
41+
"privateKey": "{{privateKey}}"
42+
}
43+
}
44+
}
45+
},
46+
"instanceCount": 1
47+
},
48+
"applicationServer": {
49+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
50+
"virtualMachineConfiguration": {
51+
"vmSize": "Standard_E4ds_v4",
52+
"imageReference": {
53+
"sku": "84sapha-gen2",
54+
"publisher": "RedHat",
55+
"version": "8.4.2021091202",
56+
"offer": "RHEL-SAP-HA"
57+
},
58+
"osProfile": {
59+
"adminUsername": "azureuser",
60+
"osConfiguration": {
61+
"osType": "Linux",
62+
"disablePasswordAuthentication": true,
63+
"sshKeyPair": {
64+
"publicKey": "{{sshkey}}",
65+
"privateKey": "{{privateKey}}"
66+
}
67+
}
68+
}
69+
},
70+
"instanceCount": 2
71+
},
72+
"databaseServer": {
73+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
74+
"virtualMachineConfiguration": {
75+
"vmSize": "Standard_M32ts",
76+
"imageReference": {
77+
"sku": "84sapha-gen2",
78+
"publisher": "RedHat",
79+
"version": "8.4.2021091202",
80+
"offer": "RHEL-SAP-HA"
81+
},
82+
"osProfile": {
83+
"adminUsername": "azureuser",
84+
"osConfiguration": {
85+
"osType": "Linux",
86+
"disablePasswordAuthentication": true,
87+
"sshKeyPair": {
88+
"publicKey": "{{sshkey}}",
89+
"privateKey": "{{privateKey}}"
90+
}
91+
}
92+
}
93+
},
94+
"instanceCount": 1
95+
}
96+
},
97+
"softwareConfiguration": {
98+
"softwareInstallationType": "External",
99+
"centralServerVmId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/sapq20scsvm0"
100+
},
101+
"osSapConfiguration": {
102+
"sapFqdn": "sap.bpaas.com"
103+
}
104+
}
105+
}
106+
}
107+
},
108+
"responses": {
109+
"200": {
110+
"body": {
111+
"id": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Workloads/sapVirtualInstances/X00",
112+
"name": "X00",
113+
"type": "microsoft.workloads/sapvirtualinstances",
114+
"location": "eastus2",
115+
"tags": {
116+
"created by": "azureuser"
117+
},
118+
"systemData": {
119+
"createdBy": "f1bc9460-9d57-4c16-99a8-5a19378a3a93",
120+
"createdByType": "Application",
121+
"createdAt": "2022-08-18T18:25:55.2406546Z",
122+
"lastModifiedBy": "f1bc9460-9d57-4c16-99a8-5a19378a3a93",
123+
"lastModifiedByType": "Application",
124+
"lastModifiedAt": "2022-08-18T18:50:59.1945444Z"
125+
},
126+
"properties": {
127+
"environment": "Prod",
128+
"sapProduct": "S4HANA",
129+
"configuration": {
130+
"configurationType": "DeploymentWithOSConfig",
131+
"appLocation": "eastus",
132+
"infrastructureConfiguration": {
133+
"deploymentType": "ThreeTier",
134+
"networkConfiguration": {
135+
"isSecondaryIpEnabled": true
136+
},
137+
"centralServer": {
138+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
139+
"virtualMachineConfiguration": {
140+
"vmSize": "Standard_E4ds_v4",
141+
"imageReference": {
142+
"sku": "84sapha-gen2",
143+
"publisher": "RedHat",
144+
"version": "8.4.2021091202",
145+
"offer": "RHEL-SAP-HA"
146+
},
147+
"osProfile": {
148+
"adminUsername": "azureuser",
149+
"osConfiguration": {
150+
"osType": "Linux",
151+
"disablePasswordAuthentication": true,
152+
"sshKeyPair": {
153+
"publicKey": "ssh-rsa AAA generated-by-azure"
154+
}
155+
}
156+
}
157+
},
158+
"instanceCount": 1
159+
},
160+
"applicationServer": {
161+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
162+
"virtualMachineConfiguration": {
163+
"vmSize": "Standard_E4ds_v4",
164+
"imageReference": {
165+
"sku": "84sapha-gen2",
166+
"publisher": "RedHat",
167+
"version": "8.4.2021091202",
168+
"offer": "RHEL-SAP-HA"
169+
},
170+
"osProfile": {
171+
"adminUsername": "azureuser",
172+
"osConfiguration": {
173+
"osType": "Linux",
174+
"disablePasswordAuthentication": true,
175+
"sshKeyPair": {
176+
"publicKey": "ssh-rsa AAA generated-by-azure"
177+
}
178+
}
179+
}
180+
},
181+
"instanceCount": 2
182+
},
183+
"databaseServer": {
184+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
185+
"virtualMachineConfiguration": {
186+
"vmSize": "Standard_M32ts",
187+
"imageReference": {
188+
"sku": "84sapha-gen2",
189+
"publisher": "RedHat",
190+
"version": "8.4.2021091202",
191+
"offer": "RHEL-SAP-HA"
192+
},
193+
"osProfile": {
194+
"adminUsername": "azureuser",
195+
"osConfiguration": {
196+
"osType": "Linux",
197+
"disablePasswordAuthentication": true,
198+
"sshKeyPair": {
199+
"publicKey": "ssh-rsa AAA generated-by-azure"
200+
}
201+
}
202+
}
203+
},
204+
"instanceCount": 1
205+
},
206+
"appResourceGroup": "aa-rg"
207+
},
208+
"softwareConfiguration": {
209+
"softwareInstallationType": "External",
210+
"centralServerVmId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/sapq20scsvm0"
211+
},
212+
"osSapConfiguration": {
213+
"sapFqdn": "sap.bpaas.com"
214+
}
215+
},
216+
"state": "RegistrationComplete",
217+
"provisioningState": "Succeeded"
218+
}
219+
}
220+
},
221+
"201": {
222+
"body": {
223+
"id": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/aa-rg/providers/Microsoft.Workloads/sapVirtualInstances/X00",
224+
"name": "X00",
225+
"type": "microsoft.workloads/sapvirtualinstances",
226+
"location": "eastus2",
227+
"tags": {
228+
"created by": "azureuser"
229+
},
230+
"systemData": {
231+
"createdBy": "f1bc9460-9d57-4c16-99a8-5a19378a3a93",
232+
"createdByType": "Application",
233+
"createdAt": "2022-08-18T18:25:55.2406546Z",
234+
"lastModifiedBy": "f1bc9460-9d57-4c16-99a8-5a19378a3a93",
235+
"lastModifiedByType": "Application",
236+
"lastModifiedAt": "2022-08-18T18:50:59.1945444Z"
237+
},
238+
"properties": {
239+
"environment": "Prod",
240+
"sapProduct": "S4HANA",
241+
"configuration": {
242+
"configurationType": "DeploymentWithOSConfig",
243+
"appLocation": "eastus",
244+
"infrastructureConfiguration": {
245+
"deploymentType": "ThreeTier",
246+
"networkConfiguration": {
247+
"isSecondaryIpEnabled": true
248+
},
249+
"centralServer": {
250+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
251+
"virtualMachineConfiguration": {
252+
"vmSize": "Standard_E4ds_v4",
253+
"imageReference": {
254+
"sku": "84sapha-gen2",
255+
"publisher": "RedHat",
256+
"version": "8.4.2021091202",
257+
"offer": "RHEL-SAP-HA"
258+
},
259+
"osProfile": {
260+
"adminUsername": "azureuser",
261+
"osConfiguration": {
262+
"osType": "Linux",
263+
"disablePasswordAuthentication": true,
264+
"sshKeyPair": {
265+
"publicKey": "ssh-rsa AAA generated-by-azure"
266+
}
267+
}
268+
}
269+
},
270+
"instanceCount": 1
271+
},
272+
"applicationServer": {
273+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
274+
"virtualMachineConfiguration": {
275+
"vmSize": "Standard_E4ds_v4",
276+
"imageReference": {
277+
"sku": "84sapha-gen2",
278+
"publisher": "RedHat",
279+
"version": "8.4.2021091202",
280+
"offer": "RHEL-SAP-HA"
281+
},
282+
"osProfile": {
283+
"adminUsername": "azureuser",
284+
"osConfiguration": {
285+
"osType": "Linux",
286+
"disablePasswordAuthentication": true,
287+
"sshKeyPair": {
288+
"publicKey": "ssh-rsa AAA generated-by-azure"
289+
}
290+
}
291+
}
292+
},
293+
"instanceCount": 2
294+
},
295+
"databaseServer": {
296+
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
297+
"virtualMachineConfiguration": {
298+
"vmSize": "Standard_M32ts",
299+
"imageReference": {
300+
"sku": "84sapha-gen2",
301+
"publisher": "RedHat",
302+
"version": "8.4.2021091202",
303+
"offer": "RHEL-SAP-HA"
304+
},
305+
"osProfile": {
306+
"adminUsername": "azureuser",
307+
"osConfiguration": {
308+
"osType": "Linux",
309+
"disablePasswordAuthentication": true,
310+
"sshKeyPair": {
311+
"publicKey": "ssh-rsa AAA generated-by-azure"
312+
}
313+
}
314+
}
315+
},
316+
"instanceCount": 1
317+
},
318+
"appResourceGroup": "aa-rg"
319+
},
320+
"softwareConfiguration": {
321+
"softwareInstallationType": "External",
322+
"centralServerVmId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/sapq20scsvm0"
323+
},
324+
"osSapConfiguration": {
325+
"sapFqdn": "sap.bpaas.com"
326+
}
327+
},
328+
"state": "SoftwareDetectionInProgress",
329+
"provisioningState": "Accepted"
330+
}
331+
}
332+
}
333+
}
334+
}

0 commit comments

Comments
 (0)