Skip to content

Commit 620386c

Browse files
ogailogail
ogail
authored and
ogail
committed
Migrate OperationalInsights project to RM
1 parent 32a79ed commit 620386c

17 files changed

+27
-35
lines changed

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

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,22 +141,14 @@
141141
</Reference>
142142
</ItemGroup>
143143
<ItemGroup>
144+
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
145+
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
146+
<Name>Commands.ResourceManager.Common</Name>
147+
</ProjectReference>
144148
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
145149
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
146150
<Name>Commands.ScenarioTests.Common</Name>
147151
</ProjectReference>
148-
<ProjectReference Include="..\..\..\Common\Commands.Common.Test\Commands.Common.Test.csproj">
149-
<Project>{3b48a77b-5956-4a62-9081-92ba04b02b27}</Project>
150-
<Name>Commands.Common.Test</Name>
151-
</ProjectReference>
152-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
153-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
154-
<Name>Commands.Common</Name>
155-
</ProjectReference>
156-
<ProjectReference Include="..\..\..\ServiceManagement\Services\Commands.Test.Utilities\Commands.Test.Utilities.csproj">
157-
<Project>{bc420543-c04e-4bf3-96e1-cd81b823bdd7}</Project>
158-
<Name>Commands.Test.Utilities</Name>
159-
</ProjectReference>
160152
</ItemGroup>
161153
<ItemGroup>
162154
<Compile Include="Properties\AssemblyInfo.cs" />

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
using Microsoft.Azure.Subscriptions;
2121
using Microsoft.Azure.Test;
2222
using Microsoft.WindowsAzure.Commands.ScenarioTest;
23+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
2324

