Skip to content

Commit 71c1a48

Browse files
dvbbdvbb
authored
Remove recording of network for some mgmt SDK (Azure#35091)
1 parent 76ff148 commit 71c1a48

File tree

52 files changed

+8520
-21690
lines changed

Some content is hidden

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

52 files changed

+8520
-21690
lines changed

‎sdk/resourcemover/Azure.ResourceManager.ResourceMover/Azure.ResourceManager.ResourceMover.sln‎

Lines changed: 23 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,15 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30309.148
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.5.33502.453
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{453629FD-DADF-41C7-9BAD-A874CE987DE6}") = "Azure.ResourceManager.ResourceMover", "src\Azure.ResourceManager.ResourceMover.csproj", "{3CAE750B-B797-49ED-8C98-A4C5EB9D9791}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.ResourceMover", "src\Azure.ResourceManager.ResourceMover.csproj", "{3CAE750B-B797-49ED-8C98-A4C5EB9D9791}"
77
EndProject
8-
Project("{453629FD-DADF-41C7-9BAD-A874CE987DE6}") = "Azure.ResourceManager.ResourceMover.Tests", "tests\Azure.ResourceManager.ResourceMover.Tests.csproj", "{EC754822-DFA3-4A21-8FAD-92A40BAD1685}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.ResourceMover.Tests", "tests\Azure.ResourceManager.ResourceMover.Tests.csproj", "{EC754822-DFA3-4A21-8FAD-92A40BAD1685}"
99
EndProject
10-
Project("{453629FD-DADF-41C7-9BAD-A874CE987DE6}") = "Azure.ResourceManager.ResourceMover.Samples", "samples\Azure.ResourceManager.ResourceMover.Samples.csproj", "{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Azure.ResourceManager.ResourceMover.Samples", "samples\Azure.ResourceManager.ResourceMover.Samples.csproj", "{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}"
1111
EndProject
1212
Global
13-
GlobalSection(SolutionProperties) = preSolution
14-
HideSolutionNode = FALSE
15-
EndGlobalSection
16-
GlobalSection(ExtensibilityGlobals) = postSolution
17-
SolutionGuid = {C29BC1BF-B5DD-4D5E-99AB-ADFBFB52D100}
18-
EndGlobalSection
1913
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2014
Debug|Any CPU = Debug|Any CPU
2115
Debug|x64 = Debug|x64
@@ -49,5 +43,23 @@ Global
4943
{EC754822-DFA3-4A21-8FAD-92A40BAD1685}.Release|x64.Build.0 = Release|Any CPU
5044
{EC754822-DFA3-4A21-8FAD-92A40BAD1685}.Release|x86.ActiveCfg = Release|Any CPU
5145
{EC754822-DFA3-4A21-8FAD-92A40BAD1685}.Release|x86.Build.0 = Release|Any CPU
46+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|x64.ActiveCfg = Debug|Any CPU
49+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|x64.Build.0 = Debug|Any CPU
50+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|x86.ActiveCfg = Debug|Any CPU
51+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Debug|x86.Build.0 = Debug|Any CPU
52+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|Any CPU.ActiveCfg = Release|Any CPU
53+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|x64.ActiveCfg = Release|Any CPU
55+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|x64.Build.0 = Release|Any CPU
56+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|x86.ActiveCfg = Release|Any CPU
57+
{CD59B3E2-819C-49D1-A2AE-4BD27EA539E0}.Release|x86.Build.0 = Release|Any CPU
58+
EndGlobalSection
59+
GlobalSection(SolutionProperties) = preSolution
60+
HideSolutionNode = FALSE
61+
EndGlobalSection
62+
GlobalSection(ExtensibilityGlobals) = postSolution
63+
SolutionGuid = {C29BC1BF-B5DD-4D5E-99AB-ADFBFB52D100}
5264
EndGlobalSection
5365
EndGlobal

‎sdk/resourcemover/Azure.ResourceManager.ResourceMover/tests/ResourceMoverManagementTestBase.cs‎

Lines changed: 24 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -54,26 +54,36 @@ protected async Task<MoverResourceSetResource> CreateMoverResourceSet(ResourceGr
5454

5555
protected async Task<VirtualNetworkResource> CreareVirtualNetwork(ResourceGroupResource rg, string vnetName)
5656
{
57-
VirtualNetworkData virtualNetworkData = new VirtualNetworkData()
57+
if (Mode == RecordedTestMode.Playback)
5858
{
59-
Location = AzureLocation.EastUS,
60-
Subnets =
59+
var vnetId = VirtualNetworkResource.CreateResourceIdentifier(rg.Id.SubscriptionId, rg.Id.Name, vnetName);
60+
return Client.GetVirtualNetworkResource(vnetId);
61+
}
62+
else
63+
{
64+
using (Recording.DisableRecording())
6165
{
62-
new SubnetData()
66+
VirtualNetworkData virtualNetworkData = new VirtualNetworkData()
6367
{
64-
Name = Recording.GenerateAssetName("Subnet-"),
65-
AddressPrefix = "10.0.0.0/24"
66-
}
67-
},
68-
AddressPrefixes = { "10.0.0.0/16" }
69-
};
70-
var lro = await rg.GetVirtualNetworks().CreateOrUpdateAsync(WaitUntil.Completed, vnetName, virtualNetworkData);
71-
return lro.Value;
68+
Location = AzureLocation.EastUS,
69+
Subnets =
70+
{
71+
new SubnetData()
72+
{
73+
Name = Recording.GenerateAssetName("Subnet-"),
74+
AddressPrefix = "10.0.0.0/24"
75+
}
76+
},
77+
AddressPrefixes = { "10.0.0.0/16" }
78+
};
79+
var lro = await rg.GetVirtualNetworks().CreateOrUpdateAsync(WaitUntil.Completed, vnetName, virtualNetworkData);
80+
return lro.Value;
81+
}
82+
}
7283
}
7384

