Skip to content

Commit 5a1dc42

Browse files
mwesigwagumamwesigwaguma
authored
Service Fabric Managed clusters Migration (#22860)
* generate sdk * generate servicefabric sdk * updates * updating test run json files * change back to original test * removing sf classic changes * removing sf classic changes * updating readme * regenerated code * add csharp sdk * updates after checking for breaking changes * more updates * fix nodetype properties * update nullable properties * updates in readme * remove seconde csproj file * updating version in readme
1 parent a2ae6ea commit 5a1dc42

File tree

198 files changed

+49506
-17536
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+49506
-17536
lines changed

‎src/ServiceFabric/.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[*.cs]
2+
3+
# CS1572: XML comment has a param tag, but there is no parameter by that name
4+
dotnet_diagnostic.CS1572.severity = none

‎src/ServiceFabric/ServiceFabric.Test/ScenarioTests/Common.ps1

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ function WaitForManagedClusterReadyStateIfRecord($clusterName, $resourceGroupNam
204204
}
205205
}
206206

207-
function WaitForManagedClusterReadyState($clusterName, $resourceGroupName, $timeoutInSeconds = 1200)
207+
function WaitForManagedClusterReadyState($clusterName, $resourceGroupName, $timeoutInSeconds = 2100)
208208
{
209209
$timeoutTime = (Get-Date).AddSeconds($timeoutInSeconds)
210210
while (-not $clusterReady -and (Get-Date) -lt $timeoutTime) {
@@ -216,14 +216,14 @@ function WaitForManagedClusterReadyState($clusterName, $resourceGroupName, $time
216216
}
217217

218218
Write-Host "Cluster state: $($cluster.ClusterState). Waiting for Ready state before continuing."
219-
Start-TestSleep -Seconds 15
219+
Start-TestSleep -Seconds 30
220220
}
221221

222222
Write-Error "WaitForClusterReadyState timed out"
223223
return $false
224224
}
225225

226-
function WaitForAllJob($timeoutInSeconds = 1200)
226+
function WaitForAllJob($timeoutInSeconds = 2100)
227227
{
228228
$timeoutTime = (Get-Date).AddSeconds($timeoutInSeconds)
229229
$allJobs = Get-Job
@@ -243,7 +243,7 @@ function WaitForAllJob($timeoutInSeconds = 1200)
243243
return $false
244244
}
245245

246-
Start-TestSleep -Seconds 15
246+
Start-TestSleep -Seconds 30
247247
} while ((Get-Date) -lt $timeoutTime)
248248

249249
Write-Error "WaitForJob timed out"
@@ -350,12 +350,12 @@ function Get-AppTypeV2Name
350350

351351
function Get-AppPackageV1
352352
{
353-
return "https://azsfapptest.blob.core.windows.net/azsfapptest/CalcApp_1.0.sfpkg"
353+
return "https://sfmcsttest.blob.core.windows.net/sfmc-ps/Voting.sfpkg?sp=r&st=2023-09-21T03:04:25Z&se=2023-11-01T11:04:25Z&spr=https&sv=2022-11-02&sr=b&sig=BTFecBFf5%2Bzm5eLH0XjqBt1r%2FknbbaAniftETWddh8A%3D"
354354
}
355355

356356
function Get-AppPackageV2
357357
{
358-
return "https://azsfapptest.blob.core.windows.net/azsfapptest/CalcApp_1.1.sfpkg"
358+
return "https://sfmcsttest.blob.core.windows.net/sfmc-ps/Voting.2.0.0.sfpkg?sp=r&st=2023-09-21T03:05:25Z&se=2023-09-21T11:05:25Z&spr=https&sv=2022-11-02&sr=b&sig=EDTkZPO8T0yMtB2gKJR2I%2FkbLUuQFFKHE0w2eyT%2Bn2E%3D"
359359
}
360360

361361
function Get-ServiceTypeName
@@ -382,12 +382,12 @@ function Get-ManagedAppTypeV2Name
382382

