Skip to content

Commit 42b838b

Browse files
markcowlmarkcowl
authored
Merge pull request #4265 from DeepakRajendranMsft/UpdateNrpSdk
update ps with network SDK with Network 11.1.0
2 parents 12ec911 + 7ae15ff commit 42b838b

25 files changed

+128
-40
lines changed

‎src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,7 @@
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.16.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
71-
<Private>True</Private>
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7271
</Reference>
7372
<Reference Include="Microsoft.Azure.Management.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7473
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/Compute/Commands.Compute.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="Microsoft.Azure.Graph.RBAC" version="3.4.0-preview" targetFramework="net452" />
88
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
10-
<package id="Microsoft.Azure.Management.Network" version="11.0.0-preview" targetFramework="net452" />
10+
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
1111
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />

‎src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<Private>True</Private>
8585
</Reference>
8686
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
87-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
87+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
8888
</Reference>
8989
<Reference Include="Microsoft.Azure.Management.Storage">
9090
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Storage.4.1.0-preview\lib\net45\Microsoft.Azure.Management.Storage.dll</HintPath>

‎src/ResourceManager/Compute/Commands.Compute/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
12-
<package id="Microsoft.Azure.Management.Network" version="11.0.0-preview" targetFramework="net452" />
12+
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
</Reference>
6666
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
67-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
67+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
6868
</Reference>
6969
<Reference Include="Microsoft.Azure.Management.ResourceManager">
7070
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
@@ -537,6 +537,10 @@
537537
<Project>{e1f5201d-6067-430e-b303-4e367652991b}</Project>
538538
<Name>Commands.Resources</Name>
539539
</ProjectReference>
540+
<ProjectReference Include="..\Commands.Network\Commands.Network.csproj">
541+
<Project>{98cfd96b-a6bc-4f15-ae2c-603fc2b58981}</Project>
542+
<Name>Commands.Network</Name>
543+
</ProjectReference>
540544
</ItemGroup>
541545
<ItemGroup>
542546
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎src/ResourceManager/Network/Commands.Network.Test/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Insights" version="0.13.1-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="11.0.0-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Redis" version="3.1.1-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Management.ResourceManager" version="1.6.0-preview" targetFramework="net452" />
1414
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/BackendHttpSettings/AzureApplicationGatewayBackendHttpSettingsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public class AzureApplicationGatewayBackendHttpSettingsBase : NetworkBaseCmdlet
5050
Mandatory = false,
5151
HelpMessage = "Request Timeout. Default value 30 seconds.")]
5252
[ValidateNotNullOrEmpty]
53-
public uint RequestTimeout { get; set; }
53+
public int RequestTimeout { get; set; }
5454

5555

5656
[Parameter(

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/ConnectionDraining/AzureApplicationGatewayConnectionDrainingBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class AzureApplicationGatewayConnectionDrainingBase : NetworkBaseCmdlet
2828
Mandatory = true,
2929
HelpMessage = "The number of seconds connection draining is active. Acceptable values are from 1 second to 3600 seconds.")]
3030
[ValidateNotNullOrEmpty]
31-
public uint DrainTimeoutInSec { get; set; }
31+
public int DrainTimeoutInSec { get; set; }
3232

3333
public override void ExecuteCmdlet()
3434
{

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/HttpListener/AzureApplicationGatewayHttpListenerBase.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
// ----------------------------------------------------------------------------------
1414

1515
using Microsoft.Azure.Commands.Network.Models;
16+
using System;
1617
using System.Management.Automation;
1718

1819
namespace Microsoft.Azure.Commands.Network
@@ -106,7 +107,15 @@ public PSApplicationGatewayHttpListener NewObject()
106107
httpListener.Name = this.Name;
107108
httpListener.Protocol = this.Protocol;
108109
httpListener.HostName = this.HostName;
109-
httpListener.RequireServerNameIndication = this.RequireServerNameIndication;
110+
111+
if(string.Equals(this.RequireServerNameIndication,"true", StringComparison.OrdinalIgnoreCase))
112+
{
113+
httpListener.RequireServerNameIndication = true;
114+
}
115+
else if(string.Equals(this.RequireServerNameIndication, "false", StringComparison.OrdinalIgnoreCase))
116+
{
117+
httpListener.RequireServerNameIndication = false;
118+
}
110119

111120
if (!string.IsNullOrEmpty(this.FrontendIPConfigurationId))
112121
{

‎src/ResourceManager/Network/Commands.Network/ApplicationGateway/Probe/AzureApplicationGatewayProbeConfigBase.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,19 +49,19 @@ public class AzureApplicationGatewayProbeConfigBase : NetworkBaseCmdlet
4949
Mandatory = true,
5050
HelpMessage = "Probe interval in seconds. This is the time interval between two consecutive probes")]
5151
[ValidateNotNullOrEmpty]
52-
public uint Interval { get; set; }
52+
public int Interval { get; set; }
5353

