Skip to content

Commit dd7e221

Browse files
sriramvusriramvu
committed
changes after sync
1 parent 5f44e08 commit dd7e221

File tree

11 files changed

+60
-60
lines changed

11 files changed

+60
-60
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
<SpecificVersion>False</SpecificVersion>
8484
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
8585
</Reference>
86-
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
86+
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8787
<SpecificVersion>False</SpecificVersion>
8888
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.5.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
8989
</Reference>

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/vaultSettings.vaultcredentials

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<ASRVaultCreds xmlns:i="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.datacontract.org/2004/07/Microsoft.Azure.Portal.RecoveryServices.Models.Common">
3-
<SubscriptionId>947a55d7-75e9-4a36-b156-305c6270f018</SubscriptionId>
3+
<SubscriptionId>a5aa5997-33e5-46cc-8ab8-8bd89b76b7ba</SubscriptionId>
44
<ResourceType>HyperVRecoveryManagerVault</ResourceType>
5-
<ResourceName>rijethma-vault</ResourceName>
6-
<ManagementCert>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</ManagementCert>
5+
<ResourceName>Hosters-FC-BVT-Vault</ResourceName>
6+
<ManagementCert>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</ManagementCert>
77
<AcsNamespace>
88
<HostName>accesscontrol.windows.net</HostName>
99
<Namespace>seabvtd2rp1users</Namespace>
1010
<ResourceProviderRealm>http://windowscloudbackup/m3</ResourceProviderRealm>
1111
</AcsNamespace>
12-
<ChannelIntegrityKey>fcWypqGV1kzbl0Znfy4HcQ==</ChannelIntegrityKey>
13-
<CloudServiceName>RecoveryServices-BKSIPEKSKUOD6BRA3PZOPIOUSEB6PBLUPHIK7Z3U7OVNBDOA257Q-west-us</CloudServiceName>
12+
<ChannelIntegrityKey>mock#ACIK</ChannelIntegrityKey>
13+
<CloudServiceName>RecoveryServices-T2RMT6H7QF7AENS66ZV7KS2QZA2BXRAUPOECQXGXX2Q4V3VQ6MUQ-West-US</CloudServiceName>
14+
<SiteId></SiteId>
15+
<SiteName></SiteName>
1416
<Version>1.0</Version>
1517
</ASRVaultCreds>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
<package id="Hydra.HttpRecorder" version="1.0.5417.13285-prerelease" targetFramework="net45" />
55
<package id="Hydra.SpecTestSupport" version="1.0.5417.13285-prerelease" targetFramework="net45" />
66
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Common.Authentication" version="1.0.8-preview" targetFramework="net45" />
78
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
89
<package id="Microsoft.Azure.Common.Extensions" version="0.14.0-preview" targetFramework="net45" />
9-
<package id="Microsoft.Azure.Common.Authentication" version="1.0.8-preview" targetFramework="net45" />
1010
<package id="Microsoft.Azure.Management.RecoveryServices" version="0.5.0-preview" targetFramework="net45" />
1111
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
1212
<package id="Microsoft.Azure.Test.Framework" version="1.0.5513.27084-prerelease" targetFramework="net45" />

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<SpecificVersion>False</SpecificVersion>
8888
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Common.1.4.1\lib\net45\Microsoft.WindowsAzure.Common.NetFramework.dll</HintPath>
8989
</Reference>
90-
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
90+
<Reference Include="Microsoft.WindowsAzure.Management.SiteRecovery, Version=0.9.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9191
<SpecificVersion>False</SpecificVersion>
9292
<HintPath>..\..\..\packages\Microsoft.Azure.Management.RecoveryServices.0.5.0-preview\lib\net40\Microsoft.WindowsAzure.Management.SiteRecovery.dll</HintPath>
9393
</Reference>

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesClient.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,13 @@
2525
using System.Xml;
2626
using Microsoft.Azure.Portal.RecoveryServices.Models.Common;
2727
using Microsoft.WindowsAzure.Commands.Common;
28+
using Microsoft.Azure.Common.Authentication;
2829
using Microsoft.Azure.Common.Authentication.Models;
2930
using Microsoft.WindowsAzure.Commands.Utilities.Common;
3031
using Microsoft.WindowsAzure.Management.RecoveryServices;
3132
using Microsoft.WindowsAzure.Management.RecoveryServices.Models;
3233
using Microsoft.WindowsAzure.Management.SiteRecovery;
3334
using Microsoft.WindowsAzure.Management.SiteRecovery.Models;
34-
using Microsoft.Azure.Common.Extensions;
35-
using Microsoft.Azure.Common.Authentication.Models;
36-
using Microsoft.Azure.Common.Authentication;
3735

