Merge branch 'master' of https://github.com/leonardbf/azure-powershell …

…into NFSAAS-1707-add-netapp
hyonholee · Feb 27, 2019 · 30aa2fc · 30aa2fc
2 parents 91cf632 + c90084b
commit 30aa2fc
Show file tree

Hide file tree

Showing 13 changed files with 1,465 additions and 1,532 deletions.
diff --git a/src/Anf/Anf.Test/ScenarioTests/AccountTests.cs b/src/Anf/Anf.Test/ScenarioTests/AccountTests.cs
@@ -13,7 +13,6 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using System;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Anf.Test.ScenarioTests.ScenarioTest

diff --git a/src/Anf/Anf.Test/ScenarioTests/AccountTests.ps1 b/src/Anf/Anf.Test/ScenarioTests/AccountTests.ps1
@@ -18,9 +18,9 @@ Test Account CRUD operations
 #>
 function Test-AccountCrud
 {
-	$resourceGroup = RandomString "pws-sdk-tests-rg-" 5
-	$accName1 = RandomString "pws-sdk-acc-1" 5
-	$accName2 = RandomString "pws-sdk-acc-2" 5
+	$resourceGroup = "pws-sdk-tests-rg-1"
+	$accName1 = "pws-sdk-acc-1"
+	$accName2 = "pws-sdk-acc-2"
     $resourceLocation = "westus2"
 
 	try

diff --git a/src/Anf/Anf.Test/ScenarioTests/Common.ps1 b/src/Anf/Anf.Test/ScenarioTests/Common.ps1
@@ -129,13 +129,3 @@ function Clean-ResourceGroup($rgname)
 {
 	Remove-AzureRmResourceGroup -Name $rgname -Force
 }
-
-
-<#
-.SYNOPSIS
-Create a random string of given length with the provided prefix
-#>
-function RandomString($prefix, $size)
-{
-    return $prefix + -join ((65..90) + (97..122) | Get-Random -Count $size | % {[char]$_})
-}
diff --git a/src/Anf/Anf.Test/ScenarioTests/PoolTests.cs b/src/Anf/Anf.Test/ScenarioTests/PoolTests.cs
@@ -13,7 +13,6 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using System;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Anf.Test.ScenarioTests.ScenarioTest
@@ -27,7 +26,7 @@ public PoolTests(Xunit.Abstractions.ITestOutputHelper output)
             _logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
             ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestPoolCrud()

diff --git a/src/Anf/Anf.Test/ScenarioTests/PoolTests.ps1 b/src/Anf/Anf.Test/ScenarioTests/PoolTests.ps1
@@ -18,10 +18,10 @@ Test Pool CRUD operations
 #>
 function Test-PoolCrud
 {
-	$resourceGroup = RandomString "pws-sdk-tests-rg-" 5
-	$accName = RandomString "pws-sdk-acc-1" 5
-	$poolName1 = RandomString "pws-sdk-pool-1" 5
-	$poolName2 = RandomString "pws-sdk-pool-2" 5
+	$resourceGroup = "pws-sdk-tests-rg-1"
+	$accName = "pws-sdk-acc-1"
+	$poolName1 = "pws-sdk-pool-1" 
+	$poolName2 = "pws-sdk-pool-2" 
     $resourceLocation = "westus2"
 	$standardPoolSize = 4398046511104
 	$serviceLevel = "Premium"

diff --git a/src/Anf/Anf.Test/ScenarioTests/SnapshotTests.cs b/src/Anf/Anf.Test/ScenarioTests/SnapshotTests.cs
@@ -27,7 +27,7 @@ public SnapshotTests(Xunit.Abstractions.ITestOutputHelper output)
             _logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
             ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSnapshotCrud()

diff --git a/src/Anf/Anf.Test/ScenarioTests/SnapshotTests.ps1 b/src/Anf/Anf.Test/ScenarioTests/SnapshotTests.ps1
@@ -21,12 +21,12 @@ function Test-SnapshotCrud
 	$currentSub = (Get-AzureRmContext).Subscription	
 	$subsid = $currentSub.SubscriptionId
 
-	$resourceGroup = RandomString "pws-sdk-tests-rg" 5
-	$accName = RandomString "pws-sdk-acc-2" 5
-	$poolName = RandomString "pws-sdk-pool-1" 5
-	$volName = RandomString "pws-sdk-vol-1" 5
-	$snName1 = RandomString "pws-sdk-snapshot-1" 5
-	$snName2 = RandomString "pws-sdk-snapshot-2" 5
+	$resourceGroup = "pws-sdk-tests-rg-1"
+	$accName = "pws-sdk-acc-2"
+	$poolName = "pws-sdk-pool-1"
+	$volName = "pws-sdk-vol-1"
+	$snName1 = "pws-sdk-snapshot-1"
+	$snName2 = "pws-sdk-snapshot-2"
 	$gibibyte = 1024 * 1024 * 1024
 	$usageThreshold = 100 * $gibibyte
 	$doubleUsage = 2 * $usageThreshold

diff --git a/src/Anf/Anf.Test/ScenarioTests/VolumeTests.cs b/src/Anf/Anf.Test/ScenarioTests/VolumeTests.cs
@@ -13,7 +13,6 @@
 // ----------------------------------------------------------------------------------
 
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using System;
 using Xunit;
 
 namespace Microsoft.Azure.Commands.Anf.Test.ScenarioTests.ScenarioTest
@@ -27,7 +26,7 @@ public VolumeTests(Xunit.Abstractions.ITestOutputHelper output)
             _logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
             ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
         }
-        
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestVolumeCrud()

diff --git a/src/Anf/Anf.Test/ScenarioTests/VolumeTests.ps1 b/src/Anf/Anf.Test/ScenarioTests/VolumeTests.ps1
@@ -21,11 +21,11 @@ function Test-VolumeCrud
 	$currentSub = (Get-AzureRmContext).Subscription	
 	$subsid = $currentSub.SubscriptionId
 
-	$resourceGroup = RandomString "pws-sdk-tests-rg" 5
-	$accName = RandomString "pws-sdk-acc-2" 5
-	$poolName = RandomString "pws-sdk-pool-1" 5
-	$volName1 = RandomString "pws-sdk-vol-1" 5
-	$volName2 = RandomString "pws-sdk-vol-2" 5
+	$resourceGroup = "pws-sdk-tests-rg-1"
+	$accName = "pws-sdk-acc-2"
+	$poolName = "pws-sdk-pool-1"
+	$volName1 = "pws-sdk-vol-1"
+	$volName2 = "pws-sdk-vol-2"
 	$gibibyte = 1024 * 1024 * 1024
 	$usageThreshold = 100 * $gibibyte
 	$doubleUsage = 2 * $usageThreshold