Merge pull request #6995 from junyezhu/juliet/fix/nwtests

fix network watcher skipped tests

Author: Maddie Clayton

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/NetworkWatcherAPITests.cs

@@ -61,7 +61,7 @@ public void TestVerifyIPFlow()
             NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-VerifyIPFlow");
         }
 
-        [Fact(Skip = "There was a bug in API. After fix is deployed, we need to rerecord test.")]
+        [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Owner, Category.netanalyticsdev)]
         public void TestPacketCapture()

src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/NetworkWatcherAPITests.ps1

@@ -98,6 +98,58 @@ function Get-TestResourcesDeployment([string]$rgn)
         New-AzureRmResourceGroupDeployment  -Name "${rgn}" -ResourceGroupName "$rgn" -TemplateFile "$templateFile" -TemplateParameterFile $paramFile
 }
 
+<#
+.SYNOPSIS
+Get existing Network Watcher.
+#>
+function Get-CreateTestNetworkWatcher($location, $nwName, $nwRgName)
+{
+	# Get Network Watcher
+	$nwlist = Get-AzureRmNetworkWatcher
+	foreach ($i in $nwlist)
+	{
+		if($i.Location -eq "$location") 
+		{
+			$nw=$i
+		}
+	}
+
+	# Create Network Watcher if no existing nw
+	if (!$nw) 
+	{
+		$nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+	}
+
+	return $nw
+}
+
+<#
+.SYNOPSIS
+Deployment of new Network Watcher.
+#>
+function Get-DeleteAndCreateTestNetworkWatcher($location, $nwName, $nwRgName, $tags)
+{
+	# Get Network Watcher
+	$nwlist = Get-AzureRmNetworkWatcher
+	foreach ($i in $nwlist)
+	{
+		if($i.Location -eq "$location") 
+		{
+			$nw=$i
+		}
+	}
+
+	# Delete Network Watcher if existing nw
+	if ($nw) 
+	{
+		Remove-AzureRmNetworkWatcher -NetworkWatcher $nw
+	}
+
+	$nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location -Tag $tags
+
+	return $nw
+}
+
 <#
 .SYNOPSIS
 Test GetTopology NetworkWatcher API.
@@ -112,7 +164,7 @@ function Test-GetTopology
     $nwLocation = Get-ProviderLocation $resourceTypeParent
     $nwRgName = Get-ResourceGroupName
     $templateFile = (Resolve-Path ".\TestData\Deployment.json").Path
