RecoveryPlan cmdlet changes for ASR along with some bug fixes

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj

@@ -44,8 +44,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.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.1.0.2-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.2.0.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1

@@ -21,7 +21,7 @@ Recovery Services Vault CRUD Tests
 function Test-RecoveryServicesVaultCRUDTests
 {
 	# Create vault
-	$vaultCreationResponse = New-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName S91-1 -Location westus
+	$vaultCreationResponse = New-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName rg1 -Location westus
 	Assert-NotNull($vaultCreationResponse.Name)
 	Assert-NotNull($vaultCreationResponse.ID)
 	Assert-NotNull($vaultCreationResponse.Type)
@@ -38,13 +38,13 @@ function Test-RecoveryServicesVaultCRUDTests
 	}
 
 	# Get the created vault
-	$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1
+	$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName rg1 -Name rsv1
 	Assert-NotNull($vaultToBeRemoved.Name)
 	Assert-NotNull($vaultToBeRemoved.ID)
 	Assert-NotNull($vaultToBeRemoved.Type)
 
 	# Remove Vault
 	Remove-AzureRmRecoveryServicesVault -Vault $vaultToBeRemoved
-	$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1
+	$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName rg1 -Name rsv1
 	Assert-True { $vaults.Count -eq 0 }
 }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs

@@ -26,6 +26,7 @@
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using System;
+using System.Collections.Generic;
 using System.Net.Http;
 using System.Reflection;
 
@@ -50,6 +51,14 @@ protected void SetupManagementClients()
 
         protected void RunPowerShellTest(params string[] scripts)
         {
+            Dictionary<string, string> d = new Dictionary<string, string>();
+            d.Add("Microsoft.Resources", null);
+            d.Add("Microsoft.Features", null);
+            d.Add("Microsoft.Authorization", null);
+            d.Add("Microsoft.Compute", null);
+            var providersToIgnore = new Dictionary<string, string>();
+            providersToIgnore.Add("Microsoft.Azure.Management.Resources.ResourceManagementClient", "2016-02-01");
+            HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(true, d, providersToIgnore);
             using (UndoContext context = UndoContext.Current)
             {
                 context.Start(TestUtilities.GetCallingClass(2), TestUtilities.GetCurrentMethodName(2));

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/packages.config

@@ -3,7 +3,7 @@
   <package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.RecoveryServices" version="1.0.2-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.RecoveryServices" version="2.0.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.11-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5896.19355-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5896.19355-prerelease" targetFramework="net45" />

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj

@@ -47,8 +47,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.1.0.2-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.2.0.0-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesClient.cs

@@ -64,7 +64,7 @@ public RecoveryServicesManagementClient GetRecoveryServicesClient
         "Microsoft.StyleCop.CSharp.MaintainabilityRules",
         "SA1401:FieldsMustBePrivate",
         Justification = "For Resource Credentials.")]
-        public static ASRVaultCreds asrVaultCreds = new ASRVaultCreds();
+        public static ASRVaultCreds arsVaultCreds = new ASRVaultCreds();
 
         /// <summary>
         /// Recovery Services client.
@@ -86,7 +86,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile)
             string resourceType = string.Empty;
 
             // Get Resource provider namespace from config if needed to communicate with internal deployments
-            if (string.IsNullOrEmpty(asrVaultCreds.ResourceNamespace))
+            if (string.IsNullOrEmpty(arsVaultCreds.ResourceNamespace))
             {
                 if (appSettings.Settings.Count == 0)
                 {
@@ -109,7 +109,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile)
 
             this.recoveryServicesClient =
             AzureSession.ClientFactory.CreateCustomClient<RecoveryServicesManagementClient>(
-                asrVaultCreds.ResourceNamespace,
+                arsVaultCreds.ResourceNamespace,
                 AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(azureProfile.Context),
                 azureProfile.Context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager));
         }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultExtendedInfoClient.cs

@@ -39,8 +39,8 @@ public async Task<ResourceExtendedInformation> GetExtendedInfo()
         {
             ResourceExtendedInformationResponse response =
                 await this.recoveryServicesClient.VaultExtendedInfo.GetExtendedInfoAsync(
-                asrVaultCreds.ResourceGroupName,
-                asrVaultCreds.ResourceName,
+                arsVaultCreds.ResourceGroupName,
+                arsVaultCreds.ResourceName,
                 this.GetRequestHeaders());
 
             return response.ResourceExtendedInformation;
@@ -54,8 +54,8 @@ await this.recoveryServicesClient.VaultExtendedInfo.GetExtendedInfoAsync(
         public AzureOperationResponse CreateExtendedInfo(ResourceExtendedInformationArgs extendedInfoArgs)
         {
             return this.recoveryServicesClient.VaultExtendedInfo.CreateExtendedInfo(
-                asrVaultCreds.ResourceGroupName,
-                asrVaultCreds.ResourceName,
+                arsVaultCreds.ResourceGroupName,
+                arsVaultCreds.ResourceName,
                 extendedInfoArgs,
                 this.GetRequestHeaders());
         }
@@ -68,8 +68,8 @@ public AzureOperationResponse CreateExtendedInfo(ResourceExtendedInformationArgs
         public async Task<UploadCertificateResponse> UpdateVaultCertificate(CertificateArgs args, string certFriendlyName)
         {
             return await this.recoveryServicesClient.VaultExtendedInfo.UploadCertificateAsync(
-                asrVaultCreds.ResourceGroupName, 
-                asrVaultCreds.ResourceName,
+                arsVaultCreds.ResourceGroupName, 
+                arsVaultCreds.ResourceName,
                 args, certFriendlyName, 
                 this.GetRequestHeaders());
         }
@@ -82,7 +82,7 @@ public async Task<UploadCertificateResponse> UpdateVaultCertificate(CertificateA
         /// <returns>credential object</returns>
         public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, ARSVault vault, ASRSite site)
         {
-            ASRVaultCreds currentVaultContext = PSRecoveryServicesClient.asrVaultCreds;
+            ASRVaultCreds currentVaultContext = PSRecoveryServicesClient.arsVaultCreds;
 
             string resourceProviderNamespace = string.Empty;
             string resourceType = string.Empty;
@@ -112,7 +112,7 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR
             acsDetails = uploadCertificate.Result;
             channelIntegrityKey = getChannelIntegrityKey.Result;
 
-            ASRVaultCreds asrVaultCreds = this.GenerateCredentialObject(
+            ASRVaultCreds arsVaultCreds = this.GenerateCredentialObject(
                                                 managementCert,
                                                 acsDetails,
                                                 channelIntegrityKey,
@@ -122,7 +122,7 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR
             // Update back the original vault settings
             Utilities.UpdateCurrentVaultContext(currentVaultContext);
 
-            return asrVaultCreds;
+            return arsVaultCreds;
         }
 
         /// <summary>
@@ -157,7 +157,7 @@ public ASRVaultCreds ChangeVaultContext(ARSVault vault)
                 ARMResourceType = resourceType
             });
 
-            return asrVaultCreds;
+            return arsVaultCreds;
         }
 
         /// <summary>

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs

@@ -190,54 +190,6 @@ public class ARMExceptionDetails
         public string Target { get; private set; }
     }
 
-    /// <summary>
-    /// Error contract returned when some exception occurs in ASR REST API.
-    /// </summary>
-    [SuppressMessage(
-        "Microsoft.StyleCop.CSharp.MaintainabilityRules",
-        "SA1402:FileMayOnlyContainASingleClass",
-        Justification = "Keeping all contracts together.")]
-    [DataContract(Namespace = "http://schemas.microsoft.com/windowsazure")]
-    public class Error
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Error" /> class.
-        /// </summary>
-        public Error()
-        {
-        }
-
-        /// <summary>
-        /// Gets or sets error code.
-        /// </summary>
-        [DataMember]
-        public string Code { get; set; }
-
-        /// <summary>
-        /// Gets or sets error message.
-        /// </summary>
-        [DataMember]
-        public string Message { get; set; }
-
-        /// <summary>
-        /// Gets or sets possible causes of error.
-        /// </summary>
-        [DataMember]
-        public string PossibleCauses { get; set; }
-
-        /// <summary>
-        /// Gets or sets recommended action to resolve error.
-        /// </summary>
-        [DataMember]
-        public string RecommendedAction { get; set; }
-
-        /// <summary>
-        /// Gets or sets client request Id.
-        /// </summary>
-        [DataMember(Name = "ActivityId")]
-        public string ClientRequestId { get; set; }
-    }
-
     /// <summary>
     /// CIK token details.
     /// </summary>