5454
[Parameter(
5555
Mandatory = true,
5656
HelpMessage = "Probe timeout in seconds. Probe marked as failed if valid response is not received with this timeout period")]
5757
[ValidateNotNullOrEmpty]
58-
public uint Timeout { get; set; }
58+
public int Timeout { get; set; }
5959

6060
[Parameter(
6161
Mandatory = true,
6262
HelpMessage = "Probe retry count. Backend server is marked down after consecutive probe failure count reaches UnhealthyThreshold")]
6363
[ValidateNotNullOrEmpty]
64-
public uint UnhealthyThreshold { get; set; }
64+
public int UnhealthyThreshold { get; set; }
6565

6666
[Parameter(
6767
Mandatory = false,
@@ -72,7 +72,7 @@ public class AzureApplicationGatewayProbeConfigBase : NetworkBaseCmdlet
7272
Mandatory = false,
7373
HelpMessage = "Minimum number of servers that are always marked healthy. Default value is 0")]
7474
[ValidateRange(0, int.MaxValue)]
75-
public uint MinServers { get; set; }
75+
public int MinServers { get; set; }
7676

7777
[Parameter(
7878
Mandatory = false,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
7575
</Reference>
7676
<Reference Include="Microsoft.Azure.Management.Network, Version=11.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
77-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
77+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.11.1.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7878
</Reference>
7979
<Reference Include="Microsoft.Data.Edm">
8080
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,18 +395,18 @@ public static void Initialize()
395395
});
396396
cfg.CreateMap<CNM.PSApplicationGatewayPathRule, MNM.ApplicationGatewayPathRule>();
397397
cfg.CreateMap<CNM.PSApplicationGatewayUrlPathMap, MNM.ApplicationGatewayUrlPathMap>();
398-
cfg.CreateMap<CNM.PSApplicationGatewayProbe, MNM.ApplicationGatewayProbe>();
399398
cfg.CreateMap<CNM.PSApplicationGatewayProbeHealthResponseMatch, MNM.ApplicationGatewayProbeHealthResponseMatch>();
399+
cfg.CreateMap<CNM.PSApplicationGatewayProbe, MNM.ApplicationGatewayProbe>();
400400
cfg.CreateMap<CNM.PSApplicationGatewayBackendAddress, MNM.ApplicationGatewayBackendAddress>();
401401
cfg.CreateMap<CNM.PSApplicationGatewayBackendAddressPool, MNM.ApplicationGatewayBackendAddressPool>();
402402
cfg.CreateMap<CNM.PSApplicationGatewayBackendHttpSettings, MNM.ApplicationGatewayBackendHttpSettings>();
403403
cfg.CreateMap<CNM.PSApplicationGatewayFrontendIPConfiguration, MNM.ApplicationGatewayFrontendIPConfiguration>();
404404
cfg.CreateMap<CNM.PSApplicationGatewayFrontendPort, MNM.ApplicationGatewayFrontendPort>();
405+
cfg.CreateMap<CNM.PSApplicationGatewaySslCertificate, MNM.ApplicationGatewaySslCertificate>();
405406
cfg.CreateMap<CNM.PSApplicationGatewayHttpListener, MNM.ApplicationGatewayHttpListener>();
406407
cfg.CreateMap<CNM.PSApplicationGatewayIPConfiguration, MNM.ApplicationGatewayIPConfiguration>();
407408
cfg.CreateMap<CNM.PSApplicationGatewayRequestRoutingRule, MNM.ApplicationGatewayRequestRoutingRule>();
408409
cfg.CreateMap<CNM.PSApplicationGatewayRedirectConfiguration, MNM.ApplicationGatewayRedirectConfiguration>();
409-
cfg.CreateMap<CNM.PSApplicationGatewaySslCertificate, MNM.ApplicationGatewaySslCertificate>();
410410
cfg.CreateMap<CNM.PSApplicationGatewayAuthenticationCertificate, MNM.ApplicationGatewayAuthenticationCertificate>();
411411
cfg.CreateMap<CNM.PSBackendAddressPool, MNM.BackendAddressPool>();
412412
cfg.CreateMap<CNM.PSApplicationGatewayBackendHealth, MNM.ApplicationGatewayBackendHealth>();
@@ -435,18 +435,18 @@ public static void Initialize()
435435
});
436436
cfg.CreateMap<MNM.ApplicationGatewayPathRule, CNM.PSApplicationGatewayPathRule>();
437437
cfg.CreateMap<MNM.ApplicationGatewayUrlPathMap, CNM.PSApplicationGatewayUrlPathMap>();
438-
cfg.CreateMap<MNM.ApplicationGatewayProbe, CNM.PSApplicationGatewayProbe>();
439438
cfg.CreateMap<MNM.ApplicationGatewayProbeHealthResponseMatch, CNM.PSApplicationGatewayProbeHealthResponseMatch>();
439+
cfg.CreateMap<MNM.ApplicationGatewayProbe, CNM.PSApplicationGatewayProbe>();
440440
cfg.CreateMap<MNM.ApplicationGatewayBackendAddress, CNM.PSApplicationGatewayBackendAddress>();
441441
cfg.CreateMap<MNM.ApplicationGatewayBackendAddressPool, CNM.PSApplicationGatewayBackendAddressPool>();
442442
cfg.CreateMap<MNM.ApplicationGatewayBackendHttpSettings, CNM.PSApplicationGatewayBackendHttpSettings>();
443443
cfg.CreateMap<MNM.ApplicationGatewayFrontendIPConfiguration, CNM.PSApplicationGatewayFrontendIPConfiguration>();
444+
cfg.CreateMap<MNM.ApplicationGatewaySslCertificate, CNM.PSApplicationGatewaySslCertificate>();
444445
cfg.CreateMap<MNM.ApplicationGatewayFrontendPort, CNM.PSApplicationGatewayFrontendPort>();
445446
cfg.CreateMap<MNM.ApplicationGatewayHttpListener, CNM.PSApplicationGatewayHttpListener>();
446447
cfg.CreateMap<MNM.ApplicationGatewayIPConfiguration, CNM.PSApplicationGatewayIPConfiguration>();
447448
cfg.CreateMap<MNM.ApplicationGatewayRequestRoutingRule, CNM.PSApplicationGatewayRequestRoutingRule>();
448449
cfg.CreateMap<MNM.ApplicationGatewayRedirectConfiguration, CNM.PSApplicationGatewayRedirectConfiguration>();
449-
cfg.CreateMap<MNM.ApplicationGatewaySslCertificate, CNM.PSApplicationGatewaySslCertificate>();
450450
cfg.CreateMap<MNM.ApplicationGatewayAuthenticationCertificate, CNM.PSApplicationGatewayAuthenticationCertificate>();
451451
cfg.CreateMap<MNM.BackendAddressPool, CNM.PSBackendAddressPool>();
452452
cfg.CreateMap<MNM.ApplicationGatewayBackendHealth, CNM.PSApplicationGatewayBackendHealth>();

