Skip to content

Commit 9886db3

Browse files
unknownunknown
unknown
authored and
unknown
committed
Merge branch 'crp2' of https://github.com/AzureRT/azure-powershell-pr into crp2
Conflicts: src/ResourceManager/Network/Commands.NetworkResourceProvider/Commands.NetworkResourceProvider.csproj src/ResourceManager/Network/Commands.NetworkResourceProvider/packages.config
2 parents 0398421 + be29c74 commit 9886db3

File tree

98 files changed

+2360
-744
lines changed

Some content is hidden

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

98 files changed

+2360
-744
lines changed

‎build.proj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,11 @@
196196
<!-- Note: all testing related target should go to 'AzurePowershell.test.targets' file except the one used by CI run -->
197197
<Import Project="$(MSBuildThisFileDirectory)AzurePowershell.test.targets"/>
198198

199-
<!-- Run checkin tests for each pull request -->
199+
<!-- Run checkin tests for each pull request -->
200200
<Target Name="Test" DependsOnTargets="BuildDebug;BeforeRunTests">
201201
<Message Importance="high" Text="Running check in tests..." />
202202
<CallTarget Targets="InvokeXUnit"/>
203-
</Target>
204-
203+
</Target>
205204
<!-- Run Full switch with scenario tests -->
206205
<Target
207206
Name="FullWithScenarioTests"

