Skip to content

Commit 1c7ebac

Browse files
Padmapriya-0909-Padmapriya
Padmapriya-09
and
09-Padmapriya
authored
update existing api version for dell with optional fields (#34020)
* update api version for dell with optional fields * add termUnit in marketplace --------- Co-authored-by: Padmapriya-09 <[email protected]>
1 parent 0c2a77f commit 1c7ebac

23 files changed

+83
-50
lines changed

‎specification/dell/Dell.Storage.Management/LiftrBase.Storage/main.tsp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,11 @@ model FileSystemResourceProperties {
6868
*/
6969
smartConnectFqdn?: string;
7070

71+
/**
72+
* OneFS url
73+
*/
74+
oneFsUrl?: string;
75+
7176
/**
7277
* DellReferenceNumber of the resource
7378
*/

‎specification/dell/Dell.Storage.Management/LiftrBase/main.tsp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,11 @@ model MarketplaceDetails {
140140
* End Date of the subscription
141141
*/
142142
endDate?: string;
143+
144+
/**
145+
* Term Unit
146+
*/
147+
termUnit?: string;
143148
}
144149

145150
/**
@@ -149,14 +154,15 @@ union ResourceEncryptionType {
149154
string,
150155

151156
/**
152-
* Microsoft Managed key
157+
* Microsoft managed keys (Default)
153158
*/
154-
ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY: "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY",
159+
"Microsoft-managed keys (MMK)",
155160

156161
/**
157-
* Customer Managed key
162+
* Customer managed keys
163+
* (CMK) - Only UserAssigned identity is supported
158164
*/
159-
ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY: "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
165+
"Customer-managed keys (CMK)",
160166
}
161167

162168
/**

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_CreateOrUpdate_MaximumSet_Gen.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
"email": "jwogfgznmjabdbcjcljjlkxdpc"
2424
},
2525
"smartConnectFqdn": "fqdn",
26+
"oneFsUrl": "oneFsUrl",
2627
"dellReferenceNumber": "fhewkj",
2728
"encryption": {
28-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
29+
"encryptionType": "Customer-managed keys (CMK)",
2930
"keyUrl": "https://contoso.com/keyurl/keyVersion",
3031
"encryptionIdentityProperties": {
3132
"identityType": "UserAssigned",
@@ -63,17 +64,19 @@
6364
"marketplaceSubscriptionStatus": "PendingFulfillmentStart",
6465
"privateOfferId": "privateOfferId",
6566
"planName": "planeName",
66-
"endDate": "2023-05-27T17:00:00-07:00"
67+
"endDate": "2023-05-27T17:00:00-07:00",
68+
"termUnit": "P1Y"
6769
},
6870
"provisioningState": "Accepted",
6971
"delegatedSubnetId": "rqkpvczbtqcxiaivtbquixblb",
7072
"delegatedSubnetCidr": "10.0.0.1/24",
7173
"user": {},
7274
"smartConnectFqdn": "fqdn",
75+
"oneFsUrl": "oneFsUrl",
7376
"dellReferenceNumber": "fhewkj",
7477
"fileSystemId": "filesystemId",
7578
"encryption": {
76-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
79+
"encryptionType": "Customer-managed keys (CMK)",
7780
"keyUrl": "https://contoso.com/keyurl/keyVersion",
7881
"encryptionIdentityProperties": {
7982
"identityType": "UserAssigned",
@@ -129,17 +132,19 @@
129132
"marketplaceSubscriptionStatus": "PendingFulfillmentStart",
130133
"privateOfferId": "privateOfferId",
131134
"planName": "planeName",
132-
"endDate": "2023-05-27T17:00:00-07:00"
135+
"endDate": "2023-05-27T17:00:00-07:00",
136+
"termUnit": "P1Y"
133137
},
134138
"provisioningState": "Accepted",
135139
"delegatedSubnetId": "rqkpvczbtqcxiaivtbquixblb",
136140
"delegatedSubnetCidr": "10.0.0.1/24",
137141
"user": {},
138142
"fileSystemId": "filesystemId",
139143
"smartConnectFqdn": "fqdn",
144+
"oneFsUrl": "oneFsUrl",
140145
"dellReferenceNumber": "fhewkj",
141146
"encryption": {
142-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
147+
"encryptionType": "Customer-managed keys (CMK)",
143148
"keyUrl": "https://contoso.com/keyurl/keyVersion",
144149
"encryptionIdentityProperties": {
145150
"identityType": "UserAssigned",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_CreateOrUpdate_MinimumSet_Gen.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"dellReferenceNumber": "fhewkj",
2323
"encryption": {
24-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
24+
"encryptionType": "Microsoft-managed keys (MMK)"
2525
}
2626
},
2727
"location": "tbcvhxzpgrijtdygkttnfswwtacs"
@@ -42,15 +42,16 @@
4242
"offerId": "pzhjvibxqgeqkndqnjlduwnxqbr",
4343
"privateOfferId": "privateOfferId",
4444
"planName": "planeName",
45-
"endDate": "2023-05-27T17:00:00-07:00"
45+
"endDate": "2023-05-27T17:00:00-07:00",
46+
"termUnit": "P1Y"
4647
},
4748
"fileSystemId": "filesystemId",
4849
"delegatedSubnetId": "yp",
4950
"delegatedSubnetCidr": "10.0.0.1/24",
5051
"user": {},
5152
"dellReferenceNumber": "fhewkj",
5253
"encryption": {
53-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
54+
"encryptionType": "Microsoft-managed keys (MMK)"
5455
}
5556
},
5657
"location": "tbcvhxzpgrijtdygkttnfswwtacs",
@@ -75,15 +76,16 @@
7576
"publisherId": "kmwtgjdzlldpau",
7677
"privateOfferId": "privateOfferId",
7778
"planName": "planeName",
78-
"endDate": "2023-05-27T17:00:00-07:00"
79+
"endDate": "2023-05-27T17:00:00-07:00",
80+
"termUnit": "P1Y"
7981
},
8082
"delegatedSubnetId": "yp",
8183
"delegatedSubnetCidr": "10.0.0.1/24",
8284
"user": {},
8385
"fileSystemId": "filesystemId",
8486
"dellReferenceNumber": "fhewkj",
8587
"encryption": {
86-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
88+
"encryptionType": "Microsoft-managed keys (MMK)"
8789
}
8890
},
8991
"location": "tbcvhxzpgrijtdygkttnfswwtacs",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_Get_MaximumSet_Gen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"smartConnectFqdn": "fqdn",
3636
"dellReferenceNumber": "fhewkj",
3737
"encryption": {
38-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
38+
"encryptionType": "Customer-managed keys (CMK)",
3939
"keyUrl": "https://contoso.com/keyurl/keyVersion",
4040
"encryptionIdentityProperties": {
4141
"identityType": "UserAssigned",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_Get_MinimumSet_Gen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"fileSystemId": "filesystemId",
3131
"dellReferenceNumber": "fhewkj",
3232
"encryption": {
33-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
33+
"encryptionType": "Microsoft-managed keys (MMK)"
3434
}
3535
},
3636
"location": "tbcvhxzpgrijtdygkttnfswwtacs",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_ListByResourceGroup_MaximumSet_Gen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"smartConnectFqdn": "fqdn",
3737
"dellReferenceNumber": "fhewkj",
3838
"encryption": {
39-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
39+
"encryptionType": "Customer-managed keys (CMK)",
4040
"keyUrl": "https://contoso.com/keyurl/keyVersion",
4141
"encryptionIdentityProperties": {
4242
"identityType": "UserAssigned",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_ListByResourceGroup_MinimumSet_Gen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"fileSystemId": "filesystemId",
3232
"dellReferenceNumber": "fhewkj",
3333
"encryption": {
34-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
34+
"encryptionType": "Microsoft-managed keys (MMK)"
3535
}
3636
},
3737
"location": "tbcvhxzpgrijtdygkttnfswwtacs",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_ListBySubscription_MaximumSet_Gen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"smartConnectFqdn": "fqdn",
3636
"dellReferenceNumber": "fhewkj",
3737
"encryption": {
38-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
38+
"encryptionType": "Customer-managed keys (CMK)",
3939
"keyUrl": "https://contoso.com/keyurl/keyVersion",
4040
"encryptionIdentityProperties": {
4141
"identityType": "UserAssigned",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_ListBySubscription_MinimumSet_Gen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"fileSystemId": "filesystemId",
3131
"dellReferenceNumber": "fhewkj",
3232
"encryption": {
33-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
33+
"encryptionType": "Microsoft-managed keys (MMK)"
3434
}
3535
},
3636
"location": "tbcvhxzpgrijtdygkttnfswwtacs",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_Update_MaximumSet_Gen.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"current": "5"
2323
},
2424
"encryption": {
25-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
25+
"encryptionType": "Customer-managed keys (CMK)",
2626
"keyUrl": "https://contoso.com/keyurl/keyVersion",
2727
"encryptionIdentityProperties": {
2828
"identityType": "UserAssigned",
@@ -60,7 +60,7 @@
6060
"smartConnectFqdn": "fqdn",
6161
"dellReferenceNumber": "fhewkj",
6262
"encryption": {
63-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
63+
"encryptionType": "Customer-managed keys (CMK)",
6464
"keyUrl": "https://contoso.com/keyurl/keyVersion",
6565
"encryptionIdentityProperties": {
6666
"identityType": "UserAssigned",

‎specification/dell/Dell.Storage.Management/examples/2025-03-21-preview/FileSystems_Update_MinimumSet_Gen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"fileSystemId": "filesystemId",
5151
"dellReferenceNumber": "fhewkj",
5252
"encryption": {
53-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
53+
"encryptionType": "Customer-managed keys (CMK)",
5454
"keyUrl": "https://contoso.com/keyurl/keyVersion",
5555
"encryptionIdentityProperties": {
5656
"identityType": "UserAssigned",

‎specification/dell/resource-manager/Dell.Storage/preview/2025-03-21-preview/Dell.Storage.json

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,10 @@
571571
"endDate": {
572572
"type": "string",
573573
"description": "End Date of the subscription"
574+
},
575+
"termUnit": {
576+
"type": "string",
577+
"description": "Term Unit"
574578
}
575579
},
576580
"required": [
@@ -686,22 +690,22 @@
686690
"type": "string",
687691
"description": "Identity type of ManagedIdentity Associated with Dell FileSystem resource",
688692
"enum": [
689-
"ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY",
690-
"ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY"
693+
"Microsoft-managed keys (MMK)",
694+
"Customer-managed keys (CMK)"
691695
],
692696
"x-ms-enum": {
693697
"name": "ResourceEncryptionType",
694698
"modelAsString": true,
695699
"values": [
696700
{
697-
"name": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY",
698-
"value": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY",
699-
"description": "Microsoft Managed key"
701+
"name": "Microsoft-managed keys (MMK)",
702+
"value": "Microsoft-managed keys (MMK)",
703+
"description": "Microsoft managed keys (Default)"
700704
},
701705
{
702-
"name": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
703-
"value": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
704-
"description": "Customer Managed key"
706+
"name": "Customer-managed keys (CMK)",
707+
"value": "Customer-managed keys (CMK)",
708+
"description": "Customer managed keys\n(CMK) - Only UserAssigned identity is supported"
705709
}
706710
]
707711
}
@@ -785,6 +789,10 @@
785789
"type": "string",
786790
"description": "Smart Connect FQDN of the resource"
787791
},
792+
"oneFsUrl": {
793+
"type": "string",
794+
"description": "OneFS url"
795+
},
788796
"dellReferenceNumber": {
789797
"type": "string",
790798
"description": "DellReferenceNumber of the resource"

‎specification/dell/resource-manager/Dell.Storage/preview/2025-03-21-preview/examples/FileSystems_CreateOrUpdate_MaximumSet_Gen.json

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323
"email": "jwogfgznmjabdbcjcljjlkxdpc"
2424
},
2525
"smartConnectFqdn": "fqdn",
26+
"oneFsUrl": "oneFsUrl",
2627
"dellReferenceNumber": "fhewkj",
2728
"encryption": {
28-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
29+
"encryptionType": "Customer-managed keys (CMK)",
2930
"keyUrl": "https://contoso.com/keyurl/keyVersion",
3031
"encryptionIdentityProperties": {
3132
"identityType": "UserAssigned",
@@ -63,17 +64,19 @@
6364
"marketplaceSubscriptionStatus": "PendingFulfillmentStart",
6465
"privateOfferId": "privateOfferId",
6566
"planName": "planeName",
66-
"endDate": "2023-05-27T17:00:00-07:00"
67+
"endDate": "2023-05-27T17:00:00-07:00",
68+
"termUnit": "P1Y"
6769
},
6870
"provisioningState": "Accepted",
6971
"delegatedSubnetId": "rqkpvczbtqcxiaivtbquixblb",
7072
"delegatedSubnetCidr": "10.0.0.1/24",
7173
"user": {},
7274
"smartConnectFqdn": "fqdn",
75+
"oneFsUrl": "oneFsUrl",
7376
"dellReferenceNumber": "fhewkj",
7477
"fileSystemId": "filesystemId",
7578
"encryption": {
76-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
79+
"encryptionType": "Customer-managed keys (CMK)",
7780
"keyUrl": "https://contoso.com/keyurl/keyVersion",
7881
"encryptionIdentityProperties": {
7982
"identityType": "UserAssigned",
@@ -129,17 +132,19 @@
129132
"marketplaceSubscriptionStatus": "PendingFulfillmentStart",
130133
"privateOfferId": "privateOfferId",
131134
"planName": "planeName",
132-
"endDate": "2023-05-27T17:00:00-07:00"
135+
"endDate": "2023-05-27T17:00:00-07:00",
136+
"termUnit": "P1Y"
133137
},
134138
"provisioningState": "Accepted",
135139
"delegatedSubnetId": "rqkpvczbtqcxiaivtbquixblb",
136140
"delegatedSubnetCidr": "10.0.0.1/24",
137141
"user": {},
138142
"fileSystemId": "filesystemId",
139143
"smartConnectFqdn": "fqdn",
144+
"oneFsUrl": "oneFsUrl",
140145
"dellReferenceNumber": "fhewkj",
141146
"encryption": {
142-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
147+
"encryptionType": "Customer-managed keys (CMK)",
143148
"keyUrl": "https://contoso.com/keyurl/keyVersion",
144149
"encryptionIdentityProperties": {
145150
"identityType": "UserAssigned",

‎specification/dell/resource-manager/Dell.Storage/preview/2025-03-21-preview/examples/FileSystems_CreateOrUpdate_MinimumSet_Gen.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
},
2222
"dellReferenceNumber": "fhewkj",
2323
"encryption": {
24-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
24+
"encryptionType": "Microsoft-managed keys (MMK)"
2525
}
2626
},
2727
"location": "tbcvhxzpgrijtdygkttnfswwtacs"
@@ -42,15 +42,16 @@
4242
"offerId": "pzhjvibxqgeqkndqnjlduwnxqbr",
4343
"privateOfferId": "privateOfferId",
4444
"planName": "planeName",
45-
"endDate": "2023-05-27T17:00:00-07:00"
45+
"endDate": "2023-05-27T17:00:00-07:00",
46+
"termUnit": "P1Y"
4647
},
4748
"fileSystemId": "filesystemId",
4849
"delegatedSubnetId": "yp",
4950
"delegatedSubnetCidr": "10.0.0.1/24",
5051
"user": {},
5152
"dellReferenceNumber": "fhewkj",
5253
"encryption": {
53-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
54+
"encryptionType": "Microsoft-managed keys (MMK)"
5455
}
5556
},
5657
"location": "tbcvhxzpgrijtdygkttnfswwtacs",
@@ -75,15 +76,16 @@
7576
"publisherId": "kmwtgjdzlldpau",
7677
"privateOfferId": "privateOfferId",
7778
"planName": "planeName",
78-
"endDate": "2023-05-27T17:00:00-07:00"
79+
"endDate": "2023-05-27T17:00:00-07:00",
80+
"termUnit": "P1Y"
7981
},
8082
"delegatedSubnetId": "yp",
8183
"delegatedSubnetCidr": "10.0.0.1/24",
8284
"user": {},
8385
"fileSystemId": "filesystemId",
8486
"dellReferenceNumber": "fhewkj",
8587
"encryption": {
86-
"encryptionType": "ENCRYPTION_AT_REST_WITH_MICROSOFT_KEY"
88+
"encryptionType": "Microsoft-managed keys (MMK)"
8789
}
8890
},
8991
"location": "tbcvhxzpgrijtdygkttnfswwtacs",

‎specification/dell/resource-manager/Dell.Storage/preview/2025-03-21-preview/examples/FileSystems_Get_MaximumSet_Gen.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"smartConnectFqdn": "fqdn",
3636
"dellReferenceNumber": "fhewkj",
3737
"encryption": {
38-
"encryptionType": "ENCRYPTION_AT_REST_WITH_CUSTOMER_KEY",
38+
"encryptionType": "Customer-managed keys (CMK)",
3939
"keyUrl": "https://contoso.com/keyurl/keyVersion",
4040
"encryptionIdentityProperties": {
4141
"identityType": "UserAssigned",

0 commit comments

Comments
 (0)