Skip to content

Commit c9d7545

Browse files
ogailogail
authored andcommitted
Migrate SiteRecovery project
1 parent 40538ec commit c9d7545

27 files changed

+43
-40
lines changed

src/ResourceManager.sln

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsight
107107
EndProject
108108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RedisCache.Test", "ResourceManager\RedisCache\Commands.RedisCache.Test\Commands.RedisCache.Test.csproj", "{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}"
109109
EndProject
110+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SiteRecovery.Test", "ResourceManager\SiteRecovery\Commands.SiteRecovery.Test\Commands.SiteRecovery.Test.csproj", "{6C7D3D81-37AB-445E-8081-78A1FEC0A773}"
111+
EndProject
110112
Global
111113
GlobalSection(SolutionConfigurationPlatforms) = preSolution
112114
Debug|Any CPU = Debug|Any CPU
@@ -305,6 +307,10 @@ Global
305307
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Debug|Any CPU.Build.0 = Debug|Any CPU
306308
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Release|Any CPU.ActiveCfg = Release|Any CPU
307309
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Release|Any CPU.Build.0 = Release|Any CPU
310+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
311+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Debug|Any CPU.Build.0 = Debug|Any CPU
312+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Release|Any CPU.ActiveCfg = Release|Any CPU
313+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Release|Any CPU.Build.0 = Release|Any CPU
308314
EndGlobalSection
309315
GlobalSection(SolutionProperties) = preSolution
310316
HideSolutionNode = FALSE
@@ -327,5 +333,6 @@ Global
327333
{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
328334
{11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
329335
{4AE5705F-62CF-461D-B72E-DD9DCD9B3609} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
336+
{6C7D3D81-37AB-445E-8081-78A1FEC0A773} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
330337
EndGlobalSection
331338
EndGlobal

src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/Commands.SiteRecovery.Test.csproj

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@
9393
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Scheduler.6.2.0\lib\net40\Microsoft.WindowsAzure.Management.Scheduler.dll</HintPath>
9494
<Private>True</Private>
9595
</Reference>
96-
<Reference Include="Microsoft.WindowsAzure.Testing, Version=1.0.5417.13285, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
97-
<SpecificVersion>False</SpecificVersion>
98-
<HintPath>..\..\..\packages\Hydra.SpecTestSupport.1.0.5417.13285-prerelease\lib\net45\Microsoft.WindowsAzure.Testing.dll</HintPath>
99-
</Reference>
10096
<Reference Include="Newtonsoft.Json">
10197
<HintPath>..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
10298
</Reference>
@@ -162,9 +158,9 @@
162158
</None>
163159
</ItemGroup>
164160
<ItemGroup>
165-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
166-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
167-
<Name>Commands.Common</Name>
161+
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
162+
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
163+
<Name>Commands.ResourceManager.Common</Name>
168164
</ProjectReference>
169165
<ProjectReference Include="..\..\..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj">
170166
<Project>{c1bda476-a5cc-4394-914d-48b0ec31a710}</Project>

src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,11 @@
3030
using Microsoft.WindowsAzure.Commands.Common;
3131
using Microsoft.Azure.Common.Authentication.Models;
3232
using Microsoft.Azure.Common.Authentication;
33+
using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
3334

3435
namespace Microsoft.Azure.Commands.SiteRecovery.Test.ScenarioTests
3536
{
36-
public abstract class SiteRecoveryTestsBase
37+
public abstract class SiteRecoveryTestsBase : RMTestBase
3738
{
3839
private CSMTestEnvironmentFactory armTestFactory;
3940
private EnvironmentSetupHelper helper;

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,6 @@
164164
<Compile Include="Vault\ImportAzureSiteRecoveryVaultSettingsFile.cs" />
165165
<Compile Include="Vault\NewAzureSiteRecoveryVault.cs" />
166166
</ItemGroup>
167-
<ItemGroup>
168-
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
169-
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
170-
<Name>Commands.Common</Name>
171-
</ProjectReference>
172-
</ItemGroup>
173167
<ItemGroup>
174168
<WCFMetadata Include="Service References\" />
175169
</ItemGroup>
@@ -189,6 +183,12 @@
189183
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
190184
</Content>
191185
</ItemGroup>
186+
<ItemGroup>
187+
<ProjectReference Include="..\..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
188+
<Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
189+
<Name>Commands.ResourceManager.Common</Name>
190+
</ProjectReference>
191+
</ItemGroup>
192192
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
193193
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
194194
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/SiteRecoveryCmdletBase.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
using System.Threading;
1919
using System.Xml;
2020
using Hyak.Common;
21+
using Microsoft.Azure.Commands.ResourceManager.Common;
2122
using Microsoft.Azure.Management.RecoveryServices;
2223
using Microsoft.Azure.Management.RecoveryServices.Models;
2324
using Microsoft.Azure.Management.SiteRecovery;
@@ -30,7 +31,7 @@ namespace Microsoft.Azure.Commands.SiteRecovery
3031
/// <summary>
3132
/// The base class for all Windows Azure Recovery Services commands
3233
/// </summary>
33-
public abstract class SiteRecoveryCmdletBase : AzureSMCmdlet
34+
public abstract class SiteRecoveryCmdletBase : AzureRMCmdlet
3435
{
3536
/// <summary>
3637
/// Recovery Services client.

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Job/GetAzureSiteRecoveryJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public class GetAzureSiteRecoveryJob : SiteRecoveryCmdletBase
8585
/// <summary>
8686
/// ProcessRecord of the command.
8787
/// </summary>
88-
public override void ExecuteCmdlet()
88+
protected override void ProcessRecord()
8989
{
9090
try
9191
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Job/ResumeAzureSiteRecoveryJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class ResumeAzureSiteRecoveryJob : SiteRecoveryCmdletBase
5151
/// <summary>
5252
/// ProcessRecord of the command.
5353
/// </summary>
54-
public override void ExecuteCmdlet()
54+
protected override void ProcessRecord()
5555
{
5656
try
5757
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionContainer/GetAzureSiteRecoveryProtectionContainer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class GetAzureSiteRecoveryProtectionContainer : SiteRecoveryCmdletBase
4747
/// <summary>
4848
/// ProcessRecord of the command.
4949
/// </summary>
50-
public override void ExecuteCmdlet()
50+
protected override void ProcessRecord()
5151
{
5252
try
5353
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/GetAzureSiteRecoveryProtectionEntity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public class GetAzureSiteRecoveryProtectionEntity : SiteRecoveryCmdletBase
5656
/// <summary>
5757
/// ProcessRecord of the command.
5858
/// </summary>
59-
public override void ExecuteCmdlet()
59+
protected override void ProcessRecord()
6060
{
6161
try
6262
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/SetAzureSiteRecoveryProtectionEntity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public class SetAzureSiteRecoveryProtectionEntity : SiteRecoveryCmdletBase
9090
/// <summary>
9191
/// ProcessRecord of the command.
9292
/// </summary>
93-
public override void ExecuteCmdlet()
93+
protected override void ProcessRecord()
9494
{
9595
this.targetNameOrId = this.ProtectionEntity.FriendlyName;
9696
this.ConfirmAction(

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/StartAzureSiteRecoveryCommitFailoverJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class StartAzureSiteRecoveryCommitFailoverJob : SiteRecoveryCmdletBase
5858
/// <summary>
5959
/// ProcessRecord of the command.
6060
/// </summary>
61-
public override void ExecuteCmdlet()
61+
protected override void ProcessRecord()
6262
{
6363
try
6464
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/StartAzureSiteRecoveryPlannedFailoverJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class StartAzureSiteRecoveryPlannedFailoverJob : SiteRecoveryCmdletBase
6767
/// <summary>
6868
/// ProcessRecord of the command.
6969
/// </summary>
70-
public override void ExecuteCmdlet()
70+
protected override void ProcessRecord()
7171
{
7272
try
7373
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/StartAzureSiteRecoveryTestFailoverJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class StartAzureSiteRecoveryTestFailoverJob : SiteRecoveryCmdletBase
6060
/// <summary>
6161
/// ProcessRecord of the command.
6262
/// </summary>
63-
public override void ExecuteCmdlet()
63+
protected override void ProcessRecord()
6464
{
6565
try
6666
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/StartAzureSiteRecoveryUnPlannedFailoverJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public class StartAzureSiteRecoveryUnplannedFailoverJob : SiteRecoveryCmdletBase
6767
/// <summary>
6868
/// ProcessRecord of the command.
6969
/// </summary>
70-
public override void ExecuteCmdlet()
70+
protected override void ProcessRecord()
7171
{
7272
try
7373
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/UpdateAzureSiteRecoveryProtectionDirection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class UpdateAzureSiteRecoveryProtection : SiteRecoveryCmdletBase
5757
/// <summary>
5858
/// ProcessRecord of the command.
5959
/// </summary>
60-
public override void ExecuteCmdlet()
60+
protected override void ProcessRecord()
6161
{
6262
try
6363
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionProfile/GetAzureSiteRecoveryProtectionProfile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class GetAzureSiteRecoveryProtectionProfile : SiteRecoveryCmdletBase
4747
/// <summary>
4848
/// ProcessRecord of the command.
4949
/// </summary>
50-
public override void ExecuteCmdlet()
50+
protected override void ProcessRecord()
5151
{
5252
try
5353
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionProfile/NewAzureSiteRecoveryProtectionProfile.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using System.Management.Automation;
1818
using Microsoft.Azure.Management.SiteRecovery.Models;
1919
using Microsoft.Azure.Portal.RecoveryServices.Models.Common;
20-
using Microsoft.WindowsAzure.Commands.Common.Properties;
2120
using Properties = Microsoft.Azure.Commands.SiteRecovery.Properties;
2221

2322
namespace Microsoft.Azure.Commands.SiteRecovery
@@ -158,7 +157,7 @@ public class NewAzureSiteRecoveryProtectionProfile : SiteRecoveryCmdletBase
158157
/// <summary>
159158
/// ProcessRecord of the command.
160159
/// </summary>
161-
public override void ExecuteCmdlet()
160+
protected override void ProcessRecord()
162161
{
163162
try
164163
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionProfile/RemoveAzureSiteRecoveryProtectionProfile.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
using System.Management.Automation;
1818
using Microsoft.Azure.Management.SiteRecovery.Models;
1919
using Microsoft.Azure.Portal.RecoveryServices.Models.Common;
20-
using Microsoft.WindowsAzure.Commands.Common.Properties;
2120
using Properties = Microsoft.Azure.Commands.SiteRecovery.Properties;
2221

2322
namespace Microsoft.Azure.Commands.SiteRecovery
@@ -41,7 +40,7 @@ public class RemoveAzureSiteRecoveryProtectionProfile : SiteRecoveryCmdletBase
4140
/// <summary>
4241
/// ProcessRecord of the command.
4342
/// </summary>
44-
public override void ExecuteCmdlet()
43+
protected override void ProcessRecord()
4544
{
4645
try
4746
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionProfile/StartAzureSiteRecoveryProtectionProfileAssociationJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class StartAzureSiteRecoveryProtectionProfileAssociationJob : SiteRecover
5757
/// <summary>
5858
/// ProcessRecord of the command.
5959
/// </summary>
60-
public override void ExecuteCmdlet()
60+
protected override void ProcessRecord()
6161
{
6262
try
6363
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionProfile/StartAzureSiteRecoveryProtectionProfileDissociationJob.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public class StartAzureSiteRecoveryProtectionProfileDissociationJob : SiteRecove
6060
/// <summary>
6161
/// ProcessRecord of the command.
6262
/// </summary>
63-
public override void ExecuteCmdlet()
63+
protected override void ProcessRecord()
6464
{
6565
try
6666
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Server/GetAzureSiteRecoveryServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class GetAzureSiteRecoveryServer : SiteRecoveryCmdletBase
4747
/// <summary>
4848
/// ProcessRecord of the command.
4949
/// </summary>
50-
public override void ExecuteCmdlet()
50+
protected override void ProcessRecord()
5151
{
5252
try
5353
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/GetAzureSiteRecoveryVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class GetAzureSiteRecoveryVaults : SiteRecoveryCmdletBase
4444
/// <summary>
4545
/// ProcessRecord of the command.
4646
/// </summary>
47-
public override void ExecuteCmdlet()
47+
protected override void ProcessRecord()
4848
{
4949
try
5050
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/GetAzureSiteRecoveryVaultSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class GetAzureSiteRecoveryVaultSettings : SiteRecoveryCmdletBase
3030
/// <summary>
3131
/// ProcessRecord of the command.
3232
/// </summary>
33-
public override void ExecuteCmdlet()
33+
protected override void ProcessRecord()
3434
{
3535
this.WriteObject(new ASRVaultSettings(
3636
PSRecoveryServicesClient.asrVaultCreds.ResourceName,

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/GetAzureSiteRecoveryVaultSettingsFile.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class GetAzureSiteRecoveryVaultSettingsFile : SiteRecoveryCmdletBase
5353
/// <summary>
5454
/// ProcessRecord of the command.
5555
/// </summary>
56-
public override void ExecuteCmdlet()
56+
protected override void ProcessRecord()
5757
{
5858
try
5959
{
@@ -73,7 +73,7 @@ public override void ExecuteCmdlet()
7373
/// </summary>
7474
private void GetVaultSettingsFile()
7575
{
76-
AzureSubscription subscription = this.Profile.DefaultContext.Subscription;
76+
AzureSubscription subscription = Profile.DefaultContext.Subscription;
7777

7878
// Generate certificate
7979
X509Certificate2 cert = CertUtils.CreateSelfSignedCertificate(VaultCertificateExpiryInHoursForHRM, subscription.Id.ToString(), this.Vault.Name);

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/ImportAzureSiteRecoveryVaultSettingsFile.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public class ImportAzureSiteRecoveryVaultSettingsFile : SiteRecoveryCmdletBase
4646
/// <summary>
4747
/// ProcessRecord of the command.
4848
/// </summary>
49-
public override void ExecuteCmdlet()
49+
protected override void ProcessRecord()
5050
{
5151
this.WriteVerbose("Vault Settings File path: " + this.Path);
5252

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/NewAzureSiteRecoveryVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class CreateAzureSiteRecoveryVault : SiteRecoveryCmdletBase
5454
/// <summary>
5555
/// ProcessRecord of the command.
5656
/// </summary>
57-
public override void ExecuteCmdlet()
57+
protected override void ProcessRecord()
5858
{
5959
try
6060
{

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Vault/SetAzureSiteRecoveryVaultSettings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public class SetAzureSiteRecoveryVaultSettings : SiteRecoveryCmdletBase
4242
/// <summary>
4343
/// ProcessRecord of the command.
4444
/// </summary>
45-
public override void ExecuteCmdlet()
45+
protected override void ProcessRecord()
4646
{
4747
// Validate the Vault
4848
RecoveryServicesClient.ValidateVaultSettings(

0 commit comments

Comments
 (0)