Skip to content

Commit 2db9536

Browse files
lamchesterlamchester
committed
Fix LocalNetworkGateway
1 parent c9d8d2a commit 2db9536

File tree

11 files changed

+28
-23
lines changed

11 files changed

+28
-23
lines changed

‎src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
121121
</Reference>
122122
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
123-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
123+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
124124
<Private>True</Private>
125125
</Reference>
126126
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
@@ -642,4 +642,4 @@
642642
<ItemGroup />
643643
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
644644
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
645-
</Project>
645+
</Project>

‎src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@
130130
</Reference>
131131
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
132132
<SpecificVersion>False</SpecificVersion>
133-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
133+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
134134
</Reference>
135135
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
136136
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -352,4 +352,4 @@
352352
</PropertyGroup>
353353
<Exec Command="$(PowerShellExe) $(PSCodeGenScriptPath) $(PSCodeGenTargetFolder) $(MSBuildProjectDirectory) $(ClientLibraryNamesSpace) $(BaseCmdletFullName) $(BaseCmdletClientName)" />
354354
</Target>
355-
</Project>
355+
</Project>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
130130
</Reference>
131131
<Reference Include="Microsoft.WindowsAzure.Management.Network">
132-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
132+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
133133
</Reference>
134134
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
135135
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -712,4 +712,4 @@
712712
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
713713
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
714714
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
715-
</Project>
715+
</Project>

‎src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
</Reference>
134134
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
135135
<SpecificVersion>False</SpecificVersion>
136-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
136+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
137137
</Reference>
138138
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
139139
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Storage.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Storage.dll</HintPath>
@@ -581,4 +581,4 @@
581581
</ItemGroup>
582582
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
583583
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
584-
</Project>
584+
</Project>

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
107107
</Reference>
108108
<Reference Include="Microsoft.WindowsAzure.Management.Network">
109-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
109+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
110110
</Reference>
111111
<Reference Include="Microsoft.WindowsAzure.Management.Storage">
112112
<SpecificVersion>False</SpecificVersion>
@@ -182,6 +182,7 @@
182182
<Compile Include="Routes\RemoveSubnetRouteTableTests.cs" />
183183
<Compile Include="Routes\SetRouteTests.cs" />
184184
<Compile Include="Routes\SetSubnetRouteTableTests.cs" />
185+
<Compile Include="ScenarioTests\Gateway\GatewayScenarioTests.cs" />
185186
<Compile Include="ScenarioTests\IPForwarding\IPForwardingScenarioTests.cs" />
186187
<Compile Include="ScenarioTests\MultiVip\MultiVip.cs" />
187188
<Compile Include="ScenarioTests\NetworkSecurityGroup\NSGScenarioTests.cs" />
@@ -193,6 +194,9 @@
193194
<ItemGroup>
194195
<None Include="MSSharedLibKey.snk" />
195196
<None Include="packages.config" />
197+
<None Include="ScenarioTests\Gateway\GatewayTests.ps1">
198+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
199+
</None>
196200
<None Include="ScenarioTests\IPForwarding\IPForwardingTests.ps1">
197201
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
198202
</None>
@@ -318,6 +322,7 @@
318322
<ItemGroup>
319323
<Content Include="Readme.txt" />
320324
</ItemGroup>
325+
<ItemGroup />
321326
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
322327
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
323-
</Project>
328+
</Project>

‎src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
</Reference>
110110
<Reference Include="Microsoft.WindowsAzure.Management.Network">
111111
<SpecificVersion>False</SpecificVersion>
112-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
112+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
113113
</Reference>
114114
<Reference Include="Microsoft.WindowsAzure.Storage, Version=6.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
115115
<SpecificVersion>False</SpecificVersion>
@@ -315,4 +315,4 @@
315315
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
316316
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
317317
<Import Project="..\..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets" Condition="Exists('..\..\..\packages\AutoMapper.3.2.1\tools\AutoMapper.targets')" />
318-
</Project>
318+
</Project>

‎src/ServiceManagement/Network/Commands.Network/NetworkClient.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1235,9 +1235,9 @@ public IEnumerable<GetLocalNetworkGatewayContext> ListLocalNetworkGateways()
12351235
GatewayName = localNetworkGateway.GatewayName,
12361236
IpAddress = localNetworkGateway.IpAddress,
12371237
AddressSpace = localNetworkGateway.AddressSpace.ToList(),
1238-
Asn = localNetworkGateway.BgpSettings.Asn,
1239-
BgpPeeringAddress = localNetworkGateway.BgpSettings.BgpPeeringAddress,
1240-
PeerWeight = localNetworkGateway.BgpSettings.PeerWeight,
1238+
Asn = localNetworkGateway.BgpSettings != null?localNetworkGateway.BgpSettings.Asn : 0,
1239+
BgpPeeringAddress = localNetworkGateway.BgpSettings != null?localNetworkGateway.BgpSettings.BgpPeeringAddress : "",
1240+
PeerWeight = localNetworkGateway.BgpSettings != null?localNetworkGateway.BgpSettings.PeerWeight : 0,
12411241
};
12421242
});
12431243
PopulateOperationContext(response.RequestId, localNetworkGateways);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.0.1-preview" targetFramework="net45" />
1919
<package id="Microsoft.WindowsAzure.Management" version="4.1.1" targetFramework="net45" />
2020
<package id="Microsoft.WindowsAzure.Management.Compute" version="12.8.0" targetFramework="net45" />
21-
<package id="Microsoft.WindowsAzure.Management.Network" version="7.1.1" targetFramework="net45" />
21+
<package id="Microsoft.WindowsAzure.Management.Network" version="7.1.2" targetFramework="net45" />
2222
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
2323
<package id="System.Spatial" version="5.6.4" targetFramework="net45" />
2424
<package id="WindowsAzure.Storage" version="6.1.0" targetFramework="net45" />
25-
</packages>
25+
</packages>

‎src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.12.8.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
111111
</Reference>
112112
<Reference Include="Microsoft.WindowsAzure.Management.Network">
113-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
113+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
114114
</Reference>
115115
<Reference Include="Microsoft.WindowsAzure.Management.RemoteApp, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
116116
<SpecificVersion>False</SpecificVersion>
@@ -249,4 +249,4 @@
249249
</ItemGroup>
250250
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
251251
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
252-
</Project>
252+
</Project>

‎src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@
139139
</Reference>
140140
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
141141
<SpecificVersion>False</SpecificVersion>
142-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
142+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
143143
</Reference>
144144
<Reference Include="Microsoft.WindowsAzure.Management.Scheduler, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
145145
<SpecificVersion>False</SpecificVersion>
@@ -707,4 +707,4 @@
707707
<PostBuildEvent>powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "$(TargetDir)\"</PostBuildEvent>
708708
</PropertyGroup>
709709
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
710-
</Project>
710+
</Project>

‎src/ServiceManagement/Services/Commands/Commands.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
</Reference>
132132
<Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
133133
<SpecificVersion>False</SpecificVersion>
134-
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.1\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
134+
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.1.2\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
135135
</Reference>
136136
<Reference Include="Microsoft.WindowsAzure.Management.Scheduler, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
137137
<SpecificVersion>False</SpecificVersion>
@@ -364,4 +364,4 @@
364364
<ItemGroup />
365365
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
366366
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
367-
</Project>
367+
</Project>

0 commit comments

Comments
 (0)