‎setup/azurecmdfiles.wxi

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2610,6 +2610,9 @@
26102610
<Component Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" Guid="*">
26112611
<File Id="filBD421847424CAE48F72C74C69770D8C0" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.Common.NetFramework.dll" />
26122612
</Component>
2613+
<Component Id="cmpF584FEE91889D98A4299209A1B9B1B94" Guid="*">
2614+
<File Id="fil1E84C52FC3BA4FCD7D38DF81574031BC" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.Azure.ResourceManager.dll" />
2615+
</Component>
26132616
<Component Id="cmp9E03AAB684EA41B087D79346AE6C1073" Guid="*">
26142617
<File Id="fil501FE0FB963E03A9292BE5CC5A895CBB" KeyPath="yes" Source="$(var.sourceDir)\ServiceManagement\Azure\StorSimple\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
26152618
</Component>
@@ -3577,6 +3580,7 @@
35773580
<ComponentRef Id="cmp844CE71A108EFCC5B93A410D5205E6DB" />
35783581
<ComponentRef Id="cmp6A927AFF9D7CBE438F31603C59A5D1A6" />
35793582
<ComponentRef Id="cmp3AC709C29C5C98FAE63EC5ACF073B2AF" />
3583+
<ComponentRef Id="cmpF584FEE91889D98A4299209A1B9B1B94" />
35803584
<ComponentRef Id="cmp9E03AAB684EA41B087D79346AE6C1073" />
35813585
<ComponentRef Id="cmpEC794DBE4822765C546A06D80EAA3292" />
35823586
<ComponentRef Id="cmpB48F1BD4D2E8307615F7E22174FF4E6D" />

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/Commands.NetworkResourceProvider.csproj

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,6 @@
7878
<Reference Include="Microsoft.Azure.Management.Network">
7979
<HintPath>..\..\..\lib\Microsoft.Azure.Management.Network.dll</HintPath>
8080
</Reference>
81-
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
82-
<SpecificVersion>False</SpecificVersion>
83-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
84-
</Reference>
8581
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8682
<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
8783
<Private>True</Private>
@@ -192,45 +188,46 @@
192188
<Compile Include="LoadBalancer\Probe\RemoveAzureLoadBalancerProbeCmdlet.cs" />
193189
<Compile Include="LoadBalancer\RemoveAzureLoadBalancerCmdlet.cs" />
194190
<Compile Include="LoadBalancer\SetAzureLoadBalancerCmdlet.cs" />
191+
<Compile Include="Models\PSNetworkSecurityGroup.cs" />
192+
<Compile Include="Models\PSSecurityRule.cs" />
195193
<Compile Include="Models\PSBackendAddressPool.cs" />
196-
<Compile Include="Models\PSBackendAddressPoolProperties.cs" />
197194
<Compile Include="Models\PSFrontendIpConfiguration.cs" />
198-
<Compile Include="Models\PSFrontendIpConfigurationProperties.cs" />
199195
<Compile Include="Models\PSInboundNatRule.cs" />
200-
<Compile Include="Models\PSInboundNatRuleProperties.cs" />
201196
<Compile Include="Models\PSLoadBalancer.cs" />
202-
<Compile Include="Models\PSLoadBalancerCreateOrUpdateParameters.cs" />
203-
<Compile Include="Models\PSLoadBalancerProperties.cs" />
204197
<Compile Include="Models\PSLoadBalancingRule.cs" />
205-
<Compile Include="Models\PSLoadBalancingRuleProperties.cs" />
206198
<Compile Include="Models\PSProbe.cs" />
207-
<Compile Include="Models\PSProbeProperties.cs" />
208199
<Compile Include="Models\PSProbeProtocol.cs" />
209200
<Compile Include="Models\PSAddressSpace.cs" />
210201
<Compile Include="Models\PSDhcpOptions.cs" />
211202
<Compile Include="Models\PSDnsSettings.cs" />
212203
<Compile Include="Models\PSNetworkInterface.cs" />
213204
<Compile Include="Models\PSNetworkInterfaceIpConfiguration.cs" />
214-
<Compile Include="Models\PSNetworkInterfaceIpConfigurationProperties.cs" />
215-
<Compile Include="Models\PSNetworkInterfaceProperties.cs" />
216205
<Compile Include="Models\PSProvisioningState.cs" />
217206
<Compile Include="Models\PSPublicIpAddress.cs" />
218207
<Compile Include="Models\PSPublicIpAddressDnsSettings.cs" />
219-
<Compile Include="Models\PSPublicIpAddressProperties.cs" />
220208
<Compile Include="Models\PSChildResource.cs" />
221209
<Compile Include="Models\PSTopLevelResource.cs" />
222210
<Compile Include="Models\PSResourceId.cs" />
223211
<Compile Include="Models\PSResourceProperties.cs" />
224212
<Compile Include="Models\PSSubnet.cs" />
225-
<Compile Include="Models\PSSubnetProperties.cs" />
226213
<Compile Include="Models\PSVirtualNetwork.cs" />
227-
<Compile Include="Models\PSVirtualNetworkProperties.cs" />
228214
<Compile Include="Models\PSTransportProtocol.cs" />
229215
<Compile Include="NetworkInterface\RemoveAzureNetworkInterfaceCmdlet.cs" />
230216
<Compile Include="NetworkInterface\GetAzureNetworkInterfaceCmdlet.cs" />
231217
<Compile Include="NetworkInterface\NetworkInterfaceBaseClient.cs" />
232218
<Compile Include="NetworkInterface\NewAzureNetworkInterfaceCmdlet.cs" />
233219
<Compile Include="NetworkInterface\SetAzureNetworkInterfaceCmdlet.cs" />
220+
<Compile Include="NetworkSecurityGroup\GetAzureNetworkSecurityGroupCmdlet.cs" />
221+
<Compile Include="NetworkSecurityGroup\NetworkSecurityGroupBaseClient.cs" />
222+
<Compile Include="NetworkSecurityGroup\NetworkSecurityRule\NewAzureNetworkSecurityRuleConfigCmdlet.cs" />
223+
<Compile Include="NetworkSecurityGroup\NetworkSecurityRule\GetAzureNetworkSecurityRuleConfigCmdlet.cs" />
224+
<Compile Include="NetworkSecurityGroup\NetworkSecurityRule\RemoveAzureNetworkSecurityRuleConfigCmdlet.cs" />
225+
<Compile Include="NetworkSecurityGroup\NetworkSecurityRule\SetAzureNetworkSecurityRuleConfigCmdlet.cs" />
226+
<Compile Include="NetworkSecurityGroup\NetworkSecurityRule\AddAzureNetworkSecurityRuleConfigCmdlet.cs" />
227+
<Compile Include="NetworkSecurityGroup\NetworkSecurityRule\CommonAzureNetworkSecurityRuleConfigCmdlet.cs" />
228+
<Compile Include="NetworkSecurityGroup\NewAzureNetworkSecurityGroupCmdlet.cs" />
229+
<Compile Include="NetworkSecurityGroup\RemoveAzureNetworkSecurityGroupCmdlet.cs" />
230+
<Compile Include="NetworkSecurityGroup\SetAzureNetworkSecurityGroupCmdlet.cs" />
234231
<Compile Include="Properties\AssemblyInfo.cs" />
235232
<Compile Include="Properties\Resources.Designer.cs">
236233
<DependentUpon>Resources.resx</DependentUpon>

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/Common/NetworkBaseClient.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using System;
1516
using Microsoft.WindowsAzure.Commands.Utilities.Common;
1617

