Skip to content

Commit e67b768

Browse files
qianliu-pdxQiang Liu
authored and
kayousef
committed
[Hub Generated] Review request for Microsoft.SqlVirtualMachine to add version preview/2022-08-01-preview (Azure#21422)
* Adds base for updating Microsoft.SqlVirtualMachine from version preview/2022-07-01-preview to version 2022-08-01-preview * Updates readme * Updates API version in new specs and examples * Adding 2022-08-01-preview version for Sql Virtual Machine swagger * move all api-version to 2022-08-01-preview * fix the following validation errors: R4041 - XmsIdentifierValidation R4009 - RequiredReadOnlySystemData * add location for 202 reponse * fix typo * fix LRO_RESPONSE_HEADER validation error * fix Swagger PrettierCheck * fix 1047 - XmsEnumChanged, manually move IdentityTypeWithNone to IdentityType * fix DefinitionsPropertiesNamesCamelCase, adding azureADAuthenticationSettings to the custom-words.txt * adding azureADAuthenticationSettings in the alphabetical position. * fix PostOperationAsyncResponseValidation and LroLocationHeader errors * fix typo * missing quote * adding quote * fix DefinitionsPropertiesNamesCamelCase * remove azureADAuthenticationSettings * fix ResourceNameRestriction * use \" to escape " * fix swagger regex syntax difference comparing to C# regex * addressing one comment from ARM team to add error response schema for the default response: * fix 202 response: 1. adding Location header 2. adding specify x-ms-long-running-operation-options * UnHealthyReplica to UnhealthyReplica uuHealthyReplica to unhealthyReplica * TroubleShoot to Troubleshoot troubleShoot to troubleshoot * "UTC format" to "UTC timezone" * SqlVmTroubleshoot to SqlVmTroubleshooting * Successfully started SQL virtual machine troubleshoot to Successfully started SQL virtual machine troubleshooting and similar cases * "SQL Iaas Extension" to "SQL IaaS Extension" * Assessment to "an assessment" and other similiar issues * resolve conflict for custom-words.txt * resolve conflict * adding default for troubleshootingScenario * refactor all sqlVirtualMachineName into common definition and reference it elsewhere * add x-ms-long-running-operation-options with azure-async-operation * remove Location header from the Post request * add back the Location header for the Post method, as the validation checks it * add response schema to HA troubleshooting endpoint 200 response. * add "default" to false for SQL IAAS auto upgrade property * renaming: troubleshootStatus => troubleshootingStatus unhealthyReplicaProperties => unhealthyReplicaInfo * update the HA troubleshooting example after the renaming in this endpoint * rewording Assessment as SQL best practices Assessment after consulting with PM. * revert custom-words.tx file Co-authored-by: Qiang Liu <qianliu@microsoft.com>
1 parent d70443a commit e67b768

29 files changed

+4158
-2
lines changed

‎specification/sqlvirtualmachine/resource-manager/Microsoft.SqlVirtualMachine/preview/2022-08-01-preview/examples/CreateOrUpdateAvailabilityGroupListener.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "testrg",
5+
"sqlVirtualMachineGroupName": "testvmgroup",
6+
"availabilityGroupListenerName": "agl-test",
7+
"api-version": "2022-08-01-preview",
8+
"parameters": {
9+
"properties": {
10+
"availabilityGroupName": "ag-test",
11+
"loadBalancerConfigurations": [
12+
{
13+
"privateIpAddress": {
14+
"ipAddress": "10.1.0.112",
15+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/default"
16+
},
17+
"loadBalancerResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/loadBalancers/lb-test",
18+
"probePort": 59983,
19+
"sqlVirtualMachineInstances": [
20+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm2",
21+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm3"
22+
]
23+
}
24+
],
25+
"port": 1433
26+
}
27+
}
28+
},
29+
"responses": {
30+
"200": {
31+
"body": {
32+
"properties": {
33+
"provisioningState": "Updating",
34+
"loadBalancerConfigurations": [
35+
{
36+
"privateIpAddress": {
37+
"ipAddress": "10.1.0.113",
38+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/default"
39+
},
40+
"sqlVirtualMachineInstances": [
41+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm2",
42+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm3"
43+
]
44+
}
45+
],
46+
"port": 1433
47+
},
48+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/testvmgroup/availabilityGroupListeners/agl-test",
49+
"name": "agl-test",
50+
"type": "Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/availabilityGroupListeners"
51+
}
52+
},
53+
"201": {
54+
"body": {
55+
"properties": {
56+
"provisioningState": "Provisioning",
57+
"loadBalancerConfigurations": [
58+
{
59+
"privateIpAddress": {
60+
"ipAddress": "10.1.0.112",
61+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/default"
62+
},
63+
"sqlVirtualMachineInstances": [
64+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm2",
65+
"/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm3"
66+
]
67+
}
68+
],
69+
"port": 1433
70+
},
71+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/testvmgroup/availabilityGroupListeners/agl-test",
72+
"name": "agl-test",
73+
"type": "Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/availabilityGroupListeners"
74+
}
75+
}
76+
}
77+
}

