Skip to content

Commit fbf56c8

Browse files
mkheranimkherani
committed
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1
2 parents 1e5efaf + e32c70a commit fbf56c8

File tree

23 files changed

+541
-2296
lines changed

23 files changed

+541
-2296
lines changed

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/JobConversions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ private static AzureRmRecoveryServicesAzureVmJob GetPSAzureVmJob(JobResource hyd
8787
}
8888

8989
response.InstanceId = GetLastIdFromFullId(hydraJob.Id);
90-
response.StartTime = vmJob.StartTime.ToLocalTime();
90+
response.StartTime = vmJob.StartTime;
9191
response.EndTime = vmJob.EndTime;
9292
response.Duration = vmJob.Duration;
9393
response.Status = vmJob.Status;

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -439,15 +439,16 @@ public List<AzureRmRecoveryServicesBackupItemBase> ListProtectedItems()
439439
}
440440
} while (skipToken != null);
441441

442-
List<AzureRmRecoveryServicesBackupItemBase> itemModels = ConversionHelpers.GetItemModelList(protectedItems, container);
443-
444442
// 1. Filter by container
445-
itemModels = itemModels.Where(itemModel =>
443+
protectedItems = protectedItems.Where(protectedItem =>
446444
{
447-
// return itemModel.ContainerName == container.Name;
448-
return container.Name.Contains(itemModel.ContainerName);
445+
Dictionary<UriEnums, string> dictionary = HelperUtils.ParseUri(protectedItem.Id);
446+
string containerUri = HelperUtils.GetContainerUri(dictionary, protectedItem.Id);
447+
return containerUri.Contains(container.Name);
449448
}).ToList();
450449

450+
List<AzureRmRecoveryServicesBackupItemBase> itemModels = ConversionHelpers.GetItemModelList(protectedItems, container);
451+
451452
// 2. Filter by item's friendly name
452453
if (!string.IsNullOrEmpty(name))
453454
{

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Dpm/ContainerTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2525
{
2626
public partial class ContainerTests : RecoveryServicesBackupTestsBase
2727
{
28+
[Fact]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2830
public void TestGetDpmContainerScenario()
2931
{
3032
this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");
3133
}
3234

35+
[Fact]
36+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3337
public void TestUnregisterDpmContainerScenario()
3438
{
3539
this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Dpm/ContainerTests.ps1

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,23 @@
1414

1515
function Test-GetContainerScenario
1616
{
17-
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
17+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
1818
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
19-
$containers = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm";
20-
foreach ($container in $containers)
21-
{
22-
echo $container.Name $container.ResourceGroupName;
23-
}
24-
Assert-AreEqual $containers[0].FriendlyName "swatidpm";
19+
$containers = Get-AzureRmRecoveryServicesBackupManagementServer;
2520

26-
$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
27-
Assert-AreEqual $namedContainer.FriendlyName "swatidpm";
21+
$namedContainer = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
22+
Assert-AreEqual $namedContainer.FriendlyName "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
2823
}
2924

3025
function Test-UnregisterContainerScenario
3126
{
32-
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
27+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
3328
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
3429

35-
$container = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
36-
Assert-AreEqual $container.FriendlyName "swatidpm";
30+
$container = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
31+
Assert-AreEqual $container.FriendlyName "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
3732

38-
Unregister-AzureRmRecoveryServicesBackupContainer -Container $container;
39-
$contianer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Scdpm" -Name "swatidpm";
33+
Unregister-AzureRmRecoveryServicesBackupContainer -AzureRmBackupManagementServer $container;
34+
$contianer = Get-AzureRmRecoveryServicesBackupManagementServer -Name "NAGAASTHRAM.DPMDOM02.SELFHOST.CORP.MICROSOFT.COM";
4035
Assert-Null $container;
4136
}

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/ItemTests.ps1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function Test-GetItemScenario
1717
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "phaniktRSV" -Name "phaniktRs1";
1818
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
1919

20-
$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
20+
$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "AzureVM" -Status "Registered" -Name "mylinux1";
2121
Assert-AreEqual $namedContainer.FriendlyName "mylinux1";
2222

2323
$item = Get-AzureRmRecoveryServicesBackupItem -Container $namedContainer -WorkloadType "AzureVM";
@@ -29,7 +29,7 @@ function Test-EnableAzureVMProtectionScenario
2929
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "phaniktRSV" -Name "phaniktRs1";
3030
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
3131

32-
$policy = Get-AzureRmRecoveryServicesProtectionPolicy -Name "pwtest1"
32+
$policy = Get-AzureRmRecoveryServicesBackupProtectionPolicy -Name "pwtest1"
3333

3434
$job = Enable-AzureRmRecoveryServicesBackupProtection -Name "mylinux1" -ResourceGroupName "mylinux1" -WorkloadType "AzureVM" -Policy $policy;
3535
Assert-AreEqual $job.Status "Completed";

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/IaasVm/JobTests.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
# ----------------------------------------------------------------------------------
1414

1515
#Have to hard-code this because time keeps changing with every run and we cannot use recorded sessions
16-
$fixedStartDate = Get-Date -Date "2016-04-12 22:00:00"
16+
$fixedStartDate = Get-Date -Date "2016-04-13 22:00:00"
1717
$fixedStartDate = $fixedStartDate.ToUniversalTime()
18-
$fixedEndDate = Get-Date -Date "2016-04-13 20:00:00"
18+
$fixedEndDate = Get-Date -Date "2016-04-14 16:00:00"
1919
$fixedEndDate = $fixedEndDate.ToUniversalTime()
2020

2121
function SetVaultContext
@@ -57,8 +57,8 @@ function Test-GetJobsTimeFilter
5757
{
5858
echo $job.StartTime;
5959

60-
Assert-AreEqual $job.StartTime.CompareTo($startTime) 1
61-
Assert-AreEqual $endTime.CompareTo($job.StartTime) 1
60+
Assert-AreEqual $job.StartTime.ToUniversalTime().CompareTo($startTime) 1
61+
Assert-AreEqual $endTime.CompareTo($job.StartTime.ToUniversalTime()) 1
6262
}
6363
}
6464

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Mab/ContainerTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Test.ScenarioTests
2525
{
2626
public partial class ContainerTests : RecoveryServicesBackupTestsBase
2727
{
28+
[Fact]
29+
[Trait(Category.AcceptanceType, Category.CheckIn)]
2830
public void TestGetMabContainerScenario()
2931
{
3032
this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");
3133
}
3234

35+
[Fact]
36+
[Trait(Category.AcceptanceType, Category.CheckIn)]
3337
public void TestUnregisterMabContainerScenario()
3438
{
3539
this.RunPowerShellTest(PsBackupProviderTypes.Mab.ToString(), "Test-GetContainerScenario");

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Test/ScenarioTests/Mab/ContainerTests.ps1

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,25 @@
1414

1515
function Test-GetContainerScenario
1616
{
17-
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
17+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
1818
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
19-
$containers = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars";
20-
foreach ($container in $containers)
21-
{
22-
echo $container.Name
23-
}
24-
Assert-AreEqual $containers[0].FriendlyName "swatimab";
19+
$containers = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS";
20+
21+
Assert-AreEqual $containers[0].FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
2522

26-
$namedContainer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "swatimab";
27-
Assert-AreEqual $namedContainer.FriendlyName "swatimab";
23+
$namedContainer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
24+
Assert-AreEqual $namedContainer.FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
2825
}
2926

3027
function Test-UnregisterContainerScenario
3128
{
32-
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "swatitestrg" -Name "swatitestrn";
29+
$vault = Get-AzureRmRecoveryServicesVault -ResourceGroupName "RsvTestRG" -Name "RsvTestRN";
3330
Set-AzureRmRecoveryServicesVaultContext -Vault $vault;
3431

35-
$container = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "swatimab";
36-
Assert-AreEqual $container.FriendlyName "swatimab";
32+
$container = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "MARS" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
33+
Assert-AreEqual $container.FriendlyName "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
3734

3835
Unregister-AzureRmRecoveryServicesBackupContainer -Container $container;
39-
$contianer = Get-AzureRmRecoveryServicesContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "swatimab";
36+
$contianer = Get-AzureRmRecoveryServicesBackupContainer -ContainerType "Windows" -BackupManagementType "Mars" -Name "ADIT-DEV2.FAREAST.CORP.MICROSOFT.COM";
4037
Assert-Null $container;
4138
}

0 commit comments

Comments
 (0)