Optimize should not be part of any parameterset.

Author: sanjkuma

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/SetAzureSiteRecoveryProtectionEntity.cs

@@ -168,6 +168,14 @@ public override void ExecuteCmdlet()
                                 string profileId = string.Empty;
                                 var input = new EnableProtectionInput();
 
+                                if (this.ProtectionEntity == null)
+                                {
+                                    var pe = RecoveryServicesClient.GetAzureSiteRecoveryProtectionEntity(
+                                        this.ProtectionContainerId,
+                                        this.Id);
+                                    this.ProtectionEntity = new ASRProtectionEntity(pe.ProtectionEntity);
+                                }
+
                                 // Get the replciation provider from profile object otherwise assume its E2E.
                                 // Let the call go without profileId set.
                                 string replicationProvider = null;
@@ -179,6 +187,9 @@ public override void ExecuteCmdlet()
                                 }
                                 else
                                 {
+                                    this.WriteDebugWithTimestamp(
+                                        Properties.Resources.MandatoryParamFromNextRelease,
+                                        "ProtectionProfile");
                                     string pcId = this.ProtectionContainerId ?? this.ProtectionEntity.ProtectionContainerId;
                                     var pc = RecoveryServicesClient.GetAzureSiteRecoveryProtectionContainer(
                                         pcId);
@@ -195,14 +206,9 @@ public override void ExecuteCmdlet()
                                     }
                                 }
 
-                                if (this.ProtectionEntity == null)
+                                if (this.ParameterSetName == ASRParameterSets.ByIDs)
                                 {
-                                    var pe = RecoveryServicesClient.GetAzureSiteRecoveryProtectionEntity(
-                                        this.ProtectionContainerId,
-                                        this.Id);
-                                    this.ProtectionEntity = new ASRProtectionEntity(pe.ProtectionEntity);
-
-                                    this.ValidateUsageById(replicationProvider, Constants.ID);
+                                    this.ValidateUsageById(replicationProvider, "Id");
                                 }
 
                                 if (replicationProvider == Constants.HyperVReplicaAzure)

src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/StartAzureSiteRecoveryPlannedFailoverJob.cs

@@ -58,15 +58,13 @@ public class StartAzureSiteRecoveryPlannedFailoverJob : RecoveryServicesCmdletBa
         /// Gets or sets Recovery Plan object.
         /// </summary>
         [Parameter(ParameterSetName = ASRParameterSets.ByRPObject, Mandatory = true, ValueFromPipeline = true)]
-        [Parameter(ParameterSetName = ASRParameterSets.ByRPObjectE2AFailback, Mandatory = true, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
         public ASRRecoveryPlan RecoveryPlan { get; set; }
 
         /// <summary>
         /// Gets or sets Protection Entity object.
         /// </summary>
         [Parameter(ParameterSetName = ASRParameterSets.ByPEObject, Mandatory = true, ValueFromPipeline = true)]
-        [Parameter(ParameterSetName = ASRParameterSets.ByPEObjectE2AFailback, Mandatory = true, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
         public ASRProtectionEntity ProtectionEntity { get; set; }
 
@@ -88,8 +86,7 @@ public class StartAzureSiteRecoveryPlannedFailoverJob : RecoveryServicesCmdletBa
         /// <summary>
         /// Gets or sets the Optimize value.
         /// </summary>
-        [Parameter(ParameterSetName = ASRParameterSets.ByPEObjectE2AFailback)]
-        [Parameter(ParameterSetName = ASRParameterSets.ByPEObjectE2AFailback)]
+        [Parameter]
         [ValidateSet(
             Constants.ForDowntime,
             Constants.ForSynchronization)]
@@ -112,12 +109,10 @@ public override void ExecuteCmdlet()
                 switch (this.ParameterSetName)
                 {
                     case ASRParameterSets.ByRPObject:
-                    case ASRParameterSets.ByRPObjectE2AFailback:
                         this.RPId = this.RecoveryPlan.ID;
                         this.StartRpPlannedFailover();
                         break;
                     case ASRParameterSets.ByPEObject:
-                    case ASRParameterSets.ByPEObjectE2AFailback:
                        this.ProtectionEntityId = this.ProtectionEntity.ID;
                         this.ProtectionContainerId = this.ProtectionEntity.ProtectionContainerId;
                         this.StartPEPlannedFailover();