Skip to content

Added new cmdlets for Diagnostics #1434

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Dec 22, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
* Azure Redis Cache: new cmdlets for enabling and disabling diagnostics
* Set-AzureRmRedisCacheDiagnostics
* Remove-AzureRmRedisCacheDiagnostics
## 2015.12.14 version 1.0.2
* Azure Compute (ARM):
* Enable BGInfo extension by default
Expand Down
28 changes: 28 additions & 0 deletions setup/azurecmdfiles.wxi
Original file line number Diff line number Diff line change
Expand Up @@ -1817,12 +1817,24 @@
<Component Id="cmpDB48760E05625FA4A872912DADB76AE8" Guid="*">
<File Id="fil60FDC0D18C9BF51BDE5B8D50240CC229" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.Common.NetFramework.dll" />
</Component>
<Component Id="cmpE542A66FF253AB7ECF153BC7F8617497" Guid="*">
<File Id="fil076A3639A8C23CB436A1A95F071AB968" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.Insights.dll" />
</Component>
<Component Id="cmp3A5E7F3EA44ACFDD84B8CE1D36DA80C7" Guid="*">
<File Id="fil9B815D18A217668B9C3F30A088551FEE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.Management.Redis.dll" />
</Component>
<Component Id="cmpB77BD825E0EE360848A0E312174B8E79" Guid="*">
<File Id="filC946540561EFB51E32A9A78C9A4C4E4E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Azure.ResourceManager.dll" />
</Component>
<Component Id="cmpB1AB5620182396F5055594CB5B71DFF5" Guid="*">
<File Id="fil927418DCA437A44F331156F1B181B0CB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Data.Edm.dll" />
</Component>
<Component Id="cmpF3A6E2A588E2828B1141B2B4F2DEE2CA" Guid="*">
<File Id="fil6885A1C5198BBE4BE218B29F4AF8CD4F" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Data.OData.dll" />
</Component>
<Component Id="cmpDFF1A711321C50653141E2AE4BB76806" Guid="*">
<File Id="filF25C5E7B600CD1857B7B71EF4B86B617" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.Data.Services.Client.dll" />
</Component>
<Component Id="cmpD5D6E28B9232D19A4D3FC543B56214DB" Guid="*">
<File Id="filA67517D2439E43C4974AAF323963F31C" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.IdentityModel.Clients.ActiveDirectory.dll" />
</Component>
Expand All @@ -1847,9 +1859,15 @@
<Component Id="cmpBF4F488538112494F0A0EC9CF8CCD0B4" Guid="*">
<File Id="fil3FED2453D2E82E73974E11458353961E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.WindowsAzure.Commands.Common.dll" />
</Component>
<Component Id="cmpD9FF11D5CD2979DD0DA06D22A9CFC352" Guid="*">
<File Id="filBE19BD3615AFCF7906F6C714C2564D63" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.WindowsAzure.Configuration.dll" />
</Component>
<Component Id="cmpA3F0584F49B26E431792BDDA23CA5844" Guid="*">
<File Id="filE0B28C51A17B5758F64068F08B6EE7F7" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.WindowsAzure.Management.dll" />
</Component>
<Component Id="cmp5D9B9CA7570E8D2EB671AA2197A22A52" Guid="*">
<File Id="fil315EBA6955167FF42135413C69608424" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Microsoft.WindowsAzure.Storage.dll" />
</Component>
<Component Id="cmpA29B2E41943B2D8BB993F59ADA816E87" Guid="*">
<File Id="fil270FECD6ED1DADB4F9730F763969841A" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\Newtonsoft.Json.dll" />
</Component>
Expand All @@ -1859,6 +1877,9 @@
<Component Id="cmpC71AD037C10F73FFA59A6255D98190D4" Guid="*">
<File Id="filED0BBA70A2560C98E0554C93CEB81B0B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\System.Net.Http.Primitives.dll" />
</Component>
<Component Id="cmp52C57B0899D353B0A0560BB9EE958B68" Guid="*">
<File Id="fil593DDDA285E20B8837098A7387A09B84" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RedisCache\System.Spatial.dll" />
</Component>
</Directory>
<Directory Id="dir5A96CDDC32336B058D325B4B67756080" Name="AzureRM.Resources">
<Component Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" Guid="*">
Expand Down Expand Up @@ -5376,8 +5397,12 @@
<ComponentRef Id="cmp90E147CA930F23090C5880CEF5A26B82" />
<ComponentRef Id="cmp805E82D161288ED9EE4AD5A6CDA1D594" />
<ComponentRef Id="cmpDB48760E05625FA4A872912DADB76AE8" />
<ComponentRef Id="cmpE542A66FF253AB7ECF153BC7F8617497" />
<ComponentRef Id="cmp3A5E7F3EA44ACFDD84B8CE1D36DA80C7" />
<ComponentRef Id="cmpB77BD825E0EE360848A0E312174B8E79" />
<ComponentRef Id="cmpB1AB5620182396F5055594CB5B71DFF5" />
<ComponentRef Id="cmpF3A6E2A588E2828B1141B2B4F2DEE2CA" />
<ComponentRef Id="cmpDFF1A711321C50653141E2AE4BB76806" />
<ComponentRef Id="cmpD5D6E28B9232D19A4D3FC543B56214DB" />
<ComponentRef Id="cmp6DCD11F46E1DCE998C423CD0BC09CD15" />
<ComponentRef Id="cmp97DCE18753534AD69AF7E7D8D9E44502" />
Expand All @@ -5386,10 +5411,13 @@
<ComponentRef Id="cmp1BF396A297DE4BB9EFCE53AA38D5EF41" />
<ComponentRef Id="cmpCD22DDF0DFFCD87EFE8CB3AEAD7B2D10" />
<ComponentRef Id="cmpBF4F488538112494F0A0EC9CF8CCD0B4" />
<ComponentRef Id="cmpD9FF11D5CD2979DD0DA06D22A9CFC352" />
<ComponentRef Id="cmpA3F0584F49B26E431792BDDA23CA5844" />
<ComponentRef Id="cmp5D9B9CA7570E8D2EB671AA2197A22A52" />
<ComponentRef Id="cmpA29B2E41943B2D8BB993F59ADA816E87" />
<ComponentRef Id="cmp4E9B33C40EDE71B61567265DDE41AA40" />
<ComponentRef Id="cmpC71AD037C10F73FFA59A6255D98190D4" />
<ComponentRef Id="cmp52C57B0899D353B0A0560BB9EE958B68" />
<ComponentRef Id="cmp4DDC11D6580AB2CC03CADEDD62194BDA" />
<ComponentRef Id="cmpE3F8AFED4B05B18FC4A7CAB87B1CB417" />
<ComponentRef Id="cmpB3DCE82FE478526DDF1700692DBA9623" />
Expand Down
4 changes: 2 additions & 2 deletions src/ResourceManager/RedisCache/AzureRM.RedisCache.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
@{

# Version number of this module.
ModuleVersion = '1.0.2'
ModuleVersion = '1.1.0'

# ID used to uniquely identify this module
GUID = '820628d7-6938-488a-8760-43373a5ffce6'
Expand Down Expand Up @@ -45,7 +45,7 @@ CLRVersion='4.0'
ProcessorArchitecture = 'None'

# Modules that must be imported into the global environment prior to importing this module
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.2'})
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.1.0'})

# Assemblies that must be loaded prior to importing this module
RequiredAssemblies = @()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,12 @@
<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.Redis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.1.1.0-preview\lib\net40\Microsoft.Azure.Management.Redis.dll</HintPath>
<Reference Include="Microsoft.Azure.Insights, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Insights.0.9.1-preview\lib\net45\Microsoft.Azure.Insights.dll</HintPath>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Make sure this is updated for all libraries using Insights. This will also require a wix file update

<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.Management.Redis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.1.2.0-preview\lib\net40\Microsoft.Azure.Management.Redis.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand All @@ -72,6 +76,18 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Test.HttpRecorder.1.0.5799.28345-prerelease\lib\net45\Microsoft.Azure.Test.HttpRecorder.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These new files will require a wix file update

<HintPath>..\..\..\packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Data.OData, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Data.Services.Client, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
Expand Down Expand Up @@ -100,9 +116,17 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Configuration, Version=1.8.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.ConfigurationManager.1.8.0.0\lib\net35-full\Microsoft.WindowsAzure.Configuration.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Moq, Version=4.2.1402.2112, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Moq.4.2.1402.2112\lib\net40\Moq.dll</HintPath>
Expand All @@ -128,6 +152,10 @@
<HintPath>..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Spatial, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -171,19 +199,19 @@
<None Include="ScenarioTests\RedisCacheTests.ps1">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestCreateExistingRedisCacheTest.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCache.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCacheClustering.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCacheParameterDeprecated.json">
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCachePipeline.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCachePipeline.json">
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRemoveAzureRedisCacheDiagnostics.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestSetAzureRedisCacheDiagnostics.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestSetNonExistingRedisCacheTest.json">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,19 @@ public void TestRedisCacheClustering()
{
RunPowerShellTest("Test-RedisCacheClustering");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestSetAzureRedisCacheDiagnostics()
{
RunPowerShellTest("Test-SetAzureRedisCacheDiagnostics");
}

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestRemoveAzureRedisCacheDiagnostics()
{
RunPowerShellTest("Test-RemoveAzureRedisCacheDiagnostics");
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ function Test-RedisCache
{
# Setup
# resource group should exists
$resourceGroupName = "MyResourceGroup"
$resourceGroupName = "SunnyAAPT6"
$cacheName = "powershelltest"
$location = "North Central US"

Expand Down Expand Up @@ -145,7 +145,7 @@ function Test-SetNonExistingRedisCacheTest
{
# Setup
# resource group should exists
$resourceGroupName = "MyResourceGroup"
$resourceGroupName = "SunnyAAPT6"
$cacheName = "NonExistingRedisCache"
$location = "North Central US"

Expand All @@ -161,7 +161,7 @@ function Test-RedisCachePipeline
{
# Setup
# resource group should exists
$resourceGroupName = "MyResourceGroup"
$resourceGroupName = "SunnyAAPT6"
$cacheName = "powershelltestpipe"
$location = "North Central US"

Expand Down Expand Up @@ -247,7 +247,7 @@ function Test-SetRedisCacheBugFixTest
{
# Setup
# resource group should exists
$resourceGroupName = "siddharth"
$resourceGroupName = "SunnyAAPT6"
$cacheName = "siddharthchatrola"
$location = "North Central US"

Expand Down Expand Up @@ -284,7 +284,7 @@ function Test-RedisCacheClustering
{
# Setup
# resource group should exists
$resourceGroupName = "MyResourceGroup"
$resourceGroupName = "SunnyAAPT6"
$cacheName = "powershellcluster"
$location = "East US"

Expand Down Expand Up @@ -393,4 +393,34 @@ function Test-RedisCacheClustering

# Delete cache
Assert-True {Remove-AzureRmRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -Force -PassThru} "Remove cache failed."
}

<#
.SYNOPSIS
Tests SetAzureRedisCacheDiagnostics
#>
function Test-SetAzureRedisCacheDiagnostics
{
# Setup
# resource group should exists
$resourceGroupName = "SunnyAAPT6"
$cacheName = "sunnycache"

# Set Diagnostics
Set-AzureRmRedisCacheDiagnostics -ResourceGroupName $resourceGroupName -Name $cacheName -StorageAccountId "/subscriptions/f8f8f139-2fd5-4d86-afca-21f21f35806e/resourceGroups/SunnyAAPT6/providers/Microsoft.ClassicStorage/storageAccounts/sunnystoragenew"
}

<#
.SYNOPSIS
Tests RemoveAzureRedisCacheDiagnostics
#>
function Test-RemoveAzureRedisCacheDiagnostics
{
# Setup
# resource group should exists
$resourceGroupName = "SunnyAAPT6"
$cacheName = "sunnycache"

# Set Diagnostics
Remove-AzureRmRedisCacheDiagnostics -ResourceGroupName $resourceGroupName -Name $cacheName -Force
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ namespace Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests
using Microsoft.Azure.Management.Redis;
using Microsoft.Azure.Common.Authentication;
using WindowsAzure.Commands.Test.Utilities.Common;
using Microsoft.Azure.Management.Insights;
using Microsoft.Azure.Management.Internal.Resources;

public abstract class RedisCacheTestsBase : RMTestBase, IDisposable
{
Expand All @@ -32,8 +34,11 @@ protected RedisCacheTestsBase()

protected void SetupManagementClients()
{
var redisManagementClient = GetRedisManagementClient();
helper.SetupManagementClients(redisManagementClient);
object[] managementClients = new object[3];
managementClients[0] = GetRedisManagementClient();
managementClients[1] = GetInsightsManagementClient();
managementClients[2] = GetResourceManagementClient();
helper.SetupManagementClients(managementClients);
}

protected void RunPowerShellTest(params string[] scripts)
Expand All @@ -59,6 +64,16 @@ protected RedisManagementClient GetRedisManagementClient()
return TestBase.GetServiceClient<RedisManagementClient>(new CSMTestEnvironmentFactory());
}

protected InsightsManagementClient GetInsightsManagementClient()
{
return TestBase.GetServiceClient<InsightsManagementClient>(new CSMTestEnvironmentFactory());
}

protected ResourceManagementClient GetResourceManagementClient()
{
return TestBase.GetServiceClient<ResourceManagementClient>(new CSMTestEnvironmentFactory());
}

public void Dispose()
{
}
Expand Down
Loading