Skip to content

Commit 0229838

Browse files
avneeshraiusitavneeshraiusit
committed
Updating session records for siterecovery project
1 parent ee307c9 commit 0229838

File tree

17 files changed

+8117
-1638
lines changed

17 files changed

+8117
-1638
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,8 @@
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">
50+
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5151
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.1.0.2-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
52-
<Private>True</Private>
5352
</Reference>
5453
<Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5554
<SpecificVersion>False</SpecificVersion>

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

Lines changed: 3 additions & 3 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 -ResouceGroupName testsitegroup -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)
@@ -38,7 +38,7 @@ function Test-RecoveryServicesVaultCRUDTests
3838
}
3939

4040
# Get the created vault
41-
$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName testsitegroup -Name rsv1
41+
$vaultToBeRemoved = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1
4242
Assert-NotNull($vaultToBeRemoved.Name)
4343
Assert-NotNull($vaultToBeRemoved.ID)
4444
Assert-NotNull($vaultToBeRemoved.Type)
@@ -48,6 +48,6 @@ function Test-RecoveryServicesVaultCRUDTests
4848

4949
# Remove Vault
5050
Remove-AzureRmRecoveryServicesVault -Vault $vaultToBeRemoved
51-
$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName testsitegroup -Name rsv1
51+
$vaults = Get-AzureRmRecoveryServicesVault -ResourceGroupName S91-1 -Name rsv1
5252
Assert-True { $vaults.Count -eq 0 }
5353
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,14 +84,14 @@ public static T GetServiceClient<T>() where T : class
8484
if (testEnvironment.UsesCustomUri())
8585
{
8686
client = new RecoveryServicesManagementClient(
87-
"Microsoft.RecoveryServices",
87+
"Microsoft.RecoveryServicesBVTD2",
8888
testEnvironment.Credentials as SubscriptionCloudCredentials,
8989
testEnvironment.BaseUri);
9090
}
9191
else
9292
{
9393
client = new RecoveryServicesManagementClient(
94-
"Microsoft.RecoveryServices",
94+
"Microsoft.RecoveryServicesBVTD2",
9595
testEnvironment.Credentials as SubscriptionCloudCredentials);
9696
}
9797
return GetServiceClient<T>(factory, client);

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices.Test/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.5.1-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.RecoveryServices" version="1.0.1-preview" targetFramework="net45" />
87
<package id="Microsoft.Azure.Management.RecoveryServices" version="1.0.2-preview" targetFramework="net45" />
98
<package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
109
<package id="Microsoft.Azure.Test.Framework" version="1.0.5774.40163-prerelease" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
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">
54+
<Reference Include="Microsoft.Azure.Management.RecoveryServices, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5555
<SpecificVersion>False</SpecificVersion>
5656
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.1.0.2-preview\lib\net40\Microsoft.Azure.Management.RecoveryServices.dll</HintPath>
5757
</Reference>

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common.Authentication" version="1.5.1-preview" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
7-
<package id="Microsoft.Azure.Management.RecoveryServices" version="1.0.1-preview" targetFramework="net45" />
87
<package id="Microsoft.Azure.Management.RecoveryServices" version="1.0.2-preview" targetFramework="net45" />
98
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
109
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
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.SiteRecovery, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50+
<Reference Include="Microsoft.Azure.Management.SiteRecovery, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
5151
<SpecificVersion>False</SpecificVersion>
5252
<HintPath>..\..\..\packages\Microsoft.Azure.Management.SiteRecovery.1.0.2-preview\lib\net40\Microsoft.Azure.Management.SiteRecovery.dll</HintPath>
5353
</Reference>

‎src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTests.ps1

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function Test-SiteRecoveryCreateProfile
6969
Import-AzureRmSiteRecoveryVaultSettingsFile $vaultSettingsFilePath
7070

7171
# Create profile
72-
$job = New-AzureRmSiteRecoveryPolicy -Name ppAzure -ReplicationProvider HyperVReplicaAzure -ReplicationFrequencyInSeconds 30 -RecoveryPoints 1 -ApplicationConsistentSnapshotFrequencyInHours 0 -RecoveryAzureStorageAccountId "/subscriptions/00a07ea0-ad8b-491c-9de8-77bf10881499/resourceGroups/testsitegroup/providers/Microsoft.Storage/storageAccounts/sa5151"
72+
$job = New-AzureRmSiteRecoveryPolicy -Name ppAzure -ReplicationProvider HyperVReplicaAzure -ReplicationFrequencyInSeconds 30 -RecoveryPoints 1 -ApplicationConsistentSnapshotFrequencyInHours 0 -RecoveryAzureStorageAccountId "/subscriptions/aef7cd8f-a06f-407d-b7f0-cc78cfebaab0/resourceGroups/Default-Storage-WestUS/providers/Microsoft.ClassicStorage/storageAccounts/b2astorageversion1"
7373

7474
# WaitForJobCompletion -JobId $job.Name
7575
}
@@ -107,7 +107,7 @@ function Test-SiteRecoveryAssociateProfile
107107
Import-AzureRmSiteRecoveryVaultSettingsFile $vaultSettingsFilePath
108108

109109
# Get the primary cloud, recovery cloud, and protection profile
110-
$pri = Get-AzureRmSiteRecoveryProtectionContainer -FriendlyName cloud9
110+
$pri = Get-AzureRmSiteRecoveryProtectionContainer -FriendlyName B2asite1
111111
$pp = Get-AzureRmSiteRecoveryPolicy -Name ppAzure;
112112

113113
# Associate the profile
@@ -127,7 +127,7 @@ function Test-SiteRecoveryDissociateProfile
127127
Import-AzureRmSiteRecoveryVaultSettingsFile $vaultSettingsFilePath
128128