1718
namespace Microsoft.Azure.Commands.NetworkResourceProvider
@@ -44,5 +45,15 @@ public override void ExecuteCmdlet()
4445
base.ExecuteCmdlet();
4546
NetworkResourceManagerProfile.Initialize();
4647
}
48+
49+
public static string GetResourceGroup(string resourceId)
50+
{
51+
const string resourceGroup = "resourceGroups";
52+
53+
var startIndex = resourceId.IndexOf(resourceGroup, StringComparison.OrdinalIgnoreCase) + resourceGroup.Length + 1;
54+
var endIndex = resourceId.IndexOf("/", startIndex, StringComparison.OrdinalIgnoreCase);
55+
56+
return resourceId.Substring(startIndex, endIndex - startIndex);
57+
}
4758
}
4859
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/Common/NetworkClient.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
using System;
1616
using Microsoft.Azure.Management.Network;
17-
using Microsoft.WindowsAzure.Commands.Common;
1817
using Microsoft.Azure.Common.Authentication.Models;
1918
using Microsoft.Azure.Common.Authentication;
2019

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/Common/NetworkResourceManagerProfile.cs

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -74,104 +74,96 @@ protected override void Configure()
7474
// Subnet
7575
// CNM to MNM
7676
Mapper.CreateMap<CNM.PSDhcpOptions, MNM.DhcpOptions>();
77-
Mapper.CreateMap<CNM.PSSubnetProperties, MNM.SubnetProperties>();
7877
Mapper.CreateMap<CNM.PSSubnet, MNM.Subnet>();
7978

8079
// MNM to CNM
8180
Mapper.CreateMap<MNM.DhcpOptions, CNM.PSDhcpOptions>();
82-
Mapper.CreateMap<MNM.SubnetProperties, CNM.PSSubnetProperties>();
8381
Mapper.CreateMap<MNM.Subnet, CNM.PSSubnet>();
8482

8583
// VirtualNetwork
8684
// CNM to MNM
8785
Mapper.CreateMap<CNM.PSAddressSpace, MNM.AddressSpace>();
88-
Mapper.CreateMap<CNM.PSVirtualNetworkProperties, MNM.VirtualNetworkProperties>();
89-
Mapper.CreateMap<CNM.PSVirtualNetwork, MNM.VirtualNetworkCreateOrUpdateParameters>();
86+
Mapper.CreateMap<CNM.PSVirtualNetwork, MNM.VirtualNetwork>();
9087

9188
// MNM to CNM
9289
Mapper.CreateMap<MNM.AddressSpace, CNM.PSAddressSpace>();
93-
Mapper.CreateMap<MNM.VirtualNetworkProperties, CNM.PSVirtualNetworkProperties>();
9490
Mapper.CreateMap<MNM.VirtualNetwork, CNM.PSVirtualNetwork>();
9591

9692
// PublicIpAddress
9793
// CNM to MNM
98-
Mapper.CreateMap<CNM.PSPublicIpAddress, MNM.PublicIpAddressCreateOrUpdateParameters>();
99-
Mapper.CreateMap<CNM.PSPublicIpAddressProperties, MNM.PublicIpAddressProperties>();
94+
Mapper.CreateMap<CNM.PSPublicIpAddress, MNM.PublicIpAddress>();
10095
Mapper.CreateMap<CNM.PSPublicIpAddressDnsSettings, MNM.PublicIpAddressDnsSettings>();
10196

