Merge dev1

Author: mkherani

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

@@ -54,11 +54,6 @@ public override void ExecuteCmdlet()
             {
                 base.ExecuteCmdlet();
                 StorageAccountName = StorageAccountName.ToLower();
-                WriteDebug("InsideRestore. going to create ResourceManager Client");
-                ResourcesNS.ResourceManagementClient rmClient = 
-                    AzureSession.ClientFactory.CreateClient<ResourcesNS.ResourceManagementClient>(
-                    DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
-                WriteDebug("Client Created successfully");
                 ResourceIdentity identity = new ResourceIdentity();
                 identity.ResourceName = StorageAccountName;
                 identity.ResourceProviderNamespace = "Microsoft.ClassicStorage/storageAccounts";
@@ -70,14 +65,14 @@ public override void ExecuteCmdlet()
                 {
                     WriteDebug(String.Format("Query Microsoft.ClassicStorage with name = {0}", 
                         StorageAccountName));
-                    resource = rmClient.Resources.GetAsync(StorageAccountResourceGroupName, 
+                    resource = RmClient.Resources.GetAsync(StorageAccountResourceGroupName, 
                         identity, CancellationToken.None).Result;
                 }
                 catch (Exception)
                 {
                     identity.ResourceProviderNamespace = "Microsoft.Storage/storageAccounts";
                     identity.ResourceProviderApiVersion = "2016-01-01";
-                    resource = rmClient.Resources.GetAsync(StorageAccountResourceGroupName, 
+                    resource = RmClient.Resources.GetAsync(StorageAccountResourceGroupName, 
                         identity, CancellationToken.None).Result;
                 }
 

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs

@@ -32,6 +32,7 @@
 using Microsoft.Azure.Commands.Common.Authentication;
 using Microsoft.Azure.Commands.Common.Authentication.Models;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
+using ResourcesNS = Microsoft.Azure.Management.Resources;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -45,10 +46,17 @@ public abstract class RecoveryServicesBackupCmdletBase : AzureRMCmdlet
 
         protected ServiceClientAdapter ServiceClientAdapter { get; set; }
 
+        protected ResourcesNS.ResourceManagementClient RmClient { get; set; }
+
         protected void InitializeAzureBackupCmdlet()
         {
             var cloudServicesClient = AzureSession.ClientFactory.CreateClient<CloudServiceManagementClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
             ServiceClientAdapter = new ServiceClientAdapter(cloudServicesClient.Credentials, cloudServicesClient.BaseUri);
+
+            WriteDebug("InsideRestore. going to create ResourceManager Client");
+            RmClient = AzureSession.ClientFactory.CreateClient<ResourcesNS.ResourceManagementClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
+            WriteDebug("Client Created successfully");
+
             Logger.Instance = new Logger(WriteWarning, WriteDebug, WriteVerbose, ThrowTerminatingError);
         }