initial commit for restore as files

Author: Sambit Rath

src/RecoveryServices/RecoveryServices.Backup.Helpers/RecoveryServices.Backup.Helpers.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />
     <PackageReference Include="TimeZoneConverter" Version="3.0.0" />
   </ItemGroup>
 

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

@@ -504,6 +504,16 @@ public class RecoveryConfigBase
         /// </summary>
         public DateTime PointInTime { get; }
 
+        /// <summary>
+        /// Recovery Mode
+        /// </summary>
+        public string RecoveryMode { get; set; }
+
+        /// <summary>
+        /// File path for Restore as Files
+        /// </summary>
+        public string FilePath { get; set; }
+
         public RecoveryConfigBase(string restoreRequestType, RecoveryPointBase recoveryPoint, DateTime pointInTime)
         {
             RestoreRequestType = restoreRequestType;

src/RecoveryServices/RecoveryServices.Backup.Models/RecoveryServices.Backup.Models.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />
   </ItemGroup>
 
 </Project>

src/RecoveryServices/RecoveryServices.Backup.Providers/Providers/AzureWorkloadPsBackupProvider.cs

@@ -390,7 +390,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 azureWorkloadSQLRestoreRequest.RecoveryType =
                     string.Compare(wLRecoveryConfig.RestoreRequestType, "Original WL Restore") == 0 ?
                     RecoveryType.OriginalLocation : RecoveryType.AlternateLocation;
-                if (azureWorkloadSQLRestoreRequest.RecoveryType == RecoveryType.AlternateLocation)
+                if (azureWorkloadSQLRestoreRequest.RecoveryType == RecoveryType.AlternateLocation && wLRecoveryConfig.RecoveryMode == "FileRecovery")
                 {
                     azureWorkloadSQLRestoreRequest.TargetInfo = new TargetRestoreInfo()
                     {
@@ -401,6 +401,16 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                     };
                     azureWorkloadSQLRestoreRequest.AlternateDirectoryPaths = wLRecoveryConfig.targetPhysicalPath;
                 }
+                if (wLRecoveryConfig.RecoveryMode == "FileRecovery")
+                {
+                    azureWorkloadSQLRestoreRequest.TargetInfo = new TargetRestoreInfo()
+                    {
+                        OverwriteOption = string.Compare(wLRecoveryConfig.OverwriteWLIfpresent, "No") == 0 ?
+                        OverwriteOptions.FailOnConflict : OverwriteOptions.Overwrite,
+                        ContainerId = wLRecoveryConfig.ContainerId,
+                        TargetDirectoryForFileRestore = wLRecoveryConfig.FilePath
+                    };
+                }
                 triggerRestoreRequest.Properties = azureWorkloadSQLRestoreRequest;
             }
             else
@@ -416,7 +426,7 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                 azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType =
                     string.Compare(wLRecoveryConfig.RestoreRequestType, "Original WL Restore") == 0 ?
                     RecoveryType.OriginalLocation : RecoveryType.AlternateLocation;
-                if (azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType == RecoveryType.AlternateLocation)
+                if (azureWorkloadSQLPointInTimeRestoreRequest.RecoveryType == RecoveryType.AlternateLocation && wLRecoveryConfig.RecoveryMode == "FileRecovery")
                 {
                     azureWorkloadSQLPointInTimeRestoreRequest.TargetInfo = new TargetRestoreInfo()
                     {
@@ -427,6 +437,18 @@ public RestAzureNS.AzureOperationResponse TriggerRestore()
                     };
                     azureWorkloadSQLPointInTimeRestoreRequest.AlternateDirectoryPaths = wLRecoveryConfig.targetPhysicalPath;
                 }
+
+                if (wLRecoveryConfig.RecoveryMode == "FileRecovery")
+                {
+                    azureWorkloadSQLPointInTimeRestoreRequest.TargetInfo = new TargetRestoreInfo()
+                    {
+                        OverwriteOption = string.Compare(wLRecoveryConfig.OverwriteWLIfpresent, "No") == 0 ?
+                        OverwriteOptions.FailOnConflict : OverwriteOptions.Overwrite,
+                        ContainerId = wLRecoveryConfig.ContainerId,
+                        TargetDirectoryForFileRestore = wLRecoveryConfig.FilePath
+                    };
+                }
+
                 azureWorkloadSQLPointInTimeRestoreRequest.PointInTime = wLRecoveryConfig.PointInTime;
                 triggerRestoreRequest.Properties = azureWorkloadSQLPointInTimeRestoreRequest;
             }

