Skip to content

. #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
huangpf merged 6 commits into from
May 20, 2015
Merged

. #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
599fba5
Alias should be PropertyObject
vivsriaus May 20, 2015
b449be4
Merge pull request #405 from huangpf/dev
ogail May 20, 2015
61feebd
Merge pull request #407 from vivsriaus/dev
ogail May 20, 2015
aab06f5
WORK:3527498 Enabled tests & add recorded tests results for Brooklyn …
Nilambari May 20, 2015
ae01bf3
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Nilambari May 20, 2015
45aa190
Merge pull request #408 from Nilambari/dev
yugangw-msft May 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ResourceManager/Network/Commands.Network.Test/ScenarioTests/LocalNetworkGatewayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Commands.Network.Test.ScenarioTests
{
public class LocalNetworkGatewayTests
{
[Fact(Skip = "TODO: Fix test.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestLocalNetworkGatewayCRUD()
{
Expand Down
4 changes: 2 additions & 2 deletions ...nager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayConnectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ namespace Commands.Network.Test.ScenarioTests
{
public class VirtualNetworkGatewayConnectionTests
{
[Fact(Skip = "TODO: Fix test.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualNetworkGatewayConnectionCRUD()
{
NetworkResourcesController.NewInstance.RunPsTest("Test-VirtualNetworkGatewayConnectionCRUD");
}

[Fact(Skip = "TODO: Fix test.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualNetworkGatewayConnectionSharedKeyCRUD()
{
Expand Down
2 changes: 1 addition & 1 deletion ...ResourceManager/Network/Commands.Network.Test/ScenarioTests/VirtualNetworkGatewayTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ namespace Commands.Network.Test.ScenarioTests
{
public class VirtualNetworkGatewayTests
{
[Fact(Skip = "TODO: Fix test.")]
[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestVirtualNetworkGatewayCRUD()
{
Expand Down
474 changes: 237 additions & 237 deletions ...ands.Network.Test.ScenarioTests.LocalNetworkGatewayTests/TestLocalNetworkGatewayCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

1,082 changes: 649 additions & 433 deletions ...ioTests.VirtualNetworkGatewayConnectionTests/TestVirtualNetworkGatewayConnectionCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

1,024 changes: 620 additions & 404 deletions ...irtualNetworkGatewayConnectionTests/TestVirtualNetworkGatewayConnectionSharedKeyCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

840 changes: 441 additions & 399 deletions ....Network.Test.ScenarioTests.VirtualNetworkGatewayTests/TestVirtualNetworkGatewayCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/NewAzureResourceCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public sealed class NewAzureResourceCmdlet : ResourceManipulationCmdletBase
/// <summary>
/// Gets or sets the property object.
/// </summary>
[Alias("Object", "PropertyObject")]
[Alias("PropertyObject")]
[Parameter(Mandatory = true, HelpMessage = "A hash table which represents resource properties.")]
[ValidateNotNullOrEmpty]
public PSObject Properties { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion ...ResourceManager/Commands.ResourceManager/Cmdlets/Implementation/SetAzureResourceCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public sealed class SetAzureResourceCmdlet : ResourceManipulationCmdletBase
/// <summary>
/// Gets or sets the property object.
/// </summary>
[Alias("PropertiesObject")]
[Alias("PropertyObject")]
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "A hash table which represents resource properties.")]
[ValidateNotNullOrEmpty]
public PSObject Properties { get; set; }
Expand Down