From eb302f4d00257224c1565c69e0a55d6343ba8619 Mon Sep 17 00:00:00 2001
From: mkherani <mkherani@microsoft.com>
Date: Tue, 18 Aug 2015 15:39:27 +0530
Subject: [PATCH] Blocking registration of already registered VM from
 powershell.

---
 .../Cmdlets/Container/RegisterAzureRMBackupContainer.cs        | 3 ++-
 .../Commands.AzureBackup/Properties/Resources.Designer.cs      | 3 ++-
 .../AzureBackup/Commands.AzureBackup/Properties/Resources.resx | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureRMBackupContainer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureRMBackupContainer.cs
index cc9acc11c418..6d64a6f3618b 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureRMBackupContainer.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureRMBackupContainer.cs
@@ -159,7 +159,8 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, out CSMContainerRes
             ContainerQueryParameters parameters = new ContainerQueryParameters()
             {
                 ContainerType = ManagedContainerType.IaasVM.ToString(),
-                FriendlyName = vmName,                
+                FriendlyName = vmName,      
+                Status = AzureBackupContainerRegistrationStatus.NotRegistered.ToString(),
             };
 
             //First check if container is discovered or not            
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.Designer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.Designer.cs
index c623108e7a72..8afdda456a66 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.Designer.cs
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.Designer.cs
@@ -65,7 +65,8 @@ internal Resources() {
         ///1. VM does not exist
         ///2. VM is Azure IaaS v2 VM
         ///3. The VM name or the Service name needs to be case sensitive
-        /// 
+        ///4. VM is already Registered with same or other Vault. Please Unregister VM first and then try to register it again.
+        ///
         ///Please contact Microsoft for further assistant..
         /// </summary>
         internal static string AzureVMNotFound {
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx
index 749a03eaa037..932e9b0e937f 100644
--- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx
+++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.resx
@@ -122,7 +122,8 @@
 1. VM does not exist
 2. VM is Azure IaaS v2 VM
 3. The VM name or the Service name needs to be case sensitive
- 
+4. VM is already Registered with same or other Vault. Please Unregister VM first and then try to register it again.
+
 Please contact Microsoft for further assistant.</value>
   </data>
   <data name="ResourceNotFoundMessage" xml:space="preserve">