ProtectionPolicy Changes 3

pragrawa · pragrawa · commit 09407d44cc03 · 2015-06-17T23:18:30.000+05:30
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletBase.cs
@@ -60,12 +60,14 @@ public abstract class AzureBackupCmdletBase : AzurePSCmdlet
         /// Cancellation Token Source
         /// </summary>
         private CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();
-        protected CancellationToken CmdletCancellationToken;
+        internal CancellationToken CmdletCancellationToken;
+
+        protected AzureBackupCmdletHelper azureBackupCmdletHelper;
 
         /// <summary>
         /// Get Azure backup client.
         /// </summary>
-        protected BackupServicesManagementClient AzureBackupClient
+        internal BackupServicesManagementClient AzureBackupClient
         {
             get
             {
@@ -97,7 +99,7 @@ public void InitializeAzureBackupCmdlet(string rgName, string rName, string loca
             WriteDebug(string.Format("Initialized AzureBackup Cmdlet, ClientRequestId: {0}, ResourceGroupName: {1}, ResourceName : {2}", this.clientRequestId, resourceGroupName, resourceName));
 
             CmdletCancellationToken = cancellationTokenSource.Token;
-            AzureBackupCmdletHelper cmdHelper = new AzureBackupCmdletHelper(this);
+            azureBackupCmdletHelper = new AzureBackupCmdletHelper(this);
         }
 
         protected void ExecutionBlock(Action execAction)
@@ -170,7 +172,7 @@ private void HandleException(Exception exception)
             }
         }
 
-        protected CustomRequestHeaders GetCustomRequestHeaders()
+        internal CustomRequestHeaders GetCustomRequestHeaders()
         {
             var hdrs = new CustomRequestHeaders()
             {
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupCmdletHelpMessage.cs
@@ -41,7 +41,8 @@ internal static class AzureBackupCmdletHelpMessage
         public const string Comments = "Comments for for removing protection";
         public const string WorkloadType = "Workload type for which the policy is defined.";
         public const string BackupType = "Type of backup.";
-        public const string ScheduleType = "Type of schedule.";
+        public const string DailyScheduleType = "Switch parameter for daily backup schedule.";
+        public const string WeeklyScheduleType = "Switch parameter for weekly backup schedule.";
         public const string ScheduleRunDays = "Days of week for running backup, required for weekly schedule.";
         public const string ScheduleRunTimes = "Times of day for running backup.";
         public const string RetentionType = "Unit of retention for the recovery point.";
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupPolicyCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupPolicyCmdletBase.cs
@@ -39,7 +39,8 @@ public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
-            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location));
+            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", 
+                ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location));
 
             InitializeAzureBackupCmdlet(ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location);
         }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/GetAzureBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/GetAzureBackupProtectionPolicy.cs
@@ -39,22 +39,23 @@ public override void ExecuteCmdlet()
             {
                 WriteDebug("Making client call");
 
-                var policyListResponse = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-
-                WriteDebug("Received policy response");
                 IEnumerable<ProtectionPolicyInfo> policyObjects = null;
                 if (Name != null)
                 {
-                    policyObjects = policyListResponse.ProtectionPolicies.Objects.Where(x => x.Name.Equals(Name, System.StringComparison.InvariantCultureIgnoreCase));
+                    AzureBackupProtectionPolicy policyInfo = azureBackupCmdletHelper.GetAzureBackupProtectionPolicyByName(Name, ResourceGroupName, ResourceName, Location);
+                    WriteDebug("Converting response");
+                    WriteObject(policyInfo);
                 }
                 else
                 {
+                    var policyListResponse = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+
+                    WriteDebug("Received policy response");
                     policyObjects = policyListResponse.ProtectionPolicies.Objects;
-                }
 
-                WriteDebug("Converting response");
-                AzureBackupCmdletHelper.WriteAzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, policyObjects);
-                
+                    WriteDebug("Converting response");
+                    azureBackupCmdletHelper.WriteAzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, policyObjects);
+                }                
             });
         }
     }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureBackupProtectionPolicy.cs
