Skip to content

Commit a27c521

Browse files
pvsravitejamarkcowl
pvsraviteja
and
markcowl
authored
[Hub Generated] Review request for Microsoft.AzureStackHCI to add version stable/2022-09-01 (#20426)
* Adds base for updating Microsoft.AzureStackHCI from version stable/2022-05-01 to version 2022-09-01 * Updates readme * Updates API version in new specs and examples * Add Software Assurance API and properties 1)Add Enable Software Assurance Benefit API 2)Add SoftwareAssurance Properties in the Cluster 3)Add NodeType in the ClusterNode 4)Add OSDisplayVersion in the properties * Add read registeredSubscriptions permission in the list of operations * Fix Validation Failures * Address review comments Co-authored-by: Mark Cowlishaw <[email protected]>
1 parent f8cc22c commit a27c521

27 files changed

+3738
-2
lines changed

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/arcSettings.json

+640
Large diffs are not rendered by default.

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/clusters.json

+950
Large diffs are not rendered by default.

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/CreateArcIdentity.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"arcSettingName": "default",
7+
"api-version": "2022-09-01"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"properties": {
13+
"arcApplicationClientId": "7b93bf67-60ac-4909-a987-ac438e69f9ba",
14+
"arcApplicationTenantId": "bdb2c88c-9cfd-4e19-927d-51e875f6912b",
15+
"arcApplicationObjectId": "400bd05f-395f-45a6-ba75-72601df80107",
16+
"arcServicePrincipalObjectId": "00cc4014-482e-4de9-9932-83415cc75f45"
17+
}
18+
}
19+
},
20+
"202": {}
21+
}
22+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/CreateCluster.json

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"api-version": "2022-09-01",
7+
"cluster": {
8+
"location": "East US",
9+
"properties": {
10+
"cloudManagementEndpoint": "https://98294836-31be-4668-aeae-698667faf99b.waconazure.com",
11+
"aadClientId": "24a6e53d-04e5-44d2-b7cc-1b732a847dfc",
12+
"aadTenantId": "7e589cc1-a8b6-4dff-91bd-5ec0fa18db94"
13+
}
14+
}
15+
},
16+
"responses": {
17+
"200": {
18+
"body": {
19+
"id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/test-rg/providers/Microsoft.AzureStackHCI/clusters/myCluster",
20+
"name": "myCluster",
21+
"type": "Microsoft.AzureStackHCI/clusters",
22+
"location": "East US",
23+
"tags": {},
24+
"systemData": {
25+
"createdBy": "user1",
26+
"createdByType": "User",
27+
"createdAt": "2020-01-01T17:18:19.1234567Z",
28+
"lastModifiedBy": "user2",
29+
"lastModifiedByType": "User",
30+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
31+
},
32+
"properties": {
33+
"provisioningState": "Succeeded",
34+
"status": "NotYetRegistered",
35+
"cloudId": "a3c0468f-e38e-4dda-ac48-817f620536f0",
36+
"cloudManagementEndpoint": "https://98294836-31be-4668-aeae-698667faf99b.waconazure.com",
37+
"aadClientId": "24a6e53d-04e5-44d2-b7cc-1b732a847dfc",
38+
"aadTenantId": "7e589cc1-a8b6-4dff-91bd-5ec0fa18db94",
39+
"desiredProperties": {
40+
"windowsServerSubscription": "Disabled",
41+
"diagnosticLevel": "Basic"
42+
},
43+
"reportedProperties": {},
44+
"trialDaysRemaining": 30,
45+
"billingModel": "Trial",
46+
"serviceEndpoint": "https://azurestackhci.azurefd.net/eastus"
47+
}
48+
}
49+
}
50+
}
51+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/CreateClusterIdentity.json

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"api-version": "2022-09-01"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"properties": {
12+
"aadClientId": "7b93bf67-60ac-4909-a987-ac438e69f9ba",
13+
"aadTenantId": "bdb2c88c-9cfd-4e19-927d-51e875f6912b",
14+
"aadServicePrincipalObjectId": "400bd05f-395f-45a6-ba75-72601df80107",
15+
"aadApplicationObjectId": "00cc4014-482e-4de9-9932-83415cc75f45"
16+
}
17+
}
18+
},
19+
"202": {}
20+
}
21+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/DeleteArcSetting.json

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"arcSettingName": "default",
7+
"api-version": "2022-09-01"
8+
},
9+
"responses": {
10+
"200": {},
11+
"202": {},
12+
"204": {}
13+
}
14+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/DeleteCluster.json

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"api-version": "2022-09-01"
7+
},
8+
"responses": {
9+
"200": {},
10+
"202": {},
11+
"204": {}
12+
}
13+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/DeleteExtension.json

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"arcSettingName": "default",
7+
"extensionName": "MicrosoftMonitoringAgent",
8+
"api-version": "2022-09-01"
9+
},
10+
"responses": {
11+
"200": {},
12+
"202": {},
13+
"204": {}
14+
}
15+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/ExtendSoftwareAssuranceBenefit.json

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"api-version": "2022-09-01",
7+
"softwareAssuranceChangeRequest": {
8+
"properties": {
9+
"softwareAssuranceIntent": "Enable"
10+
}
11+
}
12+
},
13+
"responses": {
14+
"202": {},
15+
"200": {
16+
"body": {
17+
"id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/test-rg/providers/Microsoft.AzureStackHCI/clusters/myCluster",
18+
"name": "myCluster",
19+
"type": "Microsoft.AzureStackHCI/clusters",
20+
"location": "East US",
21+
"tags": {},
22+
"systemData": {
23+
"createdBy": "user1",
24+
"createdByType": "User",
25+
"createdAt": "2020-01-01T17:18:19.1234567Z",
26+
"lastModifiedBy": "user2",
27+
"lastModifiedByType": "User",
28+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
29+
},
30+
"properties": {
31+
"provisioningState": "Succeeded",
32+
"status": "ConnectedRecently",
33+
"cloudId": "a3c0468f-e38e-4dda-ac48-817f620536f0",
34+
"cloudManagementEndpoint": "https://98294836-31be-4668-aeae-698667faf99b.waconazure.com",
35+
"aadClientId": "24a6e53d-04e5-44d2-b7cc-1b732a847dfc",
36+
"aadTenantId": "7e589cc1-a8b6-4dff-91bd-5ec0fa18db94",
37+
"desiredProperties": {
38+
"windowsServerSubscription": "Enabled",
39+
"diagnosticLevel": "Basic"
40+
},
41+
"softwareAssuranceProperties": {
42+
"softwareAssuranceStatus": "Enabled",
43+
"lastUpdated": "2022-08-18T22:01:12.4191603Z",
44+
"softwareAssuranceIntent": "Enable"
45+
},
46+
"reportedProperties": {
47+
"clusterName": "cluster1",
48+
"clusterId": "a76ac23a-1819-4e82-9410-e3e4ec3d1425",
49+
"clusterVersion": "10.0.17777",
50+
"nodes": [
51+
{
52+
"name": "Node1",
53+
"id": 1,
54+
"windowsServerSubscription": "Enabled",
55+
"nodeType": "ThirdParty",
56+
"manufacturer": "Dell Inc.",
57+
"model": "EMC AX740",
58+
"osName": "Azure Stack HCI",
59+
"osVersion": "10.0.17777.1061",
60+
"serialNumber": "Q45CZC3",
61+
"coreCount": 8,
62+
"memoryInGiB": 128
63+
}
64+
],
65+
"lastUpdated": "2020-03-11T19:24:42.1946017Z",
66+
"imdsAttestation": "Disabled",
67+
"diagnosticLevel": "Basic"
68+
},
69+
"trialDaysRemaining": 30,
70+
"billingModel": "Trial",
71+
"registrationTimestamp": "2020-03-11T20:44:32.5625121Z",
72+
"lastSyncTimestamp": "2020-03-11T20:44:32.5625121Z",
73+
"lastBillingTimestamp": "2020-03-12T08:12:55.2312022Z"
74+
}
75+
}
76+
}
77+
}
78+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/GeneratePassword.json

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"arcSettingName": "default",
7+
"api-version": "2022-09-01"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"secretText": "secretText",
13+
"startDateTime": "2022-02-17T16:24:23.6264005+05:30",
14+
"endDateTime": "2121-02-17T16:24:23.6264377+05:30",
15+
"keyId": "00000000-2d47-4fb2-8ed2-fed71a5c197b"
16+
}
17+
}
18+
}
19+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/GetArcSetting.json

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"arcSettingName": "default",
7+
"api-version": "2022-09-01"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/test-rg/providers/Microsoft.AzureStackHCI/clusters/myCluster/arcSettings/default",
13+
"type": "Microsoft.AzureStackHCI/clusters/arcSettings",
14+
"systemData": {
15+
"createdBy": "user1",
16+
"createdByType": "User",
17+
"createdAt": "2021-01-01T17:18:19.1234567Z",
18+
"lastModifiedBy": "user2",
19+
"lastModifiedByType": "User",
20+
"lastModifiedAt": "2021-01-02T17:18:19.1234567Z"
21+
},
22+
"properties": {
23+
"provisioningState": "Succeeded",
24+
"arcInstanceResourceGroup": "ArcInstance-rg",
25+
"aggregateState": "PartiallyConnected",
26+
"perNodeDetails": [
27+
{
28+
"name": "Node-1",
29+
"arcInstance": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/ArcInstance-rg/providers/Microsoft.HybridCompute/machines/Node-1",
30+
"state": "Connected"
31+
},
32+
{
33+
"name": "Node-2",
34+
"arcInstance": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/ArcInstance-rg/providers/Microsoft.HybridCompute/machines/Node-2",
35+
"state": "Disconnected"
36+
}
37+
]
38+
}
39+
}
40+
}
41+
}
42+
}

