Merge pull request #52 from AsrOneSdk/sriramvu-dev

bug1645997 & Get-AzureSiteRecoveryVault byName
Azure · Feb 25, 2015 · 15e97f5 · 15e97f5
2 parents 63abe6b + a4e3683
commit 15e97f5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 11 deletions.
diff --git a/src/Common/Commands.Common/Properties/Resources.Designer.cs b/src/Common/Commands.Common/Properties/Resources.Designer.cs
diff --git a/...ommands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesCloudServiceClient.cs b/...ommands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesCloudServiceClient.cs
@@ -44,7 +44,6 @@ public IEnumerable<CloudService> GetCloudServices()
         public CloudService GetCloudServiceForVault(ASRVault vault)
         {
             IEnumerable<CloudService> cloudServiceList = this.GetCloudServices();
-            CloudService cloudServiceToReturn = null;
 
             foreach (var cloudService in cloudServiceList)
             {
@@ -56,19 +55,17 @@ public CloudService GetCloudServiceForVault(ASRVault vault)
                         if (resource.Name.Equals(vault.Name, StringComparison.InvariantCultureIgnoreCase))
                         {
                             selectedVault = resource;
-                            break;
+                            return cloudService;
                         }
                     }
                 }
-
-                if (selectedVault != null)
-                {
-                    cloudServiceToReturn = cloudService;
-                    break;
-                }
             }
 
-            return cloudServiceToReturn;
+            throw new ArgumentException(
+                string.Format(
+                Properties.Resources.InCorrectVaultInformation,
+                vault.Name,
+                vault.Location));
         }
 
         /// <summary>

diff --git a/...iceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.Designer.cs b/...iceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.Designer.cs
diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.resx b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Properties/Resources.resx
@@ -239,6 +239,9 @@ ClientRequestId: {3}</value>
   <data name="VaultNotFound" xml:space="preserve">
     <value>Vault {0} is not associated with the given subscription.</value>
   </data>
+  <data name="InCorrectVaultInformation" xml:space="preserve">
+    <value>Vault information (Name: {0}, Location: {1}) is not correct</value>
+  </data>
   <data name="NewProtectionProfileObjectWhatIfMessage" xml:space="preserve">
     <value>Creates a new in-memory protection profile association object.</value>
   </data>

diff --git a/...anagement/RecoveryServices/Commands.RecoveryServices/Service/GetAzureSiteRecoveryVault.cs b/...anagement/RecoveryServices/Commands.RecoveryServices/Service/GetAzureSiteRecoveryVault.cs
@@ -92,7 +92,7 @@ private void GetByName()
                     this.Name));
             }
 
-            this.WriteVaults(vaultList);
+            this.WriteVaults(vaultListByName);
         }
 
         /// <summary>