Skip to content

Commit 63aee24

Browse files
author
dragonfly91
committed
Revert "Merge pull request #59 from MabOneSdk/anudeeb"
This reverts commit 474e80f, reversing changes made to 4b450e4.
1 parent d1d6602 commit 63aee24

File tree

4 files changed

+20
-25
lines changed

4 files changed

+20
-25
lines changed

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupVaultTests.ps1‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ function Test-GetAzureBackupVaultCredentialsReturnsFileNameAndDownloadsCert
2828

2929
function Test-SetAzureBackupVaultStorageTypeWithFreshResourceDoesNotThrowException
3030
{
31-
$freshVaultName = "storagetestrn";
32-
33-
Assert-Throws { New-AzureBackupVault -ResourceGroupName $ResourceGroupName -Name $freshVaultName -Region $Location };
34-
35-
$freshVault = Get-AzureBackupVault -Name $freshVaultName;
31+
$freshVault = New-AzureBackupVault -ResourceGroupName $ResourceGroupName -Name "storagetestrn" -Region $Location;
3632

3733
Set-AzureBackupVaultStorageType $freshVault -Type GeoRedundant
3834

@@ -47,6 +43,7 @@ function Test-SetAzureBackupVaultStorageTypeWithFreshResourceDoesNotThrowExcepti
4743

4844
function Test-SetAzureBackupVaultStorageTypeWithLockedResourceThrowsException
4945
{
46+
# TODO: Check for exception based on current storage type - obtained by vault properties
5047
$vault = Get-AzureBackupVault -Name $ResourceName;
5148

5249
Assert-Throws { Set-AzureBackupVaultStorageType $vault -Type GeoRedundant }

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/RegisterAzureBackupContainer.cs‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
using Microsoft.Azure.Management.BackupServices.Models;
2424
using MBS = Microsoft.Azure.Management.BackupServices;
2525
using Microsoft.WindowsAzure.Commands.ServiceManagement.Model;
26+
using Microsoft.Azure.Commands.AzureBackup.Properties;
2627
using Microsoft.Azure.Commands.AzureBackup.Models;
2728
using Microsoft.Azure.Commands.AzureBackup.Helpers;
2829
using Microsoft.Azure.Management.BackupServices;
@@ -38,15 +39,15 @@ public class RegisterAzureBackupContainer : AzureBackupVaultCmdletBase
3839
internal const string V1VMParameterSet = "V1VM";
3940
internal const string V2VMParameterSet = "V2VM";
4041

41-
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = V1VMParameterSet, HelpMessage = AzureBackupCmdletHelpMessage.VirtualMachine)]
42-
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = V2VMParameterSet, HelpMessage = AzureBackupCmdletHelpMessage.VirtualMachine)]
42+
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = V1VMParameterSet, HelpMessage = AzureBackupCmdletHelpMessage.VMName)]
43+
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = V2VMParameterSet, HelpMessage = AzureBackupCmdletHelpMessage.VMName)]
4344
public string Name { get; set; }
4445

45-
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = V1VMParameterSet, HelpMessage = AzureBackupCmdletHelpMessage.VirtualMachine)]
46+
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = V1VMParameterSet, HelpMessage = AzureBackupCmdletHelpMessage.ServiceName)]
4647
public string ServiceName { get; set; }
4748

48-
[Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = V2VMParameterSet, HelpMessage = AzureBackupCmdletHelpMessage.VirtualMachine)]
49-
public string VMResourceGroupName { get; set; }
49+
[Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = V2VMParameterSet, HelpMessage = AzureBackupCmdletHelpMessage.RGName)]
50+
public string ResourceGroupName { get; set; }
5051

5152

5253
public override void ExecuteCmdlet()
@@ -69,7 +70,7 @@ public override void ExecuteCmdlet()
6970
else if(this.ParameterSetName == V2VMParameterSet)
7071
{
7172
vmName = Name;
72-
rgName = VMResourceGroupName;
73+
rgName = ResourceGroupName;
7374
WriteDebug(String.Format("Registering ARM-V2 VM, VMName: {0}, ResourceGroupName: {1}", vmName, rgName));
7475
ServiceOrRG = "ResourceGroupName";
7576
}
@@ -94,7 +95,7 @@ public override void ExecuteCmdlet()
9495
//Container is not discovered. Throw exception
9596
string errMsg = String.Format("Failed to discover VM {0} under {1} {2}. Please make sure names are correct and VM is not deleted", vmName, ServiceOrRG, rgName);
9697
WriteDebug(errMsg);
97-
throw new Exception(errMsg); //TODO: Sync with piyush and srub error msg
98+
ThrowTerminatingError(new ErrorRecord(new Exception(Resources.AzureVMNotFound), string.Empty, ErrorCategory.InvalidArgument, null));
9899
}
99100
}
100101