2425
namespace Microsoft.Azure.Commands.OperationalInsights.Test
2526
{
26-
public abstract class OperationalInsightsScenarioTestBase
27+
public abstract class OperationalInsightsScenarioTestBase : RMTestBase
2728
{
2829
private EnvironmentSetupHelper helper;
2930

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/StorageInsightTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function Test-StorageInsightCreateUpdateDelete
6969

7070
# Delete one of the storage insights
7171
Remove-AzureOperationalInsightsStorageInsight -ResourceGroupName $rgname -WorkspaceName $wsname -Name $sinametwo -Force
72-
Assert-ThrowsContains { Get-AzureOperationalInsightsStorageInsight -Workspace $workspace -Name $sinametwo } "NotFound"
72+
Assert-ThrowsContains { Get-AzureOperationalInsightsStorageInsight -Workspace $workspace -Name $sinametwo } "Not Found"
7373
$storageinsights = Get-AzureOperationalInsightsStorageInsight -Workspace $workspace
7474
Assert-AreEqual 1 $storageinsights.Count
7575
Assert-AreEqual 1 ($storageinsights | Where {$_.Name -eq $siname}).Count
@@ -90,7 +90,7 @@ function Test-StorageInsightCreateUpdateDelete
9090

9191
# Delete the remaining storage insight via piping
9292
Remove-AzureOperationalInsightsStorageInsight -Workspace $workspace -Name $siname -Force
93-
Assert-ThrowsContains { Get-AzureOperationalInsightsStorageInsight -Workspace $workspace -Name $siname } "NotFound"
93+
Assert-ThrowsContains { Get-AzureOperationalInsightsStorageInsight -Workspace $workspace -Name $siname } "Not Found"
9494
$storageinsights = Get-AzureOperationalInsightsStorageInsight -Workspace $workspace
9595
Assert-AreEqual 0 $storageinsights.Count
9696
}

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,6 @@
123123
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
124124
</Reference>
125125
</ItemGroup>
126-
<ItemGroup>
127-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
128-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
129-
<Name>Commands.Common</Name>
130-
</ProjectReference>
131-
</ItemGroup>
132126
<ItemGroup>
133127
<Compile Include="Client\OperationalInsightsClient.StorageInsights.cs" />
134128
<Compile Include="Client\OperationalInsightsClient.Workspaces.cs" />
@@ -187,7 +181,12 @@
187181
<SubType>Designer</SubType>
188182
</EmbeddedResource>
189183
</ItemGroup>
190-
<ItemGroup />
184+
<ItemGroup>
185+
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
186+
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
187+
<Name>Commands.ResourceManager.Common</Name>
188+
</ProjectReference>
189+
</ItemGroup>
191190
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
192191
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
193192
<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')" />

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/OperationalInsightsBaseCmdlet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
namespace Microsoft.Azure.Commands.OperationalInsights
2121
{
22-
public abstract class OperationalInsightsBaseCmdlet : AzureSMCmdlet
22+
public abstract class OperationalInsightsBaseCmdlet : ResourceManager.Common.AzureRMCmdlet
2323
{
2424
protected const string ByWorkspaceName = "ByWorkspaceName";
2525
protected const string ByWorkspaceObject = "ByWorkspaceObject";

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/StorageInsights/GetAzureOperationalInsightsStorageInsightCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public class GetAzureOperationalInsightsStorageInsightCommand : OperationalInsig
4141
[ValidateNotNullOrEmpty]
4242
public string Name { get; set; }
4343

44-
public override void ExecuteCmdlet()
44+
protected override void ProcessRecord()
4545
{
4646
if (ParameterSetName == ByWorkspaceObject)
4747
{

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/StorageInsights/NewAzureOperationalInsightsStorageInsightCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public class NewAzureOperationalInsightsStorageInsightCommand : OperationalInsig
6262
[Parameter(Mandatory = false, HelpMessage = "Don't ask for confirmation.")]
6363
public SwitchParameter Force { get; set; }
6464

65-
public override void ExecuteCmdlet()
65+
protected override void ProcessRecord()
6666
{
6767
CreatePSStorageInsightParameters parameters = new CreatePSStorageInsightParameters()
6868
{

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/StorageInsights/RemoveAzureOperationalInsightsStorageInsightCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class RemoveAzureOperationalInsightsStorageInsightCommand : OperationalIn
4747
[Parameter(Mandatory = false, HelpMessage = "Don't ask for confirmation.")]
4848
public SwitchParameter Force { get; set; }
4949

50-
public override void ExecuteCmdlet()
50+
protected override void ProcessRecord()
5151
{
5252
if (ParameterSetName == ByWorkspaceObject)
5353
{

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/StorageInsights/SetAzureOperationalInsightsStorageInsightCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class SetAzureOperationalInsightsStorageInsightCommand : OperationalInsig
5454
HelpMessage = "The Azure Storage blob containers that the storage insight will read data from.")]
5555
public string[] Containers { get; set; }
5656

57-
public override void ExecuteCmdlet()
57+
protected override void ProcessRecord()
5858
{
5959
if (ParameterSetName == ByWorkspaceObject)
6060
{

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Workspaces/GetAzureOperationalInsightsLinkTargetsCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ namespace Microsoft.Azure.Commands.OperationalInsights
2121
[Cmdlet(VerbsCommon.Get, Constants.LinkTargets), OutputType(typeof(List<PSAccount>))]
2222
public class GetAzureOperationalInsightsLinkTargetsCommand : OperationalInsightsBaseCmdlet
2323
{
24-
public override void ExecuteCmdlet()
24+
protected override void ProcessRecord()
2525
{
2626
WriteObject(OperationalInsightsClient.GetLinkTargets(), true);
2727
}

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Workspaces/GetAzureOperationalInsightsWorkspaceCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class GetAzureOperationalInsightsWorkspaceCommand : OperationalInsightsBa
3131
[ValidateNotNullOrEmpty]
3232
public string Name { get; set; }
3333

34-
public override void ExecuteCmdlet()
34+
protected override void ProcessRecord()
3535
{
3636
WriteObject(OperationalInsightsClient.FilterPSWorkspaces(ResourceGroupName, Name), true);
3737
}

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Workspaces/GetAzureOperationalInsightsWorkspaceManagementGroupsCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class GetAzureOperationalInsightsWorkspaceManagementGroupsCommand : Opera
3131
[ValidateNotNullOrEmpty]
3232
public string Name { get; set; }
3333

34-
public override void ExecuteCmdlet()
34+
protected override void ProcessRecord()
3535
{
3636
WriteObject(OperationalInsightsClient.GetWorkspaceManagementGroups(ResourceGroupName, Name), true);
3737
}

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Workspaces/GetAzureOperationalInsightsWorkspaceSharedKeysCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class GetAzureOperationalInsightsWorkspaceSharedKeysCommand : Operational
3030
[ValidateNotNullOrEmpty]
3131
public string Name { get; set; }
3232

33-
public override void ExecuteCmdlet()
33+
protected override void ProcessRecord()
3434
{
3535
WriteObject(OperationalInsightsClient.GetWorkspaceKeys(ResourceGroupName, Name));
3636
}

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Workspaces/GetAzureOperationalInsightsWorkspaceUsageCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class GetAzureOperationalInsightsWorkspaceUsageCommand : OperationalInsig
3131
[ValidateNotNullOrEmpty]
3232
public string Name { get; set; }
3333

34-
public override void ExecuteCmdlet()
34+
protected override void ProcessRecord()
3535
{
3636
WriteObject(OperationalInsightsClient.GetWorkspaceUsage(ResourceGroupName, Name), true);
3737
}

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Workspaces/NewAzureOperationalInsightsWorkspaceCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class NewAzureOperationalInsightsWorkspaceCommand : OperationalInsightsBa
5353
[Parameter(Mandatory = false, HelpMessage = "Don't ask for confirmation.")]
5454
public SwitchParameter Force { get; set; }
5555

56-
public override void ExecuteCmdlet()
56+
protected override void ProcessRecord()
5757
{
5858
CreatePSWorkspaceParameters parameters = new CreatePSWorkspaceParameters()
5959
{

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Workspaces/RemoveAzureOperationalInsightsWorkspaceCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class RemoveAzureOperationalInsightsWorkspaceCommand : OperationalInsight
3535
[Parameter(Mandatory = false, HelpMessage = "Don't ask for confirmation.")]
3636
public SwitchParameter Force { get; set; }
3737

38-
public override void ExecuteCmdlet()
38+
protected override void ProcessRecord()
3939
{
4040
ConfirmAction(
4141
Force.IsPresent,

‎src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Workspaces/SetAzureOperationalInsightsWorkspaceCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class SetAzureOperationalInsightsWorkspaceCommand : OperationalInsightsBa
4545
HelpMessage = "The resource tags for the workspace.")]
4646
public Hashtable Tags { get; set; }
4747

48-
public override void ExecuteCmdlet()
48+
protected override void ProcessRecord()
4949
{
5050
if (ParameterSetName == ByObject)
5151
{

0 commit comments

Comments
 (0)