74-
protected async Task<MoverResource> CreateMoverResource(MoverResourceSetResource moverResourceSet, ResourceIdentifier vnetId, string moverResourceName)
85+
protected async Task<MoverResource> CreateMoverResource(MoverResourceSetResource moverResourceSet, ResourceIdentifier vnetId, string moverResourceName, string targetVnetName)
7586
{
76-
string targetVnetName = Recording.GenerateAssetName("targetVnet-");
7787
MoverResourceData input = new MoverResourceData
7888
{
7989
Properties = new MoverResourceProperties(vnetId)

‎sdk/resourcemover/Azure.ResourceManager.ResourceMover/tests/Scenario/MoverResourceSetTests.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,12 @@ public async Task ValidateResourceMove()
114114
string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
115115
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
116116
string vnetName = Recording.GenerateAssetName("Vnet-");
117-
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
118117
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
119-
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
118+
string targetVnetName = Recording.GenerateAssetName("targetVnet-");
119+
string targetRgName = Recording.GenerateAssetName("testRg-ResourceMover-Target-");
120+
string moverDependentResourceName = Recording.GenerateAssetName("MoverResource-");
121+
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
122+
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName, targetVnetName);
120123

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

137140
// Add the source resource group to the moverResourceSet and verify there are no missed dependencies.
138-
string targetRgName = Recording.GenerateAssetName("testRg-ResourceMover-Target-");
139141
ResourceGroupResource targetRg = await CreateResourceGroup(subscription, targetRgName, AzureLocation.EastUS2);
140-
string moverDependentResourceName = Recording.GenerateAssetName("MoverResource-");
141142
MoverResourceData input = new MoverResourceData
142143
{
143144
Properties = new MoverResourceProperties(unresolvedDependencyId)

‎sdk/resourcemover/Azure.ResourceManager.ResourceMover/tests/Scenario/MoverResourceTests.cs‎

Lines changed: 25 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,47 @@ namespace Azure.ResourceManager.ResourceMover.Tests
1212
{
1313
internal class MoverResourceTests : ResourceMoverManagementTestBase
1414
{
15+
private MoverResourceSetResource _moverResourceSet;
16+
private ResourceIdentifier _virtualNetworkId;
17+
private string _moverResourceName;
18+
private string _targetVnetName;
19+
1520
public MoverResourceTests(bool isAsync)
1621
: base(isAsync)//, RecordedTestMode.Record)
1722
{
1823
}
1924

20-
[TestCase]
21-
[RecordedTest]
22-
public async Task CreateOrUpdate()
25+
[SetUp]
26+
public async Task SetUp()
2327
{
2428
SubscriptionResource subscription = await Client.GetDefaultSubscriptionAsync();
2529
ResourceIdentifier moverResourceSetId = MoverResourceSetResource.CreateResourceIdentifier(subscription.Id.SubscriptionId, "testRG-ResourceMover", "testMoveCollection");
26-
MoverResourceSetResource moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();
30+
_moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();
2731

2832
string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
29-
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
3033
string vnetName = Recording.GenerateAssetName("Vnet-");
34+
_moverResourceName = Recording.GenerateAssetName("MoverResource-");
35+
_targetVnetName = Recording.GenerateAssetName("targetVnet-");
36+
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
3137
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
32-
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
33-
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
34-
Assert.AreEqual(moverResourceName, moverResource.Data.Name);
38+
_virtualNetworkId = virtualNetwork.Id;
3539
}
3640

3741
[TestCase]
3842
[RecordedTest]
39-
public async Task List()
43+
public async Task CreateOrUpdate()
4044
{
41-
SubscriptionResource subscription = await Client.GetDefaultSubscriptionAsync();
42-
ResourceIdentifier moverResourceSetId = MoverResourceSetResource.CreateResourceIdentifier(subscription.Id.SubscriptionId, "testRG-ResourceMover", "testMoveCollection");
43-
MoverResourceSetResource moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();
45+
MoverResource moverResource = await CreateMoverResource(_moverResourceSet, _virtualNetworkId, _moverResourceName, _targetVnetName);
46+
Assert.AreEqual(_moverResourceName, moverResource.Data.Name);
47+
}
4448

45-
string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
46-
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
47-
string vnetName = Recording.GenerateAssetName("Vnet-");
48-
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
49-
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
50-
_ = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
49+
[TestCase]
50+
[RecordedTest]
51+
public async Task List()
52+
{
53+
_ = await CreateMoverResource(_moverResourceSet, _virtualNetworkId, _moverResourceName, _targetVnetName);
5154
int count = 0;
52-
await foreach (var tempMoverResource in moverResourceSet.GetMoverResources().GetAllAsync())
55+
await foreach (var tempMoverResource in _moverResourceSet.GetMoverResources().GetAllAsync())
5356
{
5457
count++;
5558
}
@@ -60,34 +63,16 @@ public async Task List()
6063
[RecordedTest]
6164
public async Task Get()
6265
{
63-
SubscriptionResource subscription = await Client.GetDefaultSubscriptionAsync();
64-
ResourceIdentifier moverResourceSetId = MoverResourceSetResource.CreateResourceIdentifier(subscription.Id.SubscriptionId, "testRG-ResourceMover", "testMoveCollection");
65-
MoverResourceSetResource moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();
66-
67-
string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
68-
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
69-
string vnetName = Recording.GenerateAssetName("Vnet-");
70-
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
71-
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
72-
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
73-
MoverResource getMoverResource = await moverResourceSet.GetMoverResources().GetAsync(moverResourceName);
66+
MoverResource moverResource = await CreateMoverResource(_moverResourceSet, _virtualNetworkId, _moverResourceName, _targetVnetName);
67+
MoverResource getMoverResource = await _moverResourceSet.GetMoverResources().GetAsync(_moverResourceName);
7468
AssertValidMoverResource(moverResource, getMoverResource);
7569
}
7670

7771
[TestCase]
7872
[RecordedTest]
7973
public async Task Delete()
8074
{
81-
SubscriptionResource subscription = await Client.GetDefaultSubscriptionAsync();
82-
ResourceIdentifier moverResourceSetId = MoverResourceSetResource.CreateResourceIdentifier(subscription.Id.SubscriptionId, "testRG-ResourceMover", "testMoveCollection");
83-
MoverResourceSetResource moverResourceSet = await Client.GetMoverResourceSetResource(moverResourceSetId).GetAsync();
84-
85-
string rgName = Recording.GenerateAssetName("testRg-ResourceMover-");
86-
ResourceGroupResource rg = await CreateResourceGroup(subscription, rgName, AzureLocation.EastUS);
87-
string vnetName = Recording.GenerateAssetName("Vnet-");
88-
VirtualNetworkResource virtualNetwork = await CreareVirtualNetwork(rg, vnetName);
89-
string moverResourceName = Recording.GenerateAssetName("MoverResource-");
90-
MoverResource moverResource = await CreateMoverResource(moverResourceSet, virtualNetwork.Id, moverResourceName);
75+
MoverResource moverResource = await CreateMoverResource(_moverResourceSet, _virtualNetworkId, _moverResourceName, _targetVnetName);
9176
await moverResource.DeleteAsync(WaitUntil.Completed);
9277
var ex = Assert.ThrowsAsync<RequestFailedException>(async () => await moverResource.GetAsync());
9378
Assert.AreEqual(404, ex.Status);

0 commit comments

Comments
 (0)