Skip to content

Commit 1b38cd3

Browse files
a-santamariaAlfredo Santamaria Gomez
a-santamaria
and
Alfredo Santamaria Gomez
authored
[Service Fabric Managed Clusters] fix api 2020_05_01 (Azure#13961)
* Use enums and add missing properties * model enum as string Co-authored-by: Alfredo Santamaria Gomez <[email protected]>
1 parent eb6d68b commit 1b38cd3

File tree

8 files changed

+89
-66
lines changed

8 files changed

+89
-66
lines changed

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGetByEnvironment_example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"properties": {
1717
"supportExpiryUtc": "2021-11-30T00:00:00",
1818
"osType": "Windows",
19-
"codeVersion": "7.2.477.9590"
19+
"clusterCodeVersion": "7.2.477.9590"
2020
}
2121
}
2222
}

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionGet_example.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"properties": {
1616
"supportExpiryUtc": "2021-11-30T00:00:00",
1717
"osType": "Windows",
18-
"codeVersion": "7.2.477.9590"
18+
"clusterCodeVersion": "7.2.477.9590"
1919
}
2020
}
2121
}

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionListByEnvironment.json‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,30 +8,28 @@
88
"responses": {
99
"200": {
1010
"headers": {},
11-
"body": {
12-
"value": [
13-
{
14-
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.457.9590",
15-
"name": "7.2.457.9590",
16-
"type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions",
17-
"properties": {
18-
"supportExpiryUtc": "2021-11-30T00:00:00",
19-
"osType": "Windows",
20-
"codeVersion": "7.2.457.9590"
21-
}
22-
},
23-
{
24-
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.477.9590",
25-
"name": "7.2.477.9590",
26-
"type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions",
27-
"properties": {
28-
"supportExpiryUtc": "2021-11-30T00:00:00",
29-
"osType": "Windows",
30-
"codeVersion": "7.2.477.9590"
31-
}
11+
"body": [
12+
{
13+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.457.9590",
14+
"name": "7.2.457.9590",
15+
"type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions",
16+
"properties": {
17+
"supportExpiryUtc": "2021-11-30T00:00:00",
18+
"osType": "Windows",
19+
"clusterCodeVersion": "7.2.457.9590"
3220
}
33-
]
34-
}
21+
},
22+
{
23+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.477.9590",
24+
"name": "7.2.477.9590",
25+
"type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions",
26+
"properties": {
27+
"supportExpiryUtc": "2021-11-30T00:00:00",
28+
"osType": "Windows",
29+
"clusterCodeVersion": "7.2.477.9590"
30+
}
31+
}
32+
]
3533
}
3634
}
3735
}

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/ManagedClusterVersionList_example.json‎

