Skip to content

Commit 0da5bb7

Browse files
sudhakar4171sudhakar4171
committed
Merge pull request #315 from MabOneSdk/anudeeb-dev1
Review Comments Addressed
2 parents 643b0fd + 12fa9ca commit 0da5bb7

File tree

9 files changed

+31
-32
lines changed

9 files changed

+31
-32
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static ContainerBase GetContainerModel(ServiceClientModel.ProtectionConta
4747
}
4848
if (protectionContainer.Properties.GetType() == typeof(ServiceClientModel.MabProtectionContainer))
4949
{
50-
containerModel = new AzureRmRecoveryServicesBackupMabContainer(protectionContainer);
50+
containerModel = new MabContainer(protectionContainer);
5151
}
5252
}
5353

@@ -70,7 +70,7 @@ public static BackupEngineBase GetBackupEngineModel(ServiceClientModel.BackupEng
7070
}
7171
else if (backupEngine.Properties.GetType() == (typeof(ServiceClientModel.AzureBackupServerEngine)))
7272
{
73-
backupEngineModel = new AzureRmRecoveryServicesBackupAzureBackupServerEngine(backupEngine);
73+
backupEngineModel = new AzureBackupServerEngine(backupEngine);
7474
}
7575
}
7676

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,13 +70,13 @@ public ContainerContext(string backupManagementType)
7070
/// <summary>
7171
/// Class representing backup engine context.
7272
/// </summary>
73-
public class AzureRmRecoveryServicesBackupEngineContext : ManagementContext
73+
public class BackupEngineContext : ManagementContext
7474
{
7575
public string BackupEngineType { get; set; }
7676

77-
public AzureRmRecoveryServicesBackupEngineContext() { }
77+
public BackupEngineContext() { }
7878

79-
public AzureRmRecoveryServicesBackupEngineContext(string backupEngineType, string backupManagementType)
79+
public BackupEngineContext(string backupEngineType, string backupManagementType)
8080
: base(backupManagementType)
8181
{
8282
BackupEngineType = backupEngineType;
@@ -104,7 +104,7 @@ public ContainerBase(ServiceClientModel.ProtectionContainerResource protectionCo
104104
/// <summary>
105105
/// Base class for backup engine.
106106
/// </summary>
107-
public class BackupEngineBase : AzureRmRecoveryServicesBackupEngineContext
107+
public class BackupEngineBase : BackupEngineContext
108108
{
109109
/// <summary>
110110
/// Container Name

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
<Compile Include="AzureVmModels\AzureVmItem.cs" />
5656
<Compile Include="AzureVmModels\AzureVmContainer.cs" />
5757
<Compile Include="DpmModels\DpmBackupEngine.cs" />
58-
<Compile Include="MabModels\AzureRmRecoveryServicesMabContainer.cs" />
58+
<Compile Include="MabModels\MabContainer.cs" />
5959
<Compile Include="Properties\AssemblyInfo.cs" />
6060
<Compile Include="Properties\Resources.Designer.cs">
6161
<DependentUpon>Resources.resx</DependentUpon>

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/DpmBackupEngine.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public DpmBackupEngine(ServiceClientModel.BackupEngineResource backupEngine)
4848
/// <summary>
4949
/// Azure backup specific backup server engine class.
5050
/// </summary>
51-
public class AzureRmRecoveryServicesBackupAzureBackupServerEngine : BackupEngineBase
51+
public class AzureBackupServerEngine : BackupEngineBase
5252
{
5353
/// <summary>
5454
/// Friendly name of the container
@@ -60,7 +60,7 @@ public class AzureRmRecoveryServicesBackupAzureBackupServerEngine : BackupEngine
6060
/// </summary>
6161
public string Status { get; set; }
6262

63-
public AzureRmRecoveryServicesBackupAzureBackupServerEngine(ServiceClientModel.BackupEngineResource backupEngine)
63+
public AzureBackupServerEngine(ServiceClientModel.BackupEngineResource backupEngine)
6464
: base(backupEngine)
6565
{
6666
ServiceClientModel.AzureBackupServerEngine azureBackupServerEngine = (ServiceClientModel.AzureBackupServerEngine)backupEngine.Properties;

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/MabModels/AzureRmRecoveryServicesMabContainer.cs renamed to ‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/MabModels/MabContainer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
2424
/// <summary>
2525
/// MAB specific container class.
2626
/// </summary>
27-
public class AzureRmRecoveryServicesBackupMabContainer : ContainerBase
27+
public class MabContainer : ContainerBase
2828
{
2929
/// <summary>
3030
/// Friendly name of the container
@@ -36,7 +36,7 @@ public class AzureRmRecoveryServicesBackupMabContainer : ContainerBase
3636
/// </summary>
3737
public ContainerRegistrationStatus Status { get; set; }
3838

39-
public AzureRmRecoveryServicesBackupMabContainer(ProtectionContainerResource protectionContainer)
39+
public MabContainer(ProtectionContainerResource protectionContainer)
4040
: base(protectionContainer)
4141
{
4242
MabProtectionContainer mabProtectionContainer = (MabProtectionContainer)protectionContainer.Properties;

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ public override void ExecuteCmdlet()
4949
throw new ArgumentException(String.Format(Resources.UnsupportedContainerException,
5050
Container.ContainerType, Container.BackupManagementType));
5151
}
52-
AzureRmRecoveryServicesBackupMabContainer mabContainer =
53-
Container as AzureRmRecoveryServicesBackupMabContainer;
52+
MabContainer mabContainer =
53+
Container as MabContainer;
5454
string containerName = mabContainer.Name;
5555
ServiceClientAdapter.UnregisterContainers(containerName);
5656
});

‎src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<Configuration>
33
<ViewDefinitions>
44
<View>
5-
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupEngineBase</Name>
5+
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupEngineBase</Name>
66
<ViewSelectedBy>
7-
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupEngineBase</TypeName>
7+
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupEngineBase</TypeName>
88
</ViewSelectedBy>
99
<TableControl>
1010
<TableHeaders>
@@ -32,9 +32,9 @@
3232
</TableControl>
3333
</View>
3434
<View>
35-
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupMabContainer</Name>
35+
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.MabContainer</Name>
3636
<ViewSelectedBy>
37-
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupMabContainer</TypeName>
37+
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.MabContainer</TypeName>
3838
</ViewSelectedBy>
3939
<TableControl>
4040
<TableHeaders>
@@ -69,9 +69,9 @@
6969
</TableControl>
7070
</View>
7171
<View>
72-
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmPolicy</Name>
72+
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmPolicy</Name>
7373
<ViewSelectedBy>
74-
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmPolicy</TypeName>
74+
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmPolicy</TypeName>
7575
</ViewSelectedBy>
7676
<TableControl>
7777
<TableHeaders>
@@ -120,9 +120,9 @@
120120
</TableControl>
121121
</View>
122122
<View>
123-
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupJobBase</Name>
123+
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.JobBase</Name>
124124
<ViewSelectedBy>
125-
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupJobBase</TypeName>
125+
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.JobBase</TypeName>
126126
</ViewSelectedBy>
127127
<TableControl>
128128
<TableHeaders>
@@ -178,9 +178,9 @@
178178
</TableControl>
179179
</View>
180180
<View>
181-
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmContainer</Name>
181+
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmContainer</Name>
182182
<ViewSelectedBy>
183-
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmContainer</TypeName>
183+
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmContainer</TypeName>
184184
</ViewSelectedBy>
185185
<TableControl>
186186
<TableHeaders>
@@ -222,9 +222,9 @@
222222
</TableControl>
223223
</View>
224224
<View>
225-
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmItem</Name>
225+
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmItem</Name>
226226
<ViewSelectedBy>
227-
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmItem</TypeName>
227+
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmItem</TypeName>
228228
</ViewSelectedBy>
229229
<TableControl>
230230
<TableHeaders>
@@ -273,9 +273,9 @@
273273
</TableControl>
274274
</View>
275275
<View>
276-
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmRecoveryPoint</Name>
276+
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmRecoveryPoint</Name>
277277
<ViewSelectedBy>
278-
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmRecoveryPoint</TypeName>
278+
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmRecoveryPoint</TypeName>
279279
</ViewSelectedBy>
280280
<TableControl>
281281
<TableHeaders>

‎src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
23
# Visual Studio 2013
34
VisualStudioVersion = 12.0.40629.0
45
MinimumVisualStudioVersion = 10.0.40219.1
@@ -96,4 +97,4 @@ Global
9697
{65E15D74-1E24-4600-8671-D0B420524B17} = {54815A13-6BFB-406A-BEFC-44C31CABAFB4}
9798
{3436A126-EDC9-4060-8952-9A1BE34CDD95} = {54815A13-6BFB-406A-BEFC-44C31CABAFB4}
9899
EndGlobalSection
99-
EndGlobal
100+
EndGlobal

‎src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ FormatsToProcess = @(
8282
'.\AzureRM.UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml',
8383
'.\AzureRM.Sql\Microsoft.Azure.Commands.Sql.format.ps1xml',
8484
'.\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.format.ps1xml',
85-
'.\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStoreFileSystem.format.ps1xml',
86-
'.\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml'
85+
'.\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStoreFileSystem.format.ps1xml'
8786
)
8887

8988
# Modules to import as nested modules of the module specified in ModuleToProcess
@@ -118,7 +117,6 @@ NestedModules = @(
118117
'.\AzureRM.DataLakeStore',
119118
'.\AzureRM.Intune',
120119
'.\AzureRM.RecoveryServices',
121-
'.\AzureRM.RecoveryServices.Backup',
122120
'.\AzureRM.AzureStackAdmin',
123121
'.\AzureRM.AzureStackStorage'
124122
)

0 commit comments

Comments
 (0)