Skip to content

Commit 8cd94d1

Browse files
huangpfhuangpf
committed
Merge pull request Azure#440 from Azure/dev
HPF PR: dev <- Azure:dev
2 parents 4848cb4 + 227a836 commit 8cd94d1

File tree

63 files changed

+39479
-17181
lines changed

Some content is hidden

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

63 files changed

+39479
-17181
lines changed

‎ChangeLog.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
##2016.03.08 version 1.3.0
1+
##2016.03.08 version 1.3.0
22
* Azure LogicApp: New cmdlets for managing LogicApps
33
* Get-AzureLogicAppAccessKey
44
* Get-AzureLogicApp
@@ -22,6 +22,11 @@
2222
- New-AzureStorageShareSASToken
2323
- New-AzureStorageQueueSASToken
2424
- New-AzureStorageTableSASToken
25+
* Azure SQL DB Backup/restore
26+
* Get-AzureRmSqlDatabaseGeoBackup
27+
* Get-AzureRmSqlDeletedDatabaseBackup
28+
* Restore-AzureRmSqlDatabase
29+
* This cmdlet accepts as pipelined input the result of one of the first two cmdlets (or Get-AzureRmSqlDatabase if restoring a live DB to a point-in-time)
2530

2631
## 2016.02.04 version 1.2.1
2732
* Fix installer issue - remove PSGallery modules on install

‎src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,10 @@
227227
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitCRUD.json">
228228
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
229229
</None>
230-
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitPeeringCRUD.json">
230+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitMicrosoftPeeringCRUD.json" >
231+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
232+
</None>
233+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteCircuitTests\TestExpressRouteCircuitPrivatePublicPeeringCRUD.json">
231234
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
232235
</None>
233236
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.ExpressRouteServiceProviderTests\TestExpressRouteServiceProviderList.json">
@@ -314,6 +317,12 @@
314317
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.TestDnsAvailabilityTest\TestDnsAvailability.json">
315318
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
316319
</None>
320+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayConnectionTests\TestVirtualNetworkeExpressRouteGatewayConnectionCRUD.json">
321+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
322+
</None>
323+
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkGatewayTests\TestVirtualNetworkExpressRouteGatewayCRUD.json">
324+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
325+
</None>
317326
<None Include="SessionRecords\Commands.Network.Test.ScenarioTests.VirtualNetworkTests\TestVirtualNetworkCRUD.json">
318327
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
319328
</None>

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.cs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,18 @@ public void TestExpressRouteCircuitCRUD()
2626
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitCRUD");
2727
}
2828

29-
[Fact(Skip = "Rerecord tests")]
29+
[Fact]
30+
[Trait(Category.AcceptanceType, Category.CheckIn)]
31+
public void TestExpressRouteCircuitPrivatePublicPeeringCRUD()
32+
{
33+
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitPrivatePublicPeeringCRUD");
34+
}
35+
36+
[Fact]
3037
[Trait(Category.AcceptanceType, Category.CheckIn)]
31-
public void TestExpressRouteCircuitPeeringCRUD()
38+
public void TestExpressRouteCircuitMicrosoftPeeringCRUD()
3239
{
33-
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitPeeringCRUD");
40+
NetworkResourcesController.NewInstance.RunPsTest("Test-ExpressRouteCircuitMicrosoftPeeringCRUD");
3441
}
3542

3643
[Fact]

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/ExpressRouteCircuitTests.ps1

Lines changed: 163 additions & 76 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,12 @@ public void TestVirtualNetworkGatewayConnectionSharedKeyCRUD()
3232
{
3333
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayConnectionSharedKeyCRUD");
3434
}
35+
36+
[Fact]
37+
[Trait(Category.AcceptanceType, Category.CheckIn)]
38+
public void TestVirtualNetworkeExpressRouteGatewayConnectionCRUD()
39+
{
40+
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkeExpressRouteGatewayConnectionCRUD");
41+
}
3542
}
3643
}

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.ps1

