Merge pull request #131 from MabOneSdk/dev1-anudeeb

Samuel Anudeep · Samuel Anudeep · commit aa411451694f · 2015-08-20T21:08:11.000+05:30
Fixing Bug 4265568. Signed off by SwatiM.
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
@@ -41,7 +41,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.3-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
+      <HintPath>..\Commands.AzureBackup\Resources\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/VaultAdapter.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupClientAdapter/VaultAdapter.cs
@@ -117,9 +117,12 @@ public IEnumerable<AzureBackupVault> GetVaultsInResourceGroup(string resourceGro
         /// </summary>
         /// <param name="resourceGroupName"></param>
         /// <param name="vaultName"></param>
-        public void DeleteVault(string resourceGroupName, string vaultName)
+        public bool DeleteVault(string resourceGroupName, string vaultName)
         {
-            AzureBackupVaultClient.Vault.DeleteAsync(resourceGroupName, vaultName, GetCustomRequestHeaders(), CmdletCancellationToken).Wait();
+            AzureBackupVaultGetResponse response = AzureBackupVaultClient.Vault.DeleteAsync(resourceGroupName, vaultName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
+            
+            // OneSDK will return only either OK or NoContent
+            return response.StatusCode == System.Net.HttpStatusCode.OK;
         }
 
         public VaultCredUploadCertResponse UploadCertificate(string resourceGroupName, string resourceName, string certName, VaultCredUploadCertRequest request)
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/RemoveAzureRMBackupVault.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Vault/RemoveAzureRMBackupVault.cs
@@ -12,6 +12,8 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using Microsoft.Azure.Commands.AzureBackup.Properties;
+using System;
 using System.Management.Automation;
 
 namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
@@ -28,7 +30,10 @@ public override void ExecuteCmdlet()
             {
                 base.ExecuteCmdlet();
 
-                AzureBackupClient.DeleteVault(Vault.ResourceGroupName, Vault.Name);
+                if (!AzureBackupClient.DeleteVault(Vault.ResourceGroupName, Vault.Name))
+                {
+                    throw new Exception(Resources.ResourceNotFoundMessage);
+                }
             });
         }
     }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
@@ -58,7 +58,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.3-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
+      <HintPath>Resources\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/Microsoft.Azure.Management.BackupServicesManagement.dll b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/Microsoft.Azure.Management.BackupServicesManagement.dll

Original file line number	Diff line number	Diff line change
`@@ -117,9 +117,12 @@ public IEnumerable<AzureBackupVault> GetVaultsInResourceGroup(string resourceGro`
`117`	`117`	`/// </summary>`
`118`	`118`	`/// <param name="resourceGroupName"></param>`
`119`	`119`	`/// <param name="vaultName"></param>`
`120`		`- public void DeleteVault(string resourceGroupName, string vaultName)`
	`120`	`+ public bool DeleteVault(string resourceGroupName, string vaultName)`
`121`	`121`	`{`
`122`		`- AzureBackupVaultClient.Vault.DeleteAsync(resourceGroupName, vaultName, GetCustomRequestHeaders(), CmdletCancellationToken).Wait();`
	`122`	`+ AzureBackupVaultGetResponse response = AzureBackupVaultClient.Vault.DeleteAsync(resourceGroupName, vaultName, GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
	`123`	`+`
	`124`	`+ // OneSDK will return only either OK or NoContent`
	`125`	`+ return response.StatusCode == System.Net.HttpStatusCode.OK;`
`123`	`126`	`}`
`124`	`127`
`125`	`128`	`public VaultCredUploadCertResponse UploadCertificate(string resourceGroupName, string resourceName, string certName, VaultCredUploadCertRequest request)`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`	`// limitations under the License.`
`13`	`13`	`// ----------------------------------------------------------------------------------`
`14`	`14`
	`15`	`+using Microsoft.Azure.Commands.AzureBackup.Properties;`
	`16`	`+using System;`
`15`	`17`	`using System.Management.Automation;`
`16`	`18`
`17`	`19`	`namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets`
`@@ -28,7 +30,10 @@ public override void ExecuteCmdlet()`
`28`	`30`	`{`
`29`	`31`	`base.ExecuteCmdlet();`
`30`	`32`
`31`		`- AzureBackupClient.DeleteVault(Vault.ResourceGroupName, Vault.Name);`
	`33`	`+ if (!AzureBackupClient.DeleteVault(Vault.ResourceGroupName, Vault.Name))`
	`34`	`+ {`
	`35`	`+ throw new Exception(Resources.ResourceNotFoundMessage);`
	`36`	`+ }`
`32`	`37`	`});`
`33`	`38`	`}`
`34`	`39`	`}`