Skip to content

Commit 1a065bb

Browse files
author
Maddie Clayton
authored
Merge pull request #6351 from EvgenyAgafonchikov/Network-2018-05-01-v2
Merge Network updates
2 parents a9bc0f9 + 5bcd332 commit 1a065bb

File tree

33 files changed

+1284
-687
lines changed

33 files changed

+1284
-687
lines changed

‎src/Common/Commands.Common.Network/Commands.Common.Network.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
<Compile Include="Common\INetworkInterfaceReference.cs" />
6767
<Compile Include="Common\IResourceReference.cs" />
6868
<Compile Include="Common\NetworkClient.cs" />
69+
<Compile Include="Common\IOperationalInsightWorkspace.cs" />
6970
<Compile Include="Version2017_03_01\ILoadBalancersOperations.cs" />
7071
<Compile Include="Version2017_03_01\INetworkInterfacesOperations.cs" />
7172
<Compile Include="Version2017_03_01\INetworkManagementClient.cs" />

‎src/Common/Commands.Common.Network/Common/IOperationalInsightWorkspace.cs

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System;
16+
using System.Collections.Generic;
17+
18+
namespace Microsoft.Azure.Management.Internal.Network.Common
19+
{
20+
public interface IOperationalInsightWorkspace
21+
{
22+
string ResourceId { get; set; }
23+
24+
string Location { get; set; }
25+
26+
Guid? CustomerId { get; set; }
27+
}
28+
}

‎src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ public EnvironmentSetupHelper()
9292
module = GetModuleManifest(StorageDirectory, "Azure.Storage");
9393
LogIfNotNull($"Storage Data Plane Module path: {module}");
9494
RMStorageDataPlaneModule = module;
95+
module = GetModuleManifest(RmDirectory, "AzureRM.OperationalInsights");
96+
LogIfNotNull($"Storage Data Plane Module path: {module}");
97+
RMOperationalInsightsModule = module;
9598
module = GetModuleManifest(RmDirectory, "AzureRM.Network");
9699
LogIfNotNull($"Network Module path: {module}");
97100
RMNetworkModule = module;
@@ -152,7 +155,9 @@ public EnvironmentSetupHelper()
152155

153156
public string RMInsightsModule { get; private set; }
154157

155-
public string RMStorageModule { get; private set; }
158+
public string RMStorageModule { get; private set; }
159+
160+
public string RMOperationalInsightsModule { get; private set; }
156161

157162
//TODO: clarify (data plane should not be under ARM folder)
158163
public string RMStorageDataPlaneModule { get; private set; }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<Reference Include="Microsoft.Azure.Management.Compute">
6767
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Compute.18.0.0\lib\net452\Microsoft.Azure.Management.Compute.dll</HintPath>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.KeyVault, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<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
@@ -8,7 +8,7 @@
88
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Compute" version="18.0.0" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.KeyVault" version="2.3.0-preview" targetFramework="net452" />
11-
<package id="Microsoft.Azure.Management.Network" version="19.0.0-preview" targetFramework="net452" />
11+
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
1212
<package id="Microsoft.Azure.Management.Storage" version="4.1.0-preview" targetFramework="net45" />
1313
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />
1414
<package id="Microsoft.Azure.Test.HttpRecorder" version="1.6.7-preview" targetFramework="net45" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Dns.2.2.0-preview\lib\net452\Microsoft.Azure.Management.Dns.dll</HintPath>
6767
<Private>True</Private>
6868
</Reference>
69-
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
69+
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
70+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
7171
</Reference>
7272
<Reference Include="Microsoft.Azure.Management.ResourceManager, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
7373
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
77
<package id="Microsoft.Azure.Management.Authorization" version="2.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.Dns" version="2.2.0-preview" targetFramework="net452" />
9-
<package id="Microsoft.Azure.Management.Network" version="19.0.0-preview" targetFramework="net452" />
9+
<package id="Microsoft.Azure.Management.Network" version="19.0.2-preview" targetFramework="net452" />
1010
<package id="Microsoft.Azure.Management.ResourceManager" version="1.1.1-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.6179.26854-prerelease" targetFramework="net45" />

‎src/ResourceManager/Network/AzureRM.Network.Netcore.psd1

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,7 @@ PowerShellVersion = '5.1'
5454
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.11.0'; })
5555

5656
# Assemblies that must be loaded prior to importing this module
57-
RequiredAssemblies = '.\AutoMapper.dll',
58-
'.\Microsoft.Azure.Management.Network.dll'
57+
RequiredAssemblies = '.\AutoMapper.dll','.\Microsoft.Azure.Management.Network.dll'
5958

