Fix

Author: mkherani

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Restore/RestoreAzureRMRecoveryServicesBackupItem.cs

@@ -55,25 +55,25 @@ public override void ExecuteCmdlet()
                 identity.ResourceName = StorageAccountName;
                 identity.ResourceProviderNamespace = "Microsoft.ClassicStorage/storageAccounts";
                 identity.ResourceProviderApiVersion = "2015-12-01";
+                identity.ResourceType = string.Empty;
 
-                ResourcesNS.Models.ResourceGetResult resource;
+                ResourcesNS.Models.ResourceGetResult resource = null;
                 try
                 {
                     WriteDebug(String.Format("Query Microsoft.ClassicStorage with name = {0}", StorageAccountName));
                     resource = rmClient.Resources.GetAsync(StorageAccountResourceGroupName, identity, CancellationToken.None).Result;
                 }
                 catch (Hyak.Common.CloudException exp)
                 {
-                    if (exp.Error.Code == "ResourceNotFound")
-                    {
-                        identity.ResourceType = "Microsoft.Storage/storageAccounts";
-                        identity.ResourceProviderApiVersion = "2016-01-01";
-                        resource = rmClient.Resources.GetAsync(StorageAccountName, identity, CancellationToken.None).Result;
-                    }
-                    else
-                    {
-                        throw;
-                    }
+                    string expType = exp.GetType().ToString();
+                    identity.ResourceProviderNamespace = "Microsoft.Storage/storageAccounts";
+                    identity.ResourceProviderApiVersion = "2016-01-01";
+                    resource = rmClient.Resources.GetAsync(StorageAccountResourceGroupName, identity, CancellationToken.None).Result;
+                }
+                catch(Exception e)
+                {
+                    WriteDebug(e.Message);
+                    throw;
                 }
 
                 string storageAccountId = resource.Resource.Id;

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

@@ -44,6 +44,8 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureRmRecoveryServicesIaasVm
             };
 
             TriggerRestoreRequest triggerRestoreRequest = new TriggerRestoreRequest();
+            triggerRestoreRequest.Item = new RestoreRequestResource();
+            triggerRestoreRequest.Item.Properties = new RestoreRequest();
             triggerRestoreRequest.Item.Properties = restoreRequest;
 
             var response = BmsAdapter.Client.Restore.TriggerRestoreAsync(resourceGroupName, resourceName, BmsAdapter.GetCustomRequestHeaders(),