Skip to content

Commit 86bfcd4

Browse files
avneeshraiusitavneeshraiusit
committed
Merge pull request #1 from AsrOneSdk/namespaceChangeForSRVaultManagement
taking hydra spec namespace change for SiteRecovery Vault management...
2 parents e586593 + 16505e5 commit 86bfcd4

16 files changed

+80
-128
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public RecoveryServicesManagementClient GetRecoveryServicesClient
6464
"Microsoft.StyleCop.CSharp.MaintainabilityRules",
6565
"SA1401:FieldsMustBePrivate",
6666
Justification = "For Resource Credentials.")]
67-
public static ASRVaultCreds asrVaultCreds = new ASRVaultCreds();
67+
public static ARSVaultCreds arsVaultCreds = new ARSVaultCreds();
6868

6969
/// <summary>
7070
/// Recovery Services client.
@@ -86,7 +86,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile)
8686
string resourceType = string.Empty;
8787

8888
// Get Resource provider namespace from config if needed to communicate with internal deployments
89-
if (string.IsNullOrEmpty(asrVaultCreds.ResourceNamespace))
89+
if (string.IsNullOrEmpty(arsVaultCreds.ResourceNamespace))
9090
{
9191
if (appSettings.Settings.Count == 0)
9292
{
@@ -100,7 +100,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile)
100100
: appSettings.Settings["ProviderNamespace"].Value;
101101
}
102102