6059
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
6160
# ScriptsToProcess = @()

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,11 @@
6464
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
6565
<Private>True</Private>
6666
</Reference>
67-
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68-
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.0-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
67+
<Reference Include="Microsoft.Azure.Management.Network, Version=19.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
68+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Network.19.0.2-preview\lib\net452\Microsoft.Azure.Management.Network.dll</HintPath>
69+
</Reference>
70+
<Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.18.0-preview\lib\net45\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
6972
</Reference>
7073
<Reference Include="Microsoft.Azure.Management.ResourceManager">
7174
<HintPath>..\..\..\packages\Microsoft.Azure.Management.ResourceManager.1.6.0-preview\lib\net452\Microsoft.Azure.Management.ResourceManager.dll</HintPath>
@@ -685,6 +688,10 @@
685688
<Project>{98cfd96b-a6bc-4f15-ae2c-603fc2b58981}</Project>
686689
<Name>Commands.Network</Name>
687690
</ProjectReference>
691+
<ProjectReference Include="..\..\OperationalInsights\Commands.OperationalInsights\Commands.OperationalInsights.csproj">
692+
<Project>{5BE35A94-C20F-4659-AA29-9B9AEBCFAF36}</Project>
693+
<Name>Commands.OperationalInsights</Name>
694+
</ProjectReference>
688695
</ItemGroup>
689696
<ItemGroup>
690697
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />

‎src/ResourceManager/Network/Commands.Network.Test/NetworkResourcesController.cs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
using Microsoft.Azure.Management.Redis;
2222
using Microsoft.Azure.Management.Resources;
2323
using Microsoft.Azure.Management.Storage;
24+
using Microsoft.Azure.Management.OperationalInsights;
2425
using Microsoft.Azure.Subscriptions;
2526
using Microsoft.Azure.Test;
2627
using Microsoft.Azure.Test.HttpRecorder;
@@ -52,6 +53,8 @@ public sealed class NetworkResourcesController
5253

5354
public StorageManagementClient StorageManagementClient { get; private set; }
5455

56+
public OperationalInsightsManagementClient OperationalInsightsManagementClient { get; private set; }
57+
5558
public InsightsManagementClient InsightsManagementClient { get; private set; }
5659

5760
public RedisManagementClient RedisManagementClient { get; private set; }
@@ -127,6 +130,7 @@ public void RunPsTestWorkflow(
127130
helper.GetRMModulePath("AzureRM.RedisCache.psd1"),
128131
helper.GetRMModulePath("AzureRM.Network.psd1"),
129132
helper.GetRMModulePath("AzureRM.Compute.psd1"),
133+
helper.GetRMModulePath("AzureRM.OperationalInsights.psd1"),
130134
helper.RMStorageDataPlaneModule,
131135
"AzureRM.Storage.ps1",
132136
"AzureRM.Resources.ps1");
@@ -177,6 +181,7 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
177181
this.NetworkManagementClient = this.GetNetworkManagementClient(context);
178182
this.ComputeManagementClient = this.GetComputeManagementClient(context);
179183
this.StorageManagementClient = this.GetStorageManagementClient(context);
184+
this.OperationalInsightsManagementClient = this.GetOperationalInsightsManagementClient(context);
180185
this.AuthorizationManagementClient = this.GetAuthorizationManagementClient();
181186
this.InsightsManagementClient = this.GetInsightsManagementClient();
182187
this.RedisManagementClient = this.GetRedisManagementClient(context);
@@ -189,6 +194,7 @@ private void SetupManagementClients(RestTestFramework.MockContext context)
189194
this.NetworkManagementClient,
190195
this.ComputeManagementClient,
191196
this.StorageManagementClient,
197+
this.OperationalInsightsManagementClient,
192198
this.AuthorizationManagementClient,
193199
this.InsightsManagementClient,
194200
this.RedisManagementClient);
@@ -219,6 +225,11 @@ private StorageManagementClient GetStorageManagementClient(RestTestFramework.Moc
219225
return context.GetServiceClient<StorageManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
220226
}
221227

228+
private OperationalInsightsManagementClient GetOperationalInsightsManagementClient(RestTestFramework.MockContext context)
229+
{
230+
return context.GetServiceClient<OperationalInsightsManagementClient>(RestTestFramework.TestEnvironmentFactory.GetTestEnvironment());
231+
}
232+
222233
private GalleryClient GetGalleryClient()
223234
{
224235
return TestBase.GetServiceClient<GalleryClient>(this.csmTestFactory);

0 commit comments

Comments
 (0)