Skip to content

Remove recording of network for some mgmt SDK #35091

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
ArthurMa1978 merged 8 commits into from
Mar 27, 2023
Merged

Remove recording of network for some mgmt SDK #35091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
969f561
WebPubSub
dvbb Mar 22, 2023
36bd4b7
ResourceMover
dvbb Mar 22, 2023
cc5e5eb
Storage
dvbb Mar 22, 2023
6dd7573
update
dvbb Mar 23, 2023
f4aee60
update
dvbb Mar 23, 2023
5b0dbc9
update
dvbb Mar 23, 2023
349258a
update
dvbb Mar 23, 2023
6ad3916
format
dvbb Mar 23, 2023
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
34 changes: 23 additions & 11 deletions ...resourcemover/Azure.ResourceManager.ResourceMover/Azure.ResourceManager.ResourceMover.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16
VisualStudioVersion = 16.0.30309.148
# Visual Studio Version 17
VisualStudioVersion = 17.5.33502.453
MinimumVisualStudioVersion = 10.0.40219.1
Project("{453629FD-DADF-41C7-9BAD-A874CE987DE6}") = "Azure.ResourceManager.ResourceMover", "src\Azure.ResourceManager.ResourceMover.csproj", "{3CAE750B-B797-49ED-8C98-A4C5EB9D9791}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.ResourceMover", "src\Azure.ResourceManager.ResourceMover.csproj", "{3CAE750B-B797-49ED-8C98-A4C5EB9D9791}"
EndProject
Project("{453629FD-DADF-41C7-9BAD-A874CE987DE6}") = "Azure.ResourceManager.ResourceMover.Tests", "tests\Azure.ResourceManager.ResourceMover.Tests.csproj", "{EC754822-DFA3-4A21-8FAD-92A40BAD1685}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.ResourceMover.Tests", "tests\Azure.ResourceManager.ResourceMover.Tests.csproj", "{EC754822-DFA3-4A21-8FAD-92A40BAD1685}"
EndProject
Project("{453629FD-DADF-41C7-9BAD-A874CE987DE6}") = "Azure.ResourceManager.ResourceMover.Samples", "samples\Azure.ResourceManager.ResourceMover.Samples.csproj", "{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.ResourceMover.Samples", "samples\Azure.ResourceManager.ResourceMover.Samples.csproj", "{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}"
EndProject
Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C29BC1BF-B5DD-4D5E-99AB-ADFBFB52D100}
EndGlobalSection
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Expand Down Expand Up @@ -49,5 +43,23 @@ Global
{EC754822-DFA3-4A21-8FAD-92A40BAD1685}.Release|x64.Build.0 = Release|Any CPU
{EC754822-DFA3-4A21-8FAD-92A40BAD1685}.Release|x86.ActiveCfg = Release|Any CPU
{EC754822-DFA3-4A21-8FAD-92A40BAD1685}.Release|x86.Build.0 = Release|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|x64.ActiveCfg = Debug|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|x64.Build.0 = Debug|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|x86.ActiveCfg = Debug|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|x86.Build.0 = Debug|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|Any CPU.Build.0 = Release|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|x64.ActiveCfg = Release|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|x64.Build.0 = Release|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|x86.ActiveCfg = Release|Any CPU
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C29BC1BF-B5DD-4D5E-99AB-ADFBFB52D100}
EndGlobalSection
EndGlobal
38 changes: 24 additions & 14 deletions ...esourcemover/Azure.ResourceManager.ResourceMover/tests/ResourceMoverManagementTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,26 +54,36 @@ protected async Task<MoverResourceSetResource> CreateMoverResourceSet(ResourceGr

protected async Task<VirtualNetworkResource> CreareVirtualNetwork(ResourceGroupResource rg, string vnetName)
{
VirtualNetworkData virtualNetworkData = new VirtualNetworkData()
if (Mode == RecordedTestMode.Playback)
{
Location = AzureLocation.EastUS,
Subnets =
var vnetId = VirtualNetworkResource.CreateResourceIdentifier(rg.Id.SubscriptionId, rg.Id.Name, vnetName);
return Client.GetVirtualNetworkResource(vnetId);
}
else
{
using (Recording.DisableRecording())
{
new SubnetData()
VirtualNetworkData virtualNetworkData = new VirtualNetworkData()
{
Name = Recording.GenerateAssetName("Subnet-"),
AddressPrefix = "10.0.0.0/24"
}
},
AddressPrefixes = { "10.0.0.0/16" }
};
var lro = await rg.GetVirtualNetworks().CreateOrUpdateAsync(WaitUntil.Completed, vnetName, virtualNetworkData);
return lro.Value;
Location = AzureLocation.EastUS,
Subnets =
{
new SubnetData()
{
Name = Recording.GenerateAssetName("Subnet-"),
AddressPrefix = "10.0.0.0/24"
}
},
AddressPrefixes = { "10.0.0.0/16" }
};
var lro = await rg.GetVirtualNetworks().CreateOrUpdateAsync(WaitUntil.Completed, vnetName, virtualNetworkData);
return lro.Value;
}
}
}