@@ -36,31 +36,32 @@ public class NewAzureBackupProtectionPolicy : AzureBackupVaultCmdletBase
         public string Name { get; set; }
 
         [Parameter(Position = 4, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.WorkloadType, ValueFromPipelineByPropertyName = true)]
-        [ValidateSet("VM")]
+        [ValidateSet("VM", IgnoreCase = true)]
         public string WorkloadType { get; set; }
 
         [Parameter(Position = 5, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.BackupType, ValueFromPipelineByPropertyName = true)]
-        [ValidateSet("Full")]
+        [ValidateSet("Full", IgnoreCase = true)]
         public string BackupType { get; set; }
 
-        [Parameter(ParameterSetName = DailyScheduleParamSet, Position = 7, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleType)]
+        [Parameter(ParameterSetName = DailyScheduleParamSet, Position = 6, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.DailyScheduleType)]
         public SwitchParameter Daily { get; set; }
 
-        [Parameter(ParameterSetName = WeeklyScheduleParamSet, Position = 6, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleType)]
+        [Parameter(ParameterSetName = WeeklyScheduleParamSet, Position = 7, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.WeeklyScheduleType)]
         public SwitchParameter Weekly { get; set; }
 
-        [Parameter(Position = 7, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunTimes, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Position = 8, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunTimes, ValueFromPipelineByPropertyName = true)]
         public DateTime ScheduleRunTimes { get; set; }
 
-        [Parameter(Position = 8, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.RetentionType, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Position = 9, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.RetentionType, ValueFromPipelineByPropertyName = true)]
         [ValidateSet("Days", IgnoreCase = true)]
         public string RetentionType { get; set; }
 
-        [Parameter(Position = 9, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.RententionDuration, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Position = 10, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.RententionDuration, ValueFromPipelineByPropertyName = true)]
         public int RetentionDuration { get; set; }
 
-        [Parameter(ParameterSetName = WeeklyScheduleParamSet, Position = 10, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunDays, ValueFromPipelineByPropertyName = true)]
-        [Parameter(ParameterSetName = NoScheduleParamSet, Position = 10, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunDays, ValueFromPipelineByPropertyName = true)]
+        [Parameter(ParameterSetName = WeeklyScheduleParamSet, Position = 11, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunDays, ValueFromPipelineByPropertyName = true)]
+        [Parameter(ParameterSetName = NoScheduleParamSet, Position = 11, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunDays, ValueFromPipelineByPropertyName = true)]
+        [AllowEmptyCollection]
         [ValidateSet("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday", IgnoreCase = true)]
         public string[] ScheduleRunDays { get; set; }
 
@@ -74,31 +75,20 @@ public override void ExecuteCmdlet()
 
                 var ScheduleType = GetScheduelType(ScheduleRunDays);
 
