Incorporating changes from offline comments

Author: AditTulasi

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJob.cs

@@ -26,9 +26,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     [Cmdlet(VerbsCommon.Get, "AzureRmBackupJob"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>), typeof(AzureRmRecoveryServicesJobBase))]
     public class GetAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Common.Vault, ValueFromPipeline = true)]
-        public ARSVault Vault { get; set; }
-
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.FromFilter)]
         [ValidateNotNull]
         public DateTime? From { get; set; }
@@ -59,6 +56,8 @@ public class GetAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            ARSVault Vault = null;
+
             ExecutionBlock(() =>
             {
                 base.ExecuteCmdlet();

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Jobs/GetAzureRmRecoveryServicesJobDetails.cs

@@ -18,27 +18,29 @@
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
-    [Cmdlet(VerbsCommon.Get, "AzureRmBackupJobDetails"), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
+    [Cmdlet(VerbsCommon.Get, "AzureRmBackupJobDetails", DefaultParameterSetName = JobFilterSet), OutputType(typeof(AzureRmRecoveryServicesJobBase))]
     public class GetAzureRmRecoveryServicesJobDetails : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Common.Vault, ValueFromPipeline = true)]
-        public ARSVault Vault { get; set; }
+        protected const string IdFilterSet = "IdFilterSet";
+        protected const string JobFilterSet = "JobFilterSet";
 
-        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobIdFilter, ParameterSetName = "IdFilterSet")]
+        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobIdFilter, ParameterSetName = IdFilterSet)]
         [ValidateNotNullOrEmpty]
         public string JobId { get; set; }
 
-        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobFilter, ParameterSetName = "JobFilterSet")]
+        [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.JobFilter, ParameterSetName = JobFilterSet)]
         [ValidateNotNull]
         public AzureRmRecoveryServicesJobBase Job { get; set; }
 
         public override void ExecuteCmdlet()
         {
+            ARSVault Vault = null;
+
             ExecutionBlock(() =>
             {
                 base.ExecuteCmdlet();
 
-                if (string.IsNullOrEmpty(JobId) && Job != null)
+                if (ParameterSetName == JobFilterSet)
                 {
                     JobId = Job.InstanceId;
                 }

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Jobs/WaitAzureRmRecoveryServicesJob.cs

@@ -23,9 +23,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     [Cmdlet("Wait", "AzureRmBackupJob"), OutputType(typeof(List<AzureRmRecoveryServicesJobBase>), typeof(AzureRmRecoveryServicesJobBase))]
     public class WaitAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
     {
-        [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Common.Vault)]
-        public ARSVault Vault { get; set; }
-
         [Parameter(Mandatory = true, HelpMessage = ParamHelpMsg.Job.WaitJobOrListFilter)]
         [ValidateNotNull]
         public object Job { get; set; }
@@ -35,6 +32,7 @@ public class WaitAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
 
         public override void ExecuteCmdlet()
         {
+            ARSVault Vault = null;
             ExecutionBlock(() =>
             {
                 base.ExecuteCmdlet();

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs

@@ -26,43 +26,6 @@ public virtual void Validate()
         } 
     }
 
-    public class AzureRmRecoveryServicesVaultContext : AzureRmRecoveryServicesObjectBase
-    {
-        /// <summary>
-        /// Name of the resource.
-        /// </summary>
-        public string ResourceName { get; set; }
-
-        /// <summary>
-        /// Name of resource group to which this resource belongs
-        /// </summary>
-        public string ResourceGroupName { get; set; }
-
-        /// <summary>
-        /// Location of the resource
-        /// </summary>
-        public string Location { get; set; }
-
-        public AzureRmRecoveryServicesVaultContext()
-        {
-        }
-
-        public AzureRmRecoveryServicesVaultContext(
-            string resourceName,
-            string resourceGroupName,
-            string location)
-        {
-            this.ResourceGroupName = resourceGroupName;
-            this.ResourceName = ResourceName;
-            this.Location = location;
-        }
-
-        public override void Validate()
-        {
-            base.Validate();
-        }
-    }
-
     /// <summary>
     /// Represents Recovery Services Vault Credentials Class
     /// </summary>
@@ -211,7 +174,7 @@ public override void Validate()
         }
     }
 
-    public class AzureRmRecoveryServicesJobBase : AzureRmRecoveryServicesVaultContext
+    public class AzureRmRecoveryServicesJobBase : AzureRmRecoveryServicesObjectBase
     {
         public string ActivityId { get; set; }
 

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

@@ -95,9 +95,12 @@ public enum RetentionScheduleFormat
         Weekly = 2
     }
 
+    #endregion
+
+    #region jobs
+
     public enum JobOperation
     {
-        Invalid = 0,
         Backup,
         Restore,
         ConfigureBackup,
@@ -106,7 +109,6 @@ public enum JobOperation
 
     public enum JobStatus
     {
-        Invalid = 0,
         InProgress,
         Cancelling,
         Cancelled,