129129
# Get the primary cloud, recovery cloud, and protection profile
130-
$pri = Get-AzureRmSiteRecoveryProtectionContainer -FriendlyName cloud9
130+
$pri = Get-AzureRmSiteRecoveryProtectionContainer -FriendlyName B2asite1
131131
$pp = Get-AzureRmSiteRecoveryPolicy -Name ppAzure;
132132

133133
# Dissociate the profile
@@ -166,7 +166,7 @@ Site Recovery Vault CRUD Tests
166166
function Test-SiteRecoveryVaultCRUDTests
167167
{
168168
# Create vault
169-
$vaultCreationResponse = New-AzureRmSiteRecoveryVault -Name rsv1 -ResouceGroupName testsitegroup -Location westus
169+
$vaultCreationResponse = New-AzureRmSiteRecoveryVault -Name rsv1 -ResourceGroupName S91-1 -Location westus
170170
Assert-NotNull($vaultCreationResponse.Name)
171171
Assert-NotNull($vaultCreationResponse.ID)
172172
Assert-NotNull($vaultCreationResponse.Type)
@@ -183,13 +183,13 @@ function Test-SiteRecoveryVaultCRUDTests
183183
}
184184

185185
# Get the created vault
186-
$vaultToBeRemoved = Get-AzureRmSiteRecoveryVault -ResourceGroupName testsitegroup -Name rsv1
186+
$vaultToBeRemoved = Get-AzureRmSiteRecoveryVault -ResourceGroupName S91-1 -Name rsv1
187187
Assert-NotNull($vaultToBeRemoved.Name)
188188
Assert-NotNull($vaultToBeRemoved.ID)
189189
Assert-NotNull($vaultToBeRemoved.Type)
190190

191191
# Remove Vault
192192
Remove-AzureRmSiteRecoveryVault -Vault $vaultToBeRemoved
193-
$vaults = Get-AzureRmSiteRecoveryVault -ResourceGroupName testsitegroup -Name rsv1
193+
$vaults = Get-AzureRmSiteRecoveryVault -ResourceGroupName S91-1 -Name rsv1
194194
Assert-True { $vaults.Count -eq 0 }
195195
}

‎src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,15 +130,15 @@ public T GetServiceClient<T>() where T : class
130130
if (testEnvironment.UsesCustomUri())
131131
{
132132
client = new RecoveryServicesManagementClient(
133-
"Microsoft.RecoveryServices",
133+
"Microsoft.RecoveryServicesBVTD2",
134134
"vaults",
135135
testEnvironment.Credentials as SubscriptionCloudCredentials,
136136
testEnvironment.BaseUri);
137137
}
138138
else
139139
{
140140
client = new RecoveryServicesManagementClient(
141-
"Microsoft.RecoveryServices",
141+
"Microsoft.RecoveryServicesBVTD2",
142142
"vaults",
143143
testEnvironment.Credentials as SubscriptionCloudCredentials);
144144
}
@@ -153,7 +153,7 @@ public T GetServiceClient<T>() where T : class
153153
client = new SiteRecoveryManagementClient(
154154
asrVaultCreds.ResourceName,
155155
asrVaultCreds.ResourceGroupName,
156-
"Microsoft.RecoveryServices",
156+
"Microsoft.RecoveryServicesBVTD2",
157157
"vaults",
158158
testEnvironment.Credentials as SubscriptionCloudCredentials,
159159
testEnvironment.BaseUri);

‎src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/vaultSettings.VaultCredentials

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<ASRVaultCreds xmlns="http://schemas.datacontract.org/2004/07/Microsoft.Azure.Portal.RecoveryServices.Models.Common" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><SubscriptionId>00a07ea0-ad8b-491c-9de8-77bf10881499</SubscriptionId><ResourceType>HyperVRecoveryManagerVault</ResourceType><ResourceName>hello</ResourceName><ManagementCert></ManagementCert><AcsNamespace><HostName>accesscontrol.windows.net</HostName><Namespace>wusppe1rrp1users</Namespace><ResourceProviderRealm>http://windowscloudbackup/m3</ResourceProviderRealm></AcsNamespace><ARMResourceType>vaults</ARMResourceType><ChannelIntegrityKey>ffMOSoSTai8YGmsbVdEVLQ==</ChannelIntegrityKey><ResourceGroupName>testsitegroup</ResourceGroupName><ResourceNamespace>Microsoft.RecoveryServices</ResourceNamespace><SiteId/><SiteName/><Version>1.0</Version></ASRVaultCreds>
1+
<ASRVaultCreds xmlns="http://schemas.datacontract.org/2004/07/Microsoft.Azure.Portal.RecoveryServices.Models.Common" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"><SubscriptionId>3cf8bef3-d6e2-47fd-8ef9-a305d11c4255</SubscriptionId><ResourceType>HyperVRecoveryManagerVault</ResourceType><ResourceName>nvault1</ResourceName><ManagementCert></ManagementCert><AcsNamespace><HostName>accesscontrol.windows.net</HostName><Namespace>seabvtd2rrp1users</Namespace><ResourceProviderRealm>http://windowscloudbackup/m3</ResourceProviderRealm></AcsNamespace><ARMResourceType>vaults</ARMResourceType><ChannelIntegrityKey>QwgOuGhyZEWg4ZWGm0jngA==</ChannelIntegrityKey><ResourceGroupName>siterecoveryppecsmrg6</ResourceGroupName><ResourceNamespace>Microsoft.RecoveryServicesBVTD2</ResourceNamespace><SiteId/><SiteName/><Version>1.0</Version></ASRVaultCreds>

0 commit comments

Comments
 (0)