Skip to content

Commit bfc33ba

Browse files
brpanaskjosuh
brpanask
authored and
josuh
committed
[Hub Generated] Review request for Microsoft.StorageCache to add version stable/2020-10-01 (Azure#11407)
* Init the next version so diffs can work better. * Updates readme * Updates API version in new specs and examples * Updates to StorageTargetProperties and added examples of cmk, mtu Add 202 to the storage cache and storage target create/update and update examples Fix ST no junction example's 202 response. add properties for nfs extended groups fix issues with extended groups properties found with autorest add properties and objects for Active Directory username download undo unintended change changes from comments in pull request AccessPolicy support. Example fixes for Access Policies. Fix attribute names to match latest RP. update to credential properties for LDAP and Active Directory marking password properties with x-ms-secret tag minor changes on extended groups and add examples Added blob NFS and some other validation fixes. Update required property for domainName from dnsName Updated blobNfs examples and some kpi fixes. Correct validation errors in examples. Added systemdata to resources. Remove x-ms-secret in keyvault reference due to linter error and common types not using it. Remove blobNfs from this version. Remove blobNfs from spec file. Remove x-ms-secret due to linter errors. Fix certificate spelling. Updating prettier and spell check errors. Used prettier on main spec file. Readded x-ms-secret that open api hub failed on but the PR pipeline allows. * Add prettier fix after rebase * Remove 202 bodies and add systemData to examples. * Update spec with prettier. * Address comments on spec for descriptions, readmes, and extendedGroupsEnabled. * Updating to address addition ldap and pattern comments. * Update version tag to include 01 * Restore changes that would be considered breaking changes matching 2020-03-01 * Address a few other comments. * Update netbios field names and some descriptions. * Fix s360 for missing debugInfo operation. * Fix credscan error in example file. * Update required fields, new validator failure on debugInfo return codes, and bindPassword example value. * Update debug info example with new return codes. * Update other credscan password errors.
1 parent 24b7ee6 commit bfc33ba

29 files changed

+4421
-8
lines changed

‎custom-words.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,6 +1233,7 @@ paramref
12331233
PARAVIRTUAL
12341234
partnertopic
12351235
Passthrough
1236+
passwd
12361237
patternanyentities
12371238
patternrule
12381239
patternrules
@@ -1700,6 +1701,7 @@ subfolders
17001701
subinquireditemcount
17011702
sublist
17021703
sublists
1704+
submount
17031705
subnames
17041706
subnet
17051707
subnet's
@@ -1723,6 +1725,7 @@ subword
17231725
subwords
17241726
sudoer
17251727
suggesters
1728+
suid
17261729
Superfresh
17271730
superset
17281731
supportedimages

‎specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-10-01/examples/AscOperations_Get.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"location": "westus",
5+
"operationId": "testoperationid",
6+
"api-version": "2020-10-01"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"id": "/subscriptions/id/locations/westus/ascOperations/testoperationid",
12+
"name": "testoperationid",
13+
"startTime": "2020-10-01T13:13:13.933Z",
14+
"endTime": "2020-10-01T16:13:13.933Z",
15+
"status": "Succeeded"
16+
}
17+
}
18+
}
19+
}

‎specification/storagecache/resource-manager/Microsoft.StorageCache/stable/2020-10-01/examples/Caches_CreateOrUpdate.json‎