103-
Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
103+
Utilities.UpdateCurrentVaultContext(new ARSVaultCreds()
104104
{
105105
ResourceNamespace = resourceNamespace,
106106
ARMResourceType = resourceType
@@ -109,7 +109,7 @@ public PSRecoveryServicesClient(IAzureProfile azureProfile)
109109

110110
this.recoveryServicesClient =
111111
AzureSession.ClientFactory.CreateCustomClient<RecoveryServicesManagementClient>(
112-
asrVaultCreds.ResourceNamespace,
112+
arsVaultCreds.ResourceNamespace,
113113
AzureSession.AuthenticationFactory.GetSubscriptionCloudCredentials(azureProfile.Context),
114114
azureProfile.Context.Environment.GetEndpointAsUri(AzureEnvironment.Endpoint.ResourceManager));
115115
}

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ public async Task<ResourceExtendedInformation> GetExtendedInfo()
3939
{
4040
ResourceExtendedInformationResponse response =
4141
await this.recoveryServicesClient.VaultExtendedInfo.GetExtendedInfoAsync(
42-
asrVaultCreds.ResourceGroupName,
43-
asrVaultCreds.ResourceName,
42+
arsVaultCreds.ResourceGroupName,
43+
arsVaultCreds.ResourceName,
4444
this.GetRequestHeaders());
4545

4646
return response.ResourceExtendedInformation;
@@ -54,8 +54,8 @@ await this.recoveryServicesClient.VaultExtendedInfo.GetExtendedInfoAsync(
5454
public AzureOperationResponse CreateExtendedInfo(ResourceExtendedInformationArgs extendedInfoArgs)
5555
{
5656
return this.recoveryServicesClient.VaultExtendedInfo.CreateExtendedInfo(
57-
asrVaultCreds.ResourceGroupName,
58-
asrVaultCreds.ResourceName,
57+
arsVaultCreds.ResourceGroupName,
58+
arsVaultCreds.ResourceName,
5959
extendedInfoArgs,
6060
this.GetRequestHeaders());
6161
}
@@ -68,8 +68,8 @@ public AzureOperationResponse CreateExtendedInfo(ResourceExtendedInformationArgs
6868
public async Task<UploadCertificateResponse> UpdateVaultCertificate(CertificateArgs args, string certFriendlyName)
6969
{
7070
return await this.recoveryServicesClient.VaultExtendedInfo.UploadCertificateAsync(
71-
asrVaultCreds.ResourceGroupName,
72-
asrVaultCreds.ResourceName,
71+
arsVaultCreds.ResourceGroupName,
72+
arsVaultCreds.ResourceName,
7373
args, certFriendlyName,
7474
this.GetRequestHeaders());
7575
}
@@ -80,15 +80,15 @@ public async Task<UploadCertificateResponse> UpdateVaultCertificate(CertificateA
8080
/// <param name="managementCert">certificate to be uploaded</param>
8181
/// <param name="vault">vault object</param>
8282
/// <returns>credential object</returns>
83-
public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, ARSVault vault, ASRSite site)
83+
public ARSVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, ARSVault vault, ASRSite site)
8484
{
85-
ASRVaultCreds currentVaultContext = PSRecoveryServicesClient.asrVaultCreds;
85+
ARSVaultCreds currentVaultContext = PSRecoveryServicesClient.arsVaultCreds;
8686

8787
string resourceProviderNamespace = string.Empty;
8888
string resourceType = string.Empty;
8989
Utilities.GetResourceProviderNamespaceAndType(vault.ID, out resourceProviderNamespace, out resourceType);
9090
// Update vault settings with the working vault to generate file
91-
Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
91+
Utilities.UpdateCurrentVaultContext(new ARSVaultCreds()
9292
{
9393
ResourceGroupName = vault.ResouceGroupName,
9494
ResourceName = vault.Name,
@@ -112,7 +112,7 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR
112112
acsDetails = uploadCertificate.Result;
113113
channelIntegrityKey = getChannelIntegrityKey.Result;
114114

115-
ASRVaultCreds asrVaultCreds = this.GenerateCredentialObject(
115+
ARSVaultCreds arsVaultCreds = this.GenerateCredentialObject(
116116
managementCert,
117117
acsDetails,
118118
channelIntegrityKey,
@@ -122,20 +122,20 @@ public ASRVaultCreds GenerateVaultCredential(X509Certificate2 managementCert, AR
122122
// Update back the original vault settings
123123
Utilities.UpdateCurrentVaultContext(currentVaultContext);
124124

125-
return asrVaultCreds;
125+
return arsVaultCreds;
126126
}
127127

128128
/// <summary>
129129
/// Changes the Vault context
130130
/// </summary>
131131
/// <param name="vault">vault object</param>
132132
/// <returns>credential object</returns>
133-
public ASRVaultCreds ChangeVaultContext(ARSVault vault)
133+
public ARSVaultCreds ChangeVaultContext(ARSVault vault)
134134
{
135135
string resourceProviderNamespace = string.Empty;
136136
string resourceType = string.Empty;
137137
Utilities.GetResourceProviderNamespaceAndType(vault.ID, out resourceProviderNamespace, out resourceType);
138-
Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
138+
Utilities.UpdateCurrentVaultContext(new ARSVaultCreds()
139139
{
140140
ResourceGroupName = vault.ResouceGroupName,
141141
ResourceName = vault.Name,
@@ -148,7 +148,7 @@ public ASRVaultCreds ChangeVaultContext(ARSVault vault)
148148
getChannelIntegrityKey.Wait();
149149

150150
// Update vault settings along with Channel integrity key
151-
Utilities.UpdateCurrentVaultContext(new ASRVaultCreds()
151+
Utilities.UpdateCurrentVaultContext(new ARSVaultCreds()
152152
{
153153
ResourceGroupName = vault.ResouceGroupName,
154154
ResourceName = vault.Name,
@@ -157,7 +157,7 @@ public ASRVaultCreds ChangeVaultContext(ARSVault vault)
157157
ARMResourceType = resourceType
158158
});
159159

160-
return asrVaultCreds;
160+
return arsVaultCreds;
161161
}
162162

163163
/// <summary>
@@ -253,7 +253,7 @@ private ResourceExtendedInformation CreateVaultExtendedInformation()
253253
/// <param name="vault">vault object</param>
254254
/// <param name="site">site object</param>
255255
/// <returns>vault credential object</returns>
256-
private ASRVaultCreds GenerateCredentialObject(X509Certificate2 managementCert, UploadCertificateResponse acsDetails, string channelIntegrityKey, ARSVault vault, ASRSite site)
256+
private ARSVaultCreds GenerateCredentialObject(X509Certificate2 managementCert, UploadCertificateResponse acsDetails, string channelIntegrityKey, ARSVault vault, ASRSite site)
257257
{
258258
string serializedCertifivate = Convert.ToBase64String(managementCert.Export(X509ContentType.Pfx));
259259

@@ -262,7 +262,7 @@ private ASRVaultCreds GenerateCredentialObject(X509Certificate2 managementCert,
262262
string resourceProviderNamespace = string.Empty;
263263
string resourceType = string.Empty;
264264
Utilities.GetResourceProviderNamespaceAndType(vault.ID, out resourceProviderNamespace, out resourceType);
265-
ASRVaultCreds vaultCreds = new ASRVaultCreds(
265+
ARSVaultCreds vaultCreds = new ARSVaultCreds(
266266
vault.SubscriptionId,
267267
vault.Name,
268268
serializedCertifivate,

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

Lines changed: 7 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -190,54 +190,6 @@ public class ARMExceptionDetails
190190
public string Target { get; private set; }
191191
}
192192

193-
/// <summary>
194-
/// Error contract returned when some exception occurs in ASR REST API.
195-
/// </summary>
196-
[SuppressMessage(
197-
"Microsoft.StyleCop.CSharp.MaintainabilityRules",
198-
"SA1402:FileMayOnlyContainASingleClass",
199-
Justification = "Keeping all contracts together.")]
200-
[DataContract(Namespace = "http://schemas.microsoft.com/windowsazure")]
201-
public class Error
202-
{
203-
/// <summary>
204-
/// Initializes a new instance of the <see cref="Error" /> class.
205-
/// </summary>
206-
public Error()
207-
{
208-
}
209-
210-
/// <summary>
211-
/// Gets or sets error code.
212-
/// </summary>
213-
[DataMember]
214-
public string Code { get; set; }
215-
216-
/// <summary>
217-
/// Gets or sets error message.
218-
/// </summary>
219-
[DataMember]
220-
public string Message { get; set; }
221-
222-
/// <summary>
223-
/// Gets or sets possible causes of error.
224-
/// </summary>
225-
[DataMember]
226-
public string PossibleCauses { get; set; }
227-
228-
/// <summary>
229-
/// Gets or sets recommended action to resolve error.
230-
/// </summary>
231-
[DataMember]
232-
public string RecommendedAction { get; set; }
233-
234-
/// <summary>
235-
/// Gets or sets client request Id.
236-
/// </summary>
237-
[DataMember(Name = "ActivityId")]
238-
public string ClientRequestId { get; set; }
239-
}
240-
241193
/// <summary>
242194
/// CIK token details.
243195
/// </summary>
@@ -361,7 +313,7 @@ public VaultCreds()
361313
public VaultCreds(string subscriptionId, string resourceName, string managementCert, AcsNamespace acsNamespace)
362314
{
363315
this.SubscriptionId = subscriptionId;
364-
this.ResourceType = Constants.ASRVaultType;
316+
this.ResourceType = Constants.VaultType;
365317
this.ResourceName = resourceName;
366318
this.ManagementCert = managementCert;
367319
this.AcsNamespace = acsNamespace;
@@ -404,25 +356,25 @@ public VaultCreds(string subscriptionId, string resourceName, string managementC
404356
}
405357

406358
/// <summary>
407-
/// Class to define ASR Vault credentials
359+
/// Class to define ARS Vault credentials
408360
/// </summary>
409361
[SuppressMessage(
410362
"Microsoft.StyleCop.CSharp.MaintainabilityRules",
411363
"SA1402:FileMayOnlyContainASingleClass",
412364
Justification = "Keeping all contracts together.")]
413-
public class ASRVaultCreds : VaultCreds
365+
public class ARSVaultCreds : VaultCreds
414366
{
415367
#region Constructores
416368

417369
/// <summary>
418-
/// Initializes a new instance of the <see cref="ASRVaultCreds"/> class.
370+
/// Initializes a new instance of the <see cref="ARSVaultCreds"/> class.
419371
/// </summary>
420-
public ASRVaultCreds()
372+
public ARSVaultCreds()
421373
{
422374
}
423375

424376
/// <summary>
425-
/// Initializes a new instance of the <see cref="ASRVaultCreds"/> class.
377+
/// Initializes a new instance of the <see cref="ARSVaultCreds"/> class.
426378
/// </summary>
427379
/// <param name="subscriptionId">subscription Id</param>
428380
/// <param name="resourceName">resource name</param>
@@ -432,7 +384,7 @@ public ASRVaultCreds()
432384
/// <param name="resourceGroupName">cloud service name</param>
433385
/// <param name="siteId">custom site Id</param>
434386
/// <param name="siteName">custom site name</param>
435-
public ASRVaultCreds(
387+
public ARSVaultCreds(
436388
string subscriptionId,
437389
string resourceName,
438390
string managementCert,

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ namespace Microsoft.Azure.Commands.RecoveryServices
2222
public class Constants
2323
{
2424
/// <summary>
25-
/// ASR vault type
25+
/// Vault type
2626
/// </summary>
27-
public const string ASRVaultType = "HyperVRecoveryManagerVault";
27+
public const string VaultType = "HyperVRecoveryManagerVault";
2828

2929
/// <summary>
3030
/// Vault Credential version.
@@ -68,7 +68,7 @@ public ARSVault(Vault vault)
6868
this.Location = vault.Location;
6969
this.ResouceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
7070
this.SubscriptionId = PSRecoveryServicesClient.GetSubscriptionId(vault.Id);
71-
this.Properties = new ASRVaultProperties();
71+
this.Properties = new ARSVaultProperties();
7272
this.Properties.ProvisioningState = vault.Properties.ProvisioningState;
7373
}
7474

@@ -84,7 +84,7 @@ public ARSVault(VaultCreateResponse vault)
8484
this.Location = vault.Location;
8585
this.ResouceGroupName = PSRecoveryServicesClient.GetResourceGroup(vault.Id);
8686
this.SubscriptionId = PSRecoveryServicesClient.GetSubscriptionId(vault.Id);
87-
this.Properties = new ASRVaultProperties();
87+
this.Properties = new ARSVaultProperties();
8888
this.Properties.ProvisioningState = vault.Properties.ProvisioningState;
8989
}
9090

@@ -124,15 +124,15 @@ public ARSVault(VaultCreateResponse vault)
124124
/// <summary>
125125
/// Gets or sets Properties.
126126
/// </summary>
127-
public ASRVaultProperties Properties { get; set; }
127+
public ARSVaultProperties Properties { get; set; }
128128

129129
#endregion
130130
}
131131

132132
/// <summary>
133133
/// Azure Site Recovery Vault properties.
134134
/// </summary>
135-
public class ASRVaultProperties
135+
public class ARSVaultProperties
136136
{
137137
#region Properties
138138

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices
99
/// <summary>
1010
/// Parameter Sets used for Azure Site Recovery commands.
1111
/// </summary>
12-
internal static class ASRParameterSets
12+
internal static class ARSParameterSets
1313
{
1414
/// <summary>
1515
/// For default parameter set

‎src/ResourceManager/RecoveryServices/Commands.RecoveryServices/Utilities/Utilities.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,22 +102,22 @@ public static string WriteToFile<T>(T fileContent, string filePath, string fileN
102102
/// <summary>
103103
/// Updates current Vault context.
104104
/// </summary>
105-
/// <param name="asrVaultCreds">ASR Vault credentials</param>
106-
public static void UpdateCurrentVaultContext(ASRVaultCreds asrVaultCreds)
105+
/// <param name="arsVaultCreds">ARS Vault credentials</param>
106+
public static void UpdateCurrentVaultContext(ARSVaultCreds arsVaultCreds)
107107
{
108108
object updateVaultContextOneAtATime = new object();
109109
lock (updateVaultContextOneAtATime)
110110
{
111-
PSRecoveryServicesClient.asrVaultCreds.ResourceName =
112-
asrVaultCreds.ResourceName;
113-
PSRecoveryServicesClient.asrVaultCreds.ResourceGroupName =
114-
asrVaultCreds.ResourceGroupName;
115-
PSRecoveryServicesClient.asrVaultCreds.ChannelIntegrityKey =
116-
asrVaultCreds.ChannelIntegrityKey;
117-
PSRecoveryServicesClient.asrVaultCreds.ResourceNamespace =
118-
asrVaultCreds.ResourceNamespace;
119-
PSRecoveryServicesClient.asrVaultCreds.ARMResourceType =
120-
asrVaultCreds.ARMResourceType;
111+
PSRecoveryServicesClient.arsVaultCreds.ResourceName =
112+
arsVaultCreds.ResourceName;
113+
PSRecoveryServicesClient.arsVaultCreds.ResourceGroupName =
114+
arsVaultCreds.ResourceGroupName;
115+
PSRecoveryServicesClient.arsVaultCreds.ChannelIntegrityKey =
116+
arsVaultCreds.ChannelIntegrityKey;
117+
PSRecoveryServicesClient.arsVaultCreds.ResourceNamespace =
118+
arsVaultCreds.ResourceNamespace;
119+
PSRecoveryServicesClient.arsVaultCreds.ARMResourceType =
120+
arsVaultCreds.ARMResourceType;
121121
}
122122
}
123123

0 commit comments

Comments
 (0)