Skip to content

Commit

Permalink
[Workloads - Sap Virtual Instance] (Azure#21284)
Browse files Browse the repository at this point in the history 
-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.
  • Loading branch information
@dmadiraju1 @kayousef
dmadiraju1 authored and kayousef committed Dec 21, 2022
1 parent bd355d3 commit 16f0363
Show file tree
Hide file tree
Showing 5 changed files with 1,211 additions and 1 deletion.
34 changes: 33 additions & 1 deletion ...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,18 @@
"Create Infrastructure only for Single Server System": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Create_SingleServer.json"
},
"Detect SAP Software Installation on a Single Server System": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_SingleServer.json"
},
"Detect SAP Software Installation on a Distributed System": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_Distributed.json"
},
"Detect SAP Software Installation on an HA System with Availability Set": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_HA_AvSet.json"
},
"Detect SAP Software Installation on an HA System with Availability Zone": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_HA_AvZone.json"
},
"Install SAP Software on Single Server System": {
"$ref": "./examples/sapvirtualinstances/SAPVirtualInstances_Install_SingleServer.json"
},
Expand Down Expand Up @@ -1531,7 +1543,8 @@
"description": "The SAP software installation Type.",
"enum": [
"ServiceInitiated",
"SAPInstallWithoutOSConfig"
"SAPInstallWithoutOSConfig",
"External"
],
"type": "string",
"x-ms-enum": {
Expand Down Expand Up @@ -1616,6 +1629,8 @@
"SoftwareInstallationPending",
"SoftwareInstallationInProgress",
"SoftwareInstallationFailed",
"SoftwareDetectionInProgress",
"SoftwareDetectionFailed",
"DiscoveryPending",
"DiscoveryInProgress",
"DiscoveryFailed",
Expand Down Expand Up @@ -2546,6 +2561,23 @@
"softwareVersion"
]
},
"ExternalInstallationSoftwareConfiguration": {
"description": "The SAP Software configuration Input when the software is installed externally outside the service.",
"type": "object",
"x-ms-discriminator-value": "External",
"x-ms-client-flatten": true,
"allOf": [
{
"$ref": "#/definitions/SoftwareConfiguration"
}
],
"properties": {
"centralServerVmId": {
"type": "string",
"description": "The resource ID of the virtual machine containing the central server instance."
}
}
},
"HighAvailabilitySoftwareConfiguration": {
"description": "Gets or sets the HA software configuration.",
"type": "object",
Expand Down
334 changes: 334 additions & 0 deletions ...view/examples/sapvirtualinstances/SAPVirtualInstances_DetectInstallation_Distributed.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,334 @@
{
"parameters": {
"subscriptionId": "8e17e36c-42e9-4cd5-a078-7b44883414e0",
"resourceGroupName": "test-rg",
"sapVirtualInstanceName": "X00",
"api-version": "2021-12-01-preview",
"body": {
"tags": {
"created by": "azureuser"
},
"location": "eastus2",
"properties": {
"environment": "Prod",
"sapProduct": "S4HANA",
"configuration": {
"configurationType": "DeploymentWithOSConfig",
"appLocation": "eastus",
"infrastructureConfiguration": {
"deploymentType": "ThreeTier",
"appResourceGroup": "{{resourcegrp}}",
"networkConfiguration": {
"isSecondaryIpEnabled": true
},
"centralServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_E4ds_v4",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "{{sshkey}}",
"privateKey": "{{privateKey}}"
}
}
}
},
"instanceCount": 1
},
"applicationServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_E4ds_v4",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "{{sshkey}}",
"privateKey": "{{privateKey}}"
}
}
}
},
"instanceCount": 2
},
"databaseServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_M32ts",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "{{sshkey}}",
"privateKey": "{{privateKey}}"
}
}
}
},
"instanceCount": 1
}
},
"softwareConfiguration": {
"softwareInstallationType": "External",
"centralServerVmId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/sapq20scsvm0"
},
"osSapConfiguration": {
"sapFqdn": "sap.bpaas.com"
}
}
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Workloads/sapVirtualInstances/X00",
"name": "X00",
"type": "microsoft.workloads/sapvirtualinstances",
"location": "eastus2",
"tags": {
"created by": "azureuser"
},
"systemData": {
"createdBy": "f1bc9460-9d57-4c16-99a8-5a19378a3a93",
"createdByType": "Application",
"createdAt": "2022-08-18T18:25:55.2406546Z",
"lastModifiedBy": "f1bc9460-9d57-4c16-99a8-5a19378a3a93",
"lastModifiedByType": "Application",
"lastModifiedAt": "2022-08-18T18:50:59.1945444Z"
},
"properties": {
"environment": "Prod",
"sapProduct": "S4HANA",
"configuration": {
"configurationType": "DeploymentWithOSConfig",
"appLocation": "eastus",
"infrastructureConfiguration": {
"deploymentType": "ThreeTier",
"networkConfiguration": {
"isSecondaryIpEnabled": true
},
"centralServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_E4ds_v4",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "ssh-rsa AAA generated-by-azure"
}
}
}
},
"instanceCount": 1
},
"applicationServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_E4ds_v4",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "ssh-rsa AAA generated-by-azure"
}
}
}
},
"instanceCount": 2
},
"databaseServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_M32ts",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "ssh-rsa AAA generated-by-azure"
}
}
}
},
"instanceCount": 1
},
"appResourceGroup": "aa-rg"
},
"softwareConfiguration": {
"softwareInstallationType": "External",
"centralServerVmId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/sapq20scsvm0"
},
"osSapConfiguration": {
"sapFqdn": "sap.bpaas.com"
}
},
"state": "RegistrationComplete",
"provisioningState": "Succeeded"
}
}
},
"201": {
"body": {
"id": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/aa-rg/providers/Microsoft.Workloads/sapVirtualInstances/X00",
"name": "X00",
"type": "microsoft.workloads/sapvirtualinstances",
"location": "eastus2",
"tags": {
"created by": "azureuser"
},
"systemData": {
"createdBy": "f1bc9460-9d57-4c16-99a8-5a19378a3a93",
"createdByType": "Application",
"createdAt": "2022-08-18T18:25:55.2406546Z",
"lastModifiedBy": "f1bc9460-9d57-4c16-99a8-5a19378a3a93",
"lastModifiedByType": "Application",
"lastModifiedAt": "2022-08-18T18:50:59.1945444Z"
},
"properties": {
"environment": "Prod",
"sapProduct": "S4HANA",
"configuration": {
"configurationType": "DeploymentWithOSConfig",
"appLocation": "eastus",
"infrastructureConfiguration": {
"deploymentType": "ThreeTier",
"networkConfiguration": {
"isSecondaryIpEnabled": true
},
"centralServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_E4ds_v4",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "ssh-rsa AAA generated-by-azure"
}
}
}
},
"instanceCount": 1
},
"applicationServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_E4ds_v4",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "ssh-rsa AAA generated-by-azure"
}
}
}
},
"instanceCount": 2
},
"databaseServer": {
"subnetId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/app",
"virtualMachineConfiguration": {
"vmSize": "Standard_M32ts",
"imageReference": {
"sku": "84sapha-gen2",
"publisher": "RedHat",
"version": "8.4.2021091202",
"offer": "RHEL-SAP-HA"
},
"osProfile": {
"adminUsername": "azureuser",
"osConfiguration": {
"osType": "Linux",
"disablePasswordAuthentication": true,
"sshKeyPair": {
"publicKey": "ssh-rsa AAA generated-by-azure"
}
}
}
},
"instanceCount": 1
},
"appResourceGroup": "aa-rg"
},
"softwareConfiguration": {
"softwareInstallationType": "External",
"centralServerVmId": "/subscriptions/49d64d54-e966-4c46-a868-1999802b762c/resourceGroups/test-rg/providers/Microsoft.Compute/virtualMachines/sapq20scsvm0"
},
"osSapConfiguration": {
"sapFqdn": "sap.bpaas.com"
}
},
"state": "SoftwareDetectionInProgress",
"provisioningState": "Accepted"
}
}
}
}
}
Loading

0 comments on commit 16f0363

Please sign in to comment.