Lines changed: 255 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,255 @@
1+
{
2+
"parameters": {
3+
"resourceGroupName": "scgroup",
4+
"cacheName": "sc1",
5+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
6+
"api-version": "2020-10-01",
7+
"cache": {
8+
"tags": {
9+
"Dept": "ContosoAds"
10+
},
11+
"location": "westus",
12+
"properties": {
13+
"cacheSizeGB": 3072,
14+
"subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1",
15+
"encryptionSettings": {
16+
"keyEncryptionKey": {
17+
"keyUrl": "https://keyvault-cmk.vault.azure.net/keys/key2047/test",
18+
"sourceVault": {
19+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.KeyVault/vaults/keyvault-cmk"
20+
}
21+
}
22+
},
23+
"directoryServicesSettings": {
24+
"activeDirectory": {
25+
"primaryDnsIpAddress": "192.0.2.10",
26+
"secondaryDnsIpAddress": "192.0.2.11",
27+
"cacheNetBiosName": "contosoSmb",
28+
"domainName": "contosoAd.contoso.local",
29+
"domainNetBiosName": "contosoAd",
30+
"credentials": {
31+
"username": "consotoAdmin",
32+
"password": "<password>"
33+
}
34+
},
35+
"usernameDownload": {
36+
"extendedGroupsEnabled": true,
37+
"usernameSource": "LDAP",
38+
"ldapServer": "192.0.2.12",
39+
"ldapBaseDn": "dc=contosoad,dc=contoso,dc=local",
40+
"credentials": {
41+
"bindDn": "cn=ldapadmin,dc=contosoad,dc=contoso,dc=local",
42+
"bindPassword": "<bindPassword>"
43+
}
44+
}
45+
},
46+
"securitySettings": {
47+
"accessPolicies": [
48+
{
49+
"name": "default",
50+
"accessRules": [
51+
{
52+
"scope": "default",
53+
"access": "rw",
54+
"suid": false,
55+
"submountAccess": true,
56+
"rootSquash": false
57+
}
58+
]
59+
}
60+
]
61+
}
62+
},
63+
"sku": {
64+
"name": "Standard_2G"
65+
}
66+
}
67+
},
68+
"responses": {
69+
"202": {},
70+
"201": {
71+
"body": {
72+
"tags": {
73+
"Dept": "ContosoAds"
74+
},
75+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1",
76+
"location": "westus",
77+
"name": "sc1",
78+
"type": "Microsoft.StorageCache/Cache",
79+
"systemData": {
80+
"createdBy": "user1",
81+
"createdByType": "User",
82+
"createdAt": "2020-01-01T17:18:19.1234567Z",
83+
"lastModifiedBy": "user2",
84+
"lastModifiedByType": "User",
85+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
86+
},
87+
"properties": {
88+
"cacheSizeGB": 3072,
89+
"health": {
90+
"state": "Transitioning",
91+
"statusDescription": "Cache is being created."
92+
},
93+
"mountAddresses": [
94+
"192.168.1.1",
95+
"192.168.1.2"
96+
],
97+
"provisioningState": "Succeeded",
98+
"subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1",
99+
"upgradeStatus": {
100+
"currentFirmwareVersion": "5.3.23",
101+
"firmwareUpdateStatus": "available",
102+
"firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z",
103+
"lastFirmwareUpdate": "2019-01-21T18:25:43.511Z",
104+
"pendingFirmwareVersion": "5.3.24"
105+
},
106+
"networkSettings": {
107+
"mtu": 1500
108+
},
109+
"securitySettings": {
110+
"accessPolicies": [
111+
{
112+
"name": "default",
113+
"accessRules": [
114+
{
115+
"scope": "default",
116+
"access": "rw",
117+
"suid": false,
118+
"submountAccess": true,
119+
"rootSquash": false
120+
}
121+
]
122+
}
123+
]
124+
},
125+
"encryptionSettings": {
126+
"keyEncryptionKey": {
127+
"keyUrl": "https://keyvault-cmk.vault.azure.net/keys/key2048/test",
128+
"sourceVault": {
129+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.KeyVault/vaults/keyvault-cmk"
130+
}
131+
}
132+
},
133+
"directoryServicesSettings": {
134+
"activeDirectory": {
135+
"primaryDnsIpAddress": "192.0.2.10",
136+
"secondaryDnsIpAddress": "192.0.2.11",
137+
"domainName": "contosoAd.contoso.local",
138+
"domainNetBiosName": "contosoAd",
139+
"cacheNetBiosName": "contosoSmb",
140+
"domainJoined": "No"
141+
},
142+
"usernameDownload": {
143+
"extendedGroupsEnabled": true,
144+
"usernameSource": "LDAP",
145+
"groupFileURI": "",
146+
"userFileURI": "",
147+
"ldapServer": "192.0.2.12",
148+
"ldapBaseDn": "dc=contosoad,dc=contoso,dc=local",
149+
"encryptLdapConnection": false,
150+
"requireValidCertificate": false,
151+
"autoDownloadCertificate": false,
152+
"caCertificateURI": "",
153+
"usernameDownloaded": "No"
154+
}
155+
}
156+
},
157+
"sku": {
158+
"name": "Standard_2G"
159+
}
160+
}
161+
},
162+
"200": {
163+
"body": {
164+
"tags": {
165+
"Dept": "ContosoAds"
166+
},
167+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.StorageCache/caches/sc1",
168+
"location": "westus",
169+
"name": "sc1",
170+
"type": "Microsoft.StorageCache/Cache",
171+
"systemData": {
172+
"createdBy": "user1",
173+
"createdByType": "User",
174+
"createdAt": "2020-01-01T17:18:19.1234567Z",
175+
"lastModifiedBy": "user2",
176+
"lastModifiedByType": "User",
177+
"lastModifiedAt": "2020-01-02T17:18:19.1234567Z"
178+
},
179+
"properties": {
180+
"cacheSizeGB": 3072,
181+
"health": {
182+
"state": "Transitioning",
183+
"statusDescription": "Cache is being created."
184+
},
185+
"mountAddresses": [
186+
"192.168.1.1",
187+
"192.168.1.2"
188+
],
189+
"provisioningState": "Updating",
190+
"subnet": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.Network/virtualNetworks/scvnet/subnets/sub1",
191+
"upgradeStatus": {
192+
"currentFirmwareVersion": "V5.1.12",
193+
"firmwareUpdateStatus": "available",
194+
"firmwareUpdateDeadline": "2019-04-21T18:25:43.511Z",
195+
"lastFirmwareUpdate": "2019-01-21T18:25:43.511Z",
196+
"pendingFirmwareVersion": "V5.1.15"
197+
},
198+
"networkSettings": {
199+
"mtu": 1500
200+
},
201+
"securitySettings": {
202+
"accessPolicies": [
203+
{
204+
"name": "default",
205+
"accessRules": [
206+
{
207+
"scope": "default",
208+
"access": "rw",
209+
"suid": false,
210+
"submountAccess": true,
211+
"rootSquash": false
212+
}
213+
]
214+
}
215+
]
216+
},
217+
"encryptionSettings": {
218+
"keyEncryptionKey": {
219+
"keyUrl": "https://keyvault-cmk.vault.azure.net/keys/key2048/test",
220+
"sourceVault": {
221+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/scgroup/providers/Microsoft.KeyVault/vaults/keyvault-cmk"
222+
}
223+
}
224+
},
225+
"directoryServicesSettings": {
226+
"activeDirectory": {
227+
"primaryDnsIpAddress": "192.0.2.10",
228+
"secondaryDnsIpAddress": "192.0.2.11",
229+
"domainName": "contosoAd.contoso.local",
230+
"domainNetBiosName": "contosoAd",
231+
"cacheNetBiosName": "contosoSmb",
232+
"domainJoined": "Yes"
233+
},
234+
"usernameDownload": {
235+
"extendedGroupsEnabled": true,
236+
"usernameSource": "LDAP",
237+
"groupFileURI": "",
238+
"userFileURI": "",
239+
"ldapServer": "192.0.2.12",
240+
"ldapBaseDn": "dc=contosoad,dc=contoso,dc=local",
241+
"encryptLdapConnection": false,
242+
"requireValidCertificate": false,
243+
"autoDownloadCertificate": false,
244+
"caCertificateURI": "",
245+
"usernameDownloaded": "Yes"
246+
}
247+
}
248+
},
249+
"sku": {
250+
"name": "Standard_2G"
251+
}
252+
}
253+
}
254+
}
255+
}

0 commit comments

Comments
 (0)