Skip to content

Use NrpTeamAlias in Network's tests to set ownership #10233

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.

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
merged 2 commits into from
Oct 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions src/Network/Network.Test/NrpTeamAlias.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,8 @@ class NrpTeamAlias

//Azure NRP Firewall dev team
public const string azurefirewall = "azurefirewall";

// Azure NRP bastion dev team
public const string bastion = "bastion";
Comment on lines +52 to +54
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like bastion team is reorged to NRP dev team. Should it remove from Category?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we can remove all NRP aliases from Category since they are duplicates (if you're okay with that)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure~I think you can remove them if there is not any reference any more.

}
}
8 changes: 4 additions & 4 deletions src/Network/Network.Test/ScenarioTests/BastionTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,31 +28,31 @@ public BastionTests(ITestOutputHelper output)

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.bastion)]
[Trait(Category.Owner, NrpTeamAlias.bastion)]
public void TestBastionCRUD()
{
TestRunner.RunTestScript("Test-BastionCRUD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.bastion)]
[Trait(Category.Owner, NrpTeamAlias.bastion)]
public void TestBastionVnetsIpObjectsParams()
{
TestRunner.RunTestScript("Test-BastionVnetsIpObjectsParams");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.bastion)]
[Trait(Category.Owner, NrpTeamAlias.bastion)]
public void TestBastionVnetObjectParam()
{
TestRunner.RunTestScript("Test-BastionVnetObjectParam");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.bastion)]
[Trait(Category.Owner, NrpTeamAlias.bastion)]
public void TestBastionIpObjectParam()
{
TestRunner.RunTestScript("Test-BastionIpObjectParam");
Expand Down
6 changes: 3 additions & 3 deletions src/Network/Network.Test/ScenarioTests/CortexTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,23 @@ public CortexTests(ITestOutputHelper output)

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.brooklynft)]
[Trait(Category.Owner, NrpTeamAlias.brooklynft)]
public void TestCortexCRUD()
{
TestRunner.RunTestScript("Test-CortexCRUD");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.pgtm)]
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
public void TestCortexExpressRouteCRUD()
{
TestRunner.RunTestScript("Test-CortexExpressRouteCRUD");
}

[Fact]
[Trait(Category.RunType, Category.LiveOnly)]
[Trait(Category.Owner, Category.brooklynft)]
[Trait(Category.Owner, NrpTeamAlias.brooklynft)]
public void TestCortexDownloadConfig()
{
TestRunner.RunTestScript("Test-CortexDownloadConfig");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ExpressRoutePortTests(Xunit.Abstractions.ITestOutputHelper output)

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.pgtm)]
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
public void TestExpressRoutePortCRUDMinimalParameters()
{
TestRunner.RunTestScript(string.Format("Test-ExpressRoutePortCRUD"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public ExpressRoutePortsLocationTests(Xunit.Abstractions.ITestOutputHelper outpu

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
[Trait(Category.Owner, Category.pgtm)]
[Trait(Category.Owner, NrpTeamAlias.pgtm)]
public void TestExpressRoutePortsLocationRead()
{
TestRunner.RunTestScript(string.Format("Test-ExpressRoutePortsLocationRead"));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public void TestTroubleshoot()

[Fact]
[Trait(Category.RunType, Category.LiveOnly)]
[Trait(Category.Owner, Category.netanalyticsdev)]
[Trait(Category.Owner, NrpTeamAlias.netanalyticsdev)]
public void TestFlowLog()
{
TestRunner.RunTestScript("Test-FlowLog");
Expand Down
29 changes: 0 additions & 29 deletions tools/ScenarioTest.ResourceManager/Constants.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,35 +59,6 @@ public class Category

public const string OneSDK = "OneSDK";

// Below is the list of aliases to contact on test behavior

// Virtual Appliance dev team
public const string nvadev = "nvadev";

// SDN NRP Dev Team
public const string sdnnrp = "sdnnrp";

// Pankaj's Team
public const string pgtm = "pgtm";

// Windows Azure SLB Dev Team
public const string slbdev = "slbdev";

// Brooklyn FTEs
public const string brooklynft = "brooklynft";

// Azure Network Analytics Dev Team
public const string netanalyticsdev = "netanalyticsdev";

// Windows Azure NRP dev team
public const string wanrpdev = "wanrpdev";

//Azure NRP Firewall dev team
public const string azurefirewall = "azurefirewall";
Comment on lines -62 to -86
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @number213 are these variables also duplicated?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, there is not any reference of these variables in the code. They can be remove safely.


//Azure NRP bastion dev team
public const string bastion = "bastion";

// Acceptance type
public const string AcceptanceType = "AcceptanceType";

Expand Down