From 162798aab6ce33f76edd452fdc6796f37eba400a Mon Sep 17 00:00:00 2001 From: Youri Date: Mon, 1 Mar 2021 15:00:30 +0800 Subject: [PATCH 1/2] fix issue for PVS-studio --- .../CommonModels/PolicyRetentionObjects.cs | 2 +- ...etAzureRmRecoveryServicesBackupProtectionPolicy.cs | 11 ----------- .../Models/PSFabricDetails.cs | 1 - .../StartAzureRmRecoveryServicesAsrTestFailoverJob.cs | 6 +++--- ...tartAzureRmRecoveryServicesAsrUnPlannedFailover.cs | 4 ++-- ...teAzureRmRecoveryServicesAsrProtectionDirection.cs | 4 ++-- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs b/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs index 721297f8204a..85bb72fb0830 100644 --- a/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs +++ b/src/RecoveryServices/RecoveryServices.Backup.Models/CommonModels/PolicyRetentionObjects.cs @@ -220,7 +220,7 @@ public abstract class RetentionScheduleBase public virtual void Validate() { - if (RetentionTimes == null || RetentionTimes.Count == 0 || RetentionTimes.Count != 1) + if (RetentionTimes == null || RetentionTimes.Count != 1) { throw new ArgumentException(Resources.InvalidRetentionTimesInPolicyException); } diff --git a/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupProtectionPolicy.cs b/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupProtectionPolicy.cs index d484f1cfa549..16ef411187aa 100644 --- a/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupProtectionPolicy.cs +++ b/src/RecoveryServices/RecoveryServices.Backup/Cmdlets/ProtectionPolicy/GetAzureRmRecoveryServicesBackupProtectionPolicy.cs @@ -170,17 +170,6 @@ public override void ExecuteCmdlet() ServiceClientHelpers.GetServiceClientProviderType( Models.WorkloadType.AzureFiles ); } - else if( WorkloadType == Models.WorkloadType.AzureFiles ) - { - if( BackupManagementType != Models.BackupManagementType.AzureStorage ) - { - throw new ArgumentException( - Resources.AzureFileUnsupportedBackupManagementTypeException ); - } - serviceClientProviderType = - ServiceClientHelpers.GetServiceClientProviderType( - Models.WorkloadType.AzureFiles ); - } else if( WorkloadType == Models.WorkloadType.MSSQL ) { if( BackupManagementType != Models.BackupManagementType.AzureWorkload ) diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs index 3dd5fa78a2b4..5edd9f0a8494 100644 --- a/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs +++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/Models/PSFabricDetails.cs @@ -876,7 +876,6 @@ public class ASRInMageAzureV2SpecificRPIDetails : ASRProviderSpecificRPIDetails /// public ASRInMageAzureV2SpecificRPIDetails(InMageAzureV2ReplicationDetails details) { - this.LastHeartbeat = this.LastHeartbeat; this.RecoveryAvailabilitySetId = details.RecoveryAvailabilitySetId; this.AgentVersion = details.AgentVersion; this.DiscoveryType = details.DiscoveryType; diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs index 37946ea37d76..530ad0f39d2c 100644 --- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs +++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs @@ -261,9 +261,9 @@ private void StartRPITestFailover() } else { - new ArgumentException( + Console.WriteLine(new ArgumentException( Resources - .UnsupportedDirectionForTFO); // Throw Unsupported Direction Exception + .UnsupportedDirectionForTFO).Message); // Throw Unsupported Direction Exception } } else if (string.Compare( @@ -307,7 +307,7 @@ private void StartRPITestFailover() else { // RecoveryToPrimary Direction is Invalid for InMageAzureV2. - new ArgumentException(Resources.InvalidDirectionForVMWareToAzure); + Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForVMWareToAzure).Message); } } else if (string.Compare( diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs index ac8304009e7e..9d0eceb93ba8 100644 --- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs +++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs @@ -275,7 +275,7 @@ private void InMageUnplannedFailover(UnplannedFailoverInput input) else { // RecoveryToPrimary Direction is Invalid for InMage. - new ArgumentException(Resources.InvalidDirectionForAzureToVMWare); + Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForAzureToVMWare).Message); } } @@ -319,7 +319,7 @@ private void InMageAzureV2UnplannedFailover(UnplannedFailoverInput input) else { // RecoveryToPrimary Direction is Invalid for InMageAzureV2. - new ArgumentException(Resources.InvalidDirectionForVMWareToAzure); + Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForVMWareToAzure).Message); } } diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs index cf7aaeb6698b..b9b8ea6e9f15 100644 --- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs +++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs @@ -477,7 +477,7 @@ private void SetRPIReprotect() else { // PrimaryToRecovery Direction is Invalid for InMageAzureV2. - new ArgumentException(Resources.InvalidDirectionForAzureToVMWare); + Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForAzureToVMWare).Message); } } else if (string.Compare( @@ -508,7 +508,7 @@ private void SetRPIReprotect() else { // PrimaryToRecovery Direction is Invalid for InMage. - new ArgumentException(Resources.InvalidDirectionForVMWareToAzure); + Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForVMWareToAzure).Message); } } From a4fa00d58bbf6f7c590b7d1760b5dff1b06228c3 Mon Sep 17 00:00:00 2001 From: Youri Date: Tue, 2 Mar 2021 14:02:29 +0800 Subject: [PATCH 2/2] Replace 'WriteLine' with 'TODO' --- .../StartAzureRmRecoveryServicesAsrTestFailoverJob.cs | 8 +++++--- .../StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs | 6 ++++-- ...UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs index 530ad0f39d2c..3631e3c10993 100644 --- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs +++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrTestFailoverJob.cs @@ -261,9 +261,10 @@ private void StartRPITestFailover() } else { - Console.WriteLine(new ArgumentException( + // TODO + new ArgumentException( Resources - .UnsupportedDirectionForTFO).Message); // Throw Unsupported Direction Exception + .UnsupportedDirectionForTFO); // Throw Unsupported Direction Exception } } else if (string.Compare( @@ -306,8 +307,9 @@ private void StartRPITestFailover() } else { + // TODO // RecoveryToPrimary Direction is Invalid for InMageAzureV2. - Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForVMWareToAzure).Message); + new ArgumentException(Resources.InvalidDirectionForVMWareToAzure); } } else if (string.Compare( diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs index 9d0eceb93ba8..437e41783027 100644 --- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs +++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/StartAzureRmRecoveryServicesAsrUnPlannedFailover.cs @@ -274,8 +274,9 @@ private void InMageUnplannedFailover(UnplannedFailoverInput input) } else { + // TODO // RecoveryToPrimary Direction is Invalid for InMage. - Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForAzureToVMWare).Message); + new ArgumentException(Resources.InvalidDirectionForAzureToVMWare); } } @@ -318,8 +319,9 @@ private void InMageAzureV2UnplannedFailover(UnplannedFailoverInput input) } else { + // TODO // RecoveryToPrimary Direction is Invalid for InMageAzureV2. - Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForVMWareToAzure).Message); + new ArgumentException(Resources.InvalidDirectionForVMWareToAzure); } } diff --git a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs index b9b8ea6e9f15..f35143391a1b 100644 --- a/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs +++ b/src/RecoveryServices/RecoveryServices.SiteRecovery/ReplicationProtectedItem/UpdateAzureRmRecoveryServicesAsrProtectionDirection.cs @@ -476,8 +476,9 @@ private void SetRPIReprotect() } else { + // TODO // PrimaryToRecovery Direction is Invalid for InMageAzureV2. - Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForAzureToVMWare).Message); + new ArgumentException(Resources.InvalidDirectionForAzureToVMWare); } } else if (string.Compare( @@ -507,8 +508,9 @@ private void SetRPIReprotect() } else { + // TODO // PrimaryToRecovery Direction is Invalid for InMage. - Console.WriteLine(new ArgumentException(Resources.InvalidDirectionForVMWareToAzure).Message); + new ArgumentException(Resources.InvalidDirectionForVMWareToAzure); } }