diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/RecoveryPoint/GetAzureBackupRecoveryPoint.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/RecoveryPoint/GetAzureBackupRecoveryPoint.cs index 69e4c64f9dca..2f86e98e3565 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/RecoveryPoint/GetAzureBackupRecoveryPoint.cs +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/RecoveryPoint/GetAzureBackupRecoveryPoint.cs @@ -51,15 +51,25 @@ public override void ExecuteCmdlet() IEnumerable recoveryPointObjects = null; if (Id != null) { + RecoveryPointInfo recoveryPointObject = null; recoveryPointObjects = recoveryPointListResponse.RecoveryPoints.Objects.Where(x => x.InstanceId.Equals(Id, System.StringComparison.InvariantCultureIgnoreCase)); + if (recoveryPointObjects != null && recoveryPointObjects.Any()) + { + WriteVerbose("Converting response"); + recoveryPointObject = recoveryPointObjects.FirstOrDefault(); + WriteAzureBackupRecoveryPoint(recoveryPointObject, item); + } + else + { + WriteVerbose(string.Format("{0}{1}", "No recovery point exist with Id := ", Id)); + } } else { - recoveryPointObjects = recoveryPointListResponse.RecoveryPoints.Objects; - } - - WriteVerbose("Converting response"); - WriteAzureBackupRecoveryPoint(recoveryPointObjects, item); + WriteVerbose("Converting response"); + recoveryPointObjects = recoveryPointListResponse.RecoveryPoints.Objects.OrderByDescending(x => x.RecoveryPointTime); + WriteAzureBackupRecoveryPoint(recoveryPointObjects, item); + } }); } diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml index 3fa8e6771f06..866def5b8a9a 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Microsoft.Azure.Commands.AzureBackup.format.ps1xml @@ -674,7 +674,7 @@ - 36 + 18 @@ -682,7 +682,7 @@ - 18 + 36 diff --git a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 index 2b1c551ff950..60f2c5acd6ba 100644 --- a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 +++ b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 @@ -71,6 +71,7 @@ FormatsToProcess = @( '.\Compute\Microsoft.Azure.Commands.Compute.format.ps1xml', '.\Network\Microsoft.Azure.Commands.Network.format.ps1xml', '.\Storage\Microsoft.WindowsAzure.Commands.Storage.format.ps1xml' + '.\AzureBackup\Microsoft.Azure.Commands.AzureBackup.format.ps1xml' ) # Modules to import as nested modules of the module specified in ModuleToProcess