src/RecoveryServices/RecoveryServices.Backup.Providers/RecoveryServices.Backup.Providers.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/RecoveryServices/RecoveryServices.Backup.ServiceClientAdapter/RecoveryServices.Backup.ServiceClientAdapter.csproj

@@ -13,7 +13,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.1" />
   </ItemGroup>
 

src/RecoveryServices/RecoveryServices.Backup.Test/RecoveryServices.Backup.Test.csproj

@@ -14,7 +14,7 @@
     <PackageReference Include="Microsoft.Azure.Management.Compute" Version="31.0.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.18.0-preview" />
     <PackageReference Include="Microsoft.Azure.Management.RecoveryServices" Version="4.2.1-preview" />
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>

src/RecoveryServices/RecoveryServices.Backup/Cmdlets/Restore/GetAzureRmRecoveryServicesBackupWorkloadRecoveryConfig.cs

@@ -21,6 +21,7 @@
 using Microsoft.Rest.Azure.OData;
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Management.Automation;
 using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
@@ -81,6 +82,30 @@ public class GetAzureRmRecoveryServicesBackupWorkloadRecoveryConfig : RSBackupVa
         [Parameter(Mandatory = false, HelpMessage = ParamHelpMsgs.RecoveryPointConfig.AlternateWorkloadRestore)]
         public SwitchParameter AlternateWorkloadRestore { get; set; }
 
+        /// <summary>
+        /// Target Container to which files will be written
+        /// </summary>
+        [Parameter(Mandatory = false)]
+        public ContainerBase TargetContainer { get; set; }
+
+        /// <summary>
+        /// Use this switch to restore db as files to a given target container
+        /// </summary>
+        [Parameter(Mandatory = false)]
+        public SwitchParameter RestoreAsFiles { get; set; }
+
+        /// <summary>
+        /// Specify Recovery point from which logs will be applies
+        /// </summary>
+        [Parameter(Mandatory = false)]
+        public RecoveryPointBase FromFul { get; set; }
+
+        /// <summary>
+        /// Specify Recovery point from which logs will be applies
+        /// </summary>
+        [Parameter(Mandatory = false)]
+        public string FilePath { get; set; }
+
         public override void ExecuteCmdlet()
         {
             ExecutionBlock(() =>
@@ -226,6 +251,19 @@ public override void ExecuteCmdlet()
                     azureWorkloadRecoveryConfig.targetPhysicalPath = targetPhysicalPath;
                     azureWorkloadRecoveryConfig.ContainerId = GetContainerId(TargetItem.Id);
                 }
+                else if (RestoreAsFiles.IsPresent)
+                {
+                    if(TargetContainer == null)
+                    {
+                        throw new ArgumentNullException("TargetContainer", "TargetContainer can't be null for Restoring as files operation.");
+                    }
+
+                    azureWorkloadRecoveryConfig.OverwriteWLIfpresent = "No";
+                    azureWorkloadRecoveryConfig.NoRecoveryMode = "Disabled";
+                    azureWorkloadRecoveryConfig.ContainerId = (TargetContainer as AzureVmWorkloadContainer).Id;
+                    azureWorkloadRecoveryConfig.RecoveryMode = "FileRecovery";
+                    azureWorkloadRecoveryConfig.FilePath = FilePath;
+                }
                 RecoveryConfigBase baseobj = azureWorkloadRecoveryConfig;
                 WriteObject(baseobj);
             });
@@ -404,6 +442,11 @@ public AzureWorkloadRecoveryConfig GetConfigObject()
                 };
                 recoveryPoint = azureWorkloadRecoveryPoint;
             }
+            else if (RestoreAsFiles.IsPresent)
+            {
+                restoreRequestType = "Alternate WL Restore";
+                targetServer = TargetContainer.Name;
+            }
 
             return new AzureWorkloadRecoveryConfig(targetServer, parentName, restoreRequestType, recoveryPoint, pointInTime);
         }

src/RecoveryServices/RecoveryServices.Backup/RecoveryServices.Backup.csproj

@@ -12,7 +12,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.0-preview" />
+    <PackageReference Include="Microsoft.Azure.Management.RecoveryServices.Backup" Version="4.0.1-preview" />
   </ItemGroup>
 
   <ItemGroup>