@@ -112,35 +113,37 @@ public override void ExecuteCmdlet()
112113

113114
private void RefreshContainer()
114115
{
115-
bool isRetyNeeded = true;
116+
bool isRetryNeeded = true;
116117
int retryCount = 1;
117118
bool isDiscoverySuccessful = false;
118-
while (isRetyNeeded && retryCount <= 3)
119+
string errorMessage = string.Empty;
120+
while (isRetryNeeded && retryCount <= 3)
119121
{
120122
var operationId = AzureBackupClient.RefreshContainers();
121123

122124
//Now wait for the operation to Complete
123-
isRetyNeeded = WaitForDiscoveryToCOmplete(operationId, out isDiscoverySuccessful);
125+
isRetryNeeded = WaitForDiscoveryToComplete(operationId, out isDiscoverySuccessful, out errorMessage);
124126
retryCount++;
125127
}
126128

127129
if (!isDiscoverySuccessful)
128130
{
129-
//Discovery failed
130-
throw new Exception(); //TODO:
131+
ThrowTerminatingError(new ErrorRecord(new Exception(errorMessage), string.Empty, ErrorCategory.InvalidArgument, null));
131132
}
132133
}
133134

134-
private bool WaitForDiscoveryToCOmplete(Guid operationId, out bool isDiscoverySuccessful)
135+
private bool WaitForDiscoveryToComplete(Guid operationId, out bool isDiscoverySuccessful, out string errorMessage)
135136
{
136137
bool isRetryNeeded = false;
137-
var status = TrackOperation(operationId);
138+
var status = TrackOperation(operationId);
139+
errorMessage = String.Empty;
138140

139141
isDiscoverySuccessful = true;
140142
//If operation fails check if retry is needed or not
141143
if (status.OperationResult != AzureBackupOperationResult.Succeeded.ToString())
142144
{
143145
isDiscoverySuccessful = false;
146+
errorMessage = status.Message;
144147
WriteDebug(String.Format("Discovery operation failed with ErrorCode: {0}", status.ErrorCode));
145148
if ((status.ErrorCode == AzureBackupOperationErrorCode.DiscoveryInProgress.ToString() ||
146149
(status.ErrorCode == AzureBackupOperationErrorCode.BMSUserErrorObjectLocked.ToString())))

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/UnregisterAzureBackupContainer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
3232
[Cmdlet(VerbsLifecycle.Unregister, "AzureBackupContainer"), OutputType(typeof(string))]
3333
public class UnregisterAzureBackupContainer : AzureBackupVaultCmdletBase
3434
{
35-
[Parameter(Position = 2, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.VirtualMachine, ValueFromPipeline = true)]
35+
[Parameter(Position = 1, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupContainerToUnregister, ValueFromPipeline = true)]
3636
[ValidateNotNullOrEmpty]
3737
public AzureBackupContainer AzureBackupContainer { get; set; }
3838

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/VaultCredentials.cs‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ public VaultCreds(string subscriptionId, string resourceType, string resourceNam
7979
/// Class to define backup vault credentials
8080
/// </summary>
8181
[SuppressMessage("Microsoft.StyleCop.CSharp.MaintainabilityRules", "SA1402:FileMayOnlyContainASingleClass", Justification = "Grouping classes based on entity")]
82-
[DataContract]
8382
internal class BackupVaultCreds : VaultCreds
8483
{
8584
/// <summary>
@@ -129,25 +128,21 @@ public BackupVaultCreds(string subscriptionId, string resourceType, string resou
129128
/// <summary>
130129
/// AcsNamespace is where the certificate is uploaded into
131130
/// </summary>
132-
[DataContract]
133131
internal class AcsNamespace
134132
{
135133
/// <summary>
136134
/// Gets or sets the key name for HostName entry
137135
/// </summary>
138-
[DataMember(Order = 0)]
139136
public string HostName { get; set; }
140137

141138
/// <summary>
142139
/// Gets or sets the key name for Namespace entry
143140
/// </summary>
144-
[DataMember(Order = 1)]
145141
public string Namespace { get; set; }
146142

147143
/// <summary>
148144
/// Gets or sets the value for ResourceProviderRealm entry
149145
/// </summary>
150-
[DataMember(Order = 2)]
151146
public string ResourceProviderRealm { get; set; }
152147

153148
/// <summary>

0 commit comments

Comments
 (0)