Skip to content

Commit 30aa2fc

Browse files
leonardbfleonardbf
committed
Merge branch 'master' of https://github.com/leonardbf/azure-powershell into NFSAAS-1707-add-netapp
2 parents 91cf632 + c90084b commit 30aa2fc

File tree

13 files changed

+1465
-1532
lines changed

13 files changed

+1465
-1532
lines changed

‎src/Anf/Anf.Test/ScenarioTests/AccountTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16-
using System;
1716
using Xunit;
1817

1918
namespace Microsoft.Azure.Commands.Anf.Test.ScenarioTests.ScenarioTest

‎src/Anf/Anf.Test/ScenarioTests/AccountTests.ps1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ Test Account CRUD operations
1818
#>
1919
function Test-AccountCrud
2020
{
21-
$resourceGroup = RandomString "pws-sdk-tests-rg-" 5
22-
$accName1 = RandomString "pws-sdk-acc-1" 5
23-
$accName2 = RandomString "pws-sdk-acc-2" 5
21+
$resourceGroup = "pws-sdk-tests-rg-1"
22+
$accName1 = "pws-sdk-acc-1"
23+
$accName2 = "pws-sdk-acc-2"
2424
$resourceLocation = "westus2"
2525

2626
try

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,3 @@ function Clean-ResourceGroup($rgname)
129129
{
130130
Remove-AzureRmResourceGroup -Name $rgname -Force
131131
}
132-
133-
134-
<#
135-
.SYNOPSIS
136-
Create a random string of given length with the provided prefix
137-
#>
138-
function RandomString($prefix, $size)
139-
{
140-
return $prefix + -join ((65..90) + (97..122) | Get-Random -Count $size | % {[char]$_})
141-
}

‎src/Anf/Anf.Test/ScenarioTests/PoolTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16-
using System;
1716
using Xunit;
1817

1918
namespace Microsoft.Azure.Commands.Anf.Test.ScenarioTests.ScenarioTest
@@ -27,7 +26,7 @@ public PoolTests(Xunit.Abstractions.ITestOutputHelper output)
2726
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
2827
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2928
}
30-
29+
3130
[Fact]
3231
[Trait(Category.AcceptanceType, Category.CheckIn)]
3332
public void TestPoolCrud()

‎src/Anf/Anf.Test/ScenarioTests/PoolTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Test Pool CRUD operations
1818
#>
1919
function Test-PoolCrud
2020
{
21-
$resourceGroup = RandomString "pws-sdk-tests-rg-" 5
22-
$accName = RandomString "pws-sdk-acc-1" 5
23-
$poolName1 = RandomString "pws-sdk-pool-1" 5
24-
$poolName2 = RandomString "pws-sdk-pool-2" 5
21+
$resourceGroup = "pws-sdk-tests-rg-1"
22+
$accName = "pws-sdk-acc-1"
23+
$poolName1 = "pws-sdk-pool-1"
24+
$poolName2 = "pws-sdk-pool-2"
2525
$resourceLocation = "westus2"
2626
$standardPoolSize = 4398046511104
2727
$serviceLevel = "Premium"

‎src/Anf/Anf.Test/ScenarioTests/SnapshotTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public SnapshotTests(Xunit.Abstractions.ITestOutputHelper output)
2727
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
2828
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2929
}
30-
30+
3131
[Fact]
3232
[Trait(Category.AcceptanceType, Category.CheckIn)]
3333
public void TestSnapshotCrud()

‎src/Anf/Anf.Test/ScenarioTests/SnapshotTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ function Test-SnapshotCrud
2121
$currentSub = (Get-AzureRmContext).Subscription
2222
$subsid = $currentSub.SubscriptionId
2323

24-
$resourceGroup = RandomString "pws-sdk-tests-rg" 5
25-
$accName = RandomString "pws-sdk-acc-2" 5
26-
$poolName = RandomString "pws-sdk-pool-1" 5
27-
$volName = RandomString "pws-sdk-vol-1" 5
28-
$snName1 = RandomString "pws-sdk-snapshot-1" 5
29-
$snName2 = RandomString "pws-sdk-snapshot-2" 5
24+
$resourceGroup = "pws-sdk-tests-rg-1"
25+
$accName = "pws-sdk-acc-2"
26+
$poolName = "pws-sdk-pool-1"
27+
$volName = "pws-sdk-vol-1"
28+
$snName1 = "pws-sdk-snapshot-1"
29+
$snName2 = "pws-sdk-snapshot-2"
3030
$gibibyte = 1024 * 1024 * 1024
3131
$usageThreshold = 100 * $gibibyte
3232
$doubleUsage = 2 * $usageThreshold

‎src/Anf/Anf.Test/ScenarioTests/VolumeTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.WindowsAzure.Commands.ScenarioTest;
16-
using System;
1716
using Xunit;
1817

1918
namespace Microsoft.Azure.Commands.Anf.Test.ScenarioTests.ScenarioTest
@@ -27,7 +26,7 @@ public VolumeTests(Xunit.Abstractions.ITestOutputHelper output)
2726
_logger = new ServiceManagement.Common.Models.XunitTracingInterceptor(output);
2827
ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
2928
}
30-
29+
3130
[Fact]
3231
[Trait(Category.AcceptanceType, Category.CheckIn)]
3332
public void TestVolumeCrud()

‎src/Anf/Anf.Test/ScenarioTests/VolumeTests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ function Test-VolumeCrud
2121
$currentSub = (Get-AzureRmContext).Subscription
2222
$subsid = $currentSub.SubscriptionId
2323

24-
$resourceGroup = RandomString "pws-sdk-tests-rg" 5
25-
$accName = RandomString "pws-sdk-acc-2" 5
26-
$poolName = RandomString "pws-sdk-pool-1" 5
27-
$volName1 = RandomString "pws-sdk-vol-1" 5
28-
$volName2 = RandomString "pws-sdk-vol-2" 5
24+
$resourceGroup = "pws-sdk-tests-rg-1"
25+
$accName = "pws-sdk-acc-2"
26+
$poolName = "pws-sdk-pool-1"
27+
$volName1 = "pws-sdk-vol-1"
28+
$volName2 = "pws-sdk-vol-2"
2929
$gibibyte = 1024 * 1024 * 1024
3030
$usageThreshold = 100 * $gibibyte
3131
$doubleUsage = 2 * $usageThreshold

0 commit comments

Comments
 (0)