‎specification/sqlvirtualmachine/resource-manager/Microsoft.SqlVirtualMachine/preview/2022-08-01-preview/examples/CreateOrUpdateAvailabilityGroupListenerWithMultiSubnet.json‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "testrg",
5+
"sqlVirtualMachineGroupName": "testvmgroup",
6+
"availabilityGroupListenerName": "agl-test",
7+
"api-version": "2022-08-01-preview",
8+
"parameters": {
9+
"properties": {
10+
"availabilityGroupName": "ag-test",
11+
"multiSubnetIpConfigurations": [
12+
{
13+
"privateIpAddress": {
14+
"ipAddress": "10.0.0.112",
15+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/default"
16+
},
17+
"sqlVirtualMachineInstance": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm2"
18+
},
19+
{
20+
"privateIpAddress": {
21+
"ipAddress": "10.0.1.112",
22+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/alternate"
23+
},
24+
"sqlVirtualMachineInstance": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm1"
25+
}
26+
],
27+
"port": 1433
28+
}
29+
}
30+
},
31+
"responses": {
32+
"200": {
33+
"body": {
34+
"properties": {
35+
"provisioningState": "Updating",
36+
"multiSubnetIpConfigurations": [
37+
{
38+
"privateIpAddress": {
39+
"ipAddress": "10.0.0.112",
40+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/default"
41+
},
42+
"sqlVirtualMachineInstance": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm2"
43+
},
44+
{
45+
"privateIpAddress": {
46+
"ipAddress": "10.0.1.112",
47+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/alternate"
48+
},
49+
"sqlVirtualMachineInstance": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm1"
50+
}
51+
],
52+
"port": 1433
53+
},
54+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/testvmgroup/availabilityGroupListeners/agl-test",
55+
"name": "agl-test",
56+
"type": "Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/availabilityGroupListeners"
57+
}
58+
},
59+
"201": {
60+
"body": {
61+
"properties": {
62+
"provisioningState": "Provisioning",
63+
"multiSubnetIpConfigurations": [
64+
{
65+
"privateIpAddress": {
66+
"ipAddress": "10.0.0.112",
67+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/default"
68+
},
69+
"sqlVirtualMachineInstance": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm2"
70+
},
71+
{
72+
"privateIpAddress": {
73+
"ipAddress": "10.0.1.112",
74+
"subnetResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/alternate"
75+
},
76+
"sqlVirtualMachineInstance": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm1"
77+
}
78+
],
79+
"port": 1433
80+
},
81+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/testvmgroup/availabilityGroupListeners/agl-test",
82+
"name": "agl-test",
83+
"type": "Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/availabilityGroupListeners"
84+
}
85+
}
86+
}
87+
}

‎specification/sqlvirtualmachine/resource-manager/Microsoft.SqlVirtualMachine/preview/2022-08-01-preview/examples/CreateOrUpdateSqlVirtualMachineAutomatedBackupWeekly.json‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "testrg",
5+
"sqlVirtualMachineName": "testvm",
6+
"api-version": "2022-08-01-preview",
7+
"parameters": {
8+
"location": "northeurope",
9+
"properties": {
10+
"sqlServerLicenseType": "PAYG",
11+
"sqlImageSku": "Enterprise",
12+
"sqlManagement": "Full",
13+
"virtualMachineResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Compute/virtualMachines/testvm",
14+
"serverConfigurationsManagementSettings": {
15+
"sqlConnectivityUpdateSettings": {
16+
"connectivityType": "PRIVATE",
17+
"port": 1433,
18+
"sqlAuthUpdateUserName": "sqllogin",
19+
"sqlAuthUpdatePassword": "<password>"
20+
},
21+
"sqlStorageUpdateSettings": {
22+
"diskCount": 1,
23+
"startingDeviceId": 2,
24+
"diskConfigurationType": "NEW"
25+
},
26+
"sqlWorkloadTypeUpdateSettings": {
27+
"sqlWorkloadType": "OLTP"
28+
},
29+
"additionalFeaturesServerConfigurations": {
30+
"isRServicesEnabled": false
31+
}
32+
},
33+
"keyVaultCredentialSettings": {
34+
"enable": false
35+
},
36+
"autoPatchingSettings": {
37+
"enable": true,
38+
"dayOfWeek": "Sunday",
39+
"maintenanceWindowStartingHour": 2,
40+
"maintenanceWindowDuration": 60
41+
},
42+
"autoBackupSettings": {
43+
"enable": true,
44+
"retentionPeriod": 17,
45+
"enableEncryption": true,
46+
"password": "<Password>",
47+
"backupScheduleType": "Manual",
48+
"backupSystemDbs": true,
49+
"storageAccountUrl": "https://teststorage.blob.core.windows.net/",
50+
"storageContainerName": "testcontainer",
51+
"storageAccessKey": "<primary storage access key>",
52+
"fullBackupFrequency": "Weekly",
53+
"daysOfWeek": [
54+
"Monday",
55+
"Friday"
56+
],
57+
"fullBackupStartTime": 6,
58+
"fullBackupWindowHours": 11,
59+
"logBackupFrequency": 10
60+
}
61+
}
62+
}
63+
},
64+
"responses": {
65+
"200": {
66+
"body": {
67+
"properties": {
68+
"virtualMachineResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Compute/virtualMachines/testvm",
69+
"provisioningState": "Updating",
70+
"sqlServerLicenseType": "PAYG",
71+
"sqlImageSku": "Enterprise",
72+
"leastPrivilegeMode": "NotSet",
73+
"enableAutomaticUpgrade": false,
74+
"sqlManagement": "Full"
75+
},
76+
"location": "northeurope",
77+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm",
78+
"name": "testvm",
79+
"type": "Microsoft.SqlVirtualMachine/sqlVirtualMachines"
80+
}
81+
},
82+
"201": {
83+
"body": {
84+
"properties": {
85+
"virtualMachineResourceId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.Compute/virtualMachines/testvm",
86+
"provisioningState": "Provisioning",
87+
"sqlServerLicenseType": "PAYG",
88+
"sqlImageSku": "Unknown",
89+
"leastPrivilegeMode": "NotSet",
90+
"enableAutomaticUpgrade": true,
91+
"sqlManagement": "Full"
92+
},
93+
"location": "northeurope",
94+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachines/testvm",
95+
"name": "testvm",
96+
"type": "Microsoft.SqlVirtualMachine/sqlVirtualMachines"
97+
}
98+
}
99+
}
100+
}