3836
namespace Microsoft.Azure.Commands.RecoveryServices
3937
{

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/PSRecoveryServicesClient/PSRecoveryServicesClientHelper.cs

Lines changed: 37 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
using System;
1616
using System.Collections.Generic;
17-
using Microsoft.Azure.Common.Extensions;
18-
using Microsoft.Azure.Common.Extensions.Models;
17+
using Microsoft.Azure.Common.Authentication;
18+
using Microsoft.Azure.Common.Authentication.Models;
1919
using Microsoft.WindowsAzure.Commands.Common;
2020
using Microsoft.WindowsAzure.Management.SiteRecovery;
2121
using Microsoft.WindowsAzure.Management.SiteRecovery.Models;
@@ -27,42 +27,6 @@ namespace Microsoft.Azure.Commands.RecoveryServices
2727
/// </summary>
2828
public partial class PSRecoveryServicesClient
2929
{
30-
/// <summary>
31-
/// Validates whether the subscription belongs to the currently logged account or not.
32-
/// </summary>
33-
/// <param name="azureSubscriptionId">Azure Subscription ID</param>
34-
public static void ValidateSubscriptionAccountAssociation(string azureSubscriptionId)
35-
{
36-
if (string.IsNullOrEmpty(azureSubscriptionId))
37-
{
38-
throw new InvalidOperationException(
39-
string.Format(
40-
Properties.Resources.SubscriptionIdIsNotValid));
41-
}
42-
43-
bool associatedSubscription = false;
44-
ProfileClient pc = new ProfileClient();
45-
List<AzureSubscription> subscriptions =
46-
pc.RefreshSubscriptions(AzureSession.CurrentContext.Environment);
47-
48-
foreach (AzureSubscription sub in subscriptions)
49-
{
50-
if (azureSubscriptionId.Equals(sub.Id.ToString(), StringComparison.OrdinalIgnoreCase))
51-
{
52-
associatedSubscription = true;
53-
break;
54-
}
55-
}
56-
57-
if (!associatedSubscription)
58-
{
59-
throw new InvalidOperationException(
60-
string.Format(
61-
Properties.Resources.SubscriptionIsNotAssociatedWithTheAccount,
62-
azureSubscriptionId));
63-
}
64-
}
65-
6630
/// <summary>
6731
/// Converts the Parameter set string of Replication Frequency in seconds to UShort.
6832
/// </summary>
@@ -106,6 +70,41 @@ public static void ValidateReplicationStartTime(TimeSpan? timeSpan)
10670
}
10771
}
10872

