Skip to content

Commit c24ba72

Browse files
authored
[Az.ServiceFabric] Add parameters to New-AzServiceFabricManagedCluster, Set-AzServiceFabricManagedCluster, New-AzServiceFabricManagedNodeType, and Set-AzServiceFabricManagedNodeType (#28591)
1 parent f218c98 commit c24ba72

File tree

15 files changed

+25122
-1644
lines changed

15 files changed

+25122
-1644
lines changed

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricManagedClustersTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ public void TestNodeTypeOperations()
4141
TestRunner.RunTestScript("Test-NodeTypeOperations");
4242
}
4343

44+
[Fact]
45+
[Trait(Category.AcceptanceType, Category.CheckIn)]
46+
public void TestNodeTypeUpdate()
47+
{
48+
TestRunner.RunTestScript("Test-NodeTypeUpdate");
49+
}
50+
4451
[Fact]
4552
[Trait(Category.AcceptanceType, Category.CheckIn)]
4653
public void TestNodeTypeVmSizeChange()

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

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,17 @@ function Test-CreateBasicCluster
2424
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
2525

2626
$cluster = New-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Location $location `
27-
-AdminPassword $pass -Sku Basic -ClientCertThumbprint $testClientTp -Tag $tags -Verbose
27+
-AdminPassword $pass -Sku Basic -ClientCertThumbprint $testClientTp -Tag $tags -AllowRdpAccess -EnableAutoOsUpgrade -Verbose
2828
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
2929
Assert-AreEqual "Automatic" $cluster.ClusterUpgradeMode
3030
Assert-AreEqual "Wave0" $cluster.ClusterUpgradeCadence
31+
Assert-True { $cluster.EnableAutoOsUpgrade }
32+
Assert-True { $cluster.AllowRdpAccess }
33+
34+
$updatedCluster = Set-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -EnableAutoOsUpgrade $false -AllowRdpAccess $false -Verbose
35+
Assert-AreEqual "Succeeded" $updatedCluster.ProvisioningState
36+
Assert-False { $updatedCluster.EnableAutoOsUpgrade }
37+
Assert-False { $updatedCluster.AllowRdpAccess }
3138

3239
$pnt = New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 5 -DiskType Standard_LRS -Primary
3340
Assert-AreEqual 5 $pnt.VmInstanceCount
@@ -50,6 +57,52 @@ function Test-CreateBasicCluster
5057
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName } "NotFound"
5158
}
5259

60+
function Test-NodeTypeUpdate
61+
{
62+
$resourceGroupName = "sfmcps-rg-" + (getAssetname)
63+
$clusterName = "sfmcps-" + (getAssetname)
64+
$location = "southcentralus"
65+
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
66+
$pass = (ConvertTo-SecureString -AsPlainText -Force (-join ((33..126) | Get-Random -Count 16 | % {[char]$_})))
67+
$clusterTags = @{"SFRP.EnableDiagnosticMI"="true"; "SFRP.DisableDefaultOutboundAccess"="true"; "SFRP.UseUnmonitoredAutoClusterUpgradePolicy"="True"; "testName"="Test-NodeTypeUpdate"}
68+
69+
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
70+
71+
$cluster = New-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -UpgradeMode Automatic -UpgradeCadence Wave1 -Location $location `
72+
-AdminPassword $pass -Sku Standard -ClientCertThumbprint $testClientTp -Tag $clusterTags -Verbose
73+
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
74+
Assert-AreEqual "WaitingForNodes" $cluster.ClusterState
75+
Assert-AreEqual "Automatic" $cluster.ClusterUpgradeMode
76+
Assert-AreEqual "Wave1" $cluster.ClusterUpgradeCadence
77+
78+
New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 5 -Primary -DiskType Premium_LRS -VmSize "Standard_DS2" -AsJob
79+
New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name snt -InstanceCount 6 -Zone @("1", "2") -ZoneBalance -EnableOverProvisioning -IsStateless -AsJob
80+
81+
#wait for nodetypes
82+
WaitForAllJob
83+
84+
$pnt = Get-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt
85+
Assert-AreEqual "Premium_LRS" $pnt.DataDiskType
86+
Assert-False { $pnt.IsStateless }
87+
88+
$snt = Get-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name snt
89+
Assert-AreEqual "StandardSSD_LRS" $snt.DataDiskType
90+
Assert-True { $snt.IsStateless }
91+
Assert-AreEqual 2 $snt.Zones.Count
92+
Assert-True { $snt.EnableOverProvisioning }
93+
Assert-True { $snt.ZoneBalance }
94+
95+
$snt = Set-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name snt -Zone @("1", "2", "3")
96+
Assert-AreEqual 3 $snt.Zones.Count
97+
98+
$snt = Set-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name snt -ZoneBalance $false -EnableOverProvisioning $false
99+
Assert-False { $snt.EnableOverProvisioning }
100+
Assert-False { $snt.ZoneBalance }
101+
102+
$removeResponse = $cluster | Remove-AzServiceFabricManagedCluster -PassThru
103+
Assert-True { $removeResponse }
104+
}
105+
53106
function Test-NodeTypeOperations
54107
{
55108
$resourceGroupName = "sfmcps-rg-" + (getAssetname)

0 commit comments

Comments
 (0)