Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1

Author: AditTulasi

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs

@@ -54,7 +54,6 @@ public override void ExecuteCmdlet()
                 base.ExecuteCmdlet();
 
                 List<AzureBackupContainer> containers = new List<AzureBackupContainer>();
-                bool uniqueContainer = false;
 
                 switch (Type)
                 {
@@ -63,18 +62,15 @@ public override void ExecuteCmdlet()
                         containers.AddRange(GetMachineContainers());
                         break;
                     case AzureBackupContainerType.AzureVM:
-                        uniqueContainer = GetManagedContainers(containers);
+                        containers.AddRange(GetManagedContainers());
                         break;
                     default:
                         break;
                 }
 
-                if (uniqueContainer)
+                if (containers.Count == 1)
                 {
-                    if (containers.Any())
-                    {
-                        WriteObject(containers.First());
-                    }
+                    WriteObject(containers.First());
                 }
                 else
                 {
@@ -86,6 +82,17 @@ public override void ExecuteCmdlet()
         private List<AzureBackupContainer> GetMachineContainers()
         {
             List<MarsContainerResponse> marsContainerResponses = new List<MarsContainerResponse>();
+
+            // Machine containers are always registered. 
+            // So if requested Status is not Registered, return an empty list.
+            // Machine containers don't have a resource group.
+            // So, if a resource group is passed, return an empty list.
+            if (Status != AzureBackupContainerRegistrationStatus.Registered ||
+                !string.IsNullOrEmpty(ManagedResourceGroupName))
+            {
+                return new List<AzureBackupContainer>();
+            }
+
             if (string.IsNullOrEmpty(Name))
             {
                 marsContainerResponses.AddRange(AzureBackupClient.ListMachineContainers());
@@ -101,8 +108,10 @@ private List<AzureBackupContainer> GetMachineContainers()
             }).Where(container => container.ContainerType == Type.ToString()).ToList();
         }
 
-        private bool GetManagedContainers(List<AzureBackupContainer> managedContainers)
+        private List<AzureBackupContainer> GetManagedContainers()
         {
+            List<AzureBackupContainer> managedContainers = new List<AzureBackupContainer>();
+
             ContainerQueryParameters parameters = new ContainerQueryParameters();
             parameters.ContainerType = ManagedContainerType.IaasVM.ToString();
             parameters.FriendlyName = Name;
@@ -134,9 +143,7 @@ private bool GetManagedContainers(List<AzureBackupContainer> managedContainers)
                 return new AzureBackupContainer(Vault, container);
             }));
 
-            // When container resource name and container resource group name are specified, this parameter set
-            // identifies a container uniquely. Thus, we return just one container instead of a list.
-            return !string.IsNullOrEmpty(Name) & !string.IsNullOrEmpty(ManagedResourceGroupName);
+            return managedContainers;
         }
     }
 }

src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/VaultCredentials/GetAzureBackupVaultCredentials.cs

@@ -88,13 +88,7 @@ public override void ExecuteCmdlet()
 
                 // prepare for download
                 string fileName = string.Format("{0}_{1}.VaultCredentials", displayName, DateTime.UtcNow.ToString("yyyy-dd-M--HH-mm-ss"));
-                string directoryPath = Path.GetDirectoryName(TargetLocation);
-                if (directoryPath == null)
-                {
-                    // TargetLocation is a root path
-                    directoryPath = TargetLocation;
-                }
-                string filePath = Path.Combine(directoryPath, fileName);
+                string filePath = Path.Combine(TargetLocation, fileName);
                 WriteDebug(string.Format("Saving Vault Credentials to file : {0}", filePath));
 
                 File.WriteAllBytes(filePath, Encoding.UTF8.GetBytes(vaultCredsFileContent));

src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.Designer.cs

@@ -118,7 +118,12 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="AzureVMNotFound" xml:space="preserve">
-    <value>The specified Azure Virtual Machine Not Found.</value>
+    <value>The specified Azure Virtual Machine Not Found. Possible causes are
+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
+ 
+Please contact Microsoft for further assistant.</value>
   </data>
   <data name="ResourceNotFoundMessage" xml:space="preserve">
     <value>The specified resource does not exist.</value>