10297
// MNM to CNM
10398
Mapper.CreateMap<MNM.PublicIpAddress, CNM.PSPublicIpAddress>();
104-
Mapper.CreateMap<MNM.PublicIpAddressProperties, CNM.PSPublicIpAddressProperties>();
10599
Mapper.CreateMap<MNM.PublicIpAddressDnsSettings, CNM.PSPublicIpAddressDnsSettings>();
106100

107101
// NetworkInterface
108102
// CNM to MNM
109-
Mapper.CreateMap<CNM.PSNetworkInterface, MNM.NetworkInterfaceCreateOrUpdateParameters>();
110-
Mapper.CreateMap<CNM.PSNetworkInterfaceProperties, MNM.NetworkInterfaceProperties>();
103+
Mapper.CreateMap<CNM.PSNetworkInterface, MNM.NetworkInterface>();
111104
Mapper.CreateMap<CNM.PSDnsSettings, MNM.DnsSettings>();
112105
Mapper.CreateMap<CNM.PSNetworkInterfaceIpConfiguration, MNM.NetworkInterfaceIpConfiguration>();
113-
Mapper.CreateMap<CNM.PSNetworkInterfaceIpConfigurationProperties, MNM.NetworkInterfaceIpConfigurationProperties>();
114106

115107
// MNM to CNM
116108
Mapper.CreateMap<MNM.NetworkInterface, CNM.PSNetworkInterface>();
117-
Mapper.CreateMap<MNM.NetworkInterfaceProperties, CNM.PSNetworkInterfaceProperties>();
118109
Mapper.CreateMap<MNM.DnsSettings, CNM.PSDnsSettings>();
119110
Mapper.CreateMap<MNM.NetworkInterfaceIpConfiguration, CNM.PSNetworkInterfaceIpConfiguration>();
120-
Mapper.CreateMap<MNM.NetworkInterfaceIpConfigurationProperties, CNM.PSNetworkInterfaceIpConfigurationProperties>();
121111

122112
// LoadBalancer
123113
// CNM to MNM
124-
Mapper.CreateMap<CNM.PSLoadBalancer, MNM.LoadBalancerCreateOrUpdateParameters>();
125-
Mapper.CreateMap<CNM.PSLoadBalancerProperties, MNM.LoadBalancerProperties>();
114+
Mapper.CreateMap<CNM.PSLoadBalancer, MNM.LoadBalancer>();
126115

127116
// MNM to CNM
128117
Mapper.CreateMap<MNM.LoadBalancer, CNM.PSLoadBalancer>();
129-
Mapper.CreateMap<MNM.LoadBalancerProperties, CNM.PSLoadBalancerProperties>();
130118

131119
// FrontendIpConfiguration
132120
// CNM to MNM
133121
Mapper.CreateMap<CNM.PSFrontendIpConfiguration, MNM.FrontendIpConfiguration>();
134-
Mapper.CreateMap<CNM.PSFrontendIpConfigurationProperties, MNM.FrontendIpConfigurationProperties>();
135122

136123
// MNM to CNM
137124
Mapper.CreateMap<MNM.FrontendIpConfiguration, CNM.PSFrontendIpConfiguration>();
138-
Mapper.CreateMap<MNM.FrontendIpConfigurationProperties, CNM.PSFrontendIpConfigurationProperties>();
139125

140126
// BackendAddressPool
141127
// CNM to MNM
142128
Mapper.CreateMap<CNM.PSBackendAddressPool, MNM.BackendAddressPool>();
143-
Mapper.CreateMap<CNM.PSBackendAddressPoolProperties, MNM.BackendAddressPoolProperties>();
144129

145130
// MNM to CNM
146131
Mapper.CreateMap<MNM.BackendAddressPool, CNM.PSBackendAddressPool>();
147-
Mapper.CreateMap<MNM.BackendAddressPoolProperties, CNM.PSBackendAddressPoolProperties>();
148132

