Merge pull request Azure#579 from Azure/dev

huangpf PR: dev <- Azure:dev

Author: huangpf

ChangeLog.md

@@ -1,4 +1,9 @@
-##2016.07.11 version 1.6.0
+* Azure Redis Cache
+  * New cmdlet added for New-AzureRmRedisCacheScheduleEntry 
+  * New cmdlet added for New-AzureRmRedisCachePatchSchedule 
+  * New cmdlet added for Get-AzureRmRedisCachePatchSchedule
+  * New cmdlet added for Remove-AzureRmRedisCachePatchSchedule
+##2016.07.11 version 1.6.0
 * **Behavioral change for -Force, –Confirm and $ConfirmPreference parameters for all cmdlets. We are changing this implementation to be in line with PowerShell guidelines. For most cmdlets, this means removing the Force parameter and to skip the ShouldProcess prompt, users will need to include the parameter: ‘-Confirm:$false’ in their PowerShell scripts.** This changes are addressing following issues:
   * Correct implementation of –WhatIf functionality, allowing a user to determine the effects of a cmdlet or script without making any actual changes
   * Control over prompting using a session-wide $ConfirmPreference, so that the user is prompted based on the impact of a prospective change (as reported in the ConfirmImpact setting in the cmdlet)

src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj

@@ -329,9 +329,6 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchAccountTests\TestCreateAndRemoveBatchAccountViaPiping.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchAccountTests\TestCreateExistingBatchAccount.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchAccountTests\TestCreatesNewBatchAccount.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.cs

@@ -35,12 +35,6 @@ public void TestCreatesNewBatchAccount()
             BatchController.NewInstance.RunPsTest("Test-CreatesNewBatchAccount");
         }
 
-        [Fact]
-        public void TestCreateExistingBatchAccount()
-        {
-            BatchController.NewInstance.RunPsTest("Test-CreateExistingBatchAccount");
-        }
-
         [Fact]
         public void TestUpdatesExistingBatchAccount()
         {

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.ps1

@@ -57,33 +57,6 @@ function Test-CreatesNewBatchAccount
     }
 }
 
-<#
-.SYNOPSIS
-Tests creating an account that already exists throws
-#>
-function Test-CreateExistingBatchAccount
-{
-    # Setup
-    $account = Get-BatchAccountName
-    $resourceGroup = Get-ResourceGroupName
-    $location = Get-BatchAccountProviderLocation
-
-    try 
-    {
-        New-AzureRmResourceGroup -Name $resourceGroup -Location $location
-
-        # Test
-        New-AzureRmBatchAccount -Name $account -ResourceGroupName $resourceGroup -Location $location -Tag @{Name = "testtag"; Value = "testval"} 
-
-        Assert-Throws { New-AzureRmBatchAccount -Name $account -ResourceGroupName $resourceGroup -Location $location }
-    }
-    finally
-    {
-        # Cleanup
-        Clean-BatchAccountAndResourceGroup $account $resourceGroup
-    }
-}
-
 <#
 .SYNOPSIS
 Tests updating existing Batch account

src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchAccountTests/TestCreateExistingBatchAccount.json

@@ -40,13 +40,6 @@ public partial class BatchClient
         /// <returns>A BatchAccountContext object representing the new account</returns>
         public virtual BatchAccountContext CreateAccount(string resourceGroupName, string accountName, string location, Hashtable[] tags, string autoStorageAccountId)
         {
-            // use the group lookup to validate whether account already exists. We don't care about the returned
-            // group name nor the exception
-            if (GetGroupForAccountNoThrow(accountName) != null)
-            {
-                throw new CloudException(Resources.AccountAlreadyExists);
-            }
-
             Dictionary<string, string> tagDictionary = Helpers.CreateTagDictionary(tags, validate: true);
 
             AutoStorageBaseProperties autoStorage = (string.IsNullOrEmpty(autoStorageAccountId)) ? null : new AutoStorageBaseProperties

src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Accounts.cs

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -117,9 +117,6 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="AccountAlreadyExists" xml:space="preserve">
-    <value>AccountAlreadyExists: Account already exists.</value>
-  </data>
   <data name="AccountAndKeyInUse" xml:space="preserve">
     <value>Executing cmdlet with Batch account {0} with its {1} key. To change which key to use, set the KeyInUse property on the BatchAccountContext.</value>
   </data>

src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.Designer.cs

@@ -233,6 +233,9 @@
     <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\TestRedisCachePatchSchedules.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCachePipeline.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.resx

@@ -103,5 +103,12 @@ public void TestImportAzureRmRedisCache()
         {
             RedisCacheController.NewInstance.RunPowerShellTest("Test-ImportAzureRmRedisCache");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRedisCachePatchSchedules()
+        {
+            RedisCacheController.NewInstance.RunPowerShellTest("Test-RedisCachePatchSchedules");
+        }
     }
 }