383383
function Get-ManagedAppPackageV1
384384
{
385-
return "https://sfmconeboxst.blob.core.windows.net/managed-application-deployment/Voting.sfpkg"
385+
return "https://sfmcsttest.blob.core.windows.net/sfmc-ps/Voting.sfpkg?sp=r&st=2023-09-21T03:04:25Z&se=2023-11-01T11:04:25Z&spr=https&sv=2022-11-02&sr=b&sig=BTFecBFf5%2Bzm5eLH0XjqBt1r%2FknbbaAniftETWddh8A%3D"
386386
}
387387

388388
function Get-ManagedAppPackageV2
389389
{
390-
return "https://sfmconeboxst.blob.core.windows.net/managed-application-deployment/Voting.2.0.0.sfpkg"
390+
return "https://sfmcsttest.blob.core.windows.net/sfmc-ps/Voting.2.0.0.sfpkg?sp=r&st=2023-09-21T21:45:34Z&se=2023-11-01T05:45:34Z&spr=https&sv=2022-11-02&sr=b&sig=K0NUrFC47kR3OTwVG5rANy88I0eVP9hQ%2F7MXUSDAtsA%3D"
391391
}
392392

393393
function Get-ManagedStatelessServiceTypeName

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ function Test-CreateBasicCluster
5252

5353
function Test-NodeTypeOperations
5454
{
55-
$resourceGroupName = "sfmcps-rg-" + (getAssetname)
56-
$clusterName = "sfmcps-" + (getAssetname)
55+
#$resourceGroupName = "sfmcps-rg-" + (getAssetname)
56+
#$clusterName = "sfmcps-" + (getAssetname)
57+
$resourceGroupName = "sfmcps-rg-node-ops"
58+
$clusterName = "sfmcps-node-ops"
5759
$location = "southcentralus"
5860
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
5961
$pass = (ConvertTo-SecureString -AsPlainText -Force "TestPass1234!@#")
@@ -99,8 +101,10 @@ function Test-NodeTypeOperations
99101

100102
function Test-CertAndExtension
101103
{
102-
$resourceGroupName = "sfmcps-rg-" + (getAssetname)
103-
$clusterName = "sfmcps-" + (getAssetname)
104+
#$resourceGroupName = "sfmcps-rg-" + (getAssetname)
105+
#$clusterName = "sfmcps-" + (getAssetname)
106+
$resourceGroupName = "sfmcps-rg-tcl1"
107+
$clusterName = "sfmcps-test-cluster1"
104108
$location = "southcentralus"
105109
$testClientTp = "123BDACDCDFB2C7B250192C6078E47D1E1DB119B"
106110
$pass = (ConvertTo-SecureString -AsPlainText -Force "TestPass1234!@#")

‎src/ServiceFabric/ServiceFabric.Test/ScenarioTests/TestServiceFabric.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class TestServiceFabric : ServiceFabricTestRunner
2727
{
2828
public TestServiceFabric(ITestOutputHelper output) : base(output)
2929
{
30-
AddAzureRmServiceFabricNodeType.dontRandom = true;
30+
//AddAzureRmServiceFabricNodeType.dontRandom = true;
3131
ServiceFabricCommonCmdletBase.WriteVerboseIntervalInSec = 0;
3232
ServiceFabricCmdletBase.RunningTest = true;
3333
ServiceFabricCmdletBase.NewCreatedKeyVaultWaitTimeInSec = 0;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
<ItemGroup>
1414
<PackageReference Include="Microsoft.Azure.KeyVault" Version="3.0.1" />
1515
<PackageReference Include="Microsoft.Azure.KeyVault.WebKey" Version="3.0.1" />
16-
<PackageReference Include="Microsoft.Azure.Management.ServiceFabric" Version="1.3.0" />
17-
<PackageReference Include="Microsoft.Azure.Management.ServiceFabricManagedClusters" Version="1.0.0" />
1816
</ItemGroup>
1917

2018
<ItemGroup>

0 commit comments

Comments
 (0)