Skip to content

Commit 2a46a08

Browse files
iliu816YanaXu
andauthored
[Az.ServiceFabric] Set-AzServiceFabricManagedNodeType: Add parameter -VmSize (#28230)
Co-authored-by: Yan Xu <yanxu1@microsoft.com>
1 parent 508b94b commit 2a46a08

File tree

6 files changed

+14870
-12
lines changed

6 files changed

+14870
-12
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 TestNodeTypeVmSizeChange()
47+
{
48+
TestRunner.RunTestScript("Test-NodeTypeVmSizeChange");
49+
}
50+
4451
[Fact]
4552
[Trait(Category.AcceptanceType, Category.CheckIn)]
4653
public void TestCertAndExtension()

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

Lines changed: 38 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ function Test-NodeTypeOperations
5757
$location = "southcentralus"
5858
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
5959
$pass = (ConvertTo-SecureString -AsPlainText -Force (-join ((33..126) | Get-Random -Count 16 | % {[char]$_})))
60-
$tags = @{"SFRP.EnableDiagnosticMI"="true"; "SFRP.DisableDefaultOutboundAccess"="true"; "SFRP.WaitTimeBetweenUD"="00:00:10"; "testName"="Test-NodeTypeOperations"}
60+
$clusterTags = @{"SFRP.EnableDiagnosticMI"="true"; "SFRP.DisableDefaultOutboundAccess"="true"; "SFRP.UseUnmonitoredAutoClusterUpgradePolicy"="True"; "testName"="Test-NodeTypeOperations"}
6161

6262
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
6363

6464
$cluster = New-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -UpgradeMode Automatic -UpgradeCadence Wave1 -Location $location `
65-
-AdminPassword $pass -Sku Standard -ClientCertThumbprint $testClientTp -Tag $tags -Verbose
65+
-AdminPassword $pass -Sku Standard -ClientCertThumbprint $testClientTp -Tag $clusterTags -Verbose
6666
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
6767
Assert-AreEqual "WaitingForNodes" $cluster.ClusterState
6868
Assert-AreEqual "Automatic" $cluster.ClusterUpgradeMode
@@ -99,14 +99,48 @@ function Test-NodeTypeOperations
9999
Assert-True { $removeResponse }
100100
}
101101

102+
function Test-NodeTypeVmSizeChange
103+
{
104+
$resourceGroupName = "sfmcps-rg-" + (getAssetname)
105+
$clusterName = "sfmcps-" + (getAssetname)
106+
$location = "southcentralus"
107+
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
108+
$pass = (ConvertTo-SecureString -AsPlainText -Force (-join ((33..126) | Get-Random -Count 16 | % {[char]$_})))
109+
$tags = @{"SFRP.EnableDiagnosticMI"="true"; "SFRP.DisableDefaultOutboundAccess"="true"; "SFRP.UseUnmonitoredAutoClusterUpgradePolicy"="True"; "testName"="Test-NodeTypeVmSizeChange"}
110+
111+
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
112+
113+
$cluster = New-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName -UpgradeMode Automatic -UpgradeCadence Wave1 -Location $location `
114+
-AdminPassword $pass -Sku Standard -ClientCertThumbprint $testClientTp -Tag $tags -Verbose
115+
Assert-AreEqual "Succeeded" $cluster.ProvisioningState
116+
Assert-AreEqual "WaitingForNodes" $cluster.ClusterState
117+
Assert-AreEqual "Automatic" $cluster.ClusterUpgradeMode
118+
Assert-AreEqual "Wave1" $cluster.ClusterUpgradeCadence
119+
120+
New-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -InstanceCount 5 -Primary -DiskType Premium_LRS -VmSize Standard_DS2
121+
122+
$pnt = Get-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt
123+
Assert-AreEqual "Premium_LRS" $pnt.DataDiskType
124+
Assert-AreEqual "Standard_DS2" $pnt.VmSize
125+
126+
$swapSize = Set-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt -VmSize Standard_DS3_v2
127+
Assert-True { $swapSize }
128+
129+
$pnt = Get-AzServiceFabricManagedNodeType -ResourceGroupName $resourceGroupName -ClusterName $clusterName -Name pnt
130+
Assert-AreEqual "Premium_LRS" $pnt.DataDiskType
131+
Assert-AreEqual "Standard_DS3_v2" $pnt.VmSize
132+
133+
$removeResponse = Remove-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -ClusterName $clusterName
134+
}
135+
102136
function Test-CertAndExtension
103137
{
104138
$resourceGroupName = "sfmcps-rg-" + (getAssetname)
105139
$clusterName = "sfmcps-" + (getAssetname)
106140
$location = "southcentralus"
107141
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
108142
$pass = (ConvertTo-SecureString -AsPlainText -Force (-join ((33..126) | Get-Random -Count 16 | % {[char]$_})))
109-
$tags = @{"SFRP.EnableDiagnosticMI"="true"; "SFRP.DisableDefaultOutboundAccess"="true"; "SFRP.WaitTimeBetweenUD"="00:00:10"; "testName"="Test-CertAndExtension"}
143+
$tags = @{"SFRP.EnableDiagnosticMI"="true"; "SFRP.DisableDefaultOutboundAccess"="true"; "SFRP.UseUnmonitoredAutoClusterUpgradePolicy"="True"; "testName"="Test-CertAndExtension"}
110144

111145
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
112146

@@ -157,7 +191,7 @@ function Test-AddNetworkSecurityRule
157191
$pass = (ConvertTo-SecureString -AsPlainText -Force (-join ((33..126) | Get-Random -Count 16 | % {[char]$_})))
158192
$location = "southcentralus"
159193
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
160-
$tags = @{"SFRP.EnableDiagnosticMI"="true"; "SFRP.DisableDefaultOutboundAccess"="true"; "SFRP.WaitTimeBetweenUD"="00:00:10"; "testName"="Test-AddNetworkSecurityRule"}
194+
$tags = @{"SFRP.EnableDiagnosticMI"="true"; "SFRP.DisableDefaultOutboundAccess"="true"; "SFRP.UseUnmonitoredAutoClusterUpgradePolicy"="True"; "testName"="Test-AddNetworkSecurityRule"}
161195

162196
Assert-ThrowsContains { Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName } "NotFound"
163197

0 commit comments

Comments
 (0)