‎specification/sqlvirtualmachine/resource-manager/Microsoft.SqlVirtualMachine/preview/2022-08-01-preview/examples/CreateOrUpdateSqlVirtualMachineGroup.json‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-1111-2222-3333-444444444444",
4+
"resourceGroupName": "testrg",
5+
"sqlVirtualMachineGroupName": "testvmgroup",
6+
"api-version": "2022-08-01-preview",
7+
"parameters": {
8+
"location": "northeurope",
9+
"tags": {
10+
"mytag": "myval"
11+
},
12+
"properties": {
13+
"sqlImageOffer": "SQL2016-WS2016",
14+
"sqlImageSku": "Enterprise",
15+
"wsfcDomainProfile": {
16+
"domainFqdn": "testdomain.com",
17+
"ouPath": "OU=WSCluster,DC=testdomain,DC=com",
18+
"clusterBootstrapAccount": "testrpadmin",
19+
"clusterOperatorAccount": "testrp@testdomain.com",
20+
"sqlServiceAccount": "sqlservice@testdomain.com",
21+
"storageAccountUrl": "https://storgact.blob.core.windows.net/",
22+
"storageAccountPrimaryKey": "<primary storage access key>",
23+
"clusterSubnetType": "MultiSubnet"
24+
}
25+
}
26+
}
27+
},
28+
"responses": {
29+
"200": {
30+
"body": {
31+
"properties": {
32+
"provisioningState": "UpdatingDomainful",
33+
"sqlImageOffer": "SQL2016-WS2016",
34+
"sqlImageSku": "Enterprise",
35+
"wsfcDomainProfile": {
36+
"domainFqdn": "testdomain.com",
37+
"ouPath": "OU=WSCluster,DC=testdomain,DC=com",
38+
"clusterBootstrapAccount": "testrpadmin",
39+
"clusterOperatorAccount": "testrp@testdomain.com",
40+
"sqlServiceAccount": "sqlservice@testdomain.com",
41+
"storageAccountUrl": "https://storgact.blob.core.windows.net/",
42+
"clusterSubnetType": "MultiSubnet"
43+
}
44+
},
45+
"location": "northeurope",
46+
"tags": {
47+
"mytag": "myval"
48+
},
49+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/testvmgroup",
50+
"name": "testvmgroup",
51+
"type": "Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups"
52+
}
53+
},
54+
"201": {
55+
"body": {
56+
"properties": {
57+
"provisioningState": "ProvisioningDomainful",
58+
"sqlImageOffer": "SQL2016-WS2016",
59+
"sqlImageSku": "Enterprise",
60+
"wsfcDomainProfile": {
61+
"domainFqdn": "testdomain.com",
62+
"ouPath": "OU=WSCluster,DC=testdomain,DC=com",
63+
"clusterBootstrapAccount": "testrpadmin",
64+
"clusterOperatorAccount": "testrp@testdomain.com",
65+
"sqlServiceAccount": "sqlservice@testdomain.com",
66+
"storageAccountUrl": "https://storgact.blob.core.windows.net/",
67+
"clusterSubnetType": "MultiSubnet"
68+
}
69+
},
70+
"location": "northeurope",
71+
"tags": {
72+
"mytag": "myval"
73+
},
74+
"id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/testrg/providers/Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups/testvmgroup",
75+
"name": "testvmgroup",
76+
"type": "Microsoft.SqlVirtualMachine/sqlVirtualMachineGroups"
77+
}
78+
}
79+
}
80+
}

0 commit comments

Comments
 (0)