Taking CR comments and changing cmdlet names for mapping (storage classification) cmdlet

Author: RamjotSingh

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

@@ -170,8 +170,8 @@
     <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="Storage\Classification\NewAzureRmSiteRecoveryStorageClassificationMapping.cs" />
+    <Compile Include="Storage\Classification\RemoveAzureSiteRecoveryStorageClassificationMapping.cs" />
     <Compile Include="Utilities\CertUtils.cs" />
     <Compile Include="Utilities\Utilities.cs" />
     <Compile Include="Vault\RemoveAzureSiteRecoveryVault.cs" />

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

@@ -86,21 +86,23 @@ public Task EnumerateStorageClassificationMappingsAsync(Action<IEnumerable<Stora
         }
 
         /// <summary>
-        /// Starts job for unmapping storage classifications.
+        /// Starts job for unmapping classifications
         /// </summary>
-        /// <param name="mapping">Classification mapping.</param>
-        /// <returns>Operation response.</returns>
+        /// <param name="fabricName">Fabric name name.</param>
+        /// <param name="storageClassificationName">Storage classification name.</param>
+        /// <param name="mappingName">Classification mapping name.</param>
+        /// <returns>Operation result.</returns>
         public LongRunningOperationResponse UnmapStorageClassifications(
-            StorageClassificationMapping mapping)
+            string fabricName,
+            string storageClassificationName,
+            string mappingName)
         {
-            string[] tokens = mapping.Id.UnFormatArmId(
-                ARMResourceIdPaths.StorageClassificationMappingResourceIdPath);
             return this.GetSiteRecoveryClient().StorageClassificationMapping
                 .BeginUnpairStorageClassification(
-                tokens[0],
-                tokens[1],
-                tokens[2],
-                this.GetRequestHeaders());
+                fabricName,
+                storageClassificationName,
+                mappingName,
+                customRequestHeaders: this.GetRequestHeaders());
         }
 
         /// <summary>

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

@@ -61,6 +61,21 @@ internal PSRecoveryServicesClient RecoveryServicesClient
             }
         }
 
+        /// <summary>
+        /// Overrides base implementation of Process record.
+        /// </summary>
+        protected override void ProcessRecord()
+        {
+            try
+            {
+                base.ProcessRecord();
+            }
+            catch (Exception ex)
+            {
+                this.HandleException(ex);
+            }
+        }
+
         /// <summary>
         /// Exception handler.
         /// </summary>

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

@@ -310,7 +310,4 @@ Please provide a storage account with the same location as that of the vault.</v
   <data name="SiteRecoveryVaultTypeWillBeDeprecatedSoon" xml:space="preserve">
     <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 with Id {0}</value>
-  </data>
 </root>

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

@@ -12,6 +12,7 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 using System.Management.Automation;
 using Microsoft.Azure.Management.SiteRecovery.Models;
@@ -21,9 +22,9 @@ namespace Microsoft.Azure.Commands.SiteRecovery
     /// <summary>
     /// Pairs storage classification
     /// </summary>
-    [Cmdlet(VerbsLifecycle.Start, "AzureRmSiteRecoveryStorageClassificationMappingJob", DefaultParameterSetName = ASRParameterSets.Default)]
+    [Cmdlet(VerbsCommon.New, "AzureRmSiteRecoveryStorageClassificationMapping", DefaultParameterSetName = ASRParameterSets.Default)]
     [OutputType(typeof(IEnumerable<ASRStorageClassification>))]
