Skip to content

Commit ca483e5

Browse files
vishak-msvishak-ms
committed
Revert "Get/Set AzureRmRecoveryServicesBackupProperties"
This reverts commit 7471ce8.
1 parent 7471ce8 commit ca483e5

File tree

9 files changed

+14
-184
lines changed

9 files changed

+14
-184
lines changed

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@
4747
<Reference Include="Microsoft.Azure.Common.NetFramework">
4848
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
51-
<SpecificVersion>False</SpecificVersion>
52-
<HintPath>..\..\..\..\..\..\SafeHaven-1604\dll\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
50+
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
51+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.1.0.2-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
52+
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Recovery Services Vault CRUD Tests
2121
function Test-RecoveryServicesVaultCRUDTests
2222
{
2323
# Create vault
24-
$vaultCreationResponse = New-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName vishakintdrg -Location westus
24+
$vaultCreationResponse = New-AzureRmRecoveryServicesVault -Name rsv1 -ResourceGroupName S91-1 -Location westus
2525
Assert-NotNull($vaultCreationResponse.Name)
2626
Assert-NotNull($vaultCreationResponse.ID)
2727
Assert-NotNull($vaultCreationResponse.Type)
@@ -37,19 +37,14 @@ function Test-RecoveryServicesVaultCRUDTests
3737
Assert-NotNull($vault.Type)
3838
}
3939

40-
$vaultBackupProperties = Get-AzureRmRecoveryServicesBackupProperties -Vault $vaultCreationResponse
41-
Assert-NotNull($vaultBackupProperties.BackupStorageRedundancy)
42-
43-
Set-AzureRmRecoveryServicesBackupProperties -Vault $vaultCreationResponse -BackupStorageRedundancy "LocallyRedundant"
44-
4540
# Get the created vault
46-
$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName vishakintdrg -Name rsv1
41+
$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1
4742
Assert-NotNull($vaultToBeRemoved.Name)
4843
Assert-NotNull($vaultToBeRemoved.ID)
4944
Assert-NotNull($vaultToBeRemoved.Type)
5045

