Skip to content

Mkherani swagger #354

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
merged 3 commits into from
Oct 13, 2016
Merged

Mkherani swagger #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a8eb42f
Container: ServiceCLient and conversionHelper
mkherani Oct 13, 2016
dd838e2
Container: conversionHelper.cs
mkherani Oct 13, 2016
692f743
container changes completed.
mkherani Oct 13, 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
17 changes: 12 additions & 5 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 @@ -41,16 +41,16 @@ public static ContainerBase GetContainerModel(ServiceClientModel.ProtectionConta
if (protectionContainer != null &&
protectionContainer.Properties != null)
{
if (protectionContainer.Properties.GetType().IsSubclassOf(typeof(ServiceClientModel.AzureIaaSVMProtectionContainer)))
if (protectionContainer.Properties.GetType().IsSubclassOf(typeof(ServiceClientModel.IaaSVMContainer)))
{
containerModel = new AzureVmContainer(protectionContainer);
}
if (protectionContainer.Properties.GetType() == typeof(ServiceClientModel.MabProtectionContainer))
if (protectionContainer.Properties.GetType() == typeof(ServiceClientModel.MabContainer))
{
containerModel = new MabContainer(protectionContainer);
}
else if (protectionContainer.Properties.GetType() ==
typeof(ServiceClientModel.AzureSqlProtectionContainer))
typeof(ServiceClientModel.AzureSqlContainer))
{
containerModel = new AzureSqlContainer(protectionContainer);
}
Expand All @@ -62,13 +62,20 @@ public static ContainerBase GetContainerModel(ServiceClientModel.ProtectionConta
/// <summary>
/// Helper function to convert ps backup engine model from service response.
/// </summary>
public static BackupEngineBase GetBackupEngineModel(ServiceClientModel.BackupEngineResource backupEngine)
public static BackupEngineBase GetBackupEngineModel(ServiceClientModel.BackupEngineBaseResource backupEngine)
{
BackupEngineBase backupEngineModel = null;

if (backupEngine != null &&
backupEngine.Properties != null)
{
string friendlyName = backupEngine.Properties.FriendlyName;
string backupManagementType = backupEngine.Properties.BackupManagementType;
string registrationStatus = backupEngine.Properties.RegistrationStatus;
string healthStatus = backupEngine.Properties.HealthStatus;
bool? canReRegister = backupEngine.Properties.CanReRegister;
string backupEngineId = backupEngine.Properties.BackupEngineId;

if (backupEngine.Properties.GetType() == (typeof(ServiceClientModel.DpmBackupEngine)))
{
backupEngineModel = new DpmBackupEngine(backupEngine);
Expand Down Expand Up @@ -100,7 +107,7 @@ public static List<ContainerBase> GetContainerModelList(IEnumerable<ServiceClien
/// <summary>
/// Helper function to convert ps backup engine model list from service response.
/// </summary>
public static List<BackupEngineBase> GetBackupEngineModelList(IEnumerable<ServiceClientModel.BackupEngineResource> backupEngines)
public static List<BackupEngineBase> GetBackupEngineModelList(IEnumerable<ServiceClientModel.BackupEngineBaseResource> backupEngines)
{
List<BackupEngineBase> backupEngineModel = new List<BackupEngineBase>();

Expand Down
2 changes: 1 addition & 1 deletion ...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 @@ -120,7 +120,7 @@ public class BackupEngineBase : BackupEngineContext
/// </summary>
public string Name { get; set; }

public BackupEngineBase(ServiceClientModel.BackupEngineResource backupEngine)
public BackupEngineBase(ServiceClientModel.BackupEngineBaseResource backupEngine)
: base(((ServiceClientModel.BackupEngineBase)backupEngine.Properties).BackupEngineType,
((ServiceClientModel.BackupEngineBase)backupEngine.Properties).BackupManagementType)
{
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 @@ -36,7 +36,7 @@ public class DpmBackupEngine : BackupEngineBase
/// </summary>
public string Status { get; set; }

public DpmBackupEngine(ServiceClientModel.BackupEngineResource backupEngine)
public DpmBackupEngine(ServiceClientModel.BackupEngineBaseResource backupEngine)
: base(backupEngine)
{
ServiceClientModel.BackupEngineBase dpmBackupEngine = (ServiceClientModel.BackupEngineBase)backupEngine.Properties;
Expand All @@ -60,7 +60,7 @@ public class AzureBackupServerEngine : BackupEngineBase
/// </summary>
public string Status { get; set; }

public AzureBackupServerEngine(ServiceClientModel.BackupEngineResource backupEngine)
public AzureBackupServerEngine(ServiceClientModel.BackupEngineBaseResource backupEngine)
: base(backupEngine)
{
ServiceClientModel.AzureBackupServerEngine azureBackupServerEngine = (ServiceClientModel.AzureBackupServerEngine)backupEngine.Properties;
Expand Down
6 changes: 2 additions & 4 deletions ...s.Backup/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,11 +246,9 @@ public Microsoft.Rest.Azure.AzureOperationResponse<ProtectionPolicyResource> Mod
{
string name = (string)this.ProviderData[ContainerParams.Name];

ProtectionContainerListQueryParams queryParams =
new ProtectionContainerListQueryParams();
ODataQuery<BMSContainerQueryObject> queryParams = new ODataQuery<BMSContainerQueryObject>(
q => q.BackupManagementType == ServiceClientModel.BackupManagementType.AzureSql.ToString());

queryParams.BackupManagementType =
ServiceClientModel.BackupManagementType.AzureSql.ToString();

var listResponse = ServiceClientAdapter.ListContainers(queryParams);

Expand Down
3 changes: 2 additions & 1 deletion ...rvices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
using ServiceClientModel = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS;
using Microsoft.Rest.Azure.OData;

namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
{
Expand Down Expand Up @@ -101,7 +102,7 @@ public ServiceClientModel.ProtectionPolicyResponse ModifyPolicy()
{
string name = (string)this.ProviderData[ContainerParams.Name];

ServiceClientModel.BackupEngineListQueryParams queryParams = new ServiceClientModel.BackupEngineListQueryParams();
ODataQuery<ServiceClientModel.BMSBackupEngineQueryObject> queryParams = new ODataQuery<ServiceClientModel.BMSBackupEngineQueryObject>();

var listResponse = ServiceClientAdapter.ListBackupEngines(queryParams);

Expand Down
24 changes: 12 additions & 12 deletions ...ces.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,19 +467,19 @@ public List<ContainerBase> ListProtectionContainers()
}
}

ProtectionContainerListQueryParams queryParams = new ProtectionContainerListQueryParams();

// 1. Filter by Name
queryParams.FriendlyName = nameQueryFilter;

// 2. Filter by ContainerType
queryParams.BackupManagementType =
ServiceClientModel.BackupManagementType.AzureIaasVM.ToString();

// 3. Filter by Status
if (status != 0)
ODataQuery<BMSContainerQueryObject> queryParams = null;
if (status == 0)
{
queryParams = new ODataQuery<BMSContainerQueryObject>(
q => q.FriendlyName == nameQueryFilter &&
q.BackupManagementType == ServiceClientModel.BackupManagementType.AzureIaasVM.ToString());
}
else
{
queryParams.RegistrationStatus = status.ToString();
queryParams = new ODataQuery<BMSContainerQueryObject>(
q => q.FriendlyName == nameQueryFilter &&
q.BackupManagementType == ServiceClientModel.BackupManagementType.AzureIaasVM.ToString() &&
q.Status == status.ToString());
}

var listResponse = ServiceClientAdapter.ListContainers(queryParams);
Expand Down
10 changes: 3 additions & 7 deletions ...rvices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS;
using Microsoft.Rest.Azure.OData;

namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
{
Expand Down Expand Up @@ -98,13 +99,8 @@ public ProtectionPolicyResponse ModifyPolicy()
{
string name = (string)this.ProviderData[ContainerParams.Name];

ProtectionContainerListQueryParams queryParams = new ProtectionContainerListQueryParams();

// 1. Filter by Name
queryParams.FriendlyName = name;

// 2. Filter by ContainerType
queryParams.BackupManagementType = ServiceClientModel.BackupManagementType.MAB.ToString();
ODataQuery<BMSContainerQueryObject> queryParams = new ODataQuery<BMSContainerQueryObject>(
q => q.FriendlyName == name && q.BackupManagementType == ServiceClientModel.BackupManagementType.MAB.ToString());

var listResponse = ServiceClientAdapter.ListContainers(queryParams);

Expand Down
39 changes: 22 additions & 17 deletions ...ces.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ContainerAPIs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,30 +56,35 @@ public IEnumerable<ProtectionContainerResource> ListContainers(
/// </summary>
/// <param name="parameters">Query parameters</param>
/// <returns>List of backup engines</returns>
public IEnumerable<BackupEngineResource> ListBackupEngines(BackupEngineListQueryParams queryParams)
public IEnumerable<BackupEngineBaseResource> ListBackupEngines(ODataQuery<BMSBackupEngineQueryObject> queryParams)
{
PaginationRequest paginationParam = new PaginationRequest();
paginationParam.Top = "200";
var listResponse = BmsAdapter.Client.BackupEngines.ListAsync(
BmsAdapter.GetResourceGroupName(),
BmsAdapter.GetResourceName(),
queryParams,
paginationParam,
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
return listResponse.ItemList.BackupEngines;
queryParams.Top = 200;
Func<IPage<BackupEngineBaseResource>> listAsync =
() => BmsAdapter.Client.BackupEngines.GetWithHttpMessagesAsync(
BmsAdapter.GetResourceName(),
BmsAdapter.GetResourceGroupName(),
queryParams,
cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;

Func<string, IPage<BackupEngineBaseResource>> listNextAsync =
nextLink => BmsAdapter.Client.BackupEngines.GetNextWithHttpMessagesAsync(
nextLink,
cancellationToken: BmsAdapter.CmdletCancellationToken).Result.Body;
var listResponse = HelperUtils.GetPagedList(listAsync, listNextAsync);
return listResponse;
}

/// <summary>
/// Triggers refresh of container catalog in service
/// </summary>
/// <returns>Response of the job created in the service</returns>
public BaseRecoveryServicesJobResponse RefreshContainers()
public Microsoft.Rest.Azure.AzureOperationResponse RefreshContainers()
{
string resourceName = BmsAdapter.GetResourceName();
string resourceGroupName = BmsAdapter.GetResourceGroupName();
var response = BmsAdapter.Client.Containers.RefreshAsync(
var response = BmsAdapter.Client.ProtectionContainers.RefreshWithHttpMessagesAsync(
resourceName,
resourceGroupName,
resourceName,
AzureFabricName,
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
return response;
Expand All @@ -88,14 +93,14 @@ public BaseRecoveryServicesJobResponse RefreshContainers()
/// <summary>
/// Triggers unregister of a container in service
/// </summary>
public AzureOperationResponse UnregisterContainers(string containerName)
public Microsoft.Rest.Azure.AzureOperationResponse UnregisterContainers(string containerName)
{
string resourceName = BmsAdapter.GetResourceName();
string resourceGroupName = BmsAdapter.GetResourceGroupName();

var response = BmsAdapter.Client.Containers.UnregisterAsync(
resourceGroupName,
resourceName,
var response = BmsAdapter.Client.ProtectionContainers.UnregisterWithHttpMessagesAsync(
resourceName,
resourceGroupName,
containerName,
cancellationToken: BmsAdapter.CmdletCancellationToken).Result;
return response;
Expand Down