Merge pull request #307 from MabOneSdk/dev1

Merge from dev1 to release

Author: pragrawa

src/ResourceManager/RecoveryServices.Backup/AzureRM.RecoveryServices.Backup.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.6'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.7'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

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

@@ -14,8 +14,9 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
+using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
 {
@@ -31,19 +32,19 @@ public class JobConversions
         /// </summary>
         /// <param name="hydraJob"></param>
         /// <returns></returns>
-        public static AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResponse hydraJob)
+        public static CmdletModel.AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResponse hydraJob)
         {
             return GetPSJob(hydraJob.Item);
         }
 
-        public static AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource hydraJob)
+        public static CmdletModel.AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource hydraJob)
         {
-            AzureRmRecoveryServicesBackupJobBase response = null;
+            CmdletModel.AzureRmRecoveryServicesBackupJobBase response = null;
 
             // 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.
+                Logger.Instance.WriteWarning(Resources.UnsupportedJobWarning);
             }
             else if (hydraJob.Properties.GetType() == typeof(AzureIaaSVMJob))
             {
@@ -53,13 +54,13 @@ public static AzureRmRecoveryServicesBackupJobBase GetPSJob(JobResource hydraJob
             return response;
         }
 
-        public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<AzureRmRecoveryServicesBackupJobBase> psJobs, ref int jobsCount)
+        public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<CmdletModel.AzureRmRecoveryServicesBackupJobBase> psJobs, ref int jobsCount)
         {
             if (hydraJobs.ItemList != null && hydraJobs.ItemList.Value != null)
             {
                 foreach (var job in hydraJobs.ItemList.Value)
                 {
-                    AzureRmRecoveryServicesBackupJobBase convertedJob = GetPSJob(job);
+                    CmdletModel.AzureRmRecoveryServicesBackupJobBase convertedJob = GetPSJob(job);
                     if (convertedJob != null)
                     {
                         jobsCount++;
@@ -71,19 +72,19 @@ public static void AddHydraJobsToPSList(JobListResponse hydraJobs, List<AzureRmR
 
         #region AzureVm job private helpers
 
-        private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResource hydraJob)
+        private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResource hydraJob)
         {
-            AzureRmRecoveryServicesBackupAzureVmJob response;
+            CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob response;
 
             AzureIaaSVMJob vmJob = hydraJob.Properties as AzureIaaSVMJob;
 
             if (vmJob.ExtendedInfo != null)
             {
-                response = new AzureRmRecoveryServicesBackupAzureVmJobDetails();
+                response = new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobDetails();
             }
             else
             {
-                response = new AzureRmRecoveryServicesBackupAzureVmJob();
+                response = new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJob();
             }
 
             response.JobId = GetLastIdFromFullId(hydraJob.Id);
@@ -94,12 +95,12 @@ private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResour
             response.VmVersion = vmJob.VirtualMachineVersion;
             response.WorkloadName = vmJob.EntityFriendlyName;
             response.ActivityId = vmJob.ActivityId;
-            response.BackupManagementType = EnumUtils.GetEnum<Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType>(GetPSBackupManagementType(vmJob.BackupManagementType));
+            response.BackupManagementType = CmdletModel.EnumUtils.GetEnum<CmdletModel.BackupManagementType>(GetPSBackupManagementType(vmJob.BackupManagementType));
             response.Operation = vmJob.Operation;
 
             if (vmJob.ErrorDetails != null)
             {
-                response.ErrorDetails = new List<AzureRmRecoveryServicesBackupAzureVmJobErrorInfo>();
+                response.ErrorDetails = new List<CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo>();
                 foreach (var vmError in vmJob.ErrorDetails)
                 {
                     response.ErrorDetails.Add(GetPSAzureVmErrorInfo(vmError));
@@ -109,8 +110,8 @@ private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResour
             // fill extended info if present
             if (vmJob.ExtendedInfo != null)
             {
-                AzureRmRecoveryServicesBackupAzureVmJobDetails detailedResponse =
-                    response as AzureRmRecoveryServicesBackupAzureVmJobDetails;
+                CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobDetails detailedResponse =
+                    response as CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobDetails;
 
                 detailedResponse.DynamicErrorMessage = vmJob.ExtendedInfo.DynamicErrorMessage;
                 if (vmJob.ExtendedInfo.PropertyBag != null)
@@ -124,10 +125,10 @@ private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResour
 
                 if (vmJob.ExtendedInfo.TasksList != null)
                 {
-                    detailedResponse.SubTasks = new List<AzureRmRecoveryServicesBackupAzureVmJobSubTask>();
+                    detailedResponse.SubTasks = new List<CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobSubTask>();
                     foreach (var vmJobTask in vmJob.ExtendedInfo.TasksList)
                     {
-                        detailedResponse.SubTasks.Add(new AzureRmRecoveryServicesBackupAzureVmJobSubTask()
+                        detailedResponse.SubTasks.Add(new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobSubTask()
                         {
                             Name = vmJobTask.TaskId,
                             Status = vmJobTask.Status
@@ -139,9 +140,9 @@ private static AzureRmRecoveryServicesBackupAzureVmJob GetPSAzureVmJob(JobResour
             return response;
         }
 
-        private static AzureRmRecoveryServicesBackupAzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo hydraError)
+        private static CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo hydraError)
         {
-            AzureRmRecoveryServicesBackupAzureVmJobErrorInfo psErrorInfo = new AzureRmRecoveryServicesBackupAzureVmJobErrorInfo();
+            CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo psErrorInfo = new CmdletModel.AzureRmRecoveryServicesBackupAzureVmJobErrorInfo();
             psErrorInfo.ErrorCode = hydraError.ErrorCode;
             psErrorInfo.ErrorMessage = hydraError.ErrorString;
             if (hydraError.Recommendations != null)
@@ -165,22 +166,22 @@ public static string GetLastIdFromFullId(string fullId)
 
         #region Enum translators
 
-        public static string GetJobTypeForService(Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType mgmtType)
+        public static string GetJobTypeForService(CmdletModel.BackupManagementType mgmtType)
         {
             switch (mgmtType)
             {
-                case Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM:
-                    return Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString();
+                case CmdletModel.BackupManagementType.AzureVM:
+                    return BackupManagementType.AzureIaasVM.ToString();
                 default:
                     throw new Exception("Invalid BackupManagementType provided: " + mgmtType);
             }
         }
 
         public static string GetPSBackupManagementType(string jobType)
         {
-            if (jobType == Microsoft.Azure.Management.RecoveryServices.Backup.Models.BackupManagementType.AzureIaasVM.ToString())
+            if (jobType == BackupManagementType.AzureIaasVM.ToString())
             {
-                return Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM.ToString();
+                return CmdletModel.BackupManagementType.AzureVM.ToString();
             }
             else
             {

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

@@ -1,4 +1,18 @@
-using System;
+// ----------------------------------------------------------------------------------
+//
+// 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.Collections.Generic;
 using System.Linq;
 using System.Text;

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

@@ -24,10 +24,8 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterN
     public partial class HydraAdapter
     {
         /// <summary>
-        /// 
+        /// Fetch the details of given Recovery point
         /// </summary>
-        /// <param name="resourceGroupName"></param>
-        /// <param name="resourceName"></param>
         /// <param name="containerName"></param>
         /// <param name="protectedItemName"></param>
         /// <param name="recoveryPointId"></param>
@@ -44,7 +42,7 @@ public RecoveryPointResponse GetRecoveryPointDetails(string containerName, strin
         }
 
         /// <summary>
-        /// 
+        /// Fetch the Recovery points of protectedItem which satisfy specified query
         /// </summary>
         /// <param name="resourceGroupName"></param>
         /// <param name="resourceName"></param>

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

@@ -1,4 +1,18 @@
-using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
+// ----------------------------------------------------------------------------------
+//
+// 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 Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 using System;
 using System.Collections.Generic;
@@ -12,7 +26,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterN
     public partial class HydraAdapter
     {
         /// <summary>
-        /// 
+        /// Restore the given Recovery point of protectedItem to given storage account
         /// </summary>
         /// <param name="resourceGroupName"></param>
         /// <param name="resourceName"></param>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/AzureVmModels/AzureRmRecoveryServicesAzureVmRecoveryPoint.cs

@@ -22,10 +22,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
 {
     public class AzureRmRecoveryServicesBackupIaasVmRecoveryPoint : AzureRmRecoveryServicesBackupRecoveryPointBase
     {
-        /// <summary>
-        /// 
-        /// </summary>
-        /// 
         public string RecoveryPointAdditionalInfo { get; set; }
 
         public string SourceVMStorageType { get; set; }
@@ -34,9 +30,5 @@ public AzureRmRecoveryServicesBackupIaasVmRecoveryPoint()
         {
 
         }
-        public override void Validate()
-        {
-            base.Validate();
-        }
     }
 }

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

@@ -271,7 +271,7 @@ public override void Validate()
     }
 
     /// <summary>
-    /// This class is does not represent first class resource. So, we are not inheriting from the base class.
+    /// This class contains job error message details.
     /// </summary>
     public class AzureRmRecoveryServicesBackupJobErrorInfoBase
     {
@@ -281,7 +281,7 @@ public class AzureRmRecoveryServicesBackupJobErrorInfoBase
     }
 
     /// <summary>
-    /// This class is does not represent a first class resource. So, we are not inheriting from the common base class.
+    /// This class contains job sub tasks detail.
     /// </summary>
     public class AzureRmRecoveryServicesBackupJobSubTaskBase
     {

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

@@ -23,7 +23,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
     public enum ContainerType
     {
         AzureVM = 1,
-        //AzureSqlContainer,
         Windows
     }
 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

@@ -437,4 +437,7 @@ Please contact Microsoft for further assistant.</value>
   <data name="BackupManagementTypeIncorrectForContainerType" xml:space="preserve">
     <value>BackupManagementType provider for ContainerType {0} is incorrect.</value>
   </data>
+  <data name="UnsupportedJobWarning" xml:space="preserve">
+    <value>Got some unsupported jobs</value>
+  </data>
 </root>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx

@@ -57,11 +57,9 @@
   <ItemGroup>
     <Compile Include="IPsBackupProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Providers\AzureSqlPsBackupProvider.cs" />
     <Compile Include="Providers\DpmPsBackupProvider.cs" />
     <Compile Include="Providers\MabPsBackupProvider.cs" />
     <Compile Include="PsBackupProviderManager.cs" />
-    <Compile Include="PsBackupProviderDC.cs" />
     <Compile Include="Providers\IaasVmPsBackupProvider.cs" />
   </ItemGroup>
   <ItemGroup>

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

@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
     public interface IPsBackupProvider
     {
-        void Initialize(ProviderData providerData, HydraAdapter hydraAdapter);
+        void Initialize(Dictionary<System.Enum, object> providerData, HydraAdapter hydraAdapter);
 
         BaseRecoveryServicesJobResponse EnableProtection();