149133
// LoadBalancingRule
150134
// CNM to MNM
151135
Mapper.CreateMap<CNM.PSLoadBalancingRule, MNM.LoadBalancingRule>();
152-
Mapper.CreateMap<CNM.PSLoadBalancingRuleProperties, MNM.LoadBalancingRuleProperties>();
153136

154137
// MNM to CNM
155138
Mapper.CreateMap<MNM.LoadBalancingRule, CNM.PSLoadBalancingRule>();
156-
Mapper.CreateMap<MNM.LoadBalancingRuleProperties, CNM.PSLoadBalancingRuleProperties>();
157139

158140
// Probes
159141
// CNM to MNM
160142
Mapper.CreateMap<CNM.PSProbe, MNM.Probe>();
161-
Mapper.CreateMap<CNM.PSProbeProperties, MNM.ProbeProperties>();
162143

163144
// MNM to CNM
164145
Mapper.CreateMap<MNM.Probe, CNM.PSProbe>();
165-
Mapper.CreateMap<MNM.ProbeProperties, CNM.PSProbeProperties>();
166146

167147
// InboundNatRules
168148
// CNM to MNM
169149
Mapper.CreateMap<CNM.PSInboundNatRule, MNM.InboundNatRule>();
170-
Mapper.CreateMap<CNM.PSInboundNatRuleProperties, MNM.InboundNatRuleProperties>();
171150