-    public class StartAzureSiteRecoveryStorageClassificationMappingJob : SiteRecoveryCmdletBase
+    public class NewAzureRmSiteRecoveryStorageClassificationMapping : SiteRecoveryCmdletBase
     {
         #region Parameters
 
@@ -48,9 +49,10 @@ public class StartAzureSiteRecoveryStorageClassificationMappingJob : SiteRecover
         public override void ExecuteCmdlet()
         {
             string armName = string.Format(
-                    "StrgMap_{0}_{1}",
+                    "StrgMap_{0}_{1}_{2}",
                     PrimaryStorageClassification.Name,
-                    RecoveryStorageClassification.Name);
+                    RecoveryStorageClassification.Name,
+                    Guid.NewGuid());
 
             var props = new StorageClassificationMappingInputProperties()
             {

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Storage/Classification/StartAzureSiteRecoveryStorageClassificationMappingJob.cs renamed to src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Storage/Classification/NewAzureRmSiteRecoveryStorageClassificationMapping.cs

@@ -24,9 +24,9 @@ namespace Microsoft.Azure.Commands.SiteRecovery
     // <summary>
     /// Pairs storage classification
     /// </summary>
-    [Cmdlet(VerbsLifecycle.Start, "AzureRmSiteRecoveryStorageClassificationUnmappingJob", DefaultParameterSetName = ASRParameterSets.Default)]
+    [Cmdlet(VerbsCommon.Remove, "AzureRmSiteRecoveryStorageClassificationMapping", DefaultParameterSetName = ASRParameterSets.Default)]
     [OutputType(typeof(IEnumerable<ASRStorageClassification>))]
-    public class StartAzureSiteRecoveryStorageClassificationUnmappingJob : SiteRecoveryCmdletBase
+    public class RemoveAzureSiteRecoveryStorageClassificationMapping : SiteRecoveryCmdletBase
     {
         #region Parameters
 
@@ -43,38 +43,17 @@ public class StartAzureSiteRecoveryStorageClassificationUnmappingJob : SiteRecov
         /// </summary>
         public override void ExecuteCmdlet()
         {
-            List<StorageClassificationMapping> storageClassificationMappings
-                = new List<StorageClassificationMapping>();
-
-            Task mappingsTask =
-                RecoveryServicesClient.EnumerateStorageClassificationMappingsAsync((entities) =>
-                {
-                    storageClassificationMappings.AddRange(entities);
-                });
-
-            Task.WaitAll(mappingsTask);
-
-            StorageClassificationMapping selectedMap = storageClassificationMappings
-                .Where(item =>
-                    item.Id.Equals(StorageClassificationMapping.Id))
-                .FirstOrDefault();
-
-            if (selectedMap == null)
-            {
-                throw new ArgumentException(
-                    string.Format(Properties.Resources.NoClassificationMappingFound,
-                    StorageClassificationMapping.Id));
-            }
-            else
-            {
-                var operationResponse =
-                    RecoveryServicesClient.UnmapStorageClassifications(selectedMap);
-                JobResponse jobResponse =
-                    RecoveryServicesClient.GetAzureSiteRecoveryJobDetails(
-                    PSRecoveryServicesClient.GetJobIdFromReponseLocation(operationResponse.Location));
-
-                base.WriteObject(new ASRJob(jobResponse.Job));
-            }
+            string[] tokens = StorageClassificationMapping.Id.UnFormatArmId(
+                ARMResourceIdPaths.StorageClassificationMappingResourceIdPath);
+            var operationResponse = RecoveryServicesClient.UnmapStorageClassifications(
+                fabricName: tokens[0],
+                storageClassificationName: tokens[1],
+                mappingName: tokens[2]);
+            JobResponse jobResponse =
+                RecoveryServicesClient.GetAzureSiteRecoveryJobDetails(
+                PSRecoveryServicesClient.GetJobIdFromReponseLocation(operationResponse.Location));
+
+            base.WriteObject(new ASRJob(jobResponse.Job));
         }
     }
 }

src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Storage/Classification/StartAzureSiteRecoveryStorageClassificationUnmappingJob.cs renamed to src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Storage/Classification/RemoveAzureSiteRecoveryStorageClassificationMapping.cs

@@ -205,14 +205,19 @@ public static string[] UnFormatArmId(this string data, string format)
                 List<string> tokens = new List<string>();
                 string processData = string.Empty;
 
+                if (string.IsNullOrEmpty(dataCopy))
+                {
+                    throw new Exception("Null and empty strings are not valid resource Ids - " + data);
+                }
+
                 // First truncate data string to point from where format string starts.
                 // We start from 1 index so that if url starts with / we avoid picking the first /.
                 int firstTokenEnd = format.IndexOf("/", 1);
                 int matchIndex = dataCopy.ToLower().IndexOf(format.Substring(0, firstTokenEnd).ToLower());
 
-                if (matchIndex == -1 || string.IsNullOrEmpty(dataCopy))
+                if (matchIndex == -1)
                 {
-                    throw new Exception("Invalid ARM Id - " + data);
+                    throw new Exception("Invalid resource Id - " + data);
                 }
 
                 processData = dataCopy.Substring(matchIndex);
@@ -251,13 +256,13 @@ public static string[] UnFormatArmId(this string data, string format)
                 }
                 else
                 {
-                    throw new Exception("Invalid ARM Id - " + data);
+                    throw new Exception("Invalid resource Id - " + data);
                 }
             }
             catch (Exception ex)
             {
                 throw new Exception(
-                    string.Format("Invalid ARM Id - {0}. Exception - {1} ", data, ex));
+                    string.Format("Invalid resource Id - {0}. Exception - {1} ", data, ex));
             }
         }