Skip to content

Merge NRP's August branch in preview #7113

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 84 commits into from
Aug 31, 2018

Conversation

anton-evseev
Copy link
Contributor

Description

Checklist

Maddie Clayton and others added 9 commits August 30, 2018 17:30
# Conflicts:
#	src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.Netcore.csproj
#	src/ResourceManager/Compute/Commands.Compute.Test/packages.config
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestConnectionMonitor.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestConnectivityCheck.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestFlowLog.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestGetNextHop.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestGetSecurityGroupView.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestGetTopology.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestPacketCapture.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestProvidersList.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestReachabilityReport.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestTroubleshoot.json
#	src/ResourceManager/Network/Commands.Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkWatcherAPITests/TestVerifyIPFlow.json
#	src/ResourceManager/Profile/Commands.Profile/AzureRmAlias/Mappings.cs
#	tools/AliasMapping.json
@@ -406,7 +406,7 @@ public void TestCreateDeleteVaultWithPiping()

#endregion

[Fact]
[Fact(Skip = "Fails in playback")]
Copy link
Contributor

Choose a reason for hiding this comment

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

the bump in the network SDK version is causing this test to fail in playback? this needs to b looked at...

@@ -43,8 +43,28 @@
<RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup>
<ItemGroup>
<Reference Include="Hyak.Common">
Copy link
Contributor

Choose a reason for hiding this comment

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

You will need to revert these includes here... outside of the version change in network nothing else is required. The libraries are pulled in by other common dependencies.

@@ -69,7 +69,7 @@ public void TestPacketCapture()
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-PacketCapture");
}

[Fact(Skip = "Rerecord tests")]
[Fact(Skip = "Skipped for due to playback mode failures.")]
Copy link
Contributor

Choose a reason for hiding this comment

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

The test failure needs to be investigated... what caused it to now fail in playback mode?

public void TestVirtualNetworkSubnetCRUD()
{
NetworkResourcesController.NewInstance.RunPsTest(_logger, "Test-subnetCRUD");
}

[Fact]
[Fact(Skip = "'The '1' auxiliary tokens are either not application token(s) or are from the application(s) ... which are different from the application of primary identity <...>.' StatusCode: 401; ReasonPhrase: Unauthorized.")]
Copy link
Contributor

Choose a reason for hiding this comment

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

did something change here to make this test now fail?

public override void Execute()
{
base.Execute();
WriteWarning("The output object type of this cmdlet will be modified in a future release.");
Copy link
Contributor

Choose a reason for hiding this comment

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

kindly use the breaking change attributes to call out breaking changes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

talked with @chandrasekarsrinivasan, cmdlet's output is not going to be changed. Will remove this line

public override void Execute()
{
base.Execute();
WriteWarning("The output object type of this cmdlet will be modified in a future release.");
Copy link
Contributor

Choose a reason for hiding this comment

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

kindly use the breaking change attributes to call out breaking changes

Copy link
Contributor Author

Choose a reason for hiding this comment

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

talked with @chandrasekarsrinivasan, cmdlet's output is not going to be changed. Will remove this line

@@ -48,8 +48,12 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Graph.RBAC.3.2.0-preview\lib\net45\Microsoft.Azure.Graph.RBAC.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Management.Authorization, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Copy link
Contributor

Choose a reason for hiding this comment

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

revert this change

@praries880
Copy link
Contributor

@number213 Changes outside the tests look good. Once the tests are fixed ill approve the PR.

@praries880
Copy link
Contributor

@praries880
Copy link
Contributor

Copy link
Contributor

@praries880 praries880 left a comment

Choose a reason for hiding this comment

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

Approving with the understanding that the fix of the three skipped tests is owned by NRP in the preview branch

@praries880 praries880 merged commit f6a2882 into Azure:preview Aug 31, 2018
@anton-evseev anton-evseev deleted the preview-with-nrp-august branch September 3, 2018 05:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants