1) Resolving CR comments

2) Adding cmdlet to fetch storage mappings

Author: RamjotSingh

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

@@ -53,7 +53,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.SiteRecovery, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.SiteRecovery.1.0.3-preview\lib\net40\Microsoft.Azure.Management.SiteRecovery.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -168,6 +168,7 @@
     <Compile Include="Policy\StartAzureSiteRecoveryPolicyDissociationJob.cs" />
     <Compile Include="Server\GetAzureSiteRecoveryServer.cs" />
     <Compile Include="Storage\Classification\GetAzureSiteRecoveryStorageClassification.cs" />
+    <Compile Include="Storage\Classification\GetAzureSiteRecoveryStorageClassificationMapping.cs" />
     <Compile Include="Storage\Classification\StartAzureSiteRecoveryStorageClassificationMappingJob.cs" />
     <Compile Include="Storage\Classification\StartAzureSiteRecoveryStorageClassificationUnmappingJob.cs" />
     <Compile Include="Utilities\CertUtils.cs" />

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

@@ -89,73 +89,42 @@ public Task EnumerateStorageClassificationMappingsAsync(Action<IEnumerable<Stora
         /// Starts job for unmapping storage classifications.
         /// </summary>
         /// <param name="mapping">Classification mapping.</param>
-        /// <returns>Job object.</returns>
-        public ASRJob UnmapStorageClassifications(StorageClassificationMapping mapping)
+        /// <returns>Operation response.</returns>
+        public LongRunningOperationResponse UnmapStorageClassifications(
+            StorageClassificationMapping mapping)
         {
             string[] tokens = mapping.Id.UnFormatArmId(
                 ARMResourceIdPaths.StorageClassificationMappingResourceIdPath);
-            LongRunningOperationResponse operationResponse =
-                this.GetSiteRecoveryClient().StorageClassificationMapping
+            return this.GetSiteRecoveryClient().StorageClassificationMapping
                 .BeginUnpairStorageClassification(
                 tokens[0],
                 tokens[1],
                 tokens[2],
                 this.GetRequestHeaders());
-
-            JobResponse jobResponse =
-                this.GetAzureSiteRecoveryJobDetails(
-                PSRecoveryServicesClient.GetJobIdFromReponseLocation(operationResponse.Location));
-
-            return new ASRJob(jobResponse.Job);
         }
 
         /// <summary>
         /// Starts job for mapping storage classification.
         /// </summary>
         /// <param name="primaryClassification">Primary classification.</param>
-        /// <param name="recoveryClassification">Recovery classification.</param>
+        /// <param name="input">Mapping input.</param>
         /// <param name="armName">Optional. ARM name of the mapping.</param>
-        /// <returns>Job object.</returns>
-        public ASRJob MapStorageClassification(
+        /// <returns>Operation response.</returns>
+        public LongRunningOperationResponse MapStorageClassification(
             ASRStorageClassification primaryClassification,
-            ASRStorageClassification recoveryClassification,
-            string armName = null)
+            StorageClassificationMappingInput input,
+            string armName)
         {
-            string[] tokens = primaryClassification.StorageClassificationId.UnFormatArmId(
+            string[] tokens = primaryClassification.Id.UnFormatArmId(
                 ARMResourceIdPaths.StorageClassificationResourceIdPath);
 
-            if (string.IsNullOrEmpty(armName))
-            {
-                armName = string.Format(
-                    "StrgMap_{0}_{1}",
-                    primaryClassification.StorageClassificationFriendlyName,
-                    recoveryClassification.StorageClassificationFriendlyName);
-            }
-
-            var props = new StorageClassificationMappingInputProperties()
-            {
-                TargetStorageClassificationId = recoveryClassification.StorageClassificationId
-            };
-
-            var input = new StorageClassificationMappingInput()
-            {
-                Properties = props
-            };
-
-            LongRunningOperationResponse operationResponse =
-                this.GetSiteRecoveryClient().StorageClassificationMapping
+            return this.GetSiteRecoveryClient().StorageClassificationMapping
                 .BeginPairStorageClassification(
                 tokens[0],
                 tokens[1],
                 armName,
                 input,
                 this.GetRequestHeaders());
-
-            JobResponse jobResponse =
-                this.GetAzureSiteRecoveryJobDetails(
-                PSRecoveryServicesClient.GetJobIdFromReponseLocation(operationResponse.Location));
-
-            return new ASRJob(jobResponse.Job);
         }
     }
 
@@ -200,43 +169,5 @@ public static string GetFabricId(
                 ARMResourceIdPaths.FabricResourceIdPath,
                 tokens[0]);
         }
-
-        /// <summary>
-        /// Gets powershell object from Storage classification object.
-        /// </summary>
-        /// <param name="classification">Classification to process.</param>
-        /// <param name="classificationMap">Dictionary of all possible classifications.</param>
-        /// <param name="fabricMap">Dictionary of list of fabrics.</param>
-        /// <param name="mappingsDict">Dictionary of mapping objects.</param>
-        /// <returns>Powershell representation of storage classification.</returns>
-        public static ASRStorageClassification GetPSObject(
-            this StorageClassification classification,
-            Dictionary<string, StorageClassification> classificationMap,
-            Dictionary<string, Fabric> fabricMap,
-            Dictionary<string, List<StorageClassificationMapping>> mappingsDict)
-        {
-            var fabric = fabricMap[classification.GetFabricId()];
-            List<StorageClassificationMapping> targetClassifications;
-
-            return new ASRStorageClassification()
-            {
-                FabricFriendlyName = fabric.Properties.FriendlyName,
-                FabricId = fabric.Id,
-                StorageClassificationFriendlyName =
-                    classification.Properties.FriendlyName,
-                StorageClassificationId = classification.Id,
-                TargetClassifications = 
-                    mappingsDict.TryGetValue(
-                        classification.Id, 
-                        out targetClassifications) ?
-                    targetClassifications.ConvertAll(item => 
-                        classificationMap[item.Properties.TargetStorageClassificationId]
-                        .GetPSObject(
-                        classificationMap,
-                        fabricMap,
-                        mappingsDict)) :
-                    new List<ASRStorageClassification>()
-            };
-        }
     }
 }

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

@@ -1336,29 +1336,50 @@ public ASRProviderError(ProviderError error)
     public class ASRStorageClassification
     {
         /// <summary>
-        /// Gets or sets Storage classification ARM name.
+        /// Gets or sets Storage classification ARM Id.
         /// </summary>
-        public string StorageClassificationId { get; set; }
+        public string Id { get; set; }
 
         /// <summary>
-        /// Gets or sets Storage classification friendly name.
+        /// Gets or sets Storage classification ARM name.
         /// </summary>
-        public string StorageClassificationFriendlyName { get; set; }
+        public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets Storage classification fabric ARM name.
+        /// Gets or sets Storage classification friendly name.
         /// </summary>
-        public string FabricId { get; set; }
+        public string FriendlyName { get; set; }
 
         /// <summary>
         /// Gets or sets Fabric friendly name.
         /// </summary>
         public string FabricFriendlyName { get; set; }
+    }
+    
+    /// <summary>
+    /// Represents Azure site recovery storage classification mapping.
+    /// </summary>
+    public class ASRStorageClassificationMapping
+    {
+        /// <summary>
+        /// Gets or sets Storage classification ARM Id.
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets Storage classification ARM name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets primary classification ARM Id.
+        /// </summary>
+        public string PrimaryClassificationId { get; set; }
 
         /// <summary>
-        /// Gets or sets Target classifications.
+        /// Gets or sets recovery classification ARM Id.
         /// </summary>
-        public List<ASRStorageClassification> TargetClassifications { get; set; }
+        public string RecoveryClassificationId { get; set; }
     }
 
     /// <summary>

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Properties/Resources.Designer.cs

@@ -311,6 +311,6 @@ Please provide a storage account with the same location as that of the vault.</v
     <value>SiteRecovery vault type will be deprecated soon. Please use RecoveryServices vault type instead.</value>
   </data>
   <data name="NoClassificationMappingFound" xml:space="preserve">
-    <value>No storage classification mapping found between {0} and {1}</value>
+    <value>No storage classification mapping found with Id {0}</value>
   </data>
 </root>

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Properties/Resources.resx

