Skip to content

Commit f5f89f2

Browse files
jago2136Jared Gorthy
andauthored
update tests and session records (#20965)
Co-authored-by: Jared Gorthy <[email protected]>
1 parent 20c1c88 commit f5f89f2

10 files changed

+2631
-3102
lines changed

src/Network/Network.Test/ScenarioTests/NetworkManagerTests.ps1

Lines changed: 36 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ function Test-NetworkManagerCRUD
2323
$rgName = Get-ResourceGroupName
2424
$networkManagerName = Get-ResourceName
2525
$rglocation = "centraluseuap"
26-
$subscriptionId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884"
27-
$managementGroupId = "/providers/Microsoft.Management/managementGroups/PowerShellTest"
26+
$subscriptionId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52"
27+
$managementGroupId = "/providers/Microsoft.Management/managementGroups/SwaggerStackTestMG"
2828

2929
try{
3030
#Create the resource group
@@ -78,7 +78,7 @@ function Test-NetworkManagerGroupCRUD
7878
$networkManagerName = Get-ResourceName
7979
$networkGroupName = Get-ResourceName
8080
$rglocation = "centraluseuap"
81-
$subscriptionId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884"
81+
$subscriptionId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52"
8282

8383
try{
8484
#Create the resource group
@@ -139,8 +139,8 @@ function Test-NetworkManagerStaticMemberCRUD
139139
$networkGroupName = Get-ResourceName
140140
$staticMemberName = Get-ResourceName
141141
$rglocation = "centraluseuap"
142-
$subscriptionId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884"
143-
$vnetId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnet"
142+
$subscriptionId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52"
143+
$vnetId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52/resourceGroups/SwaggerStackRG/providers/Microsoft.Network/virtualNetworks/SwaggerStackVnet"
144144

145145
try{
146146
#Create the resource group
@@ -199,18 +199,18 @@ Tests creating new simple public networkmanager Connectivity Configuration
199199
function Test-NetworkManagerConnectivityConfigurationCRUD
200200
{
201201
# Setup
202-
# Please pre create vnet and hub vnet before running test in live mode, also please update subscriptionId and uncomment 10 mins sleep code
202+
# Please update subscriptionId and uncomment 1 mins sleep code
203203
$rgName = Get-ResourceGroupName
204204
$networkManagerName = Get-ResourceName
205205
$networkGroupName = Get-ResourceName
206206
$staticMemberName = Get-ResourceName
207207
$connectivityConfigurationName = Get-ResourceName
208208
$rglocation = "centraluseuap"
209-
$subscriptionId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884"
210-
$vnetId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnet"
211-
$hubId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnetHub"
212-
$vnet = "powerShellTestVnet"
213-
$vnetRG = "jaredgorthy-PowerShellTestResources"
209+
$subscriptionId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52"
210+
$vnetId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52/resourceGroups/SwaggerStackRG/providers/Microsoft.Network/virtualNetworks/SwaggerStackVnet"
211+
$hubId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52/resourceGroups/SwaggerStackRG/providers/Microsoft.Network/virtualNetworks/SwaggerStackVnet-Hub"
212+
$vnetName = "SwaggerStackVnet"
213+
$vnetRGName = "SwaggerStackRG"
214214

215215
try{
216216
#Create the resource group
@@ -290,7 +290,7 @@ function Test-NetworkManagerConnectivityConfigurationCRUD
290290
Assert-AreEqual "False" $activeConnectivityConfig.Value[0].IsGlobal;
291291
Assert-AreEqual "True" $activeConnectivityConfig.Value[0].DeleteExistingPeering;
292292

293-
$effectiveConnectivityConfig = Get-AzNetworkManagerEffectiveConnectivityConfiguration -VirtualNetworkName $vnet -VirtualNetworkResourceGroupName $vnetRG
293+
$effectiveConnectivityConfig = Get-AzNetworkManagerEffectiveConnectivityConfiguration -VirtualNetworkName $vnetName -VirtualNetworkResourceGroupName $vnetRGName
294294
Assert-NotNull $effectiveConnectivityConfig;
295295
Assert-AreEqual $newConnConfig.Id $effectiveConnectivityConfig.Value[0].Id;
296296
Assert-AreEqual $networkGroup.Id $effectiveConnectivityConfig.Value[0].ConfigurationGroups[0].Id;
@@ -346,10 +346,10 @@ function Test-NetworkManagerSecurityAdminRuleCRUD
346346
$RuleCollectionName = Get-ResourceName
347347
$RuleName = Get-ResourceName
348348
$rglocation = "centraluseuap"
349-
$subscriptionId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884"
350-
$vnetId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnet"
351-
$vnetName = "powerShellTestVnet"
352-
$vnetRG = "jaredgorthy-PowerShellTestResources"
349+
$subscriptionId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52"
350+
$vnetId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52/resourceGroups/SwaggerStackRG/providers/Microsoft.Network/virtualNetworks/SwaggerStackVnet"
351+
$vnetName = "SwaggerStackVnet"
352+
$vnetRGName = "SwaggerStackRG"
353353

354354
try{
355355
#Create the resource group
@@ -460,41 +460,26 @@ function Test-NetworkManagerSecurityAdminRuleCRUD
460460
Assert-AreEqual "10.0.0.1" $activeSecurityAdminRule.Value[0].Destinations[0].AddressPrefix
461461
Assert-AreEqual "Internet" $activeSecurityAdminRule.Value[0].Sources[0].AddressPrefix
462462

463-
$effectiveSecurityAdminRuleList = Get-AzNetworkManagerEffectiveSecurityAdminRule -VirtualNetworkName $vnetName -VirtualNetworkResourceGroupName $vnetRG
463+
$effectiveSecurityAdminRuleList = Get-AzNetworkManagerEffectiveSecurityAdminRule -VirtualNetworkName $vnetName -VirtualNetworkResourceGroupName $vnetRGName
464464
Assert-NotNull $effectiveSecurityAdminRuleList;
465465

466-
<#
467-
# Network manager at AVNM testing MG will apply rules on this vnet; extract the rule this test has applied
468-
[Microsoft.Azure.Commands.Network.Models.NetworkManager.PSNetworkManagerSecurityBaseAdminRule]$effectiveSecurityAdminRule = $null
469-
foreach ($rule in $effectiveSecurityAdminRuleList)
470-
{
471-
Write-Host rule.Id
472-
if ($rule.Id -eq $newAdminRule.Id)
473-
{
474-
$effectiveSecurityAdminRule = $rule;
475-
break;
476-
}
477-
}
478-
Assert-NotNull $effectiveSecurityAdminRule;
479-
#>
480-
481-
Assert-AreEqual $newAdminRule.Id $effectiveSecurityAdminRuleList.Value[3].Id;
482-
Assert-AreEqual $networkGroup.Id $effectiveSecurityAdminRuleList.Value[3].RuleGroups[0].Id;
483-
Assert-AreEqual $networkGroup.Id $effectiveSecurityAdminRuleList.Value[3].RuleCollectionAppliesToGroups[0].NetworkGroupId;
466+
Assert-AreEqual $newAdminRule.Id $effectiveSecurityAdminRuleList.Value[0].Id;
467+
Assert-AreEqual $networkGroup.Id $effectiveSecurityAdminRuleList.Value[0].RuleGroups[0].Id;
468+
Assert-AreEqual $networkGroup.Id $effectiveSecurityAdminRuleList.Value[0].RuleCollectionAppliesToGroups[0].NetworkGroupId;
484469

485470

486-
Assert-AreEqual $securityConfig.Description $effectiveSecurityAdminRuleList.Value[3].ConfigurationDescription;
487-
Assert-AreEqual $ruleCollection.Description $effectiveSecurityAdminRuleList.Value[3].RuleCollectionDescription;
471+
Assert-AreEqual $securityConfig.Description $effectiveSecurityAdminRuleList.Value[0].ConfigurationDescription;
472+
Assert-AreEqual $ruleCollection.Description $effectiveSecurityAdminRuleList.Value[0].RuleCollectionDescription;
488473

489-
Assert-AreEqual "TCP" $effectiveSecurityAdminRuleList.Value[3].Protocol
490-
Assert-AreEqual "Inbound" $effectiveSecurityAdminRuleList.Value[3].Direction
491-
Assert-AreEqual "Allow" $effectiveSecurityAdminRuleList.Value[3].Access
492-
Assert-AreEqual 100 $effectiveSecurityAdminRuleList.Value[3].Priority
474+
Assert-AreEqual "TCP" $effectiveSecurityAdminRuleList.Value[0].Protocol
475+
Assert-AreEqual "Inbound" $effectiveSecurityAdminRuleList.Value[0].Direction
476+
Assert-AreEqual "Allow" $effectiveSecurityAdminRuleList.Value[0].Access
477+
Assert-AreEqual 0 $effectiveSecurityAdminRuleList.Value[0].Priority
493478

494-
Assert-AreEqual "100" $effectiveSecurityAdminRuleList.Value[3].SourcePortRanges[0]
495-
Assert-AreEqual "99" $effectiveSecurityAdminRuleList.Value[3].DestinationPortRanges[0]
496-
Assert-AreEqual "10.0.0.1" $effectiveSecurityAdminRuleList.Value[3].Destinations[0].AddressPrefix
497-
Assert-AreEqual "Internet" $effectiveSecurityAdminRuleList.Value[3].Sources[0].AddressPrefix
479+
Assert-AreEqual "100" $effectiveSecurityAdminRuleList.Value[0].SourcePortRanges[0]
480+
Assert-AreEqual "99" $effectiveSecurityAdminRuleList.Value[0].DestinationPortRanges[0]
481+
Assert-AreEqual "10.0.0.1" $effectiveSecurityAdminRuleList.Value[0].Destinations[0].AddressPrefix
482+
Assert-AreEqual "Internet" $effectiveSecurityAdminRuleList.Value[0].Sources[0].AddressPrefix
498483

499484
Deploy-AzNetworkManagerCommit -ResourceGroupName $rgname -Name $networkManagerName -TargetLocation $regions -CommitType "SecurityAdmin"
500485

@@ -543,7 +528,7 @@ function Test-NetworkManagerScopeConnectionCRUD
543528
$networkManagerName = Get-ResourceName
544529
$scopeConnectionName = Get-ResourceName
545530
$rglocation = "centraluseuap"
546-
$subscriptionId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884"
531+
$subscriptionId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52"
547532

548533
try{
549534
#Create the resource group
@@ -594,7 +579,7 @@ function Test-NetworkManagerSubscriptionConnectionCRUD
594579
{
595580
# Setup
596581
$networkManagerConnectionName = Get-ResourceName
597-
$networkManagerId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/networkManagers/PowerShellTestNM-DO-NOT-DELETE"
582+
$networkManagerId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52/resourceGroups/SwaggerStackRG/providers/Microsoft.Network/networkManagers/SwaggerStackNetworkManager"
598583

599584
try{
600585
New-AzNetworkManagerSubscriptionConnection -Name $networkManagerConnectionName -NetworkManagerId $networkManagerId -Description "SampleDescription"
@@ -624,8 +609,8 @@ function Test-NetworkManagerManagementGroupConnectionCRUD
624609
{
625610
# Setup
626611
$networkManagerConnectionName = Get-ResourceName
627-
$networkManagerId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/networkManagers/PowerShellTestNM-DO-NOT-DELETE"
628-
$managementGroupId = "PowerShellTestNMConection"
612+
$networkManagerId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52/resourceGroups/SwaggerStackRG/providers/Microsoft.Network/networkManagers/SwaggerStackNetworkManager"
613+
$managementGroupId = "SwaggerStackTestMG"
629614

630615
try{
631616
New-AzNetworkManagerManagementGroupConnection -ManagementGroupId $managementGroupId -Name $networkManagerConnectionName -NetworkManagerId $networkManagerId -Description "SampleDescription"
@@ -664,8 +649,8 @@ function Test-NetworkManagerResourceMinimumParameterCreate
664649
$RuleName = Get-ResourceName
665650
$scopeConnectionName = Get-ResourceName
666651
$rglocation = "centraluseuap"
667-
$subscriptionId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884"
668-
$vnetId = "/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnet"
652+
$subscriptionId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52"
653+
$vnetId = "/subscriptions/08615b4b-bc9c-4a70-be1b-2ea10bc97b52/resourceGroups/SwaggerStackRG/providers/Microsoft.Network/virtualNetworks/SwaggerStackVnet"
669654

670655
try{
671656
#Create the resource group

0 commit comments

Comments
 (0)