Incorporated changes suggested by comments

Author: AditTulasi

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

@@ -47,15 +47,15 @@ public class GetAzureRmRecoveryServicesJob : RecoveryServicesBackupCmdletBase
 
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.BackupManagementTypeFilter)]
         [ValidateNotNullOrEmpty]
-        public string BackupManagementType { get; set; }
+        public BackupManagementType BackupManagementType { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.OperationFilter)]
         [ValidateNotNullOrEmpty]
-        public string Operation { get; set; }
+        public JobOperation Operation { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsg.Job.StatusFilter)]
         [ValidateNotNullOrEmpty]
-        public string Status { get; set; }
+        public JobStatus Status { get; set; }
 
         public override void ExecuteCmdlet()
         {
@@ -104,8 +104,8 @@ public override void ExecuteCmdlet()
                 // TODO: Initialize Vault object from base cmdlet once support is added
                 List<AzureRmRecoveryServicesJobBase> result = new List<AzureRmRecoveryServicesJobBase>();
                 int resultCount = 0;
-                var adapterResponse = HydraAdapter.GetJobs(Vault.ResouceGroupName, Vault.Name, JobId, Status, Operation, rangeStart, rangeEnd,
-                    BackupManagementType);
+                var adapterResponse = HydraAdapter.GetJobs(Vault.ResouceGroupName, Vault.Name, JobId, Status.ToString(), Operation.ToString(), rangeStart, rangeEnd,
+                    BackupManagementType.ToString());
                 JobConversions.AddHydraJobsToPSList(adapterResponse, result, ref resultCount);
 
                 while (!string.IsNullOrEmpty(adapterResponse.ItemList.NextLink))
@@ -121,8 +121,8 @@ public override void ExecuteCmdlet()
                     HydraHelpers.GetSkipTokenFromNextLink(adapterResponse.ItemList.NextLink, out skipToken);
                     if (skipToken != null)
                     {
-                        adapterResponse = HydraAdapter.GetJobs(Vault.ResouceGroupName, Vault.Name, JobId, Status, Operation,
-                            rangeStart, rangeEnd, BackupManagementType, null, skipToken);
+                        adapterResponse = HydraAdapter.GetJobs(Vault.ResouceGroupName, Vault.Name, JobId, Status.ToString(), Operation.ToString(),
+                            rangeStart, rangeEnd, BackupManagementType.ToString(), null, skipToken);
                         JobConversions.AddHydraJobsToPSList(adapterResponse, result, ref resultCount);
                     }
                     else

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

@@ -71,6 +71,7 @@
     <Compile Include="Cmdlets\Container\GetAzureRmRecoveryServicesContainer.cs" />
     <Compile Include="Cmdlets\Jobs\GetAzureRmRecoveryServicesJob.cs" />
     <Compile Include="Cmdlets\Jobs\GetAzureRmRecoveryServicesJobDetails.cs" />
+    <Compile Include="Cmdlets\Jobs\WaitAzureRmRecoveryServicesJob.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\GetAzureRmRecoveryServicesPolicy.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\GetAzureRMBackupSchedulePolicyObject.cs" />
     <Compile Include="Cmdlets\ProtectionPolicy\GetAzureRMBackupRetentionPolicyObject.cs" />

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs

@@ -39,7 +39,12 @@ public static AzureRmRecoveryServicesJobBase GetPSJob(JobResource hydraJob)
         {
             AzureRmRecoveryServicesJobBase response = null;
 
-            if (hydraJob.Properties.GetType() == typeof(AzureIaaSVMJob))
+            // hydra doesn't initialize Properties if the type of job is not known to current version of hydra.
+            if (hydraJob.Properties == null)
+            {
+                // unsupported job type.
+            }
+            else if (hydraJob.Properties.GetType() == typeof(AzureIaaSVMJob))
             {
                 response = GetPSAzureVmJob(hydraJob);
             }
@@ -53,8 +58,12 @@ public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<AzureRmR
             {
                 foreach (var job in hydraJobs.ItemList.Value)
                 {
-                    jobsCount++;
-                    psJobs.Add(GetPSJob(job));
+                    AzureRmRecoveryServicesJobBase convertedJob = GetPSJob(job);
+                    if (convertedJob != null)
+                    {
+                        jobsCount++;
+                        psJobs.Add(convertedJob);
+                    }
                 }
             }
         }

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HydraHelpers.cs

@@ -12,16 +12,11 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
-using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Globalization;
-using System.Web;
 using System.Collections.Specialized;
+using System.Web;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
 {
@@ -64,15 +59,6 @@ public static string GetHydraProviderType(WorkloadType workloadType)
             return providerType;
         }
 
-        public static string GetDateTimeStringForService(DateTime date)
-        {
-            // our service expects date time to be serialized in the following format
-            // we have to use english culture because our user might be running 
-            // PS in another culture and our service can't understand it.
-            DateTimeFormatInfo dateFormat = new CultureInfo("en-US").DateTimeFormat;
-            return date.ToString("yyyy-MM-dd hh:mm:ss tt", dateFormat);
-        }
-
         public static void GetSkipTokenFromNextLink(string url, out string nextLink)
         {
             Uri uriObj = new Uri(url);

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/JobAPIs.cs

@@ -125,8 +125,8 @@ public CommonJobQueryFilters GetQueryObject(
             CommonJobQueryFilters commonFilters = new CommonJobQueryFilters()
             {
                 BackupManagementType = backupManagementType,
-                StartTime = HydraHelpers.GetDateTimeStringForService(startTime),
-                EndTime = HydraHelpers.GetDateTimeStringForService(endTime),
+                StartTime = CommonHelpers.GetDateTimeStringForService(startTime),
+                EndTime = CommonHelpers.GetDateTimeStringForService(endTime),
                 JobId = jobId,
                 Status = status,
                 Operation = operation

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

@@ -64,18 +64,13 @@
     <Compile Include="BMSAPIs\ContainerAPIs.cs" />
     <Compile Include="ClientProxy.cs" />
     <Compile Include="ClientProxyBase.cs" />
+    <Compile Include="CommonHelpers.cs" />
     <Compile Include="HydraAdapter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Commands.RecoveryServices.Backup.Helpers\Commands.RecoveryServices.Backup.Helpers.csproj">
-      <Project>{0e1d3f36-e6c8-4764-8c7d-6f9ee537490c}</Project>
-      <Name>Commands.RecoveryServices.Backup.Helpers</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/CommonHelpers.cs

@@ -0,0 +1,33 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Globalization;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
+using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+
+namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
+{
+    public class CommonHelpers
+    {
+        public static string GetDateTimeStringForService(DateTime date)
+        {
+            // our service expects date time to be serialized in the following format
+            // we have to use english culture because our user might be running 
+            // PS in another culture and our service can't understand it.
+            DateTimeFormatInfo dateFormat = new CultureInfo("en-US").DateTimeFormat;
+            return date.ToString("yyyy-MM-dd hh:mm:ss tt", dateFormat);
+        }
+    }
+}

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

@@ -12,12 +12,9 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
 {
@@ -29,6 +26,43 @@ 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>
@@ -177,7 +211,7 @@ public override void Validate()
         }
     }
 
-    public class AzureRmRecoveryServicesJobBase : AzureRmRecoveryServicesObjectBase
+    public class AzureRmRecoveryServicesJobBase : AzureRmRecoveryServicesVaultContext
     {
         public string ActivityId { get; set; }
 

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

@@ -97,7 +97,27 @@ public enum RetentionScheduleFormat
         Invalid = 0,
         Daily = 1,
         Weekly = 2
-    }  
+    }
+
+    public enum JobOperation
+    {
+        Invalid = 0,
+        Backup,
+        Restore,
+        ConfigureBackup,
+        RemoveBackup
+    }
+
+    public enum JobStatus
+    {
+        Invalid = 0,
+        InProgress,
+        Cancelling,
+        Cancelled,
+        Completed,
+        CompletedWithWarnings,
+        Failed
+    }
 
     #endregion
 

src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs

@@ -110,5 +110,7 @@ private void HandleException(Exception exception)
                 WriteError(errorRecord);
             }
         }
+
+
     }
 }