Merge branch 'dev' of github.com:Azure/azure-powershell into signing

markcowl · markcowl · commit 1bb4db0c3bd5 · 2015-07-14T01:45:08.000-07:00
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,4 +1,6 @@
 ﻿2015.07.16 version 0.9.5
+* Azure RedisCache cmdlets 
+    * Set-AzureRedisCache - Bug fix done in management API that fixes bug here as well
 * Azure Network Resource Provider cmdlets
     * Added Application Gateway cmdlets
         * New-AzureApplicationGateway
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/Security.Cryptography.dll b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/Security.Cryptography.dll
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSBackendAddressPool.cs b/src/ResourceManager/Network/Commands.Network/Models/PSBackendAddressPool.cs
@@ -21,10 +21,13 @@ namespace Microsoft.Azure.Commands.Network.Models
 
     public class PSBackendAddressPool : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public List<PSResourceId> BackendIpConfigurations { get; set; }
 
+        [JsonProperty(Order = 1)]
         public List<PSResourceId> LoadBalancingRules { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
 
         [JsonIgnore]
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSFrontendIpConfiguration.cs b/src/ResourceManager/Network/Commands.Network/Models/PSFrontendIpConfiguration.cs
@@ -21,18 +21,25 @@ namespace Microsoft.Azure.Commands.Network.Models
 
     public class PSFrontendIPConfiguration : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public string PrivateIpAddress { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string PrivateIpAllocationMethod { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId Subnet { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId PublicIpAddress { get; set; }
 
+        [JsonProperty(Order = 1)]
         public List<PSResourceId> InboundNatRules { get; set; }
 
+        [JsonProperty(Order = 1)]
         public List<PSResourceId> LoadBalancingRules { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
 
         [JsonIgnore]
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSInboundNatRule.cs b/src/ResourceManager/Network/Commands.Network/Models/PSInboundNatRule.cs
@@ -19,20 +19,28 @@ namespace Microsoft.Azure.Commands.Network.Models
 
     public class PSInboundNatRule : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public PSResourceId FrontendIPConfiguration { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId BackendIPConfiguration { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string Protocol { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int FrontendPort { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int BackendPort { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int? IdleTimeoutInMinutes { get; set; }
 
+        [JsonProperty(Order = 1)]
         public bool EnableFloatingIP { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
 
         [JsonIgnore]
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSLoadBalancingRule.cs b/src/ResourceManager/Network/Commands.Network/Models/PSLoadBalancingRule.cs
@@ -19,24 +19,34 @@ namespace Microsoft.Azure.Commands.Network.Models
 
     public class PSLoadBalancingRule : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public PSResourceId FrontendIPConfiguration { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId BackendAddressPool { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId Probe { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string Protocol { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int FrontendPort { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int BackendPort { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int? IdleTimeoutInMinutes { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string LoadDistribution { get; set; }
 
+        [JsonProperty(Order = 1)]
         public bool EnableFloatingIP { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
 
         [JsonIgnore]
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSNetworkInterfaceIpConfiguration.cs b/src/ResourceManager/Network/Commands.Network/Models/PSNetworkInterfaceIpConfiguration.cs
@@ -20,18 +20,25 @@ namespace Microsoft.Azure.Commands.Network.Models
 
     public class PSNetworkInterfaceIpConfiguration : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public string PrivateIpAddress { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string PrivateIpAllocationMethod { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId Subnet { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId PublicIpAddress { get; set; }
 
+        [JsonProperty(Order = 1)]
         public List<PSResourceId> LoadBalancerBackendAddressPools { get; set; }
 
+        [JsonProperty(Order = 1)]
         public List<PSResourceId> LoadBalancerInboundNatRules { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
 
         [JsonIgnore]
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSProbe.cs b/src/ResourceManager/Network/Commands.Network/Models/PSProbe.cs
@@ -21,18 +21,25 @@ namespace Microsoft.Azure.Commands.Network.Models
 
     public class PSProbe : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public List<PSResourceId> LoadBalancingRules { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string Protocol { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int Port { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int IntervalInSeconds { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int NumberOfProbes { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string RequestPath { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
 
         [JsonIgnore]
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSRoute.cs b/src/ResourceManager/Network/Commands.Network/Models/PSRoute.cs
@@ -15,14 +15,20 @@
 
 namespace Microsoft.Azure.Commands.Network.Models
 {
+    using Newtonsoft.Json;
+
     public class PSRoute : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public string AddressPrefix { get; set; }
-        
+
+        [JsonProperty(Order = 1)]
         public string NextHopType { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string NextHopIpAddress { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
     }
 }
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSSecurityRule.cs b/src/ResourceManager/Network/Commands.Network/Models/PSSecurityRule.cs
@@ -15,26 +15,38 @@
 
 namespace Microsoft.Azure.Commands.Network.Models
 {
+    using Newtonsoft.Json;
+
     public class PSSecurityRule : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public string Description { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string Protocol { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string SourcePortRange { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string DestinationPortRange { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string SourceAddressPrefix { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string DestinationAddressPrefix { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string Access { get; set; }
 
+        [JsonProperty(Order = 1)]
         public int Priority { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string Direction { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
     }
 }
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSSubnet.cs b/src/ResourceManager/Network/Commands.Network/Models/PSSubnet.cs
@@ -20,14 +20,19 @@ namespace Microsoft.Azure.Commands.Network.Models
 
     public class PSSubnet : PSChildResource
     {
+        [JsonProperty(Order = 1)]
         public string AddressPrefix { get; set; }
 
+        [JsonProperty(Order = 1)]
         public List<PSResourceId> IpConfigurations { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId NetworkSecurityGroup { get; set; }
 
+        [JsonProperty(Order = 1)]
         public PSResourceId RouteTable { get; set; }
 
+        [JsonProperty(Order = 1)]
         public string ProvisioningState { get; set; }
 
         [JsonIgnore]
diff --git a/src/ResourceManager/Network/Commands.Network/NetworkInterface/NewAzureNetworkInterfaceCommand.cs b/src/ResourceManager/Network/Commands.Network/NetworkInterface/NewAzureNetworkInterfaceCommand.cs
@@ -207,18 +207,18 @@ private PSNetworkInterface CreateNetworkInterface()
 
                 if (this.LoadBalancerBackendAddressPool != null)
                 {
+                    this.LoadBalancerBackendAddressPoolId = new List<string>();
                     foreach (var bepool in this.LoadBalancerBackendAddressPool)
                     {
-                        this.LoadBalancerBackendAddressPoolId = new List<string>();
                         this.LoadBalancerBackendAddressPoolId.Add(bepool.Id);
                     }
                 }
 
                 if (this.LoadBalancerInboundNatRule != null)
                 {
+                    this.LoadBalancerInboundNatRuleId = new List<string>();
                     foreach (var natRule in this.LoadBalancerInboundNatRule)
                     {
-                        this.LoadBalancerInboundNatRuleId = new List<string>();
                         this.LoadBalancerInboundNatRuleId.Add(natRule.Id);
                     }
                 }
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj
@@ -56,8 +56,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.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 Include="Microsoft.Azure.Management.Redis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Redis.1.0.1-preview\lib\net40\Microsoft.Azure.Management.Redis.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.1-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
@@ -162,13 +163,16 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCache.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestRedisCachePipeline.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestSetNonExistingRedisCacheTest.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests\TestSetRedisCacheBugFixTest.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTests.cs b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTests.cs
@@ -40,5 +40,12 @@ public void TestRedisCachePipeline()
         {
             RunPowerShellTest("Test-RedisCachePipeline");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSetRedisCacheBugFixTest()
+        {
+            RunPowerShellTest("Test-SetRedisCacheBugFixTest");
+        }
     }
 }
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTests.ps1 b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTests.ps1
@@ -150,7 +150,7 @@ function Test-SetNonExistingRedisCacheTest
     $location = "North Central US"
 	
     # Creating Cache
-    Assert-Throws {Set-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -MaxMemoryPolicy AllKeysLRU}
+    Assert-Throws {Set-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -RedisConfiguration @{"maxmemory-policy" = "allkeys-random"} }
 }
 
 <#
@@ -237,4 +237,25 @@ function Test-RedisCachePipeline
 
     # Delete cache
     Assert-True {Get-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName | Remove-AzureRedisCache -Force -PassThru} "Remove cache failed."
+}
+
+<#
+.SYNOPSIS
+Tests bug fix in set redis cache.
+#>
+function Test-SetRedisCacheBugFixTest
+{
+    # Setup
+    # resource group should exists
+    $resourceGroupName = "Siddharth"
+    $cacheName = "siddharthchatrola"
+    $location = "North Central US"
+	
+	# Updating Cache
+    $cacheUpdated = Set-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -EnableNonSslPort $true
+    Assert-True  { $cacheUpdated.EnableNonSslPort }
+	
+    $cacheUpdated2 = Set-AzureRedisCache -ResourceGroupName $resourceGroupName -Name $cacheName -RedisConfiguration @{"maxmemory-policy" = "allkeys-lru"} 
+	Assert-AreEqual "allkeys-lru" $cacheUpdated2.RedisConfiguration.Item("maxmemory-policy")
+	Assert-True  { $cacheUpdated2.EnableNonSslPort }
 }
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestSetRedisCacheBugFixTest.json b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/SessionRecords/Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests.RedisCacheTests/TestSetRedisCacheBugFixTest.json
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheAttributes.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheAttributes.cs
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheAttributesWithAccessKeys.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheAttributesWithAccessKeys.cs
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config b/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,20 @@`
`15`	`15`
`16`	`16`	`namespace Microsoft.Azure.Commands.Network.Models`
`17`	`17`	`{`
	`18`	`+ using Newtonsoft.Json;`
	`19`	`+`
`18`	`20`	`public class PSRoute : PSChildResource`
`19`	`21`	`{`
	`22`	`+ [JsonProperty(Order = 1)]`
`20`	`23`	`public string AddressPrefix { get; set; }`
`21`		`-`
	`24`	`+`
	`25`	`+ [JsonProperty(Order = 1)]`
`22`	`26`	`public string NextHopType { get; set; }`
`23`	`27`
	`28`	`+ [JsonProperty(Order = 1)]`
`24`	`29`	`public string NextHopIpAddress { get; set; }`
`25`	`30`
	`31`	`+ [JsonProperty(Order = 1)]`
`26`	`32`	`public string ProvisioningState { get; set; }`
`27`	`33`	`}`
`28`	`34`	`}`