-    
+
     try 
     {
         . ".\AzureRM.Resources.ps1"
@@ -123,12 +175,12 @@ function Test-GetTopology
         # Deploy resources
         Get-TestResourcesDeployment -rgn "$resourceGroupName"
 
-        # Create Resource group for Network Watcher
+		# Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
 
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
-        
+        # Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
+
         # Get topology in the resource group $resourceGroupName
         $topology = Get-AzureRmNetworkWatcherTopology -NetworkWatcher $nw -TargetResourceGroupName $resourceGroupName
 
@@ -178,8 +230,8 @@ function Test-GetSecurityGroupView
         # Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
 
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+        # Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
 
         #Get Vm
         $vm = Get-AzureRmVM -ResourceGroupName $resourceGroupName
@@ -243,8 +295,8 @@ function Test-GetNextHop
         # Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
 
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+        # Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
 
         #Get Vm
         $vm = Get-AzureRmVM -ResourceGroupName $resourceGroupName
@@ -301,8 +353,8 @@ function Test-VerifyIPFlow
         # Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
 
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+        # Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
 
         #Get network security group
         $nsg = Get-AzureRmNetworkSecurityGroup -ResourceGroupName $resourceGroupName
@@ -372,8 +424,8 @@ function Test-PacketCapture
         # Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
 
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+        # Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
 
         #Get Vm
         $vm = Get-AzureRmVM -ResourceGroupName $resourceGroupName
@@ -477,9 +529,9 @@ function Test-Troubleshoot
 
         # Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
-        
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+
+		# Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
 
         # Create storage
         $stoname = 'sto' + $resourceGroupName
@@ -495,7 +547,11 @@ function Test-Troubleshoot
         $sto = Get-AzureRmStorageAccount -ResourceGroupName $resourceGroupName -Name $stoname;
 
         Start-AzureRmNetworkWatcherResourceTroubleshooting -NetworkWatcher $nw -TargetResourceId $gw.Id -StorageId $sto.Id -StoragePath $container.CloudBlobContainer.StorageUri.PrimaryUri.AbsoluteUri;
-        Get-AzureRmNetworkWatcherTroubleshootingResult -NetworkWatcher $nw -TargetResourceId $gw.Id
+		$result = Get-AzureRmNetworkWatcherTroubleshootingResult -NetworkWatcher $nw -TargetResourceId $gw.Id
+
+		# Validation
+        Assert-AreEqual $result.code "UnHealthy"
+		Assert-AreEqual $result.results[0].id "NoConnectionsFoundForGateway"
     }
     finally
     {
@@ -540,8 +596,8 @@ function Test-FlowLog
         # Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
 
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+        # Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
 
         # Create storage
 		$stoname = 'sto' + $stoname
@@ -625,8 +681,8 @@ function Test-ConnectivityCheck
         # Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
 
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+        # Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
 
         # Get Vm
         $vm = Get-AzureRmVM -ResourceGroupName $resourceGroupName
@@ -678,7 +734,7 @@ function Test-ReachabilityReport
 
         # Create the Network Watcher
         $tags = @{"key1" = "value1"; "key2" = "value2"}
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $rgname -Location $location -Tag $tags
+		$nw = Get-DeleteAndCreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $rgname -tags $tags
 
         $job = Get-AzureRmNetworkWatcherReachabilityReport -NetworkWatcher $nw -Location "West US" -Country "United States" -StartTime "2017-10-05" -EndTime "2017-10-10" -AsJob
         $job | Wait-Job
@@ -723,7 +779,7 @@ function Test-ProvidersList
 
         # Create the Network Watcher
         $tags = @{"key1" = "value1"; "key2" = "value2"}
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $rgname -Location $location -Tag $tags
+		$nw = Get-DeleteAndCreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $rgname -tags $tags
 
         $job = Get-AzureRmNetworkWatcherReachabilityProvidersList -NetworkWatcher $nw -Location "West US" -Country "United States" -AsJob
         $job | Wait-Job
@@ -769,18 +825,18 @@ function Test-ConnectionMonitor
 
         # Deploy resources
         Get-TestResourcesDeployment -rgn "$resourceGroupName"
-        
-        # Create Resource group for Network Watcher
+
+		# Create Resource group for Network Watcher
         New-AzureRmResourceGroup -Name $nwRgName -Location "$location"
 
-        # Create Network Watcher
-        $nw = New-AzureRmNetworkWatcher -Name $nwName -ResourceGroupName $nwRgName -Location $location
+		# Get Network Watcher
+		$nw = Get-CreateTestNetworkWatcher -location $location -nwName $nwName -nwRgName $nwRgName
 
         #Get Vm
         $vm = Get-AzureRmVM -ResourceGroupName $resourceGroupName
 
         #Install networkWatcherAgent on Vm
-        Set-AzureRmVMExtension -ResourceGroupName "$resourceGroupName" -Location "$location" -VMName $vm.Name -Name "MyNetworkWatcherAgent" -Type "NetworkWatcherAgentWindows" -TypeHandlerVersion "1.4" -Publisher "Microsoft.Azure.NetworkWatcher" 
+		Set-AzureRmVMExtension -ResourceGroupName "$resourceGroupName" -Location "$location" -VMName $vm.Name -Name "MyNetworkWatcherAgent" -Type "NetworkWatcherAgentWindows" -TypeHandlerVersion "1.4" -Publisher "Microsoft.Azure.NetworkWatcher" 
 
         #Create connection monitor
         $job1 = New-AzureRmNetworkWatcherConnectionMonitor -NetworkWatcher $nw -Name $cmName1 -SourceResourceId $vm.Id -DestinationAddress bing.com -DestinationPort 80 -AsJob