Skip to content

Review Comments Addressed #315

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sudhakar4171 merged 2 commits into from
Apr 27, 2016
Merged

Review Comments Addressed #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34f8c2a
Fixing renaming of some missed models and format xml
Apr 27, 2016
12fa9ca
Removed unnecessary lines from AzureResourceManager.psd1
Apr 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...Services.Backup/Commands.RecoveryServices.Backup.Helpers/Conversions/ConversionHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static ContainerBase GetContainerModel(ServiceClientModel.ProtectionConta
}
if (protectionContainer.Properties.GetType() == typeof(ServiceClientModel.MabProtectionContainer))
{
containerModel = new AzureRmRecoveryServicesBackupMabContainer(protectionContainer);
containerModel = new MabContainer(protectionContainer);
}
}

Expand All @@ -70,7 +70,7 @@ public static BackupEngineBase GetBackupEngineModel(ServiceClientModel.BackupEng
}
else if (backupEngine.Properties.GetType() == (typeof(ServiceClientModel.AzureBackupServerEngine)))
{
backupEngineModel = new AzureRmRecoveryServicesBackupAzureBackupServerEngine(backupEngine);
backupEngineModel = new AzureBackupServerEngine(backupEngine);
}
}

Expand Down
8 changes: 4 additions & 4 deletions ...rceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/BaseObjects.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,13 +70,13 @@ public ContainerContext(string backupManagementType)
/// <summary>
/// Class representing backup engine context.
/// </summary>
public class AzureRmRecoveryServicesBackupEngineContext : ManagementContext
public class BackupEngineContext : ManagementContext
{
public string BackupEngineType { get; set; }

public AzureRmRecoveryServicesBackupEngineContext() { }
public BackupEngineContext() { }

public AzureRmRecoveryServicesBackupEngineContext(string backupEngineType, string backupManagementType)
public BackupEngineContext(string backupEngineType, string backupManagementType)
: base(backupManagementType)
{
BackupEngineType = backupEngineType;
Expand Down Expand Up @@ -104,7 +104,7 @@ public ContainerBase(ServiceClientModel.ProtectionContainerResource protectionCo
/// <summary>
/// Base class for backup engine.
/// </summary>
public class BackupEngineBase : AzureRmRecoveryServicesBackupEngineContext
public class BackupEngineBase : BackupEngineContext
{
/// <summary>
/// Container Name
Expand Down
2 changes: 1 addition & 1 deletion ...up/Commands.RecoveryServices.Backup.Models/Commands.RecoveryServices.Backup.Models.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<Compile Include="AzureVmModels\AzureVmItem.cs" />
<Compile Include="AzureVmModels\AzureVmContainer.cs" />
<Compile Include="DpmModels\DpmBackupEngine.cs" />
<Compile Include="MabModels\AzureRmRecoveryServicesMabContainer.cs" />
<Compile Include="MabModels\MabContainer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
Expand Down
4 changes: 2 additions & 2 deletions ...overyServices.Backup/Commands.RecoveryServices.Backup.Models/DpmModels/DpmBackupEngine.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public DpmBackupEngine(ServiceClientModel.BackupEngineResource backupEngine)
/// <summary>
/// Azure backup specific backup server engine class.
/// </summary>
public class AzureRmRecoveryServicesBackupAzureBackupServerEngine : BackupEngineBase
public class AzureBackupServerEngine : BackupEngineBase
{
/// <summary>
/// Friendly name of the container
Expand All @@ -60,7 +60,7 @@ public class AzureRmRecoveryServicesBackupAzureBackupServerEngine : BackupEngine
/// </summary>
public string Status { get; set; }

public AzureRmRecoveryServicesBackupAzureBackupServerEngine(ServiceClientModel.BackupEngineResource backupEngine)
public AzureBackupServerEngine(ServiceClientModel.BackupEngineResource backupEngine)
: base(backupEngine)
{
ServiceClientModel.AzureBackupServerEngine azureBackupServerEngine = (ServiceClientModel.AzureBackupServerEngine)backupEngine.Properties;
Expand Down
4 changes: 2 additions & 2 deletions ...ls/AzureRmRecoveryServicesMabContainer.cs → ...s.Backup.Models/MabModels/MabContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models
/// <summary>
/// MAB specific container class.
/// </summary>
public class AzureRmRecoveryServicesBackupMabContainer : ContainerBase
public class MabContainer : ContainerBase
{
/// <summary>
/// Friendly name of the container
Expand All @@ -36,7 +36,7 @@ public class AzureRmRecoveryServicesBackupMabContainer : ContainerBase
/// </summary>
public ContainerRegistrationStatus Status { get; set; }

public AzureRmRecoveryServicesBackupMabContainer(ProtectionContainerResource protectionContainer)
public MabContainer(ProtectionContainerResource protectionContainer)
: base(protectionContainer)
{
MabProtectionContainer mabProtectionContainer = (MabProtectionContainer)protectionContainer.Properties;
Expand Down
4 changes: 2 additions & 2 deletions ...veryServices.Backup/Cmdlets/Container/UnregisterAzureRmRecoveryServicesBackupContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ public override void ExecuteCmdlet()
throw new ArgumentException(String.Format(Resources.UnsupportedContainerException,
Container.ContainerType, Container.BackupManagementType));
}
AzureRmRecoveryServicesBackupMabContainer mabContainer =
Container as AzureRmRecoveryServicesBackupMabContainer;
MabContainer mabContainer =
Container as MabContainer;
string containerName = mabContainer.Name;
ServiceClientAdapter.UnregisterContainers(containerName);
});
Expand Down
28 changes: 14 additions & 14 deletions ...ds.RecoveryServices.Backup/Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<Configuration>
<ViewDefinitions>
<View>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupEngineBase</Name>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupEngineBase</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupEngineBase</TypeName>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.BackupEngineBase</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand Down Expand Up @@ -32,9 +32,9 @@
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupMabContainer</Name>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.MabContainer</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupMabContainer</TypeName>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.MabContainer</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand Down Expand Up @@ -69,9 +69,9 @@
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmPolicy</Name>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmPolicy</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmPolicy</TypeName>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmPolicy</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand Down Expand Up @@ -120,9 +120,9 @@
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupJobBase</Name>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.JobBase</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupJobBase</TypeName>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.JobBase</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand Down Expand Up @@ -178,9 +178,9 @@
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmContainer</Name>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmContainer</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmContainer</TypeName>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmContainer</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand Down Expand Up @@ -222,9 +222,9 @@
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmItem</Name>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmItem</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmItem</TypeName>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmItem</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand Down Expand Up @@ -273,9 +273,9 @@
</TableControl>
</View>
<View>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmRecoveryPoint</Name>
<Name>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmRecoveryPoint</Name>
<ViewSelectedBy>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureRmRecoveryServicesBackupIaasVmRecoveryPoint</TypeName>
<TypeName>Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models.AzureVmRecoveryPoint</TypeName>
</ViewSelectedBy>
<TableControl>
<TableHeaders>
Expand Down
5 changes: 3 additions & 2 deletions src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
MinimumVisualStudioVersion = 10.0.40219.1
Expand Down Expand Up @@ -96,4 +97,4 @@ Global
{65E15D74-1E24-4600-8671-D0B420524B17} = {54815A13-6BFB-406A-BEFC-44C31CABAFB4}
{3436A126-EDC9-4060-8952-9A1BE34CDD95} = {54815A13-6BFB-406A-BEFC-44C31CABAFB4}
EndGlobalSection
EndGlobal
EndGlobal
4 changes: 1 addition & 3 deletions src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ FormatsToProcess = @(
'.\AzureRM.UsageAggregates\Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml',
'.\AzureRM.Sql\Microsoft.Azure.Commands.Sql.format.ps1xml',
'.\AzureRM.DataLakeAnalytics\Microsoft.Azure.Commands.DataLakeAnalytics.format.ps1xml',
'.\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStoreFileSystem.format.ps1xml',
'.\AzureRM.RecoveryServices.Backup\Microsoft.Azure.Commands.RecoveryServices.Backup.format.ps1xml'
'.\AzureRM.DataLakeStore\Microsoft.Azure.Commands.DataLakeStoreFileSystem.format.ps1xml'
)

# Modules to import as nested modules of the module specified in ModuleToProcess
Expand Down Expand Up @@ -118,7 +117,6 @@ NestedModules = @(
'.\AzureRM.DataLakeStore',
'.\AzureRM.Intune',
'.\AzureRM.RecoveryServices',
'.\AzureRM.RecoveryServices.Backup',
'.\AzureRM.AzureStackAdmin',
'.\AzureRM.AzureStackStorage'
)
Expand Down