Lines changed: 21 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,28 @@
77
"responses": {
88
"200": {
99
"headers": {},
10-
"body": {
11-
"value": [
12-
{
13-
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.457.9590",
14-
"name": "7.2.457.9590",
15-
"type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions",
16-
"properties": {
17-
"supportExpiryUtc": "2021-11-30T00:00:00",
18-
"osType": "Windows",
19-
"codeVersion": "7.2.457.9590"
20-
}
21-
},
22-
{
23-
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.477.9590",
24-
"name": "7.2.477.9590",
25-
"type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions",
26-
"properties": {
27-
"supportExpiryUtc": "2021-11-30T00:00:00",
28-
"osType": "Windows",
29-
"codeVersion": "7.2.477.9590"
30-
}
10+
"body": [
11+
{
12+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.457.9590",
13+
"name": "7.2.457.9590",
14+
"type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions",
15+
"properties": {
16+
"supportExpiryUtc": "2021-11-30T00:00:00",
17+
"osType": "Windows",
18+
"clusterCodeVersion": "7.2.457.9590"
3119
}
32-
]
33-
}
20+
},
21+
{
22+
"id": "subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.ServiceFabric/locations/eastus/environments/Windows/managedClusterVersions/7.2.477.9590",
23+
"name": "7.2.477.9590",
24+
"type": "Microsoft.ServiceFabric/locations/environments/managedClusterVersions",
25+
"properties": {
26+
"supportExpiryUtc": "2021-11-30T00:00:00",
27+
"osType": "Windows",
28+
"clusterCodeVersion": "7.2.477.9590"
29+
}
30+
}
31+
]
3432
}
3533
}
3634
}

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/examples/NodeTypePutOperation_example_max.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"vmImageVersion": "latest",
2626
"vmInstanceCount": 10,
2727
"isStateless": true,
28+
"multiplePlacementGroups": true,
2829
"vmSecrets": [
2930
{
3031
"sourceVault": {
@@ -90,6 +91,7 @@
9091
"vmImageVersion": "latest",
9192
"vmInstanceCount": 10,
9293
"isStateless": true,
94+
"multiplePlacementGroups": true,
9395
"vmSecrets": [
9496
{
9597
"sourceVault": {
@@ -149,6 +151,7 @@
149151
"vmImageVersion": "latest",
150152
"vmInstanceCount": 10,
151153
"isStateless": true,
154+
"multiplePlacementGroups": true,
152155
"vmSecrets": [
153156
{
154157
"sourceVault": {

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedapplication.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1459,7 +1459,8 @@
14591459
"metricName",
14601460
"lowerLoadThreshold",
14611461
"upperLoadThreshold",
1462-
"scaleInterval"
1462+
"scaleInterval",
1463+
"useOnlyPrimaryLoad"
14631464
],
14641465
"properties": {
14651466
"metricName": {
@@ -1479,6 +1480,10 @@
14791480
"scaleInterval": {
14801481
"type": "string",
14811482
"description": "The period in seconds on which a decision is made whether to scale or not. This property should come in ISO 8601 format \"hh:mm:ss\"."
1483+
},
1484+
"useOnlyPrimaryLoad": {
1485+
"type": "boolean",
1486+
"description": "Flag determines whether only the load of primary replica should be considered for scaling. If set to true, then trigger will only consider the load of primary replicas of stateful service. If set to false, trigger will consider load of all replicas. This parameter cannot be set to true for stateless service."
14821487
}
14831488
}
14841489
},
@@ -2412,10 +2417,6 @@
24122417
"servicePlacementTimeLimit": {
24132418
"type": "string",
24142419
"description": "The duration for which replicas can stay InBuild before reporting that build is stuck, represented in ISO 8601 format \"hh:mm:ss\"."
2415-
},
2416-
"dropSourceReplicaOnMove": {
2417-
"type": "boolean",
2418-
"description": "Indicates whether to drop source Secondary replica even if the target replica has not finished build. If desired behavior is to drop it as soon as possible the value of this property is true, if not it is false."
24192420
}
24202421
}
24212422
},

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/managedcluster.json‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@
559559
"description": "Number of unused versions per application type to keep."
560560
}
561561
},
562-
"description": "The policy used to clean up unused versions."
562+
"description": "The policy used to clean up unused versions. When the policy is not specified explicitly, the default unused application versions to keep will be 3."
563563
},
564564
"AzureActiveDirectory": {
565565
"properties": {
@@ -779,13 +779,9 @@
779779
}
780780
},
781781
"ManagedClusterCodeVersionListResult": {
782-
"properties": {
783-
"value": {
784-
"type": "array",
785-
"items": {
786-
"$ref": "#/definitions/ManagedClusterCodeVersionResult"
787-
}
788-
}
782+
"type": "array",
783+
"items": {
784+
"$ref": "#/definitions/ManagedClusterCodeVersionResult"
789785
},
790786
"description": "The list results of the Service Fabric runtime versions."
791787
},
@@ -974,7 +970,7 @@
974970
},
975971
"ManagedClusterVersionDetails": {
976972
"properties": {
977-
"codeVersion": {
973+
"clusterCodeVersion": {
978974
"type": "string",
979975
"description": "The Service Fabric runtime version of the cluster."
980976
},
@@ -1105,11 +1101,25 @@
11051101
},
11061102
"SkuName": {
11071103
"type": "string",
1108-
"description": "Sku Name. Basic requires a minimum of 3 nodes and Standard a minimum of 5. Basic only allows 1 node type.",
1104+
"description": "Sku Name.",
11091105
"enum": [
11101106
"Basic",
11111107
"Standard"
1112-
]
1108+
],
1109+
"x-ms-enum": {
1110+
"name": "SkuName",
1111+
"modelAsString": true,
1112+
"values": [
1113+
{
1114+
"value": "Basic",
1115+
"description": "Basic requires a minimum of 3 nodes and allows only 1 node type."
1116+
},
1117+
{
1118+
"value": "Standard",
1119+
"description": "Requires a minimum of 5 nodes and allows 1 or more node type."
1120+
}
1121+
]
1122+
}
11131123
},
11141124
"AvailableOperationDisplay": {
11151125
"properties": {
@@ -1168,7 +1178,11 @@
11681178
"Deleting",
11691179
"Deleted",
11701180
"Other"
1171-
]
1181+
],
1182+
"x-ms-enum": {
1183+
"name": "ManagedResourceProvisioningState",
1184+
"modelAsString": true
1185+
}
11721186
},
11731187
"OperationListResult": {
11741188
"properties": {

‎specification/servicefabricmanagedclusters/resource-manager/Microsoft.ServiceFabricManagedClusters/stable/2021-05-01/nodetype.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,11 @@
671671
"description": "Indicates if the node type can only host Stateless workloads.",
672672
"default": false
673673
},
674+
"multiplePlacementGroups": {
675+
"type": "boolean",
676+
"description": "Indicates if scale set associated with the node type can be composed of multiple placement groups.",
677+
"default": false
678+
},
674679
"provisioningState": {
675680
"$ref": "#/definitions/ManagedResourceProvisioningState",
676681
"readOnly": true,
@@ -911,7 +916,11 @@
911916
"Deleting",
912917
"Deleted",
913918
"Other"
914-
]
919+
],
920+
"x-ms-enum": {
921+
"name": "ManagedResourceProvisioningState",
922+
"modelAsString": true
923+
}
915924
},
916925
"OperationResult": {
917926
"properties": {

0 commit comments

Comments
 (0)