-                var backupSchedule = AzureBackupCmdletHelper.FillBackupSchedule(BackupType, ScheduleType, ScheduleRunTimes,
+                var backupSchedule = azureBackupCmdletHelper.FillBackupSchedule(BackupType, ScheduleType, ScheduleRunTimes,
                    RetentionType, RetentionDuration, ScheduleRunDays);
                 
-
-                //var backupSchedule = GetBackupSchedule(BackupType, ScheduleType, ScheduleRunTimes, 
-                //    RetentionType, RetentionDuration, ScheduleRunDays);
-                
                 var addProtectionPolicyRequest = new AddProtectionPolicyRequest();
                 addProtectionPolicyRequest.PolicyName = this.Name;
                 addProtectionPolicyRequest.Schedule = backupSchedule;
-                addProtectionPolicyRequest.WorkloadType = this.WorkloadType;
+                addProtectionPolicyRequest.WorkloadType = Enum.Parse(typeof(WorkloadType), this.WorkloadType, true).ToString();
 
                 var operationId = AzureBackupClient.ProtectionPolicy.AddAsync(addProtectionPolicyRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-
                 WriteDebug("Protection policy created successfully");
-               
-                var policyListResponse = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-
-                WriteDebug("Received policy response");
-
-                IEnumerable<ProtectionPolicyInfo> policyObjects = null;
-                policyObjects = policyListResponse.ProtectionPolicies.Where(x => x.Name.Equals(Name, System.StringComparison.InvariantCultureIgnoreCase));
 
+                AzureBackupProtectionPolicy policyInfo = azureBackupCmdletHelper.GetAzureBackupProtectionPolicyByName(Name, ResourceGroupName, ResourceName, Location);
                 WriteDebug("Converting response");
-                AzureBackupCmdletHelper.WriteAzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, policyObjects);
+                WriteObject(policyInfo);
             });
         }
 
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureBackupProtectionPolicy.cs
@@ -35,25 +35,20 @@ public override void ExecuteCmdlet()
             {
                 WriteDebug("Making client call");
 
-                var policyListResponse = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-
-                WriteDebug("Received policy response");
-                IEnumerable<ProtectionPolicyInfo> policyObjects = null;
-
-                policyObjects = policyListResponse.ProtectionPolicies.Objects.Where(x => x.Name.Equals(ProtectionPolicy.Name, System.StringComparison.InvariantCultureIgnoreCase));
-
-                if (policyObjects.Count<ProtectionPolicyInfo>() != 0)
+                AzureBackupProtectionPolicy policyInfo = azureBackupCmdletHelper.GetAzureBackupProtectionPolicyByName(ProtectionPolicy.Name, 
+                    ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location);
+                
+                if (policyInfo != null)
                 {
-                    ProtectionPolicyInfo protectionPolicyInfo = policyObjects.ElementAt<ProtectionPolicyInfo>(0);
-                    var policyRemoveResponse = AzureBackupClient.ProtectionPolicy.DeleteAsync(protectionPolicyInfo.InstanceId, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+                    var policyRemoveResponse = AzureBackupClient.ProtectionPolicy.DeleteAsync(policyInfo.InstanceId, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+
+                    WriteDebug("Converting response");
+                    WriteVerbose("Successfully deleted policy");
                 }
                 else
                 {
                     WriteVerbose("Policy Not Found");
                 }
-
-                WriteDebug("Converting response");
-                WriteVerbose("Successfully deleted policy");
             });
         }        
     }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/SetAzureBackupProtectionPolicy.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/SetAzureBackupProtectionPolicy.cs
@@ -31,31 +31,31 @@ public class SetAzureBackupProtectionPolicy : AzureBackupPolicyCmdletBase
         protected const string DailyScheduleParamSet = "DailyScheduleParamSet";
         protected const string NoScheduleParamSet = "NoScheduleParamSet";
 
-        [Parameter(Position = 3, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.PolicyNewName, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Position = 1, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.PolicyNewName)]
         [ValidateNotNullOrEmpty]
         public string NewName { get; set; }
 
-        [Parameter(Position = 5, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.BackupType, ValueFromPipelineByPropertyName = true)]
-        [ValidateSet("Full")]
+        [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.BackupType)]
+        [ValidateSet("Full", IgnoreCase = true)]
         public string BackupType { get; set; }
 
-        [Parameter(ParameterSetName = DailyScheduleParamSet, Position = 7, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleType)]
+        [Parameter(ParameterSetName = DailyScheduleParamSet, Position = 3, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.DailyScheduleType)]
         public SwitchParameter Daily { get; set; }
 
-        [Parameter(ParameterSetName = WeeklyScheduleParamSet, Position = 6, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleType)]
+        [Parameter(ParameterSetName = WeeklyScheduleParamSet, Position = 4, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.WeeklyScheduleType)]
         public SwitchParameter Weekly { get; set; }
 