‎specification/azurestackhci/resource-manager/Microsoft.AzureStackHCI/stable/2022-09-01/examples/GetCluster.json

+90
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "fd3c3665-1729-4b7b-9a38-238e83b0f98b",
4+
"resourceGroupName": "test-rg",
5+
"clusterName": "myCluster",
6+
"api-version": "2022-09-01"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"id": "/subscriptions/fd3c3665-1729-4b7b-9a38-238e83b0f98b/resourceGroups/test-rg/providers/Microsoft.AzureStackHCI/clusters/myCluster",
12+
"name": "myCluster",
13+
"type": "Microsoft.AzureStackHCI/clusters",
14+
"location": "East US",
15+
"tags": {},
16+
"systemData": {
17+
"createdBy": "user1",
18+
"createdByType": "User",
19+
"createdAt": "2020-01-01T17:18:19.1234567Z",
20+
"lastModifiedBy": "user2",
21+
"lastModifiedByType": "User",
22+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
23+
},
24+
"properties": {
25+
"provisioningState": "Succeeded",
26+
"status": "ConnectedRecently",
27+
"cloudId": "a3c0468f-e38e-4dda-ac48-817f620536f0",
28+
"cloudManagementEndpoint": "https://98294836-31be-4668-aeae-698667faf99b.waconazure.com",
29+
"aadClientId": "24a6e53d-04e5-44d2-b7cc-1b732a847dfc",
30+
"aadTenantId": "7e589cc1-a8b6-4dff-91bd-5ec0fa18db94",
31+
"desiredProperties": {
32+
"windowsServerSubscription": "Enabled",
33+
"diagnosticLevel": "Basic"
34+
},
35+
"reportedProperties": {
36+
"clusterName": "cluster1",
37+
"clusterId": "a76ac23a-1819-4e82-9410-e3e4ec3d1425",
38+
"clusterVersion": "10.0.17777",
39+
"nodes": [
40+
{
41+
"name": "Node1",
42+
"id": 1,
43+
"windowsServerSubscription": "Enabled",
44+
"manufacturer": "Dell Inc.",
45+
"model": "EMC AX740",
46+
"osName": "Azure Stack HCI",
47+
"osVersion": "10.0.17777.1061",
48+
"serialNumber": "Q45CZC3",
49+
"coreCount": 8,
50+
"memoryInGiB": 128
51+
},
52+
{
53+
"name": "Node2",
54+
"id": 2,
55+
"windowsServerSubscription": "Enabled",
56+
"manufacturer": "Dell Inc.",
57+
"model": "EMC AX740",
58+
"osName": "Azure Stack HCI",
59+
"osVersion": "10.0.17777.1061",
60+
"serialNumber": "Q44BSC3",
61+
"coreCount": 8,
62+
"memoryInGiB": 128
63+
},
64+
{
65+
"name": "Node3",
66+
"id": 3,
67+
"windowsServerSubscription": "Enabled",
68+
"manufacturer": "Dell Inc.",
69+
"model": "EMC AX740",
70+
"osName": "Azure Stack HCI",
71+
"osVersion": "10.0.17777.1061",
72+
"serialNumber": "Q44RFC3",
73+
"coreCount": 16,
74+
"memoryInGiB": 256
75+
}
76+
],
77+
"lastUpdated": "2020-03-11T19:24:42.1946017Z",
78+
"imdsAttestation": "Disabled",
79+
"diagnosticLevel": "Basic"
80+
},
81+
"trialDaysRemaining": 30,
82+
"billingModel": "Trial",
83+
"registrationTimestamp": "2020-03-11T20:44:32.5625121Z",
84+
"lastSyncTimestamp": "2020-03-11T20:44:32.5625121Z",
85+
"lastBillingTimestamp": "2020-03-12T08:12:55.2312022Z"
86+
}
87+
}
88+
}
89+
}
90+
}

0 commit comments

Comments
 (0)