Skip to content

Commit bdb4aa6

Browse files
AditTulasiAditTulasi
committed
Renaming backup item related files and tests
1 parent 5f119f4 commit bdb4aa6

13 files changed

+45
-45
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ $ItemName = "iaasvmcontainer;dev01testing;dev01testing"
1313

1414
function Test-BackUpAzureBackUpItem
1515
{
16-
$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureBackupItem
17-
$azureBackUpItem.ResourceGroupName = $ResourceGroupName
18-
$azureBackUpItem.ResourceName = $ResourceName
19-
$azureBackUpItem.Location = $Location
20-
$azureBackUpItem.ContainerUniqueName = $ContainerName
21-
$azureBackUpItem.ItemName = $ItemName
22-
$jobId = Backup-AzureRMBackupItem -Item $azureBackUpItem
16+
$AzureRMBackupItem = New-Object Microsoft.Azure.Commands.AzureBackup.Models.AzureRMBackupItem
17+
$AzureRMBackupItem.ResourceGroupName = $ResourceGroupName
18+
$AzureRMBackupItem.ResourceName = $ResourceName
19+
$AzureRMBackupItem.Location = $Location
20+
$AzureRMBackupItem.ContainerUniqueName = $ContainerName
21+
$AzureRMBackupItem.ItemName = $ItemName
22+
$jobId = Backup-AzureRMBackupItem -Item $AzureRMBackupItem
2323
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupDSCmdletBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2929
{
30-
public abstract class AzureBackupDSCmdletBase : AzureBackupCmdletBase
30+
public abstract class AzureRMBackupDSCmdletBase : AzureBackupCmdletBase
3131
{
3232
[Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackUpItem, ValueFromPipeline = true)]
3333
[ValidateNotNullOrEmpty]
34-
public AzureBackupItem Item { get; set; }
34+
public AzureRMBackupItem Item { get; set; }
3535

3636
public override void ExecuteCmdlet()
3737
{

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupItemCmdletBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@
2727

2828
namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2929
{
30-
public abstract class AzureBackupItemCmdletBase : AzureBackupCmdletBase
30+
public abstract class AzureRMBackupItemCmdletBase : AzureBackupCmdletBase
3131
{
3232
[Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupItem, ValueFromPipeline = true)]
3333
[ValidateNotNullOrEmpty]
34-
public AzureBackupContainerContextObject Item { get; set; }
34+
public AzureRMBackupContainerContextObject Item { get; set; }
3535

3636
public override void ExecuteCmdlet()
3737
{

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Backup/BackupAzureRMBackupItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2626
/// <summary>
2727
/// Backup Azue Backup Item
2828
/// </summary>
29-
[Cmdlet(VerbsData.Backup, "AzureRMBackupItem"), OutputType(typeof(AzureBackupJob))]
29+
[Cmdlet(VerbsData.Backup, "AzureRMBackupItem"), OutputType(typeof(AzureRMBackupJob))]
3030
public class BackupAzureRMBackupItem : AzureBackupDSCmdletBase
3131
{
3232
public override void ExecuteCmdlet()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
3333
/// <summary>
3434
/// Get list of containers
3535
/// </summary>
36-
[Cmdlet(VerbsLifecycle.Register, "AzureRMBackupContainer", DefaultParameterSetName = V1VMParameterSet), OutputType(typeof(AzureBackupJob))]
36+
[Cmdlet(VerbsLifecycle.Register, "AzureRMBackupContainer", DefaultParameterSetName = V1VMParameterSet), OutputType(typeof(AzureRMBackupJob))]
3737
public class RegisterAzureRMBackupContainer : AzureBackupVaultCmdletBase
3838
{
3939
internal const string V1VMParameterSet = "V1VM";

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureBackupProtection .cs renamed to ‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Disable-AzureRMBackupProtection .cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets.DataSource
2828
/// <summary>
2929
/// Disable Azure Backup protection
3030
/// </summary>
31-
[Cmdlet(VerbsLifecycle.Disable, "AzureBackupProtection"), OutputType(typeof(string))]
32-
public class DisableAzureBackupProtection : AzureBackupDSCmdletBase
31+
[Cmdlet(VerbsLifecycle.Disable, "AzureRMBackupProtection"), OutputType(typeof(AzureRMBackupJob))]
32+
public class DisableAzureRMBackupProtection : AzureRMBackupDSCmdletBase
3333
{
3434
[Parameter(Position = 1, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RemoveProtectionOption)]
3535
public SwitchParameter RemoveRecoveryPoints

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureBackupProtection .cs renamed to ‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/Enable-AzureRMBackupProtection .cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2828
/// <summary>
2929
/// Enable Azure Backup protection
3030
/// </summary>
31-
[Cmdlet(VerbsLifecycle.Enable, "AzureBackupProtection"), OutputType(typeof(string))]
32-
public class EnableAzureBackupProtection : AzureBackupItemCmdletBase
31+
[Cmdlet(VerbsLifecycle.Enable, "AzureRMBackupProtection"), OutputType(typeof(AzureRMBackupJob))]
32+
public class EnableAzureRMBackupProtection : AzureRMBackupItemCmdletBase
3333
{
3434
[Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]
3535
[ValidateNotNullOrEmpty]
@@ -48,9 +48,9 @@ public override void ExecuteCmdlet()
4848
input.Properties = new CSMSetProtectionRequestProperties();
4949
input.Properties.PolicyId = Policy.PolicyId;
5050

51-
if (Item.GetType() == typeof(AzureBackupItem))
51+
if (Item.GetType() == typeof(AzureRMBackupItem))
5252
{
53-
itemName = (Item as AzureBackupItem).ItemName;
53+
itemName = (Item as AzureRMBackupItem).ItemName;
5454
}
5555

5656
else if (Item.GetType() == typeof(AzureBackupContainer))

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/GetAzureBackupItem.cs renamed to ‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Item/GetAzureRMBackupItem.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2828
/// <summary>
2929
/// Get list of azure backup items
3030
/// </summary>
31-
[Cmdlet(VerbsCommon.Get, "AzureBackupItem"), OutputType(typeof(AzureBackupItem), typeof(List<AzureBackupItem>))]
32-
public class GetAzureBackupItem : AzureBackupContainerCmdletBase
31+
[Cmdlet(VerbsCommon.Get, "AzureRMBackupItem"), OutputType(typeof(AzureRMBackupItem), typeof(List<AzureRMBackupItem>))]
32+
public class GetAzureRMBackupItem : AzureBackupContainerCmdletBase
3333
{
3434
[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ProtectionStatus)]
3535
[ValidateSet("Protected", "Protecting", "NotProtected")]
@@ -89,18 +89,18 @@ public override void ExecuteCmdlet()
8989

9090
public void WriteAzureBackupItem(CSMProtectedItemResponse sourceItem, AzureBackupContainer azureBackupItem)
9191
{
92-
this.WriteObject(new AzureBackupItem(sourceItem, azureBackupItem));
92+
this.WriteObject(new AzureRMBackupItem(sourceItem, azureBackupItem));
9393
}
9494

9595
public void WriteAzureBackupItem(List<CSMProtectedItemResponse> sourceDataSourceList, List<CSMItemResponse> sourcePOList, AzureBackupContainer azureBackupContainer)
9696
{
97-
List<AzureBackupItem> targetList = new List<AzureBackupItem>();
97+
List<AzureRMBackupItem> targetList = new List<AzureRMBackupItem>();
9898

9999
if (sourceDataSourceList != null)
100100
{
101101
foreach (var item in sourceDataSourceList)
102102
{
103-
targetList.Add(new AzureBackupItem(item, azureBackupContainer));
103+
targetList.Add(new AzureRMBackupItem(item, azureBackupContainer));
104104
}
105105
}
106106

@@ -112,7 +112,7 @@ public void WriteAzureBackupItem(List<CSMProtectedItemResponse> sourceDataSource
112112
//So in this case removing po items from the list.
113113
if (targetList.FindIndex(element => element.ItemName == item.Name) < 0)
114114
{
115-
targetList.Add(new AzureBackupItem(item, azureBackupContainer));
115+
targetList.Add(new AzureRMBackupItem(item, azureBackupContainer));
116116
}
117117
}
118118
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Restore/RestoreAzureRMBackupItem.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2727
/// <summary>
2828
/// Restore Azure Backup Item
2929
/// </summary>
30-
[Cmdlet(VerbsData.Restore, "AzureRMBackupItem"), OutputType(typeof(AzureBackupJob))]
30+
[Cmdlet(VerbsData.Restore, "AzureRMBackupItem"), OutputType(typeof(AzureRMBackupJob))]
3131
public class RestoreAzureRMBackupItem : AzureBackupRestoreBase
3232
{
3333
[Parameter(Position = 1, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.StorageAccountName)]

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

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public AzureBackupVaultContextObject(AzurePSBackupVault vault)
5252
/// This class encapsulates all the properties of the container object
5353
/// that are needed by higher level objects (data source, recovery point etc).
5454
/// </summary>
55-
public class AzureBackupContainerContextObject : AzureBackupVaultContextObject
55+
public class AzureRMBackupContainerContextObject : AzureBackupVaultContextObject
5656
{
5757
/// <summary>
5858
/// Type of the Azure Backup container
@@ -64,64 +64,64 @@ public class AzureBackupContainerContextObject : AzureBackupVaultContextObject
6464
/// </summary>
6565
public string ContainerUniqueName { get; set; }
6666

67-
public AzureBackupContainerContextObject()
67+
public AzureRMBackupContainerContextObject()
6868
: base()
6969
{
7070
}
7171

72-
public AzureBackupContainerContextObject(AzurePSBackupVault vault, MarsContainerResponse marsContainerResponse)
72+
public AzureRMBackupContainerContextObject(AzurePSBackupVault vault, MarsContainerResponse marsContainerResponse)
7373
: base(vault)
7474
{
7575
ContainerType = ContainerHelpers.GetContainerType(marsContainerResponse.Properties.CustomerType).ToString();
7676
//ContainerUniqueName = marsContainerResponse.UniqueName;
7777
}
7878

79-
public AzureBackupContainerContextObject(AzureBackupContainerContextObject azureBackupContainerContextObject)
79+
public AzureRMBackupContainerContextObject(AzureRMBackupContainerContextObject azureBackupContainerContextObject)
8080
: base(azureBackupContainerContextObject.ResourceGroupName, azureBackupContainerContextObject.ResourceName, azureBackupContainerContextObject.Location)
8181
{
8282
ContainerType = azureBackupContainerContextObject.ContainerType;
8383
ContainerUniqueName = azureBackupContainerContextObject.ContainerUniqueName;
8484
}
85-
public AzureBackupContainerContextObject(AzureBackupContainer azureBackupContainer)
85+
public AzureRMBackupContainerContextObject(AzureBackupContainer azureBackupContainer)
8686
: base(azureBackupContainer.ResourceGroupName, azureBackupContainer.ResourceName, azureBackupContainer.Location)
8787
{
8888
ContainerType = azureBackupContainer.ContainerType;
8989
ContainerUniqueName = azureBackupContainer.ContainerUniqueName;
9090
}
9191

92-
public AzureBackupContainerContextObject(AzurePSBackupVault vault, CSMContainerResponse containerInfo)
92+
public AzureRMBackupContainerContextObject(AzurePSBackupVault vault, CSMContainerResponse containerInfo)
9393
: base(vault.ResourceGroupName, vault.Name, vault.Region)
9494
{
9595
ContainerType = ContainerHelpers.GetTypeForManagedContainer(containerInfo.Properties.ContainerType).ToString();
9696
ContainerUniqueName = containerInfo.Name;
9797
}
9898
}
9999

100-
public class AzureBackupItemContextObject : AzureBackupContainerContextObject
100+
public class AzureRMBackupItemContextObject : AzureRMBackupContainerContextObject
101101
{
102102
/// <summary>
103103
/// DataSourceName of Azure Backup Item
104104
/// </summary>
105105
public string ItemName { get; set; }
106106

107-
public AzureBackupItemContextObject()
107+
public AzureRMBackupItemContextObject()
108108
: base()
109109
{
110110
}
111111

112-
public AzureBackupItemContextObject(AzureBackupItemContextObject azureBackupItemContextObject)
112+
public AzureRMBackupItemContextObject(AzureRMBackupItemContextObject azureBackupItemContextObject)
113113
: base(azureBackupItemContextObject)
114114
{
115115
ItemName = azureBackupItemContextObject.ItemName;
116116
}
117117

118-
public AzureBackupItemContextObject(CSMProtectedItemResponse item, AzureBackupContainer azureBackupContainer)
118+
public AzureRMBackupItemContextObject(CSMProtectedItemResponse item, AzureBackupContainer azureBackupContainer)
119119
: base(azureBackupContainer)
120120
{
121121
ItemName = item.Name;
122122
}
123123

124-
public AzureBackupItemContextObject(CSMItemResponse item, AzureBackupContainer azureBackupContainer)
124+
public AzureRMBackupItemContextObject(CSMItemResponse item, AzureBackupContainer azureBackupContainer)
125125
: base(azureBackupContainer)
126126
{
127127
ItemName = item.Name;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Models
2525
/// <summary>
2626
/// Represents Azure Backup Container
2727
/// </summary>
28-
public class AzureBackupContainer : AzureBackupContainerContextObject
28+
public class AzureBackupContainer : AzureRMBackupContainerContextObject
2929
{
3030
/// <summary>
3131
/// Resource name of the resource (ex: resource name of the VM) being managed by the Azure Backup service.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Models
2424
/// <summary>
2525
/// Represents Azure Backup Item
2626
/// </summary>
27-
public class AzureBackupItem : AzureBackupItemContextObject
27+
public class AzureRMBackupItem : AzureRMBackupItemContextObject
2828
{
2929
/// <summary>
3030
/// Friendly Name for the Azure BackupItem
@@ -61,12 +61,12 @@ public class AzureBackupItem : AzureBackupItemContextObject
6161
/// </summary>
6262
public int RecoveryPointsCount { get; set; }
6363

64-
public AzureBackupItem()
64+
public AzureRMBackupItem()
6565
: base()
6666
{
6767
}
6868

69-
public AzureBackupItem(CSMProtectedItemResponse datasource, AzureBackupContainer azureBackupContainer)
69+
public AzureRMBackupItem(CSMProtectedItemResponse datasource, AzureBackupContainer azureBackupContainer)
7070
: base(datasource, azureBackupContainer)
7171
{
7272
DataSourceStatus = datasource.Properties.ProtectionStatus;
@@ -84,7 +84,7 @@ public AzureBackupItem(CSMProtectedItemResponse datasource, AzureBackupContainer
8484
Type = datasource.Properties.ItemType;
8585
}
8686

87-
public AzureBackupItem(CSMItemResponse pPOItem, AzureBackupContainer azureBackupContainer)
87+
public AzureRMBackupItem(CSMItemResponse pPOItem, AzureBackupContainer azureBackupContainer)
8888
: base(pPOItem, azureBackupContainer)
8989
{
9090
ProtectionStatus = pPOItem.Properties.Status;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
namespace Microsoft.Azure.Commands.AzureBackup.Models
2323
{
24-
public class AzureBackupRecoveryPointContextObject : AzureBackupItemContextObject
24+
public class AzureBackupRecoveryPointContextObject : AzureRMBackupItemContextObject
2525
{
2626
/// <summary>
2727
/// RecoveryPointId of Azure Backup Item
@@ -33,7 +33,7 @@ public AzureBackupRecoveryPointContextObject()
3333
{
3434
}
3535

36-
public AzureBackupRecoveryPointContextObject(CSMRecoveryPointResponse recoveryPointInfo, AzureBackupItem azureBackupItem)
36+
public AzureBackupRecoveryPointContextObject(CSMRecoveryPointResponse recoveryPointInfo, AzureRMBackupItem azureBackupItem)
3737
: base(azureBackupItem)
3838
{
3939
RecoveryPointName = recoveryPointInfo.Name;
@@ -60,7 +60,7 @@ public AzureBackupRecoveryPoint()
6060
{
6161
}
6262

63-
public AzureBackupRecoveryPoint(CSMRecoveryPointResponse recoveryPointInfo, AzureBackupItem azureBackupItem)
63+
public AzureBackupRecoveryPoint(CSMRecoveryPointResponse recoveryPointInfo, AzureRMBackupItem azureBackupItem)
6464
: base(recoveryPointInfo, azureBackupItem)
6565
{
6666
RecoveryPointTime = recoveryPointInfo.Properties.RecoveryPointTime;

0 commit comments

Comments
 (0)