-        [Parameter(Position = 7, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunTimes, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Position = 5, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunTimes)]
         public DateTime ScheduleRunTimes { get; set; }
 
-        [Parameter(Position = 8, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RetentionType, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Position = 6, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RetentionType)]
         [ValidateSet("Days", IgnoreCase = true)]
         public string RetentionType { get; set; }
 
-        [Parameter(Position = 9, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RententionDuration, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Position = 7, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RententionDuration)]
         public int RetentionDuration { get; set; }
 
-        [Parameter(ParameterSetName = WeeklyScheduleParamSet, Position = 10, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunDays, ValueFromPipelineByPropertyName = true)]
+        [Parameter(ParameterSetName = WeeklyScheduleParamSet, Position = 8, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ScheduleRunDays)]
         [ValidateSet("Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday", IgnoreCase = true)]
         public string[] ScheduleRunDays { get; set; }
 
@@ -66,53 +66,38 @@ public override void ExecuteCmdlet()
             ExecutionBlock(() =>
             {
                 WriteDebug("Making client call");
-                
-                AzureBackupProtectionPolicy policy = ProtectionPolicy;
-
-                FillRemainingValuesForSetPolicyRequest(policy);
 
-                AzureBackupCmdletHelper.ValidateAzureBackupPolicyRequest(policy);
+                AzureBackupProtectionPolicy policyInfo = azureBackupCmdletHelper.GetAzureBackupProtectionPolicyByName(ProtectionPolicy.Name,
+                    ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location);
+                
+                FillRemainingValuesForSetPolicyRequest(policyInfo);
 
-                var backupSchedule = AzureBackupCmdletHelper.FillBackupSchedule(BackupType, policy.ScheduleType, ScheduleRunTimes,
-                   RetentionType, RetentionDuration, policy.ScheduleRunDays.ToArray<string>());
-                   
-             
-                var policyListResponse = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+                var backupSchedule = azureBackupCmdletHelper.FillBackupSchedule(BackupType, policyInfo.ScheduleType, ScheduleRunTimes,
+                   RetentionType, RetentionDuration, policyInfo.ScheduleRunDays.ToArray<string>());
 
-                NewName = (string.IsNullOrEmpty(NewName) ? policy.Name: NewName);
+                NewName = (string.IsNullOrEmpty(NewName) ? policyInfo.Name : NewName);
                 var updateProtectionPolicyRequest = new UpdateProtectionPolicyRequest();
                 updateProtectionPolicyRequest.PolicyName = this.NewName;
                 updateProtectionPolicyRequest.Schedule = backupSchedule;
 
-                WriteDebug("Got the protectionPolicy List");
-
-                IEnumerable<ProtectionPolicyInfo> policyObjects = null;
-
-                policyObjects = policyListResponse.ProtectionPolicies.Objects.Where(x => x.Name.Equals(policy.Name, System.StringComparison.InvariantCultureIgnoreCase));
-
-                WriteDebug("Got the protectionPolicy with Name" + this.ProtectionPolicy.Name);
-
-                if (policyObjects.Count<ProtectionPolicyInfo>() != 0)
+                if (policyInfo != null)
                 {
-                    var operationId = AzureBackupClient.ProtectionPolicy.UpdateAsync(ProtectionPolicy.InstanceId, updateProtectionPolicyRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+                    var operationId = AzureBackupClient.ProtectionPolicy.UpdateAsync(policyInfo.InstanceId, updateProtectionPolicyRequest, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
                 }
                 else
                 {
                     var exception = new Exception("Protection Policy Not Found with Name" + ProtectionPolicy.Name);
                     var errorRecord = new ErrorRecord(exception, string.Empty, ErrorCategory.InvalidData, null);
-                    WriteError(errorRecord);                   
+                    WriteError(errorRecord);
+                    return;
                 }
 
                 WriteDebug("Protection Policy successfully updated");
 
-                var policyListResponse_afterUpdate = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-
-                WriteDebug("Received policy response");
-
-                policyObjects = policyListResponse_afterUpdate.ProtectionPolicies.Where(x => x.Name.Equals(NewName, System.StringComparison.InvariantCultureIgnoreCase));
-
+                AzureBackupProtectionPolicy updatedPolicyInfo = azureBackupCmdletHelper.GetAzureBackupProtectionPolicyByName(NewName,
+                    ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location);
                 WriteDebug("Converting response");
-                AzureBackupCmdletHelper.WriteAzureBackupProtectionPolicy(policy.ResourceGroupName, policy.ResourceName, policy.Location, policyObjects);
+                WriteObject(updatedPolicyInfo);
 
             });
         }
@@ -154,6 +139,7 @@ private void FillRemainingValuesForSetPolicyRequest(AzureBackupProtectionPolicy
                 else
                 {
                     policy.ScheduleType = ScheduleType.Daily.ToString();
+                    policy.ScheduleRunDays = new List<string>();
                 }          
                 
             }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Library/AzureBackupCmdletHelper.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Library/AzureBackupCmdletHelper.cs

Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,14 @@ public abstract class AzureBackupCmdletBase : AzurePSCmdlet`
`60`	`60`	`/// Cancellation Token Source`
`61`	`61`	`/// </summary>`
`62`	`62`	`private CancellationTokenSource cancellationTokenSource = new CancellationTokenSource();`
`63`		`- protected CancellationToken CmdletCancellationToken;`
	`63`	`+ internal CancellationToken CmdletCancellationToken;`
	`64`	`+`
	`65`	`+ protected AzureBackupCmdletHelper azureBackupCmdletHelper;`
`64`	`66`
`65`	`67`	`/// <summary>`
`66`	`68`	`/// Get Azure backup client.`
`67`	`69`	`/// </summary>`
`68`		`- protected BackupServicesManagementClient AzureBackupClient`
	`70`	`+ internal BackupServicesManagementClient AzureBackupClient`
`69`	`71`	`{`
`70`	`72`	`get`
`71`	`73`	`{`
`@@ -97,7 +99,7 @@ public void InitializeAzureBackupCmdlet(string rgName, string rName, string loca`
`97`	`99`	`WriteDebug(string.Format("Initialized AzureBackup Cmdlet, ClientRequestId: {0}, ResourceGroupName: {1}, ResourceName : {2}", this.clientRequestId, resourceGroupName, resourceName));`
`98`	`100`
`99`	`101`	`CmdletCancellationToken = cancellationTokenSource.Token;`
`100`		`- AzureBackupCmdletHelper cmdHelper = new AzureBackupCmdletHelper(this);`
	`102`	`+ azureBackupCmdletHelper = new AzureBackupCmdletHelper(this);`
`101`	`103`	`}`
`102`	`104`
`103`	`105`	`protected void ExecutionBlock(Action execAction)`
`@@ -170,7 +172,7 @@ private void HandleException(Exception exception)`
`170`	`172`	`}`
`171`	`173`	`}`
`172`	`174`
`173`		`- protected CustomRequestHeaders GetCustomRequestHeaders()`
	`175`	`+ internal CustomRequestHeaders GetCustomRequestHeaders()`
`174`	`176`	`{`
`175`	`177`	`var hdrs = new CustomRequestHeaders()`
`176`	`178`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ public override void ExecuteCmdlet()`
`39`	`39`	`{`
`40`	`40`	`base.ExecuteCmdlet();`
`41`	`41`
`42`		`- WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location));`
	`42`	`+ WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}",`
	`43`	`+ ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location));`
