Skip to content

Powershell changes for following changes #513

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.

Sign up for GitHub

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
markcowl merged 3 commits into from
Jun 19, 2015
Merged

Powershell changes for following changes #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a903c1
Powershell changes for following changes:
Jun 17, 2015
5637838
Modified ChangeLog for redis
Jun 19, 2015
9a12a58
ChangeLog.txt code review comment fixed
Jun 19, 2015
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.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
* Added Batch cmdlets
* Start-AzureBatchPoolResize
* Stop-AzureBatchPoolResize
* RedisCache cmdlets
* Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
* New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513

2015.06.05 version 0.9.3
* Fixed bug in Websites cmdlets related to slots #454
Expand Down
7 changes: 2 additions & 5 deletions src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<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">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.0.14.0-preview\lib\net40\Microsoft.Azure.Management.Redis.dll</HintPath>
<Reference Include="Microsoft.Azure.Management.Redis, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.1.0.0-preview\lib\net40\Microsoft.Azure.Management.Redis.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down Expand Up @@ -162,9 +162,6 @@
<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>
Expand Down
7 changes: 0 additions & 7 deletions src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,6 @@ public void TestSetNonExistingRedisCacheTest()
RunPowerShellTest("Test-SetNonExistingRedisCacheTest");
}

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

[Fact]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void TestRedisCachePipeline()
Expand Down
32 changes: 8 additions & 24 deletions src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function Test-RedisCache
}

# Updating Cache
$cacheUpdated = Set-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -MaxMemoryPolicy AllKeysLRU -EnableNonSslPort $false
$cacheUpdated = Set-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -RedisConfiguration @{"maxmemory-policy" = "allkeys-lru"} -EnableNonSslPort $true

Assert-AreEqual $cacheName $cacheUpdated.Name
Assert-AreEqual $location $cacheUpdated.Location
Expand All @@ -65,8 +65,8 @@ function Test-RedisCache
Assert-AreEqual "2.8" $cacheUpdated.RedisVersion
Assert-AreEqual "250MB" $cacheUpdated.Size
Assert-AreEqual "Basic" $cacheUpdated.Sku
Assert-AreEqual "AllKeysLRU" $cacheUpdated.MaxMemoryPolicy.Replace("-", "")
Assert-False { $cacheUpdated.EnableNonSslPort }
Assert-AreEqual "allkeys-lru" $cacheUpdated.RedisConfiguration.Item("maxmemory-policy")
Assert-True { $cacheUpdated.EnableNonSslPort }

Assert-NotNull $cacheUpdated.PrimaryKey "PrimaryKey do not exists"
Assert-NotNull $cacheUpdated.SecondaryKey "SecondaryKey do not exists"
Expand Down Expand Up @@ -153,22 +153,6 @@ function Test-SetNonExistingRedisCacheTest
Assert-Throws {Set-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -MaxMemoryPolicy AllKeysLRU}
}

<#
.SYNOPSIS
Tests creating redis cache that already exists.
#>
function Test-CreateExistingRedisCacheTest
{
# Setup
# resource group should exists
$resourceGroupName = "MyResourceGroup"
$cacheName = "myportalcache"
$location = "North Central US"

# Creating Cache
Assert-ThrowsContains {New-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -Location $location -Size 250MB -Sku Standard} "already exists"
}

<#
.SYNOPSIS
Tests redis cache.
Expand All @@ -182,7 +166,7 @@ function Test-RedisCachePipeline
$location = "North Central US"

# Creating Cache
$cacheCreated = New-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -Location $location -Size 250MB -Sku Basic -EnableNonSslPort $false
$cacheCreated = New-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -Location $location -Size 250MB -Sku Basic -EnableNonSslPort $true

Assert-AreEqual $cacheName $cacheCreated.Name
Assert-AreEqual $location $cacheCreated.Location
Expand All @@ -195,7 +179,7 @@ function Test-RedisCachePipeline
Assert-AreEqual "2.8" $cacheCreated.RedisVersion
Assert-AreEqual "250MB" $cacheCreated.Size
Assert-AreEqual "Basic" $cacheCreated.Sku
Assert-False { $cacheCreated.EnableNonSslPort }
Assert-True { $cacheCreated.EnableNonSslPort }

Assert-NotNull $cacheCreated.PrimaryKey "PrimaryKey do not exists"
Assert-NotNull $cacheCreated.SecondaryKey "SecondaryKey do not exists"
Expand Down Expand Up @@ -224,7 +208,7 @@ function Test-RedisCachePipeline
}

# Updating Cache using pipeline
Get-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName | Set-AzureRedisCache -MaxMemoryPolicy AllKeysRandom -EnableNonSslPort $true
Get-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName | Set-AzureRedisCache -RedisConfiguration @{"maxmemory-policy" = "allkeys-random"} -EnableNonSslPort $false
$cacheUpdatedPiped = Get-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName

Assert-AreEqual $cacheName $cacheUpdatedPiped.Name
Expand All @@ -238,8 +222,8 @@ function Test-RedisCachePipeline
Assert-AreEqual "2.8" $cacheUpdatedPiped.RedisVersion
Assert-AreEqual "250MB" $cacheUpdatedPiped.Size
Assert-AreEqual "Basic" $cacheUpdatedPiped.Sku
Assert-AreEqual "AllKeysRandom" $cacheUpdatedPiped.MaxMemoryPolicy.Replace("-", "")
Assert-True { $cacheUpdatedPiped.EnableNonSslPort }
Assert-AreEqual "allkeys-random" $cacheUpdatedPiped.RedisConfiguration.Item("maxmemory-policy")
Assert-False { $cacheUpdatedPiped.EnableNonSslPort }

# Get cache keys
$cacheKeysBeforeUpdate = Get-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName | Get-AzureRedisCacheKey
Expand Down
Loading