src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj

@@ -463,6 +463,63 @@ function Test-ImportAzureRmRedisCache
     Import-AzureRmRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -Files $files -Force
 }
 
+<#
+.SYNOPSIS
+Tests schedule patching
+#>
+function Test-RedisCachePatchSchedules
+{
+    $resourceGroupName = "SiddharthsSub"
+    $cacheName = "sunny-premium"
+    
+    $weekend = New-AzureRmRedisCacheScheduleEntry -DayOfWeek "Weekend" -StartHourUtc 2 -MaintenanceWindow "06:00:00"
+    $thursday = New-AzureRmRedisCacheScheduleEntry -DayOfWeek "Thursday" -StartHourUtc 10 -MaintenanceWindow "09:00:00"
+
+    $createResult = New-AzureRmRedisCachePatchSchedule -ResourceGroupName $resourceGroupName -Name $cacheName -Entries @($weekend, $thursday)
+    Assert-True {$createResult.Count -eq 3}
+    foreach ($scheduleEntry in $createResult)
+    {
+        if($scheduleEntry.DayOfWeek -eq "Thursday")
+        {
+            Assert-AreEqual 10 $scheduleEntry.StartHourUtc
+            Assert-AreEqual "09:00:00" $scheduleEntry.MaintenanceWindow
+        } 
+        elseif($scheduleEntry.DayOfWeek -eq "Saturday" -or $scheduleEntry.DayOfWeek -eq "Sunday")
+        {
+            Assert-AreEqual 2 $scheduleEntry.StartHourUtc
+            Assert-AreEqual "06:00:00" $scheduleEntry.MaintenanceWindow
+        }
+        else
+        {
+            Assert-True $false "Unknown DayOfWeek."
+        }
+    }
+
+    $getResult = Get-AzureRmRedisCachePatchSchedule -ResourceGroupName $resourceGroupName -Name $cacheName
+    Assert-True {$getResult.Count -eq 3}
+    foreach ($scheduleEntry in $getResult)
+    {
+        if($scheduleEntry.DayOfWeek -eq "Thursday")
+        {
+            Assert-AreEqual 10 $scheduleEntry.StartHourUtc
+            Assert-AreEqual "09:00:00" $scheduleEntry.MaintenanceWindow
+        } 
+        elseif($scheduleEntry.DayOfWeek -eq "Saturday" -or $scheduleEntry.DayOfWeek -eq "Sunday")
+        {
+            Assert-AreEqual 2 $scheduleEntry.StartHourUtc
+            Assert-AreEqual "06:00:00" $scheduleEntry.MaintenanceWindow
+        }
+        else
+        {
+            Assert-True $false "Unknown DayOfWeek."
+        }
+    }
+
+    Remove-AzureRmRedisCachePatchSchedule -ResourceGroupName $resourceGroupName -Name $cacheName
+
+    Assert-ThrowsContains {Get-AzureRmRedisCachePatchSchedule -ResourceGroupName $resourceGroupName -Name $cacheName} "There are no patch schedules found for redis cache 'sunny-premium'"
+}
+
 <#
 .SYNOPSIS
 Sleeps but only during recording.