`43`	`44`
`44`	`45`	`InitializeAzureBackupCmdlet(ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location);`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,22 +39,23 @@ public override void ExecuteCmdlet()`
`39`	`39`	`{`
`40`	`40`	`WriteDebug("Making client call");`
`41`	`41`
`42`		`- var policyListResponse = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
`43`		`-`
`44`		`- WriteDebug("Received policy response");`
`45`	`42`	`IEnumerable<ProtectionPolicyInfo> policyObjects = null;`
`46`	`43`	`if (Name != null)`
`47`	`44`	`{`
`48`		`- policyObjects = policyListResponse.ProtectionPolicies.Objects.Where(x => x.Name.Equals(Name, System.StringComparison.InvariantCultureIgnoreCase));`
	`45`	`+ AzureBackupProtectionPolicy policyInfo = azureBackupCmdletHelper.GetAzureBackupProtectionPolicyByName(Name, ResourceGroupName, ResourceName, Location);`
	`46`	`+ WriteDebug("Converting response");`
	`47`	`+ WriteObject(policyInfo);`
`49`	`48`	`}`
`50`	`49`	`else`
`51`	`50`	`{`
	`51`	`+ var policyListResponse = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
	`52`	`+`
	`53`	`+ WriteDebug("Received policy response");`
`52`	`54`	`policyObjects = policyListResponse.ProtectionPolicies.Objects;`
`53`		`- }`
`54`	`55`
`55`		`- WriteDebug("Converting response");`
`56`		`- AzureBackupCmdletHelper.WriteAzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, policyObjects);`
`57`		`-`
	`56`	`+ WriteDebug("Converting response");`
	`57`	`+ azureBackupCmdletHelper.WriteAzureBackupProtectionPolicy(ResourceGroupName, ResourceName, Location, policyObjects);`
	`58`	`+ }`
`58`	`59`	`});`
`59`	`60`	`}`
`60`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,25 +35,20 @@ public override void ExecuteCmdlet()`
`35`	`35`	`{`
`36`	`36`	`WriteDebug("Making client call");`
`37`	`37`
`38`		`- var policyListResponse = AzureBackupClient.ProtectionPolicy.ListAsync(GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
`39`		`-`
`40`		`- WriteDebug("Received policy response");`
`41`		`- IEnumerable<ProtectionPolicyInfo> policyObjects = null;`
`42`		`-`
`43`		`- policyObjects = policyListResponse.ProtectionPolicies.Objects.Where(x => x.Name.Equals(ProtectionPolicy.Name, System.StringComparison.InvariantCultureIgnoreCase));`
`44`		`-`
`45`		`- if (policyObjects.Count<ProtectionPolicyInfo>() != 0)`
	`38`	`+ AzureBackupProtectionPolicy policyInfo = azureBackupCmdletHelper.GetAzureBackupProtectionPolicyByName(ProtectionPolicy.Name,`
	`39`	`+ ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, ProtectionPolicy.Location);`
	`40`	`+`
	`41`	`+ if (policyInfo != null)`
`46`	`42`	`{`
`47`		`- ProtectionPolicyInfo protectionPolicyInfo = policyObjects.ElementAt<ProtectionPolicyInfo>(0);`
`48`		`- var policyRemoveResponse = AzureBackupClient.ProtectionPolicy.DeleteAsync(protectionPolicyInfo.InstanceId, GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
	`43`	`+ var policyRemoveResponse = AzureBackupClient.ProtectionPolicy.DeleteAsync(policyInfo.InstanceId, GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
	`44`	`+`
	`45`	`+ WriteDebug("Converting response");`
	`46`	`+ WriteVerbose("Successfully deleted policy");`
`49`	`47`	`}`
`50`	`48`	`else`
`51`	`49`	`{`
`52`	`50`	`WriteVerbose("Policy Not Found");`
`53`	`51`	`}`
`54`		`-`
`55`		`- WriteDebug("Converting response");`
`56`		`- WriteVerbose("Successfully deleted policy");`
`57`	`52`	`});`
`58`	`53`	`}`
`59`	`54`	`}`