73+
/// <summary>
74+
/// Validates whether the subscription belongs to the currently logged account or not.
75+
/// </summary>
76+
/// <param name="azureSubscriptionId">Azure Subscription ID</param>
77+
public void ValidateSubscriptionAccountAssociation(string azureSubscriptionId)
78+
{
79+
if (string.IsNullOrEmpty(azureSubscriptionId))
80+
{
81+
throw new InvalidOperationException(
82+
string.Format(
83+
Properties.Resources.SubscriptionIdIsNotValid));
84+
}
85+
86+
bool associatedSubscription = false;
87+
List<AzureSubscription> subscriptions =
88+
new List<AzureSubscription>(this.Profile.Subscriptions.Values);
89+
90+
foreach (AzureSubscription sub in subscriptions)
91+
{
92+
if (azureSubscriptionId.Equals(sub.Id.ToString(), StringComparison.OrdinalIgnoreCase))
93+
{
94+
associatedSubscription = true;
95+
break;
96+
}
97+
}
98+
99+
if (!associatedSubscription)
100+
{
101+
throw new InvalidOperationException(
102+
string.Format(
103+
Properties.Resources.SubscriptionIsNotAssociatedWithTheAccount,
104+
azureSubscriptionId));
105+
}
106+
}
107+
109108
/// <summary>
110109
/// Validates whether the storage belongs to the currently logged account or not.
111110
/// </summary>

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/GetAzureSiteRecoveryVault.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private List<ASRVault> GetVaults()
110110
{
111111
if (vault.Type.Equals(Constants.ASRVaultType, StringComparison.InvariantCultureIgnoreCase))
112112
{
113-
vaultList.Add(new ASRVault(cloudService, vault));
113+
vaultList.Add(new ASRVault(cloudService, vault, this.Profile.Context.Subscription.ToString()));
114114
}
115115
}
116116
}

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/GetAzureSiteRecoveryVaultSettingsFile.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
using System.Management.Automation;
1818
using System.Security.Cryptography.X509Certificates;
1919
using Microsoft.Azure.Commands.RecoveryServices.SiteRecovery;
20-
using Microsoft.Azure.Common.Extensions;
21-
using Microsoft.Azure.Common.Extensions.Models;
20+
using Microsoft.Azure.Common.Authentication;
21+
using Microsoft.Azure.Common.Authentication.Models;
2222
using Microsoft.Azure.Portal.RecoveryServices.Models.Common;
2323
using Microsoft.WindowsAzure.Management.RecoveryServices.Models;
2424
using Microsoft.WindowsAzure.Management.SiteRecovery.Models;
@@ -135,7 +135,7 @@ public override void ExecuteCmdlet()
135135
/// </summary>
136136
private void GetByObject()
137137
{
138-
AzureSubscription subscription = AzureSession.CurrentContext.Subscription;
138+
AzureSubscription subscription = this.Profile.Context.Subscription;
139139
this.Vault.SubscriptionId = subscription.Id.ToString();
140140

141141
CloudService cloudService = RecoveryServicesClient.GetCloudServiceForVault(this.Vault);

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/NewAzureSiteRecoveryNetworkMapping.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ private void EnterpriseToEnterpriseNetworkMapping()
109109
private void EnterpriseToAzureNetworkMapping()
110110
{
111111
// Verify whether the subscription is associated with the account or not.
112-
PSRecoveryServicesClient.ValidateSubscriptionAccountAssociation(this.AzureSubscriptionId);
112+
RecoveryServicesClient.ValidateSubscriptionAccountAssociation(this.AzureSubscriptionId);
113113

114114
// Check if the Azure VM Network is associated with the Subscription or not.
115115
string azureVMNetworkName;

‎src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/lib/PSObjects.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
using System.Collections.Generic;
1717
using System.Diagnostics.CodeAnalysis;
1818
using System.Runtime.Serialization;
19-
using Microsoft.Azure.Common.Extensions;
19+
using Microsoft.Azure.Common.Authentication;
2020
using Microsoft.Azure.Portal.RecoveryServices.Models.Common;
2121
using Microsoft.WindowsAzure.Management.RecoveryServices.Models;
2222
using Microsoft.WindowsAzure.Management.SiteRecovery.Models;
@@ -1183,12 +1183,12 @@ public ASRJob(Job job)
11831183
/// <summary>
11841184
/// Gets or sets Start timestamp.
11851185
/// </summary>
1186-
public DateTimeOffset? StartTime { get; set; }
1186+
public string StartTime { get; set; }
11871187

11881188
/// <summary>
11891189
/// Gets or sets End timestamp.
11901190
/// </summary>
1191-
public DateTimeOffset? EndTime { get; set; }
1191+
public string EndTime { get; set; }
11921192

11931193
/// <summary>
11941194
/// Gets or sets TargetObjectId.
@@ -1245,12 +1245,13 @@ public ASRVault()
12451245
/// </summary>
12461246
/// <param name="cloudService">cloud service object</param>
12471247
/// <param name="vault">vault object</param>
1248-
public ASRVault(CloudService cloudService, Vault vault)
1248+
/// <param name="subscription">Current subscription</param>
1249+
public ASRVault(CloudService cloudService, Vault vault, string subscription)
12491250
{
12501251
this.CloudServiceName = cloudService.Name;
12511252
this.Location = cloudService.GeoRegion;
12521253
this.Name = vault.Name;
1253-
this.SubscriptionId = AzureSession.CurrentContext.Subscription.Id.ToString();
1254+
this.SubscriptionId = subscription;
12541255
this.Status = this.ParseStatus(vault.OperationStatus);
12551256
this.ID = this.ParseVaultId(vault.OutputItems);
12561257
if (vault.OperationStatus.Error != null)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<package id="BuildTools.StyleCop" version="4.7.49.0" targetFramework="net45" />
44
<package id="Hyak.Common" version="1.0.2" targetFramework="net45" />
55
<package id="Microsoft.Azure.Common" version="2.0.2" targetFramework="net45" />
6-
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
76
<package id="Microsoft.Azure.Common.Authentication" version="1.0.8-preview" targetFramework="net45" />
7+
<package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
88
<package id="Microsoft.Azure.Management.RecoveryServices" version="0.5.0-preview" targetFramework="net45" />
99
<package id="Microsoft.Azure.Management.Resources" version="2.12.0-preview" targetFramework="net45" />
1010
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />

0 commit comments

Comments
 (0)