@@ -29,15 +29,29 @@ namespace Microsoft.Azure.Commands.SiteRecovery
     [OutputType(typeof(IEnumerable<ASRStorageClassification>))]
     public class GetAzureSiteRecoveryStorageClassification : SiteRecoveryCmdletBase
     {
+        #region Parameters
+        /// <summary>
+        /// Gets or sets name of classification.
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.ByName, Mandatory = true, ValueFromPipeline = true)]
+        [ValidateNotNullOrEmpty]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Gets or sets friendly name of classification.
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.ByFriendlyName, Mandatory = true, ValueFromPipeline = true)]
+        [ValidateNotNullOrEmpty]
+        public string FriendlyName { get; set; }
+        #endregion
+
         /// <summary>
         /// ProcessRecord of the command.
         /// </summary>
         public override void ExecuteCmdlet()
         {
             List<Fabric> fabrics = new List<Fabric>();
             List<StorageClassification> storageClassifications = new List<StorageClassification>();
-            List<StorageClassificationMapping> storageClassificationMappings
-                = new List<StorageClassificationMapping>();
 
             Task fabricTask = RecoveryServicesClient.EnumerateFabricsAsync((entities) =>
                 {
@@ -50,28 +64,42 @@ List<StorageClassificationMapping> storageClassificationMappings
                     storageClassifications.AddRange(entities);
                 });
 
-            Task mappingsTask = 
-                RecoveryServicesClient.EnumerateStorageClassificationMappingsAsync((entities) =>
-                {
-                    storageClassificationMappings.AddRange(entities);
-                });
-
-            Task.WaitAll(fabricTask, storageClassificationTask, mappingsTask);
+            Task.WaitAll(fabricTask, storageClassificationTask);
 
             var fabricMap = fabrics.ToDictionary(item => item.Id, item => item);
-            var classificationMap = storageClassifications
-                .ToDictionary(item => item.Id, item => item);
-            var mappingsDict = storageClassificationMappings
-                .GroupBy(item => item.GetPrimaryStorageClassificationId())
-                .ToDictionary(item => item.Key, item => item.ToList());
 
-            List<ASRStorageClassification> psStorageClassifications
-                = new List<ASRStorageClassification>();
+            switch (this.ParameterSetName)
+            {
+                case ASRParameterSets.ByFriendlyName:
+                    storageClassifications = storageClassifications.Where(item =>
+                        item.Properties.FriendlyName.Equals(
+                            this.FriendlyName, 
+                            StringComparison.InvariantCultureIgnoreCase))
+                        .ToList();
+                    break;
+                case ASRParameterSets.ByName:
+                    storageClassifications = storageClassifications.Where(item =>
+                        item.Name.Equals(
+                            this.Name, 
+                            StringComparison.InvariantCultureIgnoreCase))
+                        .ToList();
+                    break;
+            }
 
-            var psObject = storageClassifications.ConvertAll(item => 
-                item.GetPSObject(classificationMap, fabricMap, mappingsDict));
+            var psObject = storageClassifications.ConvertAll(item =>
+                {
+                    var fabric = fabricMap[item.GetFabricId()];
+
+                    return new ASRStorageClassification()
+                    {
+                        FabricFriendlyName = fabric.Properties.FriendlyName,
+                        FriendlyName = item.Properties.FriendlyName,
+                        Id = item.Id,
+                        Name = item.Name
+                    };
+                });
 
-            base.WriteObject(psObject);
+            this.WriteObject(psObject, true);
         }
     }
 }

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Storage/Classification/GetAzureSiteRecoveryStorageClassification.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Management.Automation;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Azure.Management.SiteRecovery.Models;
+
+namespace Microsoft.Azure.Commands.SiteRecovery
+{
+    /// <summary>
+    /// Retrieves Azure Site Recovery storage classification.
+    /// </summary>
+    [Cmdlet(VerbsCommon.Get, "AzureRmSiteRecoveryStorageClassificationMapping", DefaultParameterSetName = ASRParameterSets.Default)]
+    [OutputType(typeof(IEnumerable<ASRStorageClassification>))]
+    public class GetAzureSiteRecoveryStorageClassificationMapping : SiteRecoveryCmdletBase
+    {
+        #region Parameters
+        /// <summary>
+        /// Gets or sets name of classification.
+        /// </summary>
+        [Parameter(ParameterSetName = ASRParameterSets.ByName, Mandatory = true, ValueFromPipeline = true)]
+        [ValidateNotNullOrEmpty]
+        public string Name { get; set; }
+        #endregion
+
+        /// <summary>
+        /// ProcessRecord of the command.
+        /// </summary>
+        public override void ExecuteCmdlet()
+        {
+            List<StorageClassificationMapping> mappings = new List<StorageClassificationMapping>();
+            Task mappingTask = 
+                RecoveryServicesClient.EnumerateStorageClassificationMappingsAsync((entities) =>
+                {
+                    mappings.AddRange(entities);
+                });
+
+            Task.WaitAll(mappingTask);
+
+            switch (this.ParameterSetName)
+            {
+                case ASRParameterSets.ByName:
+                    mappings = mappings.Where(item =>
+                        item.Name.Equals(
+                            this.Name,
+                            StringComparison.InvariantCultureIgnoreCase))
+                        .ToList();
+                    break;
+            }
+
+            var psObject = mappings.ConvertAll(item =>
+            {
+                return new ASRStorageClassificationMapping()
+                {
+                    Id = item.Id,
+                    Name = item.Name,
+                    PrimaryClassificationId = item.GetPrimaryStorageClassificationId(),
+                    RecoveryClassificationId =  item.Properties.TargetStorageClassificationId
+                };
+            });
+
+            base.WriteObject(psObject);
+        }
+    }
+}