Skip to content

Commit 10cfeb5

Browse files
chshumchshum
authored
Merge branch 'main' into main
2 parents aa46f99 + 3906cab commit 10cfeb5

File tree

307 files changed

+50395
-4
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

307 files changed

+50395
-4
lines changed

‎cSpell.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -471,7 +471,9 @@
471471
"filename": "**/specification/netapp/**/*.json",
472472
"words": [
473473
"SVMs",
474-
"kibibytes"
474+
"SVM's",
475+
"kibibytes",
476+
"transitiontocmk"
475477
]
476478
},
477479
{
@@ -1053,7 +1055,7 @@
10531055
"words": [
10541056
"HanaScaleoutContainer"
10551057
]
1056-
},
1058+
},
10571059
{
10581060
"filename": "**/specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/stable/2021-10-15/iotdps.json",
10591061
"words": [
@@ -1371,7 +1373,7 @@
13711373
"efgyghrtguk",
13721374
"Elong",
13731375
"emaccess",
1374-
"ENCHIPHERMENT",
1376+
"ENCHIPHERMENT",
13751377
"ENIs",
13761378
"FARGAT",
13771379
"Fargate",

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_ChangeKeyVault.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview",
7+
"body": {
8+
"keyVaultUri": "https://my-key-vault.managedhsm.azure.net",
9+
"keyName": "rsakey",
10+
"keyVaultResourceId": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.KeyVault/managedHSMs/my-hsm",
11+
"keyVaultPrivateEndpoints": [
12+
{
13+
"virtualNetworkId": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.Network/virtualNetworks/vnet1",
14+
"privateEndpointId": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.Network/privateEndpoints/privip1"
15+
}
16+
]
17+
}
18+
},
19+
"responses": {
20+
"202": {
21+
"headers": {
22+
"Location": "https://management.azure.com/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/operationResults/a0216c17-f9d6-4b99-9faf-9ebd4883d0e4?api-version=2024-05-01-preview&operationResultResponseType=Location"
23+
}
24+
}
25+
}
26+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_CreateOrUpdate.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview",
7+
"body": {
8+
"location": "eastus",
9+
"properties": {}
10+
}
11+
},
12+
"responses": {
13+
"200": {
14+
"body": {
15+
"id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1",
16+
"name": "account1",
17+
"type": "Microsoft.NetApp/netAppAccounts",
18+
"location": "eastus",
19+
"properties": {
20+
"provisioningState": "Succeeded"
21+
}
22+
}
23+
},
24+
"201": {
25+
"body": {
26+
"id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1",
27+
"name": "account1",
28+
"type": "Microsoft.NetApp/netAppAccounts",
29+
"location": "eastus",
30+
"properties": {
31+
"provisioningState": "Creating"
32+
}
33+
}
34+
}
35+
}
36+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_CreateOrUpdateAD.json

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview",
7+
"body": {
8+
"location": "eastus",
9+
"properties": {
10+
"activeDirectories": [
11+
{
12+
"site": "SiteName",
13+
"username": "ad_user_name",
14+
"password": "ad_password",
15+
"domain": "10.10.10.3",
16+
"dns": "10.10.10.3",
17+
"smbServerName": "SMBServer",
18+
"organizationalUnit": "OU=Engineering",
19+
"aesEncryption": true,
20+
"ldapSigning": false,
21+
"ldapOverTLS": false
22+
}
23+
]
24+
}
25+
}
26+
},
27+
"responses": {
28+
"200": {
29+
"body": {
30+
"id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1",
31+
"name": "account1",
32+
"type": "Microsoft.NetApp/netAppAccounts",
33+
"location": "eastus",
34+
"properties": {
35+
"provisioningState": "Succeeded",
36+
"activeDirectories": [
37+
{
38+
"activeDirectoryId": "503d38f9-f17c-f92d-ef26-b0d46374534b",
39+
"site": "SiteName",
40+
"username": "ad_user_name",
41+
"password": null,
42+
"domain": "10.10.10.3",
43+
"dns": "10.10.10.3",
44+
"smbServerName": "SMBServer",
45+
"organizationalUnit": "OU=Engineering",
46+
"aesEncryption": true,
47+
"ldapSigning": false,
48+
"ldapOverTLS": false
49+
}
50+
]
51+
}
52+
}
53+
},
54+
"201": {
55+
"body": {
56+
"id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1",
57+
"name": "account1",
58+
"type": "Microsoft.NetApp/netAppAccounts",
59+
"location": "eastus",
60+
"properties": {
61+
"provisioningState": "Creating",
62+
"activeDirectories": [
63+
{
64+
"activeDirectoryId": "503d38f9-f17c-f92d-ef26-b0d46374534b",
65+
"site": "SiteName",
66+
"username": "ad_user_name",
67+
"password": null,
68+
"domain": "10.10.10.3",
69+
"dns": "10.10.10.3",
70+
"smbServerName": "SMBServer",
71+
"organizationalUnit": "OU=Engineering",
72+
"aesEncryption": true,
73+
"ldapSigning": false,
74+
"ldapOverTLS": false
75+
}
76+
]
77+
}
78+
}
79+
}
80+
}
81+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_Delete.json

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview"
7+
},
8+
"responses": {
9+
"202": {
10+
"headers": {
11+
"Location": "https://management.azure.com/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/operationResults/616ee961-4042-4935-b4a0-ed6f4dae0172?api-version=2024-05-01-preview&operationResultResponseType=Location"
12+
}
13+
},
14+
"204": {}
15+
}
16+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_Get.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1",
12+
"name": "account1",
13+
"type": "Microsoft.NetApp/netAppAccounts",
14+
"location": "eastus",
15+
"properties": {
16+
"provisioningState": "Succeeded",
17+
"activeDirectories": [
18+
{
19+
"site": "SiteName",
20+
"activeDirectoryId": "02da3711-6c58-2d64-098a-e3af7afaf936",
21+
"username": "ad_user_name",
22+
"domain": "10.10.10.3",
23+
"dns": "10.10.10.3",
24+
"status": "InUse",
25+
"smbServerName": "SMBServer",
26+
"organizationalUnit": "OU=Engineering",
27+
"statusDetails": "Status Details",
28+
"aesEncryption": true,
29+
"ldapSigning": true
30+
}
31+
]
32+
}
33+
}
34+
}
35+
}
36+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_GetChangeKeyVaultInformation.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview"
7+
},
8+
"responses": {
9+
"202": {
10+
"headers": {
11+
"Location": "https://management.azure.com/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/operationResults/616ee961-4042-4935-b4a0-ed6f4dae0172?api-version=2024-05-01-preview&operationResultResponseType=Location"
12+
}
13+
}
14+
}
15+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_List.json

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"api-version": "2024-05-01-preview"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1",
13+
"name": "account1",
14+
"type": "Microsoft.NetApp/netAppAccounts",
15+
"location": "eastus",
16+
"properties": {
17+
"provisioningState": "Succeeded"
18+
}
19+
}
20+
]
21+
}
22+
}
23+
}
24+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_RenewCredentials.json

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview",
7+
"body": {}
8+
},
9+
"responses": {
10+
"200": {},
11+
"202": {
12+
"headers": {
13+
"Location": "https://management.azure.com/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/operationResults/a0216c17-f9d6-4b99-9faf-9ebd4883d0e4?api-version=2024-05-01-preview&operationResultResponseType=Location"
14+
}
15+
}
16+
}
17+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_TransitionEncryptionKey.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview",
7+
"body": {
8+
"virtualNetworkId": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.Network/virtualNetworks/vnet1",
9+
"privateEndpointId": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.Network/privateEndpoints/privip1"
10+
}
11+
},
12+
"responses": {
13+
"202": {
14+
"headers": {
15+
"Location": "https://management.azure.com/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/operationResults/a0216c17-f9d6-4b99-9faf-9ebd4883d0e4?api-version=2024-05-01-preview&operationResultResponseType=Location",
16+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/operationResults/a0216c17-f9d6-4b99-9faf-9ebd4883d0e4?api-version=2024-05-01-preview"
17+
}
18+
}
19+
}
20+
}

