Skip to content

Commit 766fa9b

Browse files
author
dragonfly91
committed
fixing merge conflicts
2 parents a2faab0 + b635679 commit 766fa9b

File tree

6 files changed

+94
-34
lines changed

6 files changed

+94
-34
lines changed

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupContainerTests.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,20 @@ public class AzureBackupContainerTests : AzureBackupTestsBase
2929
public void AzureBackupMarsContainerScenarioTests()
3030
{
3131
this.RunPowerShellTest("Test-AzureBackupMarsContainerScenario");
32+
}
33+
34+
[Fact]
35+
[Trait(Category.AcceptanceType, Category.CheckIn)]
36+
public void AzureBackupRegisterContainerScenarioTests()
37+
{
38+
this.RunPowerShellTest("Test-RegisterAzureBackupContainer");
39+
}
40+
41+
[Fact]
42+
[Trait(Category.AcceptanceType, Category.CheckIn)]
43+
public void AzureBackupUnregisterContainerScenarioTests()
44+
{
45+
this.RunPowerShellTest("Test-UnregisterAzureBackupContainer");
3246
}
3347
}
3448
}

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

Lines changed: 51 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,55 @@ $ContainerStatus = "Registered"
2121

2222
function Test-AzureBackupMarsContainerScenario
2323
{
24-
$vault = Get-AzureBackupVault -ResourceGroupName $ResourceGroupName -Name $ResourceName
25-
26-
$containers = Get-AzureBackupContainer -vault $vault -type $ContainerType
27-
Assert-AreEqual $containers[0].ContainerType $ContainerType;
28-
Assert-AreEqual $containers[0].Id $ContainerId;
29-
Assert-AreEqual $containers[0].Location $vault.Region;
30-
Assert-AreEqual $containers[0].Name $ContainerName;
31-
Assert-AreEqual $containers[0].ResourceGroupName $vault.ResourceGroupName;
32-
Assert-AreEqual $containers[0].ResourceName $vault.Name;
33-
Assert-AreEqual $containers[0].Status $ContainerStatus;
34-
35-
$namedContainers = Get-AzureBackupContainer -vault $vault -type $ContainerType -name $ContainerName
36-
$container = $namedContainers[0];
37-
Assert-AreEqual $container.ContainerType $ContainerType;
38-
Assert-AreEqual $container.Id $ContainerId;
39-
Assert-AreEqual $container.Location $vault.Region;
40-
Assert-AreEqual $container.Name $ContainerName;
41-
Assert-AreEqual $container.ResourceGroupName $vault.ResourceGroupName;
42-
Assert-AreEqual $container.ResourceName $vault.Name;
43-
Assert-AreEqual $container.Status $ContainerStatus;
44-
45-
Enable-AzureBackupContainerReregistration -Container $container
46-
47-
Unregister-AzureBackupContainer -Container $container -Force
48-
49-
$unregContainers = Get-AzureBackupContainer -vault $vault -type $ContainerType -name $ContainerName
50-
Assert-AreEqual $unregContainers.Count 0;
24+
$vault = Get-AzureBackupVault -ResourceGroupName $ResourceGroupName -Name $ResourceName
25+
26+
$containers = Get-AzureBackupContainer -vault $vault -type $ContainerType
27+
Assert-AreEqual $containers[0].ContainerType $ContainerType;
28+
Assert-AreEqual $containers[0].Id $ContainerId;
29+
Assert-AreEqual $containers[0].Location $vault.Region;
30+
Assert-AreEqual $containers[0].Name $ContainerName;
31+
Assert-AreEqual $containers[0].ResourceGroupName $vault.ResourceGroupName;
32+
Assert-AreEqual $containers[0].ResourceName $vault.Name;
33+
Assert-AreEqual $containers[0].Status $ContainerStatus;
34+
35+
$namedContainers = Get-AzureBackupContainer -vault $vault -type $ContainerType -name $ContainerName
36+
$container = $namedContainers[0];
37+
Assert-AreEqual $container.ContainerType $ContainerType;
38+
Assert-AreEqual $container.Id $ContainerId;
39+
Assert-AreEqual $container.Location $vault.Region;
40+
Assert-AreEqual $container.Name $ContainerName;
41+
Assert-AreEqual $container.ResourceGroupName $vault.ResourceGroupName;
42+
Assert-AreEqual $container.ResourceName $vault.Name;
43+
Assert-AreEqual $container.Status $ContainerStatus;
44+
45+
Enable-AzureBackupContainerReregistration -Container $container
46+
47+
Unregister-AzureBackupContainer -Container $container -Force
48+
49+
$unregContainers = Get-AzureBackupContainer -vault $vault -type $ContainerType -name $ContainerName
50+
Assert-AreEqual $unregContainers.Count 0;
51+
}
52+
53+
$IaasVMManagedResourceName = "dev01testing"
54+
$IaasVMManagedResourceGroupName = "dev01testing"
55+
$VaultResourceName = "backuprn"
56+
$VaultResourceRGName = "backuprg"
57+
58+
59+
function Test-RegisterAzureBackupContainer
60+
{
61+
$vault = Get-AzureBackupVault -$VaultResourceRGName mkheranirg -Name $VaultResourceName
62+
$jobId = Register-AzureBackupContainer -vault $vault -Name $IaasVMManagedResourceName -ServiceName $IaasVMManagedResourceGroupName
63+
64+
Assert-NotNull $jobId 'Job should not be null';
65+
}
66+
67+
68+
function Test-UnregisterAzureBackupContainer
69+
{
70+
$vault = Get-AzureBackupVault -$VaultResourceRGName mkheranirg -Name $VaultResourceName
71+
$container = Get-AzureBackupContainer -Name $IaasVMManagedResourceName -Type AzureVM -ManagedResourceGroupName $IaasVMManagedResourceGroupName -Vault $vault
72+
$jobId = Unregister-AzureBackupContainer -Container $container
73+
74+
Assert-NotNull $jobId 'Job should not be null';
5175
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ private bool IsDiscoveryNeeded(string vmName, string rgName, out CSMContainerRes
162162
FriendlyName = vmName,
163163
};
164164

165-
//First check if container is discoverd or not
165+
//First check if container is discovered or not
166166
var containers = AzureBackupClient.ListContainers(parameters);
167167
WriteDebug(String.Format("Container count returned from service: {0}.", containers.Count()));
168168
if (containers.Count() == 0)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public override void ExecuteCmdlet()
4545
{
4646
base.ExecuteCmdlet();
4747

48-
AzureBackupContainerType containerType = (AzureBackupContainerType)Enum.Parse(typeof(AzureBackupContainerType), Container.ContainerType);
48+
AzureBackupContainerType containerType = (AzureBackupContainerType)Enum.Parse(typeof(AzureBackupContainerType), Container.ContainerType, true);
4949
switch (containerType)
5050
{
5151
case AzureBackupContainerType.Windows:

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ContainerHelpers.cs

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Helpers
3636
{
3737
internal class ContainerHelpers
3838
{
39-
private static readonly Regex ResourceGroupRegex = new Regex(@"/resourceGroups/(?<resourceGroupName>.+)/providers/", RegexOptions.Compiled);
39+
private static readonly Regex ResourceGroupRegex = new Regex(@"/subscriptions/(?<subscriptionsId>.+)/resourceGroups/(?<resourceGroupName>.+)/providers/(?<providersName>.+)/BackupVault/(?<BackupVaultName>.+)/containers/(?<containersName>.+)", RegexOptions.Compiled);
4040

4141
internal static AzureBackupContainerType GetContainerType(string customerType)
4242
{
@@ -70,6 +70,28 @@ internal static AzureBackupContainerType GetContainerType(string customerType)
7070
return containerType;
7171
}
7272

73+
internal static AzureBackupContainerType GetTypeForManagedContainer(string managedContainerTypeString)
74+
{
75+
ManagedContainerType managedContainerType = (ManagedContainerType)Enum.Parse(typeof(ManagedContainerType), managedContainerTypeString, true);
76+
77+
AzureBackupContainerType containerType = 0;
78+
79+
switch (managedContainerType)
80+
{
81+
case ManagedContainerType.Invalid:
82+
break;
83+
case ManagedContainerType.IaasVM:
84+
containerType = AzureBackupContainerType.AzureVM;
85+
break;
86+
case ManagedContainerType.IaasVMService:
87+
break;
88+
default:
89+
break;
90+
}
91+
92+
return containerType;
93+
}
94+
7395
internal static string GetQueryFilter(ListContainerQueryParameter queryParams)
7496
{
7597
NameValueCollection collection = new NameValueCollection();
@@ -101,10 +123,10 @@ internal static string GetRGNameFromId(string id)
101123
var match = ResourceGroupRegex.Match(id);
102124
if (match.Success)
103125
{
104-
var resourceGroupNameGroup = match.Groups["resourceGroupName"];
105-
if (resourceGroupNameGroup != null && resourceGroupNameGroup.Success)
126+
var vmRGName = match.Groups["containersName"];
127+
if (vmRGName != null && vmRGName.Success)
106128
{
107-
return resourceGroupNameGroup.Value;
129+
return vmRGName.Value;
108130
}
109131
}
110132

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ public AzureBackupContainerContextObject(AzureBackupContainer azureBackupContain
9292
public AzureBackupContainerContextObject(AzurePSBackupVault vault, CSMContainerResponse containerInfo)
9393
: base(vault.ResourceGroupName, vault.Name, vault.Region)
9494
{
95-
ContainerType = containerInfo.Properties.ContainerType;
95+
ContainerType = ContainerHelpers.GetTypeForManagedContainer(containerInfo.Properties.ContainerType).ToString();
9696
ContainerUniqueName = containerInfo.Name;
9797
}
9898
}

0 commit comments

Comments
 (0)