Migrate RedisCache project

ogail · ogail · commit 29bfcdf6dcf7 · 2015-09-09T11:29:25.000-07:00
diff --git a/src/ResourceManager.sln b/src/ResourceManager.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}"
 	ProjectSection(SolutionItems) = preProject
@@ -103,6 +103,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network.Test", "Re
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Compute.Test", "ResourceManager\Compute\Commands.Compute.Test\Commands.Compute.Test.csproj", "{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsights.Test", "ResourceManager\OperationalInsights\Commands.OperationalInsights.Test\Commands.OperationalInsights.Test.csproj", "{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RedisCache.Test", "ResourceManager\RedisCache\Commands.RedisCache.Test\Commands.RedisCache.Test.csproj", "{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -293,6 +297,14 @@ Global
 		{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -313,5 +325,7 @@ Global
 		{7D1D3B56-4EB4-4819-86FD-43330DED8EE7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{A2DF4FE5-46EE-43E2-B246-E5CDDD47B752} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{4AE5705F-62CF-461D-B72E-DD9DCD9B3609} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 EndGlobal
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj
@@ -148,14 +148,14 @@
     <Compile Include="ScenarioTests\RedisCacheTests.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
+      <Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
+      <Name>Commands.ResourceManager.Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
       <Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>
       <Name>Commands.ScenarioTests.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
-      <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
-      <Name>Commands.Common</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Commands.RedisCache\Commands.RedisCache.csproj">
       <Project>{c972e3ef-4461-4758-ba31-93e0947b1253}</Project>
       <Name>Commands.RedisCache</Name>
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs
@@ -20,8 +20,9 @@ namespace Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests
     using Microsoft.Azure.Test;
     using Microsoft.Azure.Management.Redis;
     using Microsoft.Azure.Common.Authentication;
+    using WindowsAzure.Commands.Test.Utilities.Common;
 
-    public abstract class RedisCacheTestsBase : IDisposable
+    public abstract class RedisCacheTestsBase : RMTestBase, IDisposable
     {
         private EnvironmentSetupHelper helper;
 
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj
@@ -161,9 +161,9 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
-      <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
-      <Name>Commands.Common</Name>
+    <ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
+      <Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
+      <Name>Commands.ResourceManager.Common</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/GetAzureRedisCache.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/GetAzureRedisCache.cs
@@ -33,7 +33,7 @@ public class GetAzureRedisCache : RedisCacheCmdletBase
         [Parameter(ParameterSetName = RedisCacheParameterSetName, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of redis cache.")]
         public string Name { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ProcessRecord()
         {
             if (!string.IsNullOrEmpty(ResourceGroupName) && !string.IsNullOrEmpty(Name))
             {
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/GetAzureRedisCacheKey.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/GetAzureRedisCacheKey.cs
@@ -28,7 +28,7 @@ public class GetAzureRedisCacheKey : RedisCacheCmdletBase
         [ValidateNotNullOrEmpty]
         public string Name { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ProcessRecord()
         {
             RedisListKeysResponse keysResponse = CacheClient.GetAccessKeys(ResourceGroupName, Name);
             WriteObject(new RedisAccessKeys() {
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCache.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCache.cs
@@ -58,7 +58,7 @@ public class NewAzureRedisCache : RedisCacheCmdletBase
 
         private const string redisDefaultVersion = "2.8";
 
-        public override void ExecuteCmdlet()
+        protected override void ProcessRecord()
         {
             string skuFamily;
 
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCacheKey.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/NewAzureRedisCacheKey.cs
@@ -37,7 +37,7 @@ public class NewAzureRedisCacheKey : RedisCacheCmdletBase
         [Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ProcessRecord()
         {
             RedisKeyType keyTypeToRegenerated = RedisKeyType.Primary;
             if (KeyType.Equals("Secondary"))
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/RemoveAzureRedisCache.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/RemoveAzureRedisCache.cs
@@ -34,7 +34,7 @@ public class RemoveAzureRedisCache : RedisCacheCmdletBase
         [Parameter(Mandatory = false)]
         public SwitchParameter PassThru { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ProcessRecord()
         {
             if (!Force.IsPresent)
             {
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/SetAzureRedisCache.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands/SetAzureRedisCache.cs
@@ -48,7 +48,7 @@ public class SetAzureRedisCache : RedisCacheCmdletBase
         [Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "EnableNonSslPort property of redis cache.")]
         public bool? EnableNonSslPort { get; set; }
 
-        public override void ExecuteCmdlet()
+        protected override void ProcessRecord()
         {
             RedisGetResponse response = CacheClient.GetCache(ResourceGroupName, Name);
 
diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheCmdletBase.cs b/src/ResourceManager/RedisCache/Commands.RedisCache/Models/RedisCacheCmdletBase.cs
@@ -14,12 +14,13 @@
 
 namespace Microsoft.Azure.Commands.RedisCache
 {
+    using ResourceManager.Common;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
     /// <summary>
     /// The base class for all Microsoft Azure Redis Cache Management Cmdlets
     /// </summary>
-    public abstract class RedisCacheCmdletBase : AzureSMCmdlet
+    public abstract class RedisCacheCmdletBase : AzureRMCmdlet
     {
         private RedisCacheClient cacheClient;
 

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,9 @@ namespace Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests`
`20`	`20`	`using Microsoft.Azure.Test;`
`21`	`21`	`using Microsoft.Azure.Management.Redis;`
`22`	`22`	`using Microsoft.Azure.Common.Authentication;`
	`23`	`+ using WindowsAzure.Commands.Test.Utilities.Common;`
`23`	`24`
`24`		`- public abstract class RedisCacheTestsBase : IDisposable`
	`25`	`+ public abstract class RedisCacheTestsBase : RMTestBase, IDisposable`
`25`	`26`	`{`
`26`	`27`	`private EnvironmentSetupHelper helper;`
`27`	`28`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class GetAzureRedisCache : RedisCacheCmdletBase`
`33`	`33`	`[Parameter(ParameterSetName = RedisCacheParameterSetName, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Name of redis cache.")]`
`34`	`34`	`public string Name { get; set; }`
`35`	`35`
`36`		`- public override void ExecuteCmdlet()`
	`36`	`+ protected override void ProcessRecord()`
`37`	`37`	`{`
`38`	`38`	`if (!string.IsNullOrEmpty(ResourceGroupName) && !string.IsNullOrEmpty(Name))`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class GetAzureRedisCacheKey : RedisCacheCmdletBase`
`28`	`28`	`[ValidateNotNullOrEmpty]`
`29`	`29`	`public string Name { get; set; }`
`30`	`30`
`31`		`- public override void ExecuteCmdlet()`
	`31`	`+ protected override void ProcessRecord()`
`32`	`32`	`{`
`33`	`33`	`RedisListKeysResponse keysResponse = CacheClient.GetAccessKeys(ResourceGroupName, Name);`
`34`	`34`	`WriteObject(new RedisAccessKeys() {`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ public class NewAzureRedisCache : RedisCacheCmdletBase`
`58`	`58`
`59`	`59`	`private const string redisDefaultVersion = "2.8";`
`60`	`60`
`61`		`- public override void ExecuteCmdlet()`
	`61`	`+ protected override void ProcessRecord()`
`62`	`62`	`{`
`63`	`63`	`string skuFamily;`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ public class NewAzureRedisCacheKey : RedisCacheCmdletBase`
`37`	`37`	`[Parameter(Mandatory = false, HelpMessage = "Do not ask for confirmation.")]`
`38`	`38`	`public SwitchParameter Force { get; set; }`
`39`	`39`
`40`		`- public override void ExecuteCmdlet()`
	`40`	`+ protected override void ProcessRecord()`
`41`	`41`	`{`
`42`	`42`	`RedisKeyType keyTypeToRegenerated = RedisKeyType.Primary;`
`43`	`43`	`if (KeyType.Equals("Secondary"))`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class RemoveAzureRedisCache : RedisCacheCmdletBase`
`34`	`34`	`[Parameter(Mandatory = false)]`
`35`	`35`	`public SwitchParameter PassThru { get; set; }`
`36`	`36`
`37`		`- public override void ExecuteCmdlet()`
	`37`	`+ protected override void ProcessRecord()`
`38`	`38`	`{`
`39`	`39`	`if (!Force.IsPresent)`
`40`	`40`	`{`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public class SetAzureRedisCache : RedisCacheCmdletBase`
`48`	`48`	`[Parameter(ValueFromPipelineByPropertyName = true, Mandatory = false, HelpMessage = "EnableNonSslPort property of redis cache.")]`
`49`	`49`	`public bool? EnableNonSslPort { get; set; }`
`50`	`50`
`51`		`- public override void ExecuteCmdlet()`
	`51`	`+ protected override void ProcessRecord()`
`52`	`52`	`{`
`53`	`53`	`RedisGetResponse response = CacheClient.GetCache(ResourceGroupName, Name);`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -14,12 +14,13 @@`
`14`	`14`
`15`	`15`	`namespace Microsoft.Azure.Commands.RedisCache`
`16`	`16`	`{`
	`17`	`+ using ResourceManager.Common;`
`17`	`18`	`using Microsoft.WindowsAzure.Commands.Utilities.Common;`
`18`	`19`
`19`	`20`	`/// <summary>`
`20`	`21`	`/// The base class for all Microsoft Azure Redis Cache Management Cmdlets`
`21`	`22`	`/// </summary>`
`22`		`- public abstract class RedisCacheCmdletBase : AzureSMCmdlet`
	`23`	`+ public abstract class RedisCacheCmdletBase : AzureRMCmdlet`
`23`	`24`	`{`
`24`	`25`	`private RedisCacheClient cacheClient;`
`25`	`26`