5146
# Remove Vault
5247
Remove-AzureRmRecoveryServicesVault -Vault $vaultToBeRemoved
53-
$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName vishakintdrg -Name rsv1
48+
$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1
5449
Assert-True { $vaults.Count -eq 0 }
5550
}

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTestsBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public static T GetServiceClient<T>() where T : class
8484
if (testEnvironment.UsesCustomUri())
8585
{
8686
client = new RecoveryServicesManagementClient(
87-
"Microsoft.RecoveryServicesBVTD",
87+
"Microsoft.RecoveryServicesBVTD2",
8888
testEnvironment.Credentials as SubscriptionCloudCredentials,
8989
testEnvironment.BaseUri);
9090
}

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
<SpecificVersion>False</SpecificVersion>
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
5353
</Reference>
54-
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<SpecificVersion>False</SpecificVersion>
56-
<HintPath>..\..\..\..\..\..\SafeHaven-1604\dll\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
54+
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
55+
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.1.0.2-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
56+
<Private>True</Private>
5757
</Reference>
5858
<Reference Include="Microsoft.IdentityModel.Clients.ActiveDirectory, Version=2.18.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5959
<HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll</HintPath>
@@ -129,12 +129,10 @@
129129
</Compile>
130130
<Compile Include="Utilities\CertUtils.cs" />
131131
<Compile Include="Utilities\Utilities.cs" />
132-
<Compile Include="Vault\GetAzureRmRecoveryServicesBackupProperties.cs" />
133132
<Compile Include="Vault\GetAzureRmRecoveryServicesVaults.cs" />
134133
<Compile Include="Vault\GetAzureRmRecoveryServicesVaultSettingsFile.cs" />
135134
<Compile Include="Vault\NewAzureRmRecoveryServicesVault.cs" />
136135
<Compile Include="Vault\RemoveAzureRmRecoveryServicesVault.cs" />
137-
<Compile Include="Vault\SetAzureRmRecoveryServicesBackupProperties.cs" />
138136
</ItemGroup>
139137
<ItemGroup>
140138
<EmbeddedResource Include="Properties\Resources.resx">

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Common/PSRecoveryServicesVaultClient.cs

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -63,31 +63,5 @@ public ResourceGroupListResponse GetResouceGroups()
6363
{
6464
return this.GetRecoveryServicesClient.ResourceGroup.List();
6565
}
66-
67-
68-
/// <summary>
69-
/// Method to Update Azure Recovery Services Vault Backup Properties
70-
/// </summary>
71-
/// <param name="resouceGroupName">Name of the resouce group</param>
72-
/// <param name="vaultName">Name of the vault</param>
73-
/// <param name="vaultStorageUpdateRequest">Backup Properties Update</param>
74-
/// <returns>Azure Operation response object.</returns>
75-
public AzureOperationResponse UpdateVaultStorageType(string resouceGroupName, string vaultName, UpdateVaultStorageTypeRequest vaultStorageUpdateRequest)
76-
{
77-
return this.recoveryServicesClient.Vaults.UpdateStorageType(resouceGroupName, vaultName,
78-
vaultStorageUpdateRequest, this.GetRequestHeaders());
79-
}
80-
81-
/// <summary>
82-
/// Method to Get Azure Recovery Services Vault Backup Properties
83-
/// </summary>
84-
/// <param name="resouceGroupName">Name of the resouce group</param>
85-
/// <param name="vaultName">Name of the vault</param>
86-
/// <returns>Azure Resource Storage response object.</returns>
87-
public GetResourceStorageConfigResponse GetVaultStorageType(string resouceGroupName, string vaultName)
88-
{
89-
return this.recoveryServicesClient.Vaults.GetResourceStorageConfig(resouceGroupName, vaultName, this.GetRequestHeaders());
90-
}
91-
9266
}
9367
}

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSContracts.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -520,10 +520,9 @@ public class AcsNamespace
520520
/// <param name="acsDetails">authenticating service Details name</param>
521521
public AcsNamespace(UploadCertificateResponse acsDetails)
522522
{
523-
this.HostName = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsHostName;
524-
this.Namespace = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsNamespace;
525-
this.ResourceProviderRealm = (acsDetails.Properties as ACSCertificateProperties).GlobalAcsRPRealm;
526-
523+
this.HostName = acsDetails.Properties.GlobalAcsHostName;
524+
this.Namespace = acsDetails.Properties.GlobalAcsNamespace;
525+
this.ResourceProviderRealm = acsDetails.Properties.GlobalAcsRPRealm;
527526
}
528527

529528
/// <summary>

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Models/PSObjects.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ public ARSVault(VaultCreateResponse vault)
135135
public class ASRVaultProperties
136136
{
137137
#region Properties
138-
138+
139139
/// <summary>
140140
/// Gets or sets Provisioning State.
141141
/// </summary>
@@ -144,18 +144,6 @@ public class ASRVaultProperties
144144
#endregion
145145
}
146146

147-
public class ASRVaultBackupProperties
148-
{
149-
#region Properties
150-
151-
/// <summary>
152-
/// Gets or sets BackupStorageRedundancy type.
153-
/// </summary>
154-
public string BackupStorageRedundancy { get; set; }
155-
156-
#endregion
157-
}
158-
159147
/// <summary>
160148
/// Class to define the output of the vault settings file generation.
161149
/// </summary>

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/GetAzureRmRecoveryServicesBackupProperties.cs

Lines changed: 0 additions & 59 deletions
This file was deleted.

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Vault/SetAzureRmRecoveryServicesBackupProperties.cs

Lines changed: 0 additions & 65 deletions
This file was deleted.

0 commit comments

Comments
 (0)