Lines changed: 57 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,52 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15+
<#
16+
.SYNOPSIS
17+
Virtual network express route gateway connection tests
18+
This is a special case which need a provisioned circuit
19+
If you need to re-record this case, please contact express route team
20+
#>
21+
function Test-VirtualNetworkeExpressRouteGatewayConnectionCRUD
22+
{
23+
# Setup
24+
$rgname = "onesdkTestConnection"
25+
$vnetConnectionName = Get-ResourceName
26+
$location = "westus"
27+
try
28+
{
29+
# Get the resource group
30+
$resourceGroup = Get-AzureRmResourceGroup -Name $rgname
31+
Assert-NotNull $resourceGroup
32+
# Get Gateway
33+
$gw = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname
34+
Assert-AreEqual 1 @($gw).Count
35+
# Get Circuit
36+
$circuit = Get-AzureRmExpressRouteCircuit -ResourceGroupName $rgname
37+
Assert-AreEqual 1 @($circuit).Count
38+
39+
# Create & Get VirtualNetworkGatewayConnection
40+
$actual = New-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName -location $location -VirtualNetworkGateway1 $gw -ConnectionType ExpressRoute -RoutingWeight 3 -PeerId $circuit.Id
41+
$expected = Get-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName
42+
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
43+
Assert-AreEqual $expected.Name $actual.Name
44+
Assert-AreEqual "ExpressRoute" $expected.ConnectionType
45+
Assert-AreEqual "3" $expected.RoutingWeight
46+
47+
48+
# Delete VirtualNetworkGatewayConnection
49+
$delete = Remove-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $actual.ResourceGroupName -name $vnetConnectionName -PassThru -Force
50+
Assert-AreEqual true $delete
51+
$list = Get-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $actual.ResourceGroupName
52+
Assert-AreEqual 0 @($list).Count
53+
}
54+
finally
55+
{
56+
# Cleanup
57+
58+
}
59+
}
60+
1561
<#
1662
.SYNOPSIS
1763
Virtual network gateway connection tests
@@ -35,7 +81,7 @@ function Test-VirtualNetworkGatewayConnectionCRUD
3581
{
3682
# Create the resource group
3783
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"}
38-
84+
3985
# Create the Virtual Network
4086
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
4187
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
@@ -54,8 +100,8 @@ function Test-VirtualNetworkGatewayConnectionCRUD
54100
Assert-AreEqual $vnetGateway.Name $actual.Name
55101
#Assert-AreEqual "Vpn" $expected.GatewayType
56102
#Assert-AreEqual "RouteBased" $expected.VpnType
57-
58-
# Create LocalNetworkGateway
103+
104+
# Create LocalNetworkGateway
59105
$actual = New-AzureRmLocalNetworkGateway -ResourceGroupName $rgname -name $localnetName -location $location -AddressPrefix 192.168.0.0/16 -GatewayIpAddress 192.168.3.10
60106
$localnetGateway = Get-AzureRmLocalNetworkGateway -ResourceGroupName $rgname -name $localnetName
61107
Assert-AreEqual $localnetGateway.ResourceGroupName $actual.ResourceGroupName
@@ -92,19 +138,19 @@ function Test-VirtualNetworkGatewayConnectionCRUD
92138

93139
$actual = Set-AzureRmVirtualNetworkGatewayConnection -VirtualNetworkGatewayConnection $expected -Force
94140
$expected = Get-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $rgname -name $vnetConnectionName
95-
Assert-AreEqual "4" $expected.RoutingWeight
141+
Assert-AreEqual "4" $expected.RoutingWeight
96142
#Assert-AreEqual "xyz" $expected.SharedKey
97-
143+
98144
# Delete VirtualNetworkGatewayConnection
99145
$delete = Remove-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $actual.ResourceGroupName -name $vnetConnectionName -PassThru -Force
100146
Assert-AreEqual true $delete
101-
147+
102148
$list = Get-AzureRmVirtualNetworkGatewayConnection -ResourceGroupName $actual.ResourceGroupName
103149
Assert-AreEqual 0 @($list).Count
104150
}
105151
finally
106152
{
107-
# Cleanup
153+
# Cleanup
108154
Clean-ResourceGroup $rgname
109155
}
110156
}
@@ -132,7 +178,7 @@ function Test-VirtualNetworkGatewayConnectionSharedKeyCRUD
132178
{
133179
# Create the resource group
134180
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"}
135-
181+
136182
# Create the Virtual Network
137183
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
138184
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
@@ -151,7 +197,7 @@ function Test-VirtualNetworkGatewayConnectionSharedKeyCRUD
151197
Assert-AreEqual $vnetGateway.Name $actual.Name
152198
#Assert-AreEqual "Vpn" $expected.GatewayType
153199
#Assert-AreEqual "RouteBased" $expected.VpnType
154-
200+
155201
# Create LocalNetworkGateway
156202
$actual = New-AzureRmLocalNetworkGateway -ResourceGroupName $rgname -name $localnetName -location $location -AddressPrefix 192.168.0.0/16 -GatewayIpAddress 192.168.3.11
157203
$localnetGateway = Get-AzureRmLocalNetworkGateway -ResourceGroupName $rgname -name $localnetName
@@ -188,7 +234,7 @@ function Test-VirtualNetworkGatewayConnectionSharedKeyCRUD
188234
}
189235
finally
190236
{
191-
# Cleanup
192-
Clean-ResourceGroup $rgname
237+
# Cleanup
238+
Clean-ResourceGroup $rgname
193239
}
194240
}

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,14 @@ namespace Commands.Network.Test.ScenarioTests
1919
{
2020
public class VirtualNetworkGatewayTests : Microsoft.WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
2121
{
22+
[Fact]
23+
[Trait(Category.AcceptanceType, Category.CheckIn)]
24+
public void TestVirtualNetworkExpressRouteGatewayCRUD()
25+
{
26+
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkExpressRouteGatewayCRUD");
27+
}
28+
29+
2230
[Fact(Skip = "Rerecord tests")]
2331
[Trait(Category.AcceptanceType, Category.CheckIn)]
2432
public void TestVirtualNetworkGatewayCRUD()

‎src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.ps1

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,69 @@
1212
# limitations under the License.
1313
# ----------------------------------------------------------------------------------
1414

15+
<#
16+
.SYNOPSIS
17+
Virtual network express route gateway tests
18+
#>
19+
function Test-VirtualNetworkExpressRouteGatewayCRUD
20+
{
21+
# Setup
22+
$rgname = Get-ResourceGroupName
23+
$rname = Get-ResourceName
24+
$domainNameLabel = Get-ResourceName
25+
$vnetName = Get-ResourceName
26+
$publicIpName = Get-ResourceName
27+
$vnetGatewayConfigName = Get-ResourceName
28+
$rglocation = Get-ProviderLocation ResourceManagement
29+
$resourceTypeParent = "Microsoft.Network/virtualNetworkGateways"
30+
$location = Get-ProviderLocation $resourceTypeParent
31+
32+
try
33+
{
34+
# Create the resource group
35+
$resourceGroup = New-AzureRmResourceGroup -Name $rgname -Location $rglocation -Tags @{Name = "testtag"; Value = "testval"}
36+
37+
38+
# Create the Virtual Network
39+
$subnet = New-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -AddressPrefix 10.0.0.0/24
40+
$vnet = New-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname -Location $location -AddressPrefix 10.0.0.0/16 -Subnet $subnet
41+
$vnet = Get-AzureRmvirtualNetwork -Name $vnetName -ResourceGroupName $rgname
42+
$subnet = Get-AzureRmVirtualNetworkSubnetConfig -Name "GatewaySubnet" -VirtualNetwork $vnet
43+
44+
# Create the publicip
45+
$publicip = New-AzureRmPublicIpAddress -ResourceGroupName $rgname -name $publicIpName -location $location -AllocationMethod Dynamic -DomainNameLabel $domainNameLabel
46+
47+
# Create & Get virtualnetworkgateway
48+
$vnetIpConfig = New-AzureRmVirtualNetworkGatewayIpConfig -Name $vnetGatewayConfigName -PublicIpAddress $publicip -Subnet $subnet
49+
50+
$actual = New-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname -location $location -IpConfigurations $vnetIpConfig -GatewayType ExpressRoute
51+
$expected = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname -name $rname
52+
Assert-AreEqual $expected.ResourceGroupName $actual.ResourceGroupName
53+
Assert-AreEqual $expected.Name $actual.Name
54+
#Assert-AreEqual "ExpressRoute" $expected.GatewayType
55+
56+
# List virtualNetworkGateways
57+
$list = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $rgname
58+
Assert-AreEqual 1 @($list).Count
59+
Assert-AreEqual $list[0].ResourceGroupName $actual.ResourceGroupName
60+
Assert-AreEqual $list[0].Name $actual.Name
61+
Assert-AreEqual $list[0].Location $actual.Location
62+
63+
# Delete virtualNetworkGateway
64+
$delete = Remove-AzureRmVirtualNetworkGateway -ResourceGroupName $actual.ResourceGroupName -name $rname -PassThru -Force
65+
Assert-AreEqual true $delete
66+
67+
$list = Get-AzureRmVirtualNetworkGateway -ResourceGroupName $actual.ResourceGroupName
68+
Assert-AreEqual 0 @($list).Count
69+
70+
}
71+
finally
72+
{
73+
# Cleanup
74+
Clean-ResourceGroup $rgname
75+
}
76+
}
77+
1578
<#
1679
.SYNOPSIS
1780
Virtual network gateway tests

0 commit comments

Comments
 (0)