Merge pull request Azure#2157 from independentwork/dev

Hovsep · Hovsep · commit a1ddf30b3b79 · 2016-04-27T18:20:19.000Z
Fix list intelligence packs so it returns a full list
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj
@@ -58,8 +58,8 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.11.0-preview\lib\net40\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.12.0-preview\lib\net40\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/WorkspaceTests.ps1 b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/WorkspaceTests.ps1
@@ -179,11 +179,11 @@ function Test-WorkspaceEnableDisableListIntelligencePacks
 	{
 		if (($ip.Name -eq "ChangeTracking") -or ($ip.Name -eq "SiteRecovery") -or ($ip.Name -eq "LogManagement"))
 		{
-			Assert-True $ip.Enabled
+			Assert-AreEqual $ip.Enabled $true
 		}
 		else
 		{
-			Assert-False $ip.Enabled
+			Assert-AreEqual $ip.Enabled $false
 		}
 	}
 
@@ -197,11 +197,11 @@ function Test-WorkspaceEnableDisableListIntelligencePacks
 	{
 		if ($ip.Name -eq "LogManagement")
 		{
-			Assert-True $ip.Enabled
+			Assert-AreEqual $ip.Enabled $true
 		}
 		else
 		{
-			Assert-False $ip.Enabled
+			Assert-AreEqual $ip.Enabled $false
 		}
 	}
 
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/SessionRecords/Microsoft.Azure.Commands.OperationalInsights.Test.WorkspaceTests/TestWorkspaceEnableDisableListIntelligencePacks.json b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/SessionRecords/Microsoft.Azure.Commands.OperationalInsights.Test.WorkspaceTests/TestWorkspaceEnableDisableListIntelligencePacks.json
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config
@@ -5,7 +5,7 @@
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.OperationalInsights" version="0.11.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.OperationalInsights" version="0.12.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5896.19355-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5896.19355-prerelease" targetFramework="net45" />
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Client/OperationalInsightsClient.Workspaces.cs b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Client/OperationalInsightsClient.Workspaces.cs
@@ -260,9 +260,9 @@ public virtual List<PSIntelligencePack> GetIntelligencePackList(string resourceG
             List<PSIntelligencePack> intelligencePacks = new List<PSIntelligencePack>();
 
             var listResponse = OperationalInsightsManagementClient.Workspaces.ListIntelligencePacks(resourceGroupName, workspaceName);
-            if (listResponse != null)
+            if (listResponse != null && listResponse.IntelligencePacks != null)
             {
-                listResponse.ForEach(ip => intelligencePacks.Add(new PSIntelligencePack(ip.Name, ip.Enabled)));
+                listResponse.IntelligencePacks.ForEach(ip => intelligencePacks.Add(new PSIntelligencePack(ip.Name, ip.Enabled)));
             }
 
             return intelligencePacks;
@@ -272,12 +272,12 @@ public virtual PSIntelligencePack SetIntelligencePack(string resourceGroupName,
         {
             if (enabled)
             {
-                OperationalInsightsManagementClient.Workspaces.EnableIntelligencePackAsync(resourceGroupName, workspaceName, intelligencePackName);
+                OperationalInsightsManagementClient.Workspaces.EnableIntelligencePack(resourceGroupName, workspaceName, intelligencePackName);
                 return new PSIntelligencePack(intelligencePackName, enabled); ;
             }
             else
             {
-                OperationalInsightsManagementClient.Workspaces.DisableIntelligencePackAsync(resourceGroupName, workspaceName, intelligencePackName);
+                OperationalInsightsManagementClient.Workspaces.DisableIntelligencePack(resourceGroupName, workspaceName, intelligencePackName);
                 return new PSIntelligencePack(intelligencePackName, enabled);
             }
         }
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj
@@ -57,9 +57,9 @@
     <Reference Include="Microsoft.Azure.Common.NetFramework">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.11.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.11.0-preview\lib\net40\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.OperationalInsights, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.OperationalInsights.0.12.0-preview\lib\net40\Microsoft.Azure.Management.OperationalInsights.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/packages.config b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/packages.config
@@ -3,7 +3,7 @@
   <package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.OperationalInsights" version="0.11.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.OperationalInsights" version="0.12.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -179,11 +179,11 @@ function Test-WorkspaceEnableDisableListIntelligencePacks`
`179`	`179`	`{`
`180`	`180`	`if (($ip.Name -eq "ChangeTracking") -or ($ip.Name -eq "SiteRecovery") -or ($ip.Name -eq "LogManagement"))`
`181`	`181`	`{`
`182`		`- Assert-True $ip.Enabled`
	`182`	`+ Assert-AreEqual $ip.Enabled $true`
`183`	`183`	`}`
`184`	`184`	`else`
`185`	`185`	`{`
`186`		`- Assert-False $ip.Enabled`
	`186`	`+ Assert-AreEqual $ip.Enabled $false`
`187`	`187`	`}`
`188`	`188`	`}`
`189`	`189`
`@@ -197,11 +197,11 @@ function Test-WorkspaceEnableDisableListIntelligencePacks`
`197`	`197`	`{`
`198`	`198`	`if ($ip.Name -eq "LogManagement")`
`199`	`199`	`{`
`200`		`- Assert-True $ip.Enabled`
	`200`	`+ Assert-AreEqual $ip.Enabled $true`
`201`	`201`	`}`
`202`	`202`	`else`
`203`	`203`	`{`
`204`		`- Assert-False $ip.Enabled`
	`204`	`+ Assert-AreEqual $ip.Enabled $false`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`
Original file line number	Diff line number	Diff line change
`@@ -260,9 +260,9 @@ public virtual List<PSIntelligencePack> GetIntelligencePackList(string resourceG`
`260`	`260`	`List<PSIntelligencePack> intelligencePacks = new List<PSIntelligencePack>();`
`261`	`261`
`262`	`262`	`var listResponse = OperationalInsightsManagementClient.Workspaces.ListIntelligencePacks(resourceGroupName, workspaceName);`
`263`		`- if (listResponse != null)`
	`263`	`+ if (listResponse != null && listResponse.IntelligencePacks != null)`
`264`	`264`	`{`
`265`		`- listResponse.ForEach(ip => intelligencePacks.Add(new PSIntelligencePack(ip.Name, ip.Enabled)));`
	`265`	`+ listResponse.IntelligencePacks.ForEach(ip => intelligencePacks.Add(new PSIntelligencePack(ip.Name, ip.Enabled)));`
`266`	`266`	`}`
`267`	`267`
`268`	`268`	`return intelligencePacks;`
`@@ -272,12 +272,12 @@ public virtual PSIntelligencePack SetIntelligencePack(string resourceGroupName,`
`272`	`272`	`{`
`273`	`273`	`if (enabled)`
`274`	`274`	`{`
`275`		`- OperationalInsightsManagementClient.Workspaces.EnableIntelligencePackAsync(resourceGroupName, workspaceName, intelligencePackName);`
	`275`	`+ OperationalInsightsManagementClient.Workspaces.EnableIntelligencePack(resourceGroupName, workspaceName, intelligencePackName);`
`276`	`276`	`return new PSIntelligencePack(intelligencePackName, enabled); ;`
`277`	`277`	`}`
`278`	`278`	`else`
`279`	`279`	`{`
`280`		`- OperationalInsightsManagementClient.Workspaces.DisableIntelligencePackAsync(resourceGroupName, workspaceName, intelligencePackName);`
	`280`	`+ OperationalInsightsManagementClient.Workspaces.DisableIntelligencePack(resourceGroupName, workspaceName, intelligencePackName);`
`281`	`281`	`return new PSIntelligencePack(intelligencePackName, enabled);`
`282`	`282`	`}`
`283`	`283`	`}`