172151
// MNM to CNM
173152
Mapper.CreateMap<MNM.InboundNatRule, CNM.PSInboundNatRule>();
174-
Mapper.CreateMap<MNM.InboundNatRuleProperties, CNM.PSInboundNatRuleProperties>();
153+
154+
// NetworkSecurityGroups
155+
// CNM to MNM
156+
Mapper.CreateMap<CNM.PSNetworkSecurityGroup, MNM.NetworkSecurityGroup>();
157+
158+
// MNM to CNM
159+
Mapper.CreateMap<MNM.NetworkSecurityGroup, CNM.PSNetworkSecurityGroup>();
160+
161+
// NetworkSecrityRule
162+
// CNM to MNM
163+
Mapper.CreateMap<CNM.PSSecurityRule, MNM.SecurityRule>();
164+
165+
// MNM to CNM
166+
Mapper.CreateMap<MNM.SecurityRule, CNM.PSSecurityRule>();
175167
}
176168
}
177169
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/BackendAddressPool/AddAzureLoadBalancerBackendAddressPoolConfigCmdlet.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public override void ExecuteCmdlet()
4040
{
4141
base.ExecuteCmdlet();
4242

43-
var existingbackendAddressPool = this.LoadBalancer.Properties.BackendAddressPools.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
43+
var existingbackendAddressPool = this.LoadBalancer.BackendAddressPools.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
4444

4545
if (existingbackendAddressPool != null)
4646
{
@@ -49,14 +49,13 @@ public override void ExecuteCmdlet()
4949

5050
var backendAddressPool = new PSBackendAddressPool();
5151
backendAddressPool.Name = this.Name;
52-
backendAddressPool.Properties = new PSBackendAddressPoolProperties();
53-
backendAddressPool.Properties.BackendIpConfigurations = new List<PSResourceId>();
52+
backendAddressPool.BackendIpConfigurations = new List<PSResourceId>();
5453

5554
foreach (var backendIpConfigurationId in this.BackendIpConfigurationId)
5655
{
5756
var resourceId = new PSResourceId();
5857
resourceId.Id = backendIpConfigurationId;
59-
backendAddressPool.Properties.BackendIpConfigurations.Add(resourceId);
58+
backendAddressPool.BackendIpConfigurations.Add(resourceId);
6059
}
6160

6261
backendAddressPool.Id =
@@ -67,7 +66,7 @@ public override void ExecuteCmdlet()
6766
Resources.LoadBalancerBackendAddressPoolName,
6867
this.Name);
6968

70-
this.LoadBalancer.Properties.BackendAddressPools.Add(backendAddressPool);
69+
this.LoadBalancer.BackendAddressPools.Add(backendAddressPool);
7170

7271
WriteObject(this.LoadBalancer);
7372
}

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/BackendAddressPool/GetAzureLoadBalancerBackendAddressPoolConfigCmdlet.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ public override void ExecuteCmdlet()
3939
if (!string.IsNullOrEmpty(this.Name))
4040
{
4141
var backendAddressPool =
42-
this.LoadBalancer.Properties.BackendAddressPools.First(
42+
this.LoadBalancer.BackendAddressPools.First(
4343
resource =>
4444
string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
4545

4646
WriteObject(backendAddressPool);
4747
}
4848
else
4949
{
50-
var backendAddressPools = this.LoadBalancer.Properties.BackendAddressPools;
50+
var backendAddressPools = this.LoadBalancer.BackendAddressPools;
5151
WriteObject(backendAddressPools, true);
5252
}
5353

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/BackendAddressPool/NewAzureLoadBalancerBackendAddressPoolConfigCmdlet.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,13 @@ public override void ExecuteCmdlet()
3434

3535
var backendAddressPool = new PSBackendAddressPool();
3636
backendAddressPool.Name = this.Name;
37-
backendAddressPool.Properties = new PSBackendAddressPoolProperties();
38-
backendAddressPool.Properties.BackendIpConfigurations = new List<PSResourceId>();
37+
backendAddressPool.BackendIpConfigurations = new List<PSResourceId>();
3938

4039
foreach (var backendIpConfigurationId in this.BackendIpConfigurationId)
4140
{
4241
var resourceId = new PSResourceId();
4342
resourceId.Id = backendIpConfigurationId;
44-
backendAddressPool.Properties.BackendIpConfigurations.Add(resourceId);
43+
backendAddressPool.BackendIpConfigurations.Add(resourceId);
4544
}
4645

4746
backendAddressPool.Id =

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/BackendAddressPool/RemoveAzureLoadBalancerBackendAddressPoolConfigCmdlet.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public override void ExecuteCmdlet()
3737
{
3838
base.ExecuteCmdlet();
3939

40-
var backendAddressPool = this.LoadBalancer.Properties.BackendAddressPools.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
40+
var backendAddressPool = this.LoadBalancer.BackendAddressPools.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
4141

4242
if (backendAddressPool != null)
4343
{
44-
this.LoadBalancer.Properties.BackendAddressPools.Remove(backendAddressPool);
44+
this.LoadBalancer.BackendAddressPools.Remove(backendAddressPool);
4545
}
4646

4747
WriteObject(this.LoadBalancer);

‎src/ResourceManager/Network/Commands.NetworkResourceProvider/LoadBalancer/BackendAddressPool/SetAzureLoadBalancerBackendAddressPoolConfigCmdlet.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,21 @@ public override void ExecuteCmdlet()
3939
{
4040
base.ExecuteCmdlet();
4141

42-
var backendAddressPool = this.LoadBalancer.Properties.BackendAddressPools.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
42+
var backendAddressPool = this.LoadBalancer.BackendAddressPools.SingleOrDefault(resource => string.Equals(resource.Name, this.Name, System.StringComparison.CurrentCultureIgnoreCase));
4343

4444
if (backendAddressPool == null)
4545
{
4646
throw new ArgumentException("BackendAddressPool with the specified name does not exist");
4747
}
4848

4949
backendAddressPool.Name = this.Name;
50-
backendAddressPool.Properties = new PSBackendAddressPoolProperties();
51-
backendAddressPool.Properties.BackendIpConfigurations = new List<PSResourceId>();
50+
backendAddressPool.BackendIpConfigurations = new List<PSResourceId>();
5251

5352
foreach (var backendIpConfigurationId in this.BackendIpConfigurationId)
5453
{
5554
var resourceId = new PSResourceId();
5655
resourceId.Id = backendIpConfigurationId;
57-
backendAddressPool.Properties.BackendIpConfigurations.Add(resourceId);
56+
backendAddressPool.BackendIpConfigurations.Add(resourceId);
5857
}
5958

6059
WriteObject(this.LoadBalancer);

0 commit comments

Comments
 (0)