Merge pull request #3208 from MabOneSdk/devSwagger

Migrating RS.Backup to Swagger

Author: cormacpayne

setup/azurecmdfiles.wxi

@@ -2331,6 +2331,9 @@
                         <Component Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" Guid="*">
                             <File Id="filDFC93A6AA2A808957B249CC88C7D6EE5" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
                         </Component>
+                        <Component Id="cmpDB3F89FCB6F69647096085E3C07D2EA7" Guid="*">
+                            <File Id="fil981731C42616352E119DFCB2CDFCF8BB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.Azure.dll" />
+                        </Component>
                         <Component Id="cmpF8AEF0C5D785D40AEC8F1BF4ACE4E939" Guid="*">
                             <File Id="filA708CDDEB8C8A8363E22F4C83953E14E" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.RecoveryServices.Backup\Microsoft.Rest.ClientRuntime.dll" />
                         </Component>
@@ -6277,6 +6280,7 @@
             <ComponentRef Id="cmp13B3F08D31DD4410B1934B82517CAC9A" />
             <ComponentRef Id="cmpA2EFAF047A9595A3CA7DFC6031140F27" />
             <ComponentRef Id="cmp902DC2364C6FF451A60B4D115B5DC7A9" />
+            <ComponentRef Id="cmpDB3F89FCB6F69647096085E3C07D2EA7" />
             <ComponentRef Id="cmpF8AEF0C5D785D40AEC8F1BF4ACE4E939" />
             <ComponentRef Id="cmp0FB4C1F5BB0FB399774156C4B56696B8" />
             <ComponentRef Id="cmp7B84FC694FB5281CF08E6F1B41D07E12" />

src/Common/Commands.Common/Commands.Common.csproj

@@ -183,4 +183,4 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

src/ResourceManager/RecoveryServices.Backup/ChangeLog.md

@@ -18,5 +18,5 @@
         - Additional information about change #1
 -->
 ## Current Release
-
+* Migrated from Hyak based Azure SDK to Swagger based Azure SDK
 ## Version 2.3.0

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

@@ -40,12 +40,22 @@
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Azure.Management.RecoveryServices.Backup, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.0.1.2\lib\net40\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.Backup.1.1.2-preview\lib\net45\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.3\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.3\lib\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -56,6 +66,8 @@
   <ItemGroup>
     <Compile Include="Conversions\JobConversions.cs" />
     <Compile Include="Conversions\RecoveryPointConversions.cs" />
+    <Compile Include="Extensions\EnumExtensions.cs" />
+    <Compile Include="Extensions\HttpHeadersExtensions.cs" />
     <Compile Include="HelperUtils.cs" />
     <Compile Include="TrackingHelpers.cs" />
     <Compile Include="Validations\PolicyValidations.cs" />
@@ -92,4 +104,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>

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

@@ -14,11 +14,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
-using CmdletModels = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
 using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
 using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
 
