1) Fix for bug 6635655 2) Purge Protection support

avneeshraiusit · avneeshraiusit · commit 6dbea7399176 · 2016-02-22T18:00:54.000+05:30
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryReplicationProtectedItemsClient.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Common/PSSiteRecoveryReplicationProtectedItemsClient.cs
@@ -128,6 +128,23 @@ public LongRunningOperationResponse DisableProtection(string fabricName,
                 this.GetRequestHeaders());
         }
 
+        /// <summary>
+        /// Purges Replicated Protected Item.
+        /// </summary>
+        /// <param name="protectionContainerName">Protection Container ID</param>
+        /// <param name="replicationProtectedItemName">Virtual Machine ID or Replication group Id</param>
+        /// <returns>Job response</returns>
+        public LongRunningOperationResponse PurgeProtection(string fabricName,
+            string protectionContainerName,
+            string replicationProtectedItemName)
+        {
+            return this.GetSiteRecoveryClient().ReplicationProtectedItem.BeginPurgeProtection(
+                fabricName,
+                protectionContainerName,
+                replicationProtectedItemName,
+                this.GetRequestHeaders());
+        }
+
         /// <summary>
         /// Starts Planned Failover
         /// </summary>
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSRecoveryPlanObjects.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Models/PSRecoveryPlanObjects.cs
@@ -41,6 +41,10 @@ public ASRRecoveryPlanGroup(RecoveryPlanGroup recoveryPlanGroup, IList<Replicati
                     var replicationProtectedItemList = recoveryPlanGroup.ReplicationProtectedItems.Select(item => item.Id.ToLower());
                     this.ReplicationProtectedItems = replicationProtectedItems.Where(rpi => replicationProtectedItemList.Contains(rpi.Id.ToLower())).ToList();
                 }
+                else
+                {
+                    this.ReplicationProtectedItems = new List<ReplicationProtectedItem>();
+                }
             }
         }
 
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Properties/Resources.Designer.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Properties/Resources.Designer.cs
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Properties/Resources.resx b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Properties/Resources.resx
@@ -326,9 +326,9 @@ Please provide a storage account with the same location as that of the vault.</v
     <value>Group "{0}" not found for recovery plan "{1}"</value>
   </data>
   <data name="VMAlreadyPartOfGroup" xml:space="preserve">
-    <value>Virtual Machine "{0}" is already part of Group "{1}" for recovery plan "{1}"</value>
+    <value>Virtual Machine "{0}" is already part of Group "{1}" for recovery plan "{2}"</value>
   </data>
   <data name="VMNotFoundInGroup" xml:space="preserve">
-    <value>Virtual Machine "{0}" not found in Group "{1}" for recovery plan "{1}"</value>
+    <value>Virtual Machine "{0}" not found in Group "{1}" for recovery plan "{2}"</value>
   </data>
 </root>
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/SetAzureSiteRecoveryProtectionEntity.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/ProtectionEntity/SetAzureSiteRecoveryProtectionEntity.cs
@@ -219,24 +219,36 @@ public override void ExecuteSiteRecoveryCmdlet()
                     }
                     else
                     {
-                        DisableProtectionInput input = new DisableProtectionInput();
-                        input.Properties = new DisableProtectionInputProperties()
-                        {
-                            ProviderSettings = new DisableProtectionProviderSpecificInput()
-                        };
-
                         // fetch the latest PE object
                         ProtectableItemResponse protectableItemResponse =
                                                     RecoveryServicesClient.GetAzureSiteRecoveryProtectableItem(Utilities.GetValueFromArmId(this.ProtectionEntity.ID, ARMResourceTypeConstants.ReplicationFabrics),
                                                     this.ProtectionEntity.ProtectionContainerId, this.ProtectionEntity.Name);
                         ProtectableItem protectableItem = protectableItemResponse.ProtectableItem;
 
-                        this.response =
-                            RecoveryServicesClient.DisableProtection(
-                            Utilities.GetValueFromArmId(this.ProtectionEntity.ID, ARMResourceTypeConstants.ReplicationFabrics),
-                            Utilities.GetValueFromArmId(this.ProtectionEntity.ID, ARMResourceTypeConstants.ReplicationProtectionContainers),
-                            Utilities.GetValueFromArmId(protectableItem.Properties.ReplicationProtectedItemId, ARMResourceTypeConstants.ReplicationProtectedItems),
-                            input);
+                        if (!this.Force.IsPresent)
+                        {
+                            DisableProtectionInput input = new DisableProtectionInput();
+                            input.Properties = new DisableProtectionInputProperties()
+                            {
+                                ProviderSettings = new DisableProtectionProviderSpecificInput()
+                            };
+
+                            this.response =
+                                RecoveryServicesClient.DisableProtection(
+                                Utilities.GetValueFromArmId(this.ProtectionEntity.ID, ARMResourceTypeConstants.ReplicationFabrics),
+                                Utilities.GetValueFromArmId(this.ProtectionEntity.ID, ARMResourceTypeConstants.ReplicationProtectionContainers),
+                                Utilities.GetValueFromArmId(protectableItem.Properties.ReplicationProtectedItemId, ARMResourceTypeConstants.ReplicationProtectedItems),
+                                input);
+                        }
+                        else
+                        {
+                            this.response =
+                                RecoveryServicesClient.PurgeProtection(
+                                Utilities.GetValueFromArmId(this.ProtectionEntity.ID, ARMResourceTypeConstants.ReplicationFabrics),
+                                Utilities.GetValueFromArmId(this.ProtectionEntity.ID, ARMResourceTypeConstants.ReplicationProtectionContainers),
+                                Utilities.GetValueFromArmId(protectableItem.Properties.ReplicationProtectedItemId, ARMResourceTypeConstants.ReplicationProtectedItems)
+                                );
+                        }
                     }
 
                     jobResponse =
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/RecoveryPlan/EditAzureSiteRecoveryRecoveryPlan.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/RecoveryPlan/EditAzureSiteRecoveryRecoveryPlan.cs
@@ -94,7 +94,7 @@ public override void ExecuteSiteRecoveryCmdlet()
                     this.RecoveryPlan.Groups.Add(new ASRRecoveryPlanGroup("Group " + (RecoveryPlan.Groups.Count - 1).ToString(), recoveryPlanGroup));
                     break;
                 case ASRParameterSets.RemoveGroup:
-                    tempGroup = this.RecoveryPlan.Groups.FirstOrDefault(g => String.CompareOrdinal(g.Name, RemoveGroup.Name) == 0);
+                    tempGroup = this.RecoveryPlan.Groups.FirstOrDefault(g => String.Compare(g.Name, RemoveGroup.Name, StringComparison.OrdinalIgnoreCase) == 0);
 
                     if (tempGroup != null)
                     {
@@ -127,7 +127,10 @@ public override void ExecuteSiteRecoveryCmdlet()
                         {
                             foreach (ASRRecoveryPlanGroup gp in this.RecoveryPlan.Groups)
                             {
-                                if(gp.ReplicationProtectedItems.Any(pi => String.CompareOrdinal(pi.Id, replicationProtectedItemResponse.ReplicationProtectedItem.Id) == 0))
+                                if (gp.ReplicationProtectedItems == null)
+                                    continue;
+
+                                if (gp.ReplicationProtectedItems.Any(pi => String.Compare(pi.Id, replicationProtectedItemResponse.ReplicationProtectedItem.Id, StringComparison.OrdinalIgnoreCase) == 0))
                                 {
                                     throw new PSArgumentException(string.Format(Properties.Resources.VMAlreadyPartOfGroup, pe.FriendlyName, gp.Name, this.RecoveryPlan.FriendlyName));
                                 }
@@ -150,18 +153,16 @@ public override void ExecuteSiteRecoveryCmdlet()
                         RecoveryServicesClient.GetAzureSiteRecoveryProtectableItem(fabricName,
                         pe.ProtectionContainerId, pe.Name);
 
-                        ReplicationProtectedItemResponse replicationProtectedItemResponse =
-                        RecoveryServicesClient.GetAzureSiteRecoveryReplicationProtectedItem(fabricName,
-                        pe.ProtectionContainerId, Utilities.GetValueFromArmId(protectableItemResponse.ProtectableItem.Properties.ReplicationProtectedItemId, 
-                        ARMResourceTypeConstants.ReplicationProtectedItems));
-
                         tempGroup = this.RecoveryPlan.Groups.FirstOrDefault(g => String.Compare(g.Name, Group.Name, StringComparison.OrdinalIgnoreCase) == 0);
 
                         if (tempGroup != null)
                         {
                             var ReplicationProtectedItem =
-                                this.RecoveryPlan.Groups[RecoveryPlan.Groups.IndexOf(tempGroup)].ReplicationProtectedItems.
-                                FirstOrDefault(pi => String.CompareOrdinal(pi.Id, replicationProtectedItemResponse.ReplicationProtectedItem.Id) == 0);
+                                this.RecoveryPlan.Groups[RecoveryPlan.Groups.IndexOf(tempGroup)].
+                                ReplicationProtectedItems.
+                                FirstOrDefault(pi => String.Compare(pi.Id, 
+                                protectableItemResponse.ProtectableItem.Properties.ReplicationProtectedItemId, 
+                                StringComparison.OrdinalIgnoreCase) == 0);
 
                             if (ReplicationProtectedItem != null)
                             {
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/RecoveryPlan/NewAzureSiteRecoveryRecoveryPlan.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/RecoveryPlan/NewAzureSiteRecoveryRecoveryPlan.cs
@@ -201,16 +201,14 @@ private void CreateRecoveryPlan()
 
                 string VmId = null;
 
-                switch (replicationProtectedItemResponse.ReplicationProtectedItem.Properties.ProviderSpecificDetails.InstanceType)
+                if(replicationProtectedItemResponse.ReplicationProtectedItem.Properties.ProviderSpecificDetails.GetType() == typeof(HyperVReplicaAzureReplicationDetails))
+                {                  
+                    VmId = ((HyperVReplicaAzureReplicationDetails)replicationProtectedItemResponse.ReplicationProtectedItem.Properties.ProviderSpecificDetails).VmId;
+                }
+                else if(replicationProtectedItemResponse.ReplicationProtectedItem.Properties.ProviderSpecificDetails.GetType() == typeof(HyperVReplica2012ReplicationDetails))
                 {
-                    case Constants.HyperVReplicaAzureReplicationDetails:
-                        VmId = ((HyperVReplicaAzureReplicationDetails)replicationProtectedItemResponse.ReplicationProtectedItem.Properties.ProviderSpecificDetails).VmId;
-                        break;
-
-                    case Constants.HyperVReplica2012ReplicationDetails:
-                        VmId = ((HyperVReplica2012ReplicationDetails)replicationProtectedItemResponse.ReplicationProtectedItem.Properties.ProviderSpecificDetails).VmId;
-                        break;
-                };
+                    VmId = ((HyperVReplica2012ReplicationDetails)replicationProtectedItemResponse.ReplicationProtectedItem.Properties.ProviderSpecificDetails).VmId;
+                }
 
                 RecoveryPlanProtectedItem recoveryPlanProtectedItem = new RecoveryPlanProtectedItem();
                 recoveryPlanProtectedItem.Id = replicationProtectedItemResponse.ReplicationProtectedItem.Id;
diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/RecoveryPlan/UpdateAzureSiteRecoveryRecoveryPlan.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/RecoveryPlan/UpdateAzureSiteRecoveryRecoveryPlan.cs
@@ -94,22 +94,24 @@ private void UpdateRecoveryPlan(ASRRecoveryPlan asrRecoveryPlan)
                 RecoveryPlanGroup recoveryPlanGroup = new RecoveryPlanGroup()
                 {
                     GroupType = asrRecoveryPlanGroup.GroupType,
-                    ReplicationProtectedItems = asrRecoveryPlanGroup.ReplicationProtectedItems.Select(item =>
-                        { 
+
+                    // Initialize ReplicationProtectedItems with empty List if asrRecoveryPlanGroup.ReplicationProtectedItems is null
+                    // otherwise assign respective values
+                    ReplicationProtectedItems = asrRecoveryPlanGroup.ReplicationProtectedItems == null ? new List<RecoveryPlanProtectedItem>() :
+                    asrRecoveryPlanGroup.ReplicationProtectedItems.Select(item =>
+                        {
                             var newItem = new RecoveryPlanProtectedItem(item.Id);
 
                             string VmId = null;
 
-                            switch (item.Properties.ProviderSpecificDetails.InstanceType)
+                            if (item.Properties.ProviderSpecificDetails.GetType() == typeof(HyperVReplicaAzureReplicationDetails))
                             {
-                                case Constants.HyperVReplicaAzureReplicationDetails:
-                                    VmId = ((HyperVReplicaAzureReplicationDetails)item.Properties.ProviderSpecificDetails).VmId;
-                                    break;
-
-                                case Constants.HyperVReplica2012ReplicationDetails:
-                                    VmId = ((HyperVReplica2012ReplicationDetails)item.Properties.ProviderSpecificDetails).VmId;
-                                    break;
-                            };
+                                VmId = ((HyperVReplicaAzureReplicationDetails)item.Properties.ProviderSpecificDetails).VmId;
+                            }
+                            else if (item.Properties.ProviderSpecificDetails.GetType() == typeof(HyperVReplica2012ReplicationDetails))
+                            {
+                                VmId = ((HyperVReplica2012ReplicationDetails)item.Properties.ProviderSpecificDetails).VmId;
+                            }
 
                             newItem.VirtualMachineId = VmId;
 
@@ -163,6 +165,6 @@ private void UpdateRecoveryPlan(string recoveryPlanName, UpdateRecoveryPlanInput
 
             WriteObject(new ASRJob(jobResponse.Job));
         }
-       
+
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,10 @@ public ASRRecoveryPlanGroup(RecoveryPlanGroup recoveryPlanGroup, IList<Replicati`
`41`	`41`	`var replicationProtectedItemList = recoveryPlanGroup.ReplicationProtectedItems.Select(item => item.Id.ToLower());`
`42`	`42`	`this.ReplicationProtectedItems = replicationProtectedItems.Where(rpi => replicationProtectedItemList.Contains(rpi.Id.ToLower())).ToList();`
`43`	`43`	`}`
	`44`	`+ else`
	`45`	`+ {`
	`46`	`+ this.ReplicationProtectedItems = new List<ReplicationProtectedItem>();`
	`47`	`+ }`
`44`	`48`	`}`
`45`	`49`	`}`
`46`	`50`
Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public override void ExecuteSiteRecoveryCmdlet()`
`94`	`94`	`this.RecoveryPlan.Groups.Add(new ASRRecoveryPlanGroup("Group " + (RecoveryPlan.Groups.Count - 1).ToString(), recoveryPlanGroup));`
`95`	`95`	`break;`
`96`	`96`	`case ASRParameterSets.RemoveGroup:`
`97`		`- tempGroup = this.RecoveryPlan.Groups.FirstOrDefault(g => String.CompareOrdinal(g.Name, RemoveGroup.Name) == 0);`
	`97`	`+ tempGroup = this.RecoveryPlan.Groups.FirstOrDefault(g => String.Compare(g.Name, RemoveGroup.Name, StringComparison.OrdinalIgnoreCase) == 0);`
`98`	`98`
`99`	`99`	`if (tempGroup != null)`
`100`	`100`	`{`
`@@ -127,7 +127,10 @@ public override void ExecuteSiteRecoveryCmdlet()`
`127`	`127`	`{`
`128`	`128`	`foreach (ASRRecoveryPlanGroup gp in this.RecoveryPlan.Groups)`
`129`	`129`	`{`
`130`		`- if(gp.ReplicationProtectedItems.Any(pi => String.CompareOrdinal(pi.Id, replicationProtectedItemResponse.ReplicationProtectedItem.Id) == 0))`
	`130`	`+ if (gp.ReplicationProtectedItems == null)`
	`131`	`+ continue;`
	`132`	`+`
	`133`	`+ if (gp.ReplicationProtectedItems.Any(pi => String.Compare(pi.Id, replicationProtectedItemResponse.ReplicationProtectedItem.Id, StringComparison.OrdinalIgnoreCase) == 0))`
`131`	`134`	`{`
`132`	`135`	`throw new PSArgumentException(string.Format(Properties.Resources.VMAlreadyPartOfGroup, pe.FriendlyName, gp.Name, this.RecoveryPlan.FriendlyName));`
`133`	`136`	`}`
`@@ -150,18 +153,16 @@ public override void ExecuteSiteRecoveryCmdlet()`
`150`	`153`	`RecoveryServicesClient.GetAzureSiteRecoveryProtectableItem(fabricName,`
`151`	`154`	`pe.ProtectionContainerId, pe.Name);`
`152`	`155`
`153`		`- ReplicationProtectedItemResponse replicationProtectedItemResponse =`
`154`		`- RecoveryServicesClient.GetAzureSiteRecoveryReplicationProtectedItem(fabricName,`
`155`		`- pe.ProtectionContainerId, Utilities.GetValueFromArmId(protectableItemResponse.ProtectableItem.Properties.ReplicationProtectedItemId,`
`156`		`- ARMResourceTypeConstants.ReplicationProtectedItems));`
`157`		`-`
`158`	`156`	`tempGroup = this.RecoveryPlan.Groups.FirstOrDefault(g => String.Compare(g.Name, Group.Name, StringComparison.OrdinalIgnoreCase) == 0);`
`159`	`157`
`160`	`158`	`if (tempGroup != null)`
`161`	`159`	`{`
`162`	`160`	`var ReplicationProtectedItem =`
`163`		`- this.RecoveryPlan.Groups[RecoveryPlan.Groups.IndexOf(tempGroup)].ReplicationProtectedItems.`
`164`		`- FirstOrDefault(pi => String.CompareOrdinal(pi.Id, replicationProtectedItemResponse.ReplicationProtectedItem.Id) == 0);`
	`161`	`+ this.RecoveryPlan.Groups[RecoveryPlan.Groups.IndexOf(tempGroup)].`
	`162`	`+ ReplicationProtectedItems.`
	`163`	`+ FirstOrDefault(pi => String.Compare(pi.Id,`
	`164`	`+ protectableItemResponse.ProtectableItem.Properties.ReplicationProtectedItemId,`
	`165`	`+ StringComparison.OrdinalIgnoreCase) == 0);`
`165`	`166`
`166`	`167`	`if (ReplicationProtectedItem != null)`
`167`	`168`	`{`