‎specification/netapp/resource-manager/Microsoft.NetApp/preview/2024-05-01-preview/examples/Accounts_Update.json

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "D633CC2E-722B-4AE1-B636-BBD9E4C60ED9",
4+
"resourceGroupName": "myRG",
5+
"accountName": "account1",
6+
"api-version": "2024-05-01-preview",
7+
"body": {
8+
"tags": {
9+
"Tag1": "Value1"
10+
}
11+
}
12+
},
13+
"responses": {
14+
"200": {
15+
"body": {
16+
"id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1",
17+
"name": "account1",
18+
"type": "Microsoft.NetApp/netAppAccounts",
19+
"location": "eastus",
20+
"properties": {
21+
"provisioningState": "Succeeded"
22+
}
23+
}
24+
},
25+
"202": {
26+
"headers": {
27+
"Location": "https://management.azure.com/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/providers/Microsoft.NetApp/locations/eastus/operationResults/a0216c17-f9d6-4b99-9faf-9ebd4883d0e4?api-version=2024-05-01-preview&operationResultResponseType=Location"
28+
},
29+
"body": {
30+
"id": "/subscriptions/D633CC2E-722B-4AE1-B636-BBD9E4C60ED9/resourceGroups/myRG/providers/Microsoft.NetApp/netAppAccounts/account1",
31+
"name": "account1",
32+
"type": "Microsoft.NetApp/netAppAccounts",
33+
"location": "eastus",
34+
"tags": {
35+
"Tag1": "Value1"
36+
},
37+
"properties": {
38+
"provisioningState": "Patching",
39+
"encryption": {
40+
"keySource": "Microsoft.NetApp"
41+
}
42+
}
43+
}
44+
}
45+
}
46+
}

0 commit comments

Comments
 (0)