@@ -41,16 +37,16 @@ public static ContainerBase GetContainerModel(ServiceClientModel.ProtectionConta
             if (protectionContainer != null &&
                 protectionContainer.Properties != null)
             {
-                if (protectionContainer.Properties.GetType().IsSubclassOf(typeof(ServiceClientModel.AzureIaaSVMProtectionContainer)))
+                if (protectionContainer.Properties.GetType().IsSubclassOf(typeof(ServiceClientModel.IaaSVMContainer)))
                 {
                     containerModel = new AzureVmContainer(protectionContainer);
                 }
-                if (protectionContainer.Properties.GetType() == typeof(ServiceClientModel.MabProtectionContainer))
+                if (protectionContainer.Properties.GetType() == typeof(ServiceClientModel.MabContainer))
                 {
                     containerModel = new MabContainer(protectionContainer);
                 }
                 else if (protectionContainer.Properties.GetType() ==
-                    typeof(ServiceClientModel.AzureSqlProtectionContainer))
+                    typeof(ServiceClientModel.AzureSqlContainer))
                 {
                     containerModel = new AzureSqlContainer(protectionContainer);
                 }
@@ -62,13 +58,22 @@ public static ContainerBase GetContainerModel(ServiceClientModel.ProtectionConta
         /// <summary>
         /// Helper function to convert ps backup engine model from service response.
         /// </summary>
-        public static BackupEngineBase GetBackupEngineModel(ServiceClientModel.BackupEngineResource backupEngine)
+        public static BackupEngineBase GetBackupEngineModel(
+            ServiceClientModel.BackupEngineBaseResource backupEngine)
         {
             BackupEngineBase backupEngineModel = null;
 
             if (backupEngine != null &&
                 backupEngine.Properties != null)
             {
+                string friendlyName = backupEngine.Properties.FriendlyName;
+                string backupManagementType =
+                    backupEngine.Properties.BackupManagementType.ToString();
+                string registrationStatus = backupEngine.Properties.RegistrationStatus;
+                string healthStatus = backupEngine.Properties.HealthStatus;
+                bool? canReRegister = backupEngine.Properties.CanReRegister;
+                string backupEngineId = backupEngine.Properties.BackupEngineId;
+
                 if (backupEngine.Properties.GetType() == (typeof(ServiceClientModel.DpmBackupEngine)))
                 {
                     backupEngineModel = new DpmBackupEngine(backupEngine);
@@ -100,7 +105,8 @@ public static List<ContainerBase> GetContainerModelList(IEnumerable<ServiceClien
         /// <summary>
         /// Helper function to convert ps backup engine model list from service response.
         /// </summary>
-        public static List<BackupEngineBase> GetBackupEngineModelList(IEnumerable<ServiceClientModel.BackupEngineResource> backupEngines)
+        public static List<BackupEngineBase> GetBackupEngineModelList(
+            IEnumerable<ServiceClientModel.BackupEngineBaseResource> backupEngines)
         {
             List<BackupEngineBase> backupEngineModel = new List<BackupEngineBase>();
 
@@ -151,8 +157,8 @@ public static PolicyBase GetPolicyModel(ServiceClientModel.ProtectionPolicyResou
 
                 policyModel = new AzureVmPolicy();
                 AzureVmPolicy iaasPolicyModel = policyModel as AzureVmPolicy;
-                iaasPolicyModel.WorkloadType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.WorkloadType.AzureVM;
-                iaasPolicyModel.BackupManagementType = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupManagementType.AzureVM;
+                iaasPolicyModel.WorkloadType = WorkloadType.AzureVM;
+                iaasPolicyModel.BackupManagementType = BackupManagementType.AzureVM;
                 iaasPolicyModel.RetentionPolicy = PolicyHelpers.GetPSLongTermRetentionPolicy((ServiceClientModel.LongTermRetentionPolicy)
                                                   ((ServiceClientModel.AzureIaaSVMProtectionPolicy)serviceClientResponse.Properties).RetentionPolicy);
                 iaasPolicyModel.SchedulePolicy = PolicyHelpers.GetPSSimpleSchedulePolicy((ServiceClientModel.SimpleSchedulePolicy)
@@ -175,8 +181,8 @@ public static PolicyBase GetPolicyModel(ServiceClientModel.ProtectionPolicyResou
 
                 policyModel = new AzureSqlPolicy();
                 AzureSqlPolicy sqlPolicyModel = policyModel as AzureSqlPolicy;
-                sqlPolicyModel.WorkloadType = CmdletModels.WorkloadType.AzureSQLDatabase;
-                sqlPolicyModel.BackupManagementType = CmdletModels.BackupManagementType.AzureSQL;
+                sqlPolicyModel.WorkloadType = WorkloadType.AzureSQLDatabase;
+                sqlPolicyModel.BackupManagementType = BackupManagementType.AzureSQL;
 
                 ServiceClientModel.SimpleRetentionPolicy azureSqlRetentionPolicy =
                     (ServiceClientModel.SimpleRetentionPolicy)azureSqlPolicy.RetentionPolicy;
@@ -203,10 +209,9 @@ public static PolicyBase GetPolicyModel(ServiceClientModel.ProtectionPolicyResou
         /// Helper function to convert ps backup policy list model from service response.
         /// </summary>
         public static List<PolicyBase> GetPolicyModelList(
-            ServiceClientModel.ProtectionPolicyListResponse serviceClientListResponse)
+            List<ServiceClientModel.ProtectionPolicyResource> serviceClientListResponse)
         {
-            if (serviceClientListResponse == null || serviceClientListResponse.ItemList == null ||
-               serviceClientListResponse.ItemList.Value == null || serviceClientListResponse.ItemList.Value.Count == 0)
+            if (serviceClientListResponse == null && serviceClientListResponse.Count == 0)
             {
                 Logger.Instance.WriteDebug("Received empty list of policies from service");
                 return null;
@@ -215,7 +220,8 @@ public static List<PolicyBase> GetPolicyModelList(
             List<PolicyBase> policyModels = new List<PolicyBase>();
             PolicyBase policyModel = null;
 
-            foreach (ServiceClientModel.ProtectionPolicyResource resource in serviceClientListResponse.ItemList.Value)
+            foreach (ServiceClientModel.ProtectionPolicyResource resource
+                in serviceClientListResponse)
             {
                 policyModel = GetPolicyModel(resource);
                 if (policyModel != null)
@@ -260,18 +266,18 @@ public static ItemBase GetItemModel(ServiceClientModel.ProtectedItemResource pro
                     itemModel = new AzureVmItem(
                         protectedItem,
                         IdUtils.GetNameFromUri(containerUri),
-                        Cmdlets.Models.ContainerType.AzureVM,
+                        ContainerType.AzureVM,
                         policyName);
                 }
 
-                if (protectedItem.Properties.GetType() == 
+                if (protectedItem.Properties.GetType() ==
                     typeof(ServiceClientModel.AzureSqlProtectedItem))
                 {
                     ServiceClientModel.AzureSqlProtectedItem azureSqlProtectedItem =
                         (ServiceClientModel.AzureSqlProtectedItem)protectedItem.Properties;
                     string policyName = null;
                     string policyId = azureSqlProtectedItem.PolicyId;
-                    if (!String.IsNullOrEmpty(policyId))
+                    if (!string.IsNullOrEmpty(policyId))
                     {
                         Dictionary<UriEnums, string> keyVauleDict =
                         HelperUtils.ParseUri(policyId);
@@ -285,7 +291,7 @@ public static ItemBase GetItemModel(ServiceClientModel.ProtectedItemResource pro
                     itemModel = new AzureSqlItem(
                         protectedItem,
                         IdUtils.GetNameFromUri(containerUri),
-                        Cmdlets.Models.ContainerType.AzureSQL,
+                        ContainerType.AzureSQL,
                         policyName);
                 }
             }

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

@@ -27,19 +27,6 @@ public class JobConversions
     {
         #region ServiceClient to PS convertors
 
-        /// <summary>
-        /// This function returns either job object or job details object based on 
-        /// what ServiceClient object contains.
-        /// To elaborate, if ServiceClient job's ExtendedInfo is filled then this function will
-        /// return a job details object. Otherwise it will return a job object.
-        /// </summary>
-        /// <param name="ServiceClientJob"></param>
-        /// <returns></returns>
-        public static CmdletModel.JobBase GetPSJob(JobResponse serviceClientJob)
-        {
-            return GetPSJob(serviceClientJob.Item);
-        }
-
         /// <summary>
         /// Helper function to convert ps backup job model from service response.
         /// </summary>
@@ -63,18 +50,26 @@ public static CmdletModel.JobBase GetPSJob(JobResource serviceClientJob)
         /// <summary>
         /// Helper function to convert ps backup job list model from service response.
         /// </summary>
-        public static void AddServiceClientJobsToPSList(JobListResponse serviceClientJobs, List<CmdletModel.JobBase> psJobs, ref int jobsCount)
+        public static void AddServiceClientJobsToPSList(
+            List<JobResource> serviceClientJobs,
+            List<CmdletModel.JobBase> psJobs,
+            ref int jobsCount)
         {
-            if (serviceClientJobs.ItemList != null && serviceClientJobs.ItemList.Value != null)
+            if (serviceClientJobs != null)
             {
-                foreach (var job in serviceClientJobs.ItemList.Value)
+                foreach (var job in serviceClientJobs)
                 {
                     CmdletModel.JobBase convertedJob = GetPSJob(job);
                     if (convertedJob != null)
                     {
                         jobsCount++;
                         psJobs.Add(convertedJob);
                     }
+                    else
+                    {
+                        Logger.Instance.WriteDebug(
+                            "Ignoring some of the unexpected job while conversion");
+                    }
                 }
             }
         }
@@ -100,15 +95,24 @@ private static CmdletModel.AzureVmJob GetPSAzureVmJob(JobResource serviceClientJ
             }
 
             response.JobId = GetLastIdFromFullId(serviceClientJob.Id);
-            response.StartTime = vmJob.StartTime;
+            DateTime startTime = DateTime.MinValue;
+            if (vmJob.StartTime.HasValue)
+            {
+                response.StartTime = (DateTime)vmJob.StartTime;
+            }
+            else
+            {
+                throw new ArgumentNullException("Job Start Time is null");
+            }
             response.EndTime = vmJob.EndTime;
-            response.Duration = vmJob.Duration;
+            response.Duration =
+                vmJob.Duration.HasValue ? (TimeSpan)vmJob.Duration : default(TimeSpan);
             response.Status = vmJob.Status;
             response.VmVersion = vmJob.VirtualMachineVersion;
             response.WorkloadName = vmJob.EntityFriendlyName;
             response.ActivityId = vmJob.ActivityId;
             response.BackupManagementType = CmdletModel.EnumUtils.GetEnum<CmdletModel.BackupManagementType>(
-                GetPSBackupManagementType(vmJob.BackupManagementType));
+                GetPSBackupManagementType(vmJob.BackupManagementType.ToString()));
             response.Operation = vmJob.Operation;
 
             if (vmJob.ErrorDetails != null)
@@ -159,7 +163,7 @@ private static CmdletModel.AzureVmJob GetPSAzureVmJob(JobResource serviceClientJ
         private static CmdletModel.AzureVmJobErrorInfo GetPSAzureVmErrorInfo(AzureIaaSVMErrorInfo serviceClientError)
         {
             CmdletModel.AzureVmJobErrorInfo psErrorInfo = new CmdletModel.AzureVmJobErrorInfo();
-            psErrorInfo.ErrorCode = serviceClientError.ErrorCode;
+            psErrorInfo.ErrorCode = serviceClientError.ErrorCode ?? default(int);
             psErrorInfo.ErrorMessage = serviceClientError.ErrorString;
             if (serviceClientError.Recommendations != null)
             {
@@ -189,12 +193,13 @@ public static string GetLastIdFromFullId(string fullId)
         /// <summary>
         /// Helper function to get job type from ps backup management type.
         /// </summary>
-        public static string GetJobTypeForService(CmdletModel.BackupManagementType mgmtType)
+        public static BackupManagementType GetJobTypeForService(
+            CmdletModel.BackupManagementType mgmtType)
         {
             switch (mgmtType)
             {
                 case CmdletModel.BackupManagementType.AzureVM:
-                    return BackupManagementType.AzureIaasVM.ToString();
+                    return BackupManagementType.AzureIaasVM;
                 default:
                     throw new Exception("Invalid BackupManagementType provided: " + mgmtType);
             }
@@ -214,7 +219,7 @@ public static string GetPSBackupManagementType(string jobType)
                 throw new Exception("Invalid JobType provided: " + jobType);
             }
         }
-                    
+
         #endregion
     }
 }