Skip to content

Commit 64e42f3

Browse files
a-santamariaAlfredo Santamaria Gomez
andauthored
Service fabric Managed Clusters - Update managed .net sdk for api version 2021-05-01 (#14807)
* update managed sdk to ga version and update cmdlets * update managed tests * runtest agains the test region and add params to PS objects * record managed cluster tests * record managed app tests and update changelog * rename plural parameters and update help documents * fix change log param names * breaking change and signature issue exceptions * add breaking change message for PSManagedService Co-authored-by: Alfredo Santamaria Gomez <[email protected]>
1 parent 3c7d24a commit 64e42f3

File tree

35 files changed

+20670
-12471
lines changed

35 files changed

+20670
-12471
lines changed

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricManagedClustersApplicationTests.ps1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -248,14 +248,12 @@ function Test-ManagedService
248248
Assert-AreEqual $standByReplicaKeepDuration $statefulService.Properties.StandByReplicaKeepDuration
249249
Assert-AreEqual $servicePlacementTimeLimit $statefulService.Properties.ServicePlacementTimeLimit
250250

251-
$instanceCloseDelayDuration = "00:11:00"
252251
$minInstancePercentage = 20
253252
$minInstanceCount = 2
254253

255-
$statelessService = $statelessServiceFromGet | Set-AzServiceFabricManagedClusterService -Stateless -InstanceCloseDelayDuration $instanceCloseDelayDuration -MinInstancePercentage $minInstancePercentage `
254+
$statelessService = $statelessServiceFromGet | Set-AzServiceFabricManagedClusterService -Stateless -MinInstancePercentage $minInstancePercentage `
256255
-MinInstanceCount $minInstanceCount -Verbose
257256
Assert-AreEqual "Succeeded" $statelessService.Properties.ProvisioningState
258-
Assert-AreEqual $instanceCloseDelayDuration $statelessService.Properties.InstanceCloseDelayDuration
259257
Assert-AreEqual $minInstancePercentage $statelessService.Properties.MinInstancePercentage
260258
Assert-AreEqual $minInstanceCount $statelessService.Properties.MinInstanceCount
261259

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricManagedClustersTests.ps1

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,25 @@ function Test-CreateBasicCluster
1717
$resourceGroupName = "sfmcps-rg-" + (getAssetname)
1818
$clusterName = "sfmcps-" + (getAssetname)
1919
$pass = (ConvertTo-SecureString -AsPlainText -Force "TestPass1234!@#")
20-
$location = "northeurope"
20+
$location = "southcentralus"
2121
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
2222
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
2323

2424
$cluster = New-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Location $location `
2525
-AdminPassword $pass -Sku Basic -ClientCertThumbprint $testClientTp -Verbose
26-
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
27-
Assert-AreEqual "WaitingForNodes" $cluster.ClusterState
26+
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
27+
Assert-AreEqual "Automatic" $cluster.ClusterUpgradeMode
28+
Assert-AreEqual "Wave0" $cluster.ClusterUpgradeCadence
29+
30+
$pnt = New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 5 -DiskType Standard_LRS -Primary
31+
Assert-AreEqual 5 $pnt.VmInstanceCount
32+
Assert-AreEqual "Standard_LRS" $pnt.DataDiskType
2833

29-
$pnt = New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 5 -Primary
30-
3134
# shouldn't be allowed to remove the only primary node type in the cluster
3235
Assert-ThrowsContains { $pnt | Remove-AzServiceFabricManagedNodeType } "InvalidParameter"
3336

3437
$cluster = Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName
35-
Assert-AreEqual "Deploying" $cluster.ClusterState
38+
Assert-AreEqual "Deploying" $cluster.ClusterState
3639

3740
# scale primary node type
3841
$pnt = Set-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 6
@@ -48,22 +51,32 @@ function Test-NodeTypeOperations
4851
{
4952
$resourceGroupName = "sfmcps-rg-" + (getAssetname)
5053
$clusterName = "sfmcps-" + (getAssetname)
51-
$location = "northeurope"
54+
$location = "southcentralus"
5255
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
5356
$pass = (ConvertTo-SecureString -AsPlainText -Force "TestPass1234!@#")
5457
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
5558

56-
$cluster = New-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Location $location `
59+
$cluster = New-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -UpgradeMode Automatic -UpgradeCadence Wave1 -Location $location `
5760
-AdminPassword $pass -Sku Standard -ClientCertThumbprint $testClientTp -Verbose
58-
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
59-
Assert-AreEqual "WaitingForNodes" $cluster.ClusterState
61+
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
62+
Assert-AreEqual "WaitingForNodes" $cluster.ClusterState
63+
Assert-AreEqual "Automatic" $cluster.ClusterUpgradeMode
64+
Assert-AreEqual "Wave1" $cluster.ClusterUpgradeCadence
6065

61-
New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 5 -Primary -AsJob
62-
New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name snt -InstanceCount 6 -AsJob
66+
New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 5 -Primary -DiskType Premium_LRS -VmSize "Standard_DS2" -AsJob
67+
New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name snt -InstanceCount 6 -IsStateless -AsJob
6368

6469
#wait for nodetypes
6570
WaitForAllJob
6671

72+
$pnt = Get-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt
73+
Assert-AreEqual "Premium_LRS" $pnt.DataDiskType
74+
Assert-False { $pnt.IsStateless }
75+
76+
$snt = Get-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name snt
77+
Assert-AreEqual "StandardSSD_LRS" $snt.DataDiskType
78+
Assert-True { $snt.IsStateless }
79+
6780
$restart = Restart-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name snt -NodeName snt_0, snt_1 -PassThru
6881
Assert-True { $restart }
6982

@@ -85,15 +98,15 @@ function Test-CertAndExtension
8598
{
8699
$resourceGroupName = "sfmcps-rg-" + (getAssetname)
87100
$clusterName = "sfmcps-" + (getAssetname)
88-
$location = "northeurope"
101+
$location = "southcentralus"
89102
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
90103
$pass = (ConvertTo-SecureString -AsPlainText -Force "TestPass1234!@#")
91104
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
92105

93106
$cluster = New-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Location $location `
94107
-AdminPassword $pass -Sku Standard -ClientCertThumbprint $testClientTp -Verbose
95-
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
96-
Assert-AreEqual "WaitingForNodes" $cluster.ClusterState
108+
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
109+
Assert-AreEqual "WaitingForNodes" $cluster.ClusterState
97110

98111
$pnt = New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 5 -Primary
99112

src/ServiceFabric/ServiceFabric.Test/ServiceFabric.Test.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
1515
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
1616
<PackageReference Include="Microsoft.Azure.Management.ServiceFabric" Version="1.3.0" />
17-
<PackageReference Include="Microsoft.Azure.Management.ServiceFabricManagedClusters" Version="1.0.0-beta.1" />
17+
<PackageReference Include="Microsoft.Azure.Management.ServiceFabricManagedClusters" Version="1.0.0" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

0 commit comments

Comments
 (0)