protected async Task<MoverResource> CreateMoverResource(MoverResourceSetResource moverResourceSet, ResourceIdentifier vnetId, string moverResourceName)
protected async Task<MoverResource> CreateMoverResource(MoverResourceSetResource moverResourceSet, ResourceIdentifier vnetId, string moverResourceName, string targetVnetName)
{
string targetVnetName = Recording.GenerateAssetName("targetVnet-");
MoverResourceData input = new MoverResourceData
{
Properties = new MoverResourceProperties(vnetId)
Expand Down
9 changes: 5 additions & 4 deletions ...resourcemover/Azure.ResourceManager.ResourceMover/tests/Scenario/MoverResourceSetTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,9 +114,12 @@ public async Task ValidateResourceMove()
string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
string vnetName = Recording.GenerateAssetName("Vnet-");
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
string targetVnetName = Recording.GenerateAssetName("targetVnet-");
string targetRgName = Recording.GenerateAssetName("testRg-ResourceMover-Target-");
string moverDependentResourceName = Recording.GenerateAssetName("MoverResource-");
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName, targetVnetName);

// Validate that the Vnet has an dependency.
ArmOperation<MoverOperationStatus> lro = await moverResourceSet.ResolveDependenciesAsync(WaitUntil.Completed);
Expand All @@ -135,9 +138,7 @@ public async Task ValidateResourceMove()
Assert.AreEqual(unresolvedDependencyId, rg.Id);

// Add the source resource group to the moverResourceSet and verify there are no missed dependencies.
string targetRgName = Recording.GenerateAssetName("testRg-ResourceMover-Target-");
ResourceGroupResource targetRg = await CreateResourceGroup(subscription, targetRgName, AzureLocation.EastUS2);
string moverDependentResourceName = Recording.GenerateAssetName("MoverResource-");
MoverResourceData input = new MoverResourceData
{
Properties = new MoverResourceProperties(unresolvedDependencyId)
Expand Down
65 changes: 25 additions & 40 deletions sdk/resourcemover/Azure.ResourceManager.ResourceMover/tests/Scenario/MoverResourceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,44 +12,47 @@ namespace Azure.ResourceManager.ResourceMover.Tests
{
internal class MoverResourceTests : ResourceMoverManagementTestBase
{
private MoverResourceSetResource _moverResourceSet;
private ResourceIdentifier _virtualNetworkId;
private string _moverResourceName;
private string _targetVnetName;

public MoverResourceTests(bool isAsync)
: base(isAsync)//, RecordedTestMode.Record)
{
}

[TestCase]
[RecordedTest]
public async Task CreateOrUpdate()
[SetUp]
public async Task SetUp()
{
SubscriptionResource subscription = await Client.GetDefaultSubscriptionAsync();
ResourceIdentifier moverResourceSetId = MoverResourceSetResource.CreateResourceIdentifier(subscription.Id.SubscriptionId, "testRG-ResourceMover", "testMoveCollection");
MoverResourceSetResource moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();
_moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();

string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
string vnetName = Recording.GenerateAssetName("Vnet-");
_moverResourceName = Recording.GenerateAssetName("MoverResource-");
_targetVnetName = Recording.GenerateAssetName("targetVnet-");
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
Assert.AreEqual(moverResourceName, moverResource.Data.Name);
_virtualNetworkId = virtualNetwork.Id;
}

[TestCase]
[RecordedTest]
public async Task List()
public async Task CreateOrUpdate()
{
SubscriptionResource subscription = await Client.GetDefaultSubscriptionAsync();
ResourceIdentifier moverResourceSetId = MoverResourceSetResource.CreateResourceIdentifier(subscription.Id.SubscriptionId, "testRG-ResourceMover", "testMoveCollection");
MoverResourceSetResource moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();
MoverResource moverResource = await CreateMoverResource(_moverResourceSet, _virtualNetworkId, _moverResourceName, _targetVnetName);
Assert.AreEqual(_moverResourceName, moverResource.Data.Name);
}

string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
string vnetName = Recording.GenerateAssetName("Vnet-");
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
_ = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
[TestCase]
[RecordedTest]
public async Task List()
{
_ = await CreateMoverResource(_moverResourceSet, _virtualNetworkId, _moverResourceName, _targetVnetName);
int count = 0;
await foreach (var tempMoverResource in moverResourceSet.GetMoverResources().GetAllAsync())
await foreach (var tempMoverResource in _moverResourceSet.GetMoverResources().GetAllAsync())
{
count++;
}
Expand All @@ -60,34 +63,16 @@ public async Task List()
[RecordedTest]
public async Task Get()
{
SubscriptionResource subscription = await Client.GetDefaultSubscriptionAsync();
ResourceIdentifier moverResourceSetId = MoverResourceSetResource.CreateResourceIdentifier(subscription.Id.SubscriptionId, "testRG-ResourceMover", "testMoveCollection");
MoverResourceSetResource moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();

string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
string vnetName = Recording.GenerateAssetName("Vnet-");
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
MoverResource getMoverResource = await moverResourceSet.GetMoverResources().GetAsync(moverResourceName);
MoverResource moverResource = await CreateMoverResource(_moverResourceSet, _virtualNetworkId, _moverResourceName, _targetVnetName);
MoverResource getMoverResource = await _moverResourceSet.GetMoverResources().GetAsync(_moverResourceName);
AssertValidMoverResource(moverResource, getMoverResource);
}

[TestCase]
[RecordedTest]
public async Task Delete()
{
SubscriptionResource subscription = await Client.GetDefaultSubscriptionAsync();
ResourceIdentifier moverResourceSetId = MoverResourceSetResource.CreateResourceIdentifier(subscription.Id.SubscriptionId, "testRG-ResourceMover", "testMoveCollection");
MoverResourceSetResource moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();

string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
string vnetName = Recording.GenerateAssetName("Vnet-");
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
MoverResource moverResource = await CreateMoverResource(_moverResourceSet, _virtualNetworkId, _moverResourceName, _targetVnetName);
await moverResource.DeleteAsync(WaitUntil.Completed);
var ex = Assert.ThrowsAsync<RequestFailedException>(async () => await moverResource.GetAsync());
Assert.AreEqual(404, ex.Status);
Expand Down
Loading