Taking review comments. Added ResourceBackupStatus object as the response of the Get-AzureRmRecoveryServicesBackupStatus cmdlet.

Author: Samuel Anudeep

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj

@@ -57,6 +57,7 @@
     <Compile Include="AzureVmModels\AzureVmRecoveryPoint.cs" />
     <Compile Include="BaseObjects.cs" />
     <Compile Include="CmdletParamEnums.cs" />
+    <Compile Include="CommonModels\ResourceBackupStatus.cs" />
     <Compile Include="CommonModels\Utils.cs" />
     <Compile Include="CommonModels\Enums.cs" />
     <Compile Include="CommonModels\PolicyRetentionObjects.cs" />

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Models/CommonModels/ResourceBackupStatus.cs

@@ -0,0 +1,44 @@
+using System;
+
+namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
+{
+    /// <summary>
+    /// Backup status of a resource.
+    /// </summary>
+    public class ResourceBackupStatus
+    {
+        /// <summary>
+        /// The Resource Name.
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// The Resource Group Name.
+        /// </summary>
+        public string ResourceGroupName { get; set; }
+
+        /// <summary>
+        /// If the resource is protected by some vault in the subscription, this contains the resource ID of that vault.
+        /// </summary>
+        public string VaultId { get; set; }
+
+        /// <summary>
+        /// Specifies whether the resource is protected by some vault in the subscription.
+        /// </summary>
+        public bool BackedUp { get; set; }
+
+        public ResourceBackupStatus(string name, string resourceGroupName, string vaultId, bool backedUp)
+        {
+            if (backedUp && string.IsNullOrEmpty(vaultId) ||
+                !backedUp && !string.IsNullOrEmpty(vaultId))
+            {
+                throw new ArgumentException($"Inconsistent parameters specified. backedUp: {backedUp} and vaultId: {vaultId}.");
+            }
+
+            Name = name;
+            ResourceGroupName = resourceGroupName;
+            VaultId = vaultId;
+            BackedUp = backedUp;
+        }
+    }
+}

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs

@@ -62,6 +62,6 @@ public interface IPsBackupProvider
 
         void RevokeItemLevelRecoveryAccess();
 
-        string CheckBackupStatus();
+        ResourceBackupStatus CheckBackupStatus();
     }
 }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs

@@ -479,7 +479,7 @@ public List<ItemBase> ListProtectedItems()
             return itemModels;
         }
 
-        public string CheckBackupStatus()
+        public ResourceBackupStatus CheckBackupStatus()
         {
             throw new NotImplementedException();
         }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs

@@ -154,7 +154,7 @@ public List<ItemBase> ListProtectedItems()
             throw new NotImplementedException();
         }
 
-        public string CheckBackupStatus()
+        public ResourceBackupStatus CheckBackupStatus()
         {
             throw new NotImplementedException();
         }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

@@ -924,7 +924,7 @@ public RetentionPolicyBase GetDefaultRetentionPolicyObject()
 
         }
 
-        public string CheckBackupStatus()
+        public ResourceBackupStatus CheckBackupStatus()
         {
             string azureVmName = (string)ProviderData[ProtectionCheckParams.Name];
             string azureVmResourceGroupName =
@@ -936,10 +936,10 @@ public string CheckBackupStatus()
                             == ServiceClientModel.BackupManagementType.AzureIaasVM &&
                          q.ItemType == DataSourceType.VM);
 
-            var vaults = ServiceClientAdapter.ListVaults();
-            foreach (var vault in vaults)
+            var vaultIds = ServiceClientAdapter.ListVaults();
+            foreach (var vaultId in vaultIds)
             {
-                ResourceIdentifier vaultIdentifier = new ResourceIdentifier(vault);
+                ResourceIdentifier vaultIdentifier = new ResourceIdentifier(vaultId);
 
                 var items = ServiceClientAdapter.ListProtectedItem(
                     queryParams,
@@ -958,11 +958,19 @@ public string CheckBackupStatus()
                             itemVmRgName.ToLower() == azureVmResourceGroupName.ToLower();
                     }))
                 {
-                    return vault;
+                    return new ResourceBackupStatus(
+                        azureVmName,
+                        azureVmResourceGroupName,
+                        vaultId,
+                        true);
                 }
             }
 
-            return null;
+            return new ResourceBackupStatus(
+                azureVmName,
+                azureVmResourceGroupName,
+                null,
+                false);
         }
 
         #region private

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs

@@ -157,7 +157,7 @@ public List<ItemBase> ListProtectedItems()
             throw new NotImplementedException();
         }
 
-        public string CheckBackupStatus()
+        public ResourceBackupStatus CheckBackupStatus()
         {
             throw new NotImplementedException();
         }

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ProtectionCheckTests.ps1

@@ -27,20 +27,23 @@ function Test-AzureVMProtectionCheck
 			-ResourceGroupName $vm.ResourceGroupName `
 			-Type AzureVM
 
-		Assert-Null $status
+		Assert-NotNull $status
+		Assert-False $status.BackedUp
 
 		$vault = Create-RecoveryServicesVault $resourceGroupName $location
 		Enable-Protection $vault $vm
 
-		$vaultId = Get-AzureRmRecoveryServicesBackupStatus -ResourceId $vm.Id
-		Assert-NotNull $vaultId
-		Assert-True { $vault.ID -eq $vaultId }
+		$status = Get-AzureRmRecoveryServicesBackupStatus -ResourceId $vm.Id
+		Assert-NotNull $status
+		Assert-True $status.BackedUp
+		Assert-True { $status.VaultId -eq $vaultId }
 
 		Delete-Vault $vault
 
 		$status = Get-AzureRmRecoveryServicesBackupStatus -ResourceId $vm.Id
 
-		Assert-Null $status
+		Assert-NotNull $status
+		Assert-False $status.BackedUp
 	}
 	finally
 	{

src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Backup/Cmdlets/Backup/GetAzureRmRecoveryServicesBackupStatus.cs

@@ -17,7 +17,6 @@
 using System.Management.Automation;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
-using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
 using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 using Microsoft.Azure.Management.Internal.Resources.Utilities.Models;
 
@@ -28,7 +27,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// </summary>
     [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesBackupStatus",
         DefaultParameterSetName = NameParamSet)]
-    [OutputType(typeof(string))]
+    [OutputType(typeof(ResourceBackupStatus))]
     public class GetAzureRmRecoveryServicesBackupStatus : RecoveryServicesBackupCmdletBase
     {
         const string NameParamSet = "Name";