‎src/ResourceManager/Network/Commands.Network/Models/PSApplicationGatewayBackendHttpSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class PSApplicationGatewayBackendHttpSettings : PSChildResource
2323
public int Port { get; set; }
2424
public string Protocol { get; set; }
2525
public string CookieBasedAffinity { get; set; }
26-
public uint RequestTimeout { get; set; }
26+
public int RequestTimeout { get; set; }
2727
public PSApplicationGatewayConnectionDraining ConnectionDraining { get; set; }
2828
public PSResourceId Probe { get; set; }
2929
public List<PSResourceId> AuthenticationCertificates { get; set; }

‎src/ResourceManager/Network/Commands.Network/Models/PSApplicationGatewayConnectionDraining.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ namespace Microsoft.Azure.Commands.Network.Models
1818
public class PSApplicationGatewayConnectionDraining
1919
{
2020
public bool Enabled { get; set; }
21-
public uint DrainTimeoutInSec { get; set; }
21+
public int DrainTimeoutInSec { get; set; }
2222
}
2323
}

‎src/ResourceManager/Network/Commands.Network/Models/PSApplicationGatewayHttpListener.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class PSApplicationGatewayHttpListener : PSChildResource
2424
public string Protocol { get; set; }
2525
public string HostName { get; set; }
2626
public PSResourceId SslCertificate { get; set; }
27-
public string RequireServerNameIndication { get; set; }
27+
public bool RequireServerNameIndication { get; set; }
2828
public string ProvisioningState { get; set; }
2929
public string Type { get; set; }
3030

‎src/ResourceManager/Network/Commands.Network/Models/PSApplicationGatewayProbe.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ public class PSApplicationGatewayProbe : PSChildResource
2222
public string Protocol { get; set; }
2323
public string Host { get; set; }
2424
public string Path { get; set; }
25-
public uint Interval { get; set; }
26-
public uint Timeout { get; set; }
27-
public uint UnhealthyThreshold { get; set; }
25+
public int? Interval { get; set; }
26+
public int? Timeout { get; set; }
27+
public int? UnhealthyThreshold { get; set; }
2828
public bool? PickHostNameFromBackendHttpSettings { get; set; }
29-
public uint? MinServers { get; set; }
29+
public int? MinServers { get; set; }
3030
public PSApplicationGatewayProbeHealthResponseMatch Match { get; set; }
3131
public string ProvisioningState { get; set; }
3232
public string Type { get; set; }