@@ -361,7 +313,7 @@ public VaultCreds()
         public VaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace)
         {
             this.SubscriptionId = subscriptionId;
-            this.ResourceType = Constants.ASRVaultType;
+            this.ResourceType = Constants.VaultType;
             this.ResourceName = resourceName;
             this.ManagementCert = managementCert;
             this.AcsNamespace = acsNamespace;
@@ -404,7 +356,7 @@ public VaultCreds(string subscriptionId, string resourceName, string managementC
     }
 
     /// <summary>
-    /// Class to define ASR Vault credentials
+    /// Class to define ARS Vault credentials
     /// </summary>
     [SuppressMessage(
         "Microsoft.StyleCop.CSharp.MaintainabilityRules",

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs

@@ -22,9 +22,9 @@ namespace Microsoft.Azure.Commands.RecoveryServices
     public class Constants
     {
         /// <summary>
-        /// ASR vault type
+        /// Vault type
         /// </summary>
-        public const string ASRVaultType = "HyperVRecoveryManagerVault";
+        public const string VaultType = "HyperVRecoveryManagerVault";
 
         /// <summary>
         /// Vault Credential version.
@@ -68,7 +68,7 @@ public ARSVault(Vault vault)
             this.Location = vault.Location;
             this.ResouceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
             this.SubscriptionId = PSRecoveryServicesClient.GetSubscriptionId(vault.Id);
-            this.Properties = new ASRVaultProperties();
+            this.Properties = new ARSVaultProperties();
             this.Properties.ProvisioningState = vault.Properties.ProvisioningState;
         }
 
@@ -84,7 +84,7 @@ public ARSVault(VaultCreateResponse vault)
             this.Location = vault.Location;
             this.ResouceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
             this.SubscriptionId = PSRecoveryServicesClient.GetSubscriptionId(vault.Id);
-            this.Properties = new ASRVaultProperties();
+            this.Properties = new ARSVaultProperties();
             this.Properties.ProvisioningState = vault.Properties.ProvisioningState;
         }
 
@@ -124,15 +124,15 @@ public ARSVault(VaultCreateResponse vault)
         /// <summary>
         /// Gets or sets Properties.
         /// </summary>
-        public ASRVaultProperties Properties { get; set; }
+        public ARSVaultProperties Properties { get; set; }
 
         #endregion
     }
 
     /// <summary>
     /// Azure Site Recovery Vault properties.
     /// </summary>
-    public class ASRVaultProperties
+    public class ARSVaultProperties
     {
         #region Properties
 

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSParameterSets.cs

@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices
    /// <summary>
     /// Parameter Sets used for Azure Site Recovery commands.
     /// </summary>
-    internal static class ASRParameterSets
+    internal static class ARSParameterSets
     {
         /// <summary>
         /// For default parameter set

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Utilities/Utilities.cs

@@ -102,22 +102,22 @@ public static string WriteToFile<T>(T fileContent, string filePath, string fileN
         /// <summary>
         /// Updates current Vault context.
         /// </summary>
-        /// <param name="asrVaultCreds">ASR Vault credentials</param>
-        public static void UpdateCurrentVaultContext(ASRVaultCreds asrVaultCreds)
+        /// <param name="arsVaultCreds">ARS Vault credentials</param>
+        public static void UpdateCurrentVaultContext(ASRVaultCreds arsVaultCreds)
         {
             object updateVaultContextOneAtATime = new object();
             lock (updateVaultContextOneAtATime)
             {
-                PSRecoveryServicesClient.asrVaultCreds.ResourceName =
-                    asrVaultCreds.ResourceName;
-                PSRecoveryServicesClient.asrVaultCreds.ResourceGroupName =
-                    asrVaultCreds.ResourceGroupName;
-                PSRecoveryServicesClient.asrVaultCreds.ChannelIntegrityKey =
-                    asrVaultCreds.ChannelIntegrityKey;
-                PSRecoveryServicesClient.asrVaultCreds.ResourceNamespace =
-                    asrVaultCreds.ResourceNamespace;
-                PSRecoveryServicesClient.asrVaultCreds.ARMResourceType =
-                    asrVaultCreds.ARMResourceType;
+                PSRecoveryServicesClient.arsVaultCreds.ResourceName =
+                    arsVaultCreds.ResourceName;
+                PSRecoveryServicesClient.arsVaultCreds.ResourceGroupName =
+                    arsVaultCreds.ResourceGroupName;
+                PSRecoveryServicesClient.arsVaultCreds.ChannelIntegrityKey =
+                    arsVaultCreds.ChannelIntegrityKey;
+                PSRecoveryServicesClient.arsVaultCreds.ResourceNamespace =
+                    arsVaultCreds.ResourceNamespace;
+                PSRecoveryServicesClient.arsVaultCreds.ARMResourceType =
+                    arsVaultCreds.ARMResourceType;
             }
         }
 

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRMRecoveryServicesVaultSettingsFile.cs

@@ -38,22 +38,22 @@ public class GetAzureRmRecoveryServicesVaultSettingsFile : RecoveryServicesCmdle
         /// <summary>
         /// Gets or sets vault Object.
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ByDefault, Mandatory = true, ValueFromPipeline = true)]
-        [Parameter(ParameterSetName = ASRParameterSets.ForSite, Mandatory = true, ValueFromPipeline = true)]
+        [Parameter(ParameterSetName = ARSParameterSets.ByDefault, Mandatory = true, ValueFromPipeline = true)]
+        [Parameter(ParameterSetName = ARSParameterSets.ForSite, Mandatory = true, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
         public ARSVault Vault { get; set; }
 
         /// <summary>
         /// Gets or sets Site Identifier.
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ForSite, Mandatory = true)]
+        [Parameter(ParameterSetName = ARSParameterSets.ForSite, Mandatory = true)]
         [ValidateNotNullOrEmpty]
         public String SiteIdentifier { get; set; }
 
         /// <summary>
         /// Gets or sets SiteFriendlyName.
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ForSite, Mandatory = true)]
+        [Parameter(ParameterSetName = ARSParameterSets.ForSite, Mandatory = true)]
         [ValidateNotNullOrEmpty]
         public String SiteFriendlyName { get; set; }
 
@@ -63,8 +63,8 @@ public class GetAzureRmRecoveryServicesVaultSettingsFile : RecoveryServicesCmdle
         /// <summary>
         /// Gets or sets vault Object.
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ByDefault)]
-        [Parameter(ParameterSetName = ASRParameterSets.ForSite)]
+        [Parameter(ParameterSetName = ARSParameterSets.ByDefault)]
+        [Parameter(ParameterSetName = ARSParameterSets.ForSite)]
         public string Path { get; set; }
 
         #endregion Parameters

src/ResourceManager/RecoveryServices/Commands.RecoveryServices/packages.config

@@ -3,7 +3,7 @@
   <package id="Hyak.Common" version="1.0.3" targetFramework="net45" />
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.RecoveryServices" version="1.0.2-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.RecoveryServices" version="2.0.0-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />