Revert "Get/Set AzureRmRecoveryServicesBackupProperties"

This reverts commit 7471ce8.
RecoveryServicesOneSDK · Apr 12, 2016 · ca483e5 · ca483e5
1 parent 7471ce8
commit ca483e5
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 184 deletions.
diff --git a/...ger/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj b/...ger/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj
@@ -47,9 +47,9 @@
     <Reference Include="Microsoft.Azure.Common.NetFramework">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\SafeHaven-1604\dll\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.1.0.2-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

diff --git a/...r/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1 b/...r/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1
@@ -21,7 +21,7 @@ Recovery Services Vault CRUD Tests
 function Test-RecoveryServicesVaultCRUDTests
 {
 	# Create vault
-	$vaultCreationResponse = New-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName vishakintdrg -Location westus
+	$vaultCreationResponse = New-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName S91-1 -Location westus
 	Assert-NotNull($vaultCreationResponse.Name)
 	Assert-NotNull($vaultCreationResponse.ID)
 	Assert-NotNull($vaultCreationResponse.Type)
@@ -37,19 +37,14 @@ function Test-RecoveryServicesVaultCRUDTests
 		Assert-NotNull($vault.Type)
 	}
 
-	$vaultBackupProperties = Get-AzureRmRecoveryServicesBackupProperties -Vault $vaultCreationResponse
-	Assert-NotNull($vaultBackupProperties.BackupStorageRedundancy)
-
-	Set-AzureRmRecoveryServicesBackupProperties -Vault $vaultCreationResponse -BackupStorageRedundancy "LocallyRedundant"
-
 	# Get the created vault
-	$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName vishakintdrg -Name rsv1
+	$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1
 	Assert-NotNull($vaultToBeRemoved.Name)
 	Assert-NotNull($vaultToBeRemoved.ID)
 	Assert-NotNull($vaultToBeRemoved.Type)
 
 	# Remove Vault
 	Remove-AzureRmRecoveryServicesVault -Vault $vaultToBeRemoved
-	$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName vishakintdrg -Name rsv1
+	$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1
 	Assert-True { $vaults.Count -eq 0 }
 }
diff --git a/...ecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs b/...ecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs
@@ -84,7 +84,7 @@ public static T GetServiceClient<T>() where T : class
             if (testEnvironment.UsesCustomUri())
             {
                 client = new RecoveryServicesManagementClient(
-                    "Microsoft.RecoveryServicesBVTD",
+                    "Microsoft.RecoveryServicesBVTD2",
                     testEnvironment.Credentials as SubscriptionCloudCredentials,
                     testEnvironment.BaseUri);
             }

diff --git a/...sourceManager/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj b/...sourceManager/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj
@@ -51,9 +51,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\SafeHaven-1604\dll\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.1.0.2-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -129,12 +129,10 @@
     </Compile>
     <Compile Include="Utilities\CertUtils.cs" />
     <Compile Include="Utilities\Utilities.cs" />
-    <Compile Include="Vault\GetAzureRmRecoveryServicesBackupProperties.cs" />
     <Compile Include="Vault\GetAzureRmRecoveryServicesVaults.cs" />
     <Compile Include="Vault\GetAzureRmRecoveryServicesVaultSettingsFile.cs" />
     <Compile Include="Vault\NewAzureRmRecoveryServicesVault.cs" />
     <Compile Include="Vault\RemoveAzureRmRecoveryServicesVault.cs" />
-    <Compile Include="Vault\SetAzureRmRecoveryServicesBackupProperties.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Properties\Resources.resx">

diff --git a/...anager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultClient.cs b/...anager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultClient.cs
@@ -63,31 +63,5 @@ public ResourceGroupListResponse GetResouceGroups()
         {
             return this.GetRecoveryServicesClient.ResourceGroup.List();
         }
-
-
-        /// <summary>  
-        /// Method to Update Azure Recovery Services Vault Backup Properties  
-        /// </summary>  
-        /// <param name="resouceGroupName">Name of the resouce group</param>  
-        /// <param name="vaultName">Name of the vault</param>  
-        /// <param name="vaultStorageUpdateRequest">Backup Properties Update</param>  
-        /// <returns>Azure Operation response object.</returns>  
-        public AzureOperationResponse UpdateVaultStorageType(string resouceGroupName, string vaultName, UpdateVaultStorageTypeRequest vaultStorageUpdateRequest)  
-        {  
-            return this.recoveryServicesClient.Vaults.UpdateStorageType(resouceGroupName, vaultName,   
-                                                            vaultStorageUpdateRequest, this.GetRequestHeaders());  
-        }  
-
-        /// <summary>  
-        /// Method to Get Azure Recovery Services Vault Backup Properties  
-        /// </summary>  
-        /// <param name="resouceGroupName">Name of the resouce group</param>  
-        /// <param name="vaultName">Name of the vault</param>  
-        /// <returns>Azure Resource Storage response object.</returns>  
-        public GetResourceStorageConfigResponse GetVaultStorageType(string resouceGroupName, string vaultName)  
-        {  
-            return this.recoveryServicesClient.Vaults.GetResourceStorageConfig(resouceGroupName, vaultName, this.GetRequestHeaders());  
-        }  
-
     }
 }
diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs
@@ -520,10 +520,9 @@ public class AcsNamespace
         /// <param name="acsDetails">authenticating service Details name</param>
         public AcsNamespace(UploadCertificateResponse acsDetails)
         {
-            this.HostName = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsHostName;
-            this.Namespace = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsNamespace;
-            this.ResourceProviderRealm = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsRPRealm;  
-
+            this.HostName = acsDetails.Properties.GlobalAcsHostName;
+            this.Namespace = acsDetails.Properties.GlobalAcsNamespace;
+            this.ResourceProviderRealm = acsDetails.Properties.GlobalAcsRPRealm;
         }
 
         /// <summary>

diff --git a/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs b/src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs
@@ -135,7 +135,7 @@ public ARSVault(VaultCreateResponse vault)
     public class ASRVaultProperties
     {
         #region Properties
-
+        
         /// <summary>
         /// Gets or sets Provisioning State.
         /// </summary>
@@ -144,18 +144,6 @@ public class ASRVaultProperties
         #endregion
     }
 
-    public class ASRVaultBackupProperties
-    {
-        #region Properties
-
-        /// <summary>
-        /// Gets or sets BackupStorageRedundancy type.
-        /// </summary>
-        public string BackupStorageRedundancy { get; set; }
-
-        #endregion
-    }
-
     /// <summary>
     /// Class to define the output of the vault settings file generation.
     /// </summary>

diff --git a/...eryServices/Commands.RecoveryServices/Vault/GetAzureRmRecoveryServicesBackupProperties.cs b/...eryServices/Commands.RecoveryServices/Vault/GetAzureRmRecoveryServicesBackupProperties.cs
diff --git a/...eryServices/Commands.RecoveryServices/Vault/SetAzureRmRecoveryServicesBackupProperties.cs b/...eryServices/Commands.RecoveryServices/Vault/SetAzureRmRecoveryServicesBackupProperties.cs