‎src/ResourceManager/Network/Commands.Network/Models/PSBgpPeerStatus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public class PSBGPPeerStatus
1919
public int? Asn { get; set; }
2020
public string ConnectedDuration { get; set; }
2121
public string LocalAddress { get; set; }
22-
public int? MessagesReceived { get; set; }
22+
public long? MessagesReceived { get; set; }
2323
public long? MessagesSent { get; set; }
2424
public string Neighbor { get; set; }
2525
public long? RoutesReceived { get; set; }

‎src/ResourceManager/Network/Commands.Network/Models/PSConnectionResetSharedKey.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ namespace Microsoft.Azure.Commands.Network.Models
1616
{
1717
public class PSConnectionResetSharedKey
1818
{
19-
public uint KeyLength { get; set; }
19+
public int KeyLength { get; set; }
2020
}
2121
}

‎src/ResourceManager/Network/Commands.Network/Models/PSIpFlowVerify.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ public class PSIpFlowVerify
2020
public string Direction { get; set; }
2121
public string LocalIPAddress { get; set; }
2222
public string LocalPort { get; set; }
23-
public uint Protocol { get; set; }
24-
public uint RemoteIPAddress { get; set; }
25-
public uint RemotePort { get; set; }
23+
public int Protocol { get; set; }
24+
public int RemoteIPAddress { get; set; }
25+
public int RemotePort { get; set; }
2626
public string TargetNicResourceId { get; set; }
2727
public string TargetResourceId { get; set; }
2828
}

‎src/ResourceManager/Network/Commands.Network/Models/PSTunnelConnectionHealth.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ public class PSTunnelConnectionHealth
2222

2323
public string ConnectionStatus { get; set; }
2424

25-
public ulong IngressBytesTransferred { get; set; }
25+
public long? IngressBytesTransferred { get; set; }
2626

27-
public ulong EgressBytesTransferred { get; set; }
27+
public long? EgressBytesTransferred { get; set; }
2828

2929
public string LastConnectionEstablishedUtcTime { get; set; }
3030
}

‎src/ResourceManager/Network/Commands.Network/Models/PSVirtualNetworkGatewayConnection.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public class PSVirtualNetworkGatewayConnection : PSTopLevelResource
3838

3939
public string ConnectionStatus { get; set; }
4040

41-
public ulong EgressBytesTransferred { get; set; }
41+
public long? EgressBytesTransferred { get; set; }
4242

43-
public ulong IngressBytesTransferred { get; set; }
43+
public long? IngressBytesTransferred { get; set; }
4444

4545
public List<PSTunnelConnectionHealth> TunnelConnectionStatus { get; set; }
4646

‎src/ResourceManager/Network/Commands.Network/Models/PSVirtualNetworkUsage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
public partial class PSVirtualNetworkUsage
44
{
55
public string Id { get; set; }
6-
public long CurrentValue { get; set; }
7-
public long Limit { get; set; }
6+
public double CurrentValue { get; set; }
7+
public double Limit { get; set; }
88
public string Unit { get; set; }
99
public PSUsageName Name { get; set; }
1010
}

‎src/ResourceManager/Network/Commands.Network/VirtualNetworkGatewayConnection/ResetAzureVirtualNetworkGatewayConnectionSharedKeyCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public override void Execute()
6969
private string ResetVirtualNetworkGatewayConnectionSharedKey()
7070
{
7171
var vnetGatewayConnectionSharedKey = new PSConnectionResetSharedKey();
72-
vnetGatewayConnectionSharedKey.KeyLength = KeyLength;
72+
vnetGatewayConnectionSharedKey.KeyLength = (int)KeyLength;
7373

7474
// Map to the sdk object
7575
var vnetGatewayConnectionSharedKeyModel = Mapper.Map<MNM.ConnectionResetSharedKey>(vnetGatewayConnectionSharedKey);

‎src/ResourceManager/Network/Commands.Network/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Compute" version="16.0.0" targetFramework="net452" />
12-
<package id="Microsoft.Azure.Management.Network" version="11.0.0-preview" targetFramework="net452" />
12+
<package id="Microsoft.Azure.Management.Network" version="11.1.0-preview" targetFramework="net452" />
1313
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1414
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
1515
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

0 commit comments

Comments
 (0)