Skip to content

Mkherani swagger #350

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 2 commits into from
Oct 10, 2016
Merged

Mkherani swagger #350

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
6d62068
Swagger Changes
Oct 10, 2016
766726a
Swagger changes.
mkherani Oct 10, 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
7 changes: 7 additions & 0 deletions .../Commands.RecoveryServices.Backup.Helpers/Commands.RecoveryServices.Backup.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\tempDll\Debug-Net45\net45\Microsoft.Azure.Management.RecoveryServices.Backup.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\tempDll\Debug-Net45\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure">
<HintPath>..\..\..\tempDll\Debug-Net45\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Web" />
Expand Down
28 changes: 28 additions & 0 deletions ...ceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/HelperUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
using System.Threading.Tasks;
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
using CmdletModel = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
using Microsoft.Rest.Azure;

namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers
{
Expand Down Expand Up @@ -269,5 +270,32 @@ public static string GetVaultNameFromId(

return vaultName;
}

public static List<T> GetPagedList<T>(Func<IPage<T>> listResources, Func<string, IPage<T>> listNext)
where T : Management.RecoveryServices.Backup.Models.Resource
{
var resources = new List<T>();
string nextLink = null;

var pagedResources = listResources();

foreach (var pagedResource in pagedResources)
{
resources.Add(pagedResource);
}

while (!string.IsNullOrEmpty(nextLink))
{
nextLink = pagedResources.NextPageLink;

foreach (var pagedResource in listNext(nextLink))
{
resources.Add(pagedResource);
}
}

return resources;
}

}
}
7 changes: 4 additions & 3 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 @@ -93,7 +93,7 @@ public Microsoft.Rest.Azure.AzureOperationResponse EnableProtection()
azureVMResourceGroupName,
policy);

ProtectableObjectResource protectableObjectResource =
WorkloadProtectableItem protectableObjectResource =
GetAzureVMProtectableObject(azureVMName, azureVMRGName, isComputeAzureVM);

Dictionary<UriEnums, string> keyValueDict =
Expand All @@ -103,8 +103,9 @@ public Microsoft.Rest.Azure.AzureOperationResponse EnableProtection()
protectedItemUri = HelperUtils.GetProtectableItemUri(
keyValueDict, protectableObjectResource.Id);

AzureIaaSVMProtectableItem iaasVmProtectableItem =
(AzureIaaSVMProtectableItem)protectableObjectResource.Properties;

IaaSVMProtectableItem iaasVmProtectableItem =
(IaaSVMProtectableItem)protectableObjectResource;
if (iaasVmProtectableItem != null)
{
sourceResourceId = iaasVmProtectableItem.VirtualMachineId;
Expand Down
62 changes: 36 additions & 26 deletions ...Services.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/ItemAPIs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,11 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
using Microsoft.Rest.Azure.OData;
using System;
using System.Collections.Generic;

namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ServiceClientAdapterNS
{
Expand All @@ -26,17 +29,17 @@ public partial class ServiceClientAdapter
/// <param name="protectedItemName">Name of the item</param>
/// <param name="request">Protected item create or update request</param>
/// <returns>Job created in the service for this operation</returns>
public BaseRecoveryServicesJobResponse CreateOrUpdateProtectedItem(
public Microsoft.Rest.Azure.AzureOperationResponse CreateOrUpdateProtectedItem(
string containerName,
string protectedItemName,
ProtectedItemCreateOrUpdateRequest request)
ProtectedItemResource request)
{
string resourceName = BmsAdapter.GetResourceName();
string resourceGroupName = BmsAdapter.GetResourceGroupName();

return BmsAdapter.Client.ProtectedItems.CreateOrUpdateProtectedItemAsync(
resourceGroupName,
return BmsAdapter.Client.ProtectedItems.CreateOrUpdateWithHttpMessagesAsync(
resourceName,
resourceGroupName,
AzureFabricName,
containerName,
protectedItemName,
Expand All @@ -51,16 +54,16 @@ public BaseRecoveryServicesJobResponse CreateOrUpdateProtectedItem(
/// <param name="containerName">Name of the container which this item belongs to</param>
/// <param name="protectedItemName">Name of the item</param>
/// <returns>Job created in the service for this operation</returns>
public BaseRecoveryServicesJobResponse DeleteProtectedItem(
public Microsoft.Rest.Azure.AzureOperationResponse DeleteProtectedItem(
string containerName,
string protectedItemName)
{
string resourceName = BmsAdapter.GetResourceName();
string resourceGroupName = BmsAdapter.GetResourceGroupName();

return BmsAdapter.Client.ProtectedItems.DeleteProtectedItemAsync(
resourceGroupName,
return BmsAdapter.Client.ProtectedItems.DeleteWithHttpMessagesAsync(
resourceName,
resourceGroupName,
AzureFabricName,
containerName,
protectedItemName,
Expand All @@ -75,17 +78,17 @@ public BaseRecoveryServicesJobResponse DeleteProtectedItem(
/// <param name="protectedItemName">Name of the item</param>
/// <param name="queryFilter">Query filter</param>
/// <returns>Protected item</returns>
public ProtectedItemResponse GetProtectedItem(
public Microsoft.Rest.Azure.AzureOperationResponse<ProtectedItemResource> GetProtectedItem(
string containerName,
string protectedItemName,
GetProtectedItemQueryParam queryFilter)
ODataQuery<GetProtectedItemQueryObject> queryFilter)
{
string resourceName = BmsAdapter.GetResourceName();
string resourceGroupName = BmsAdapter.GetResourceGroupName();

return BmsAdapter.Client.ProtectedItems.GetAsync(
resourceGroupName,
return BmsAdapter.Client.ProtectedItems.GetWithHttpMessagesAsync(
resourceName,
resourceGroupName,
AzureFabricName,
containerName,
protectedItemName,
Expand All @@ -101,47 +104,54 @@ public ProtectedItemResponse GetProtectedItem(
/// <param name="queryFilter">Query params</param>
/// <param name="paginationParams">Pagination params</param>
/// <returns>List of protected items</returns>
public ProtectedItemListResponse ListProtectedItem(
ProtectedItemListQueryParam queryFilter,
PaginationRequest paginationParams = null)
public List<ProtectedItemResource> ListProtectedItem(
ODataQuery<ProtectedItemQueryObject> queryFilter,
string skipToken = default(string))
{
string resourceName = BmsAdapter.GetResourceName();
string resourceGroupName = BmsAdapter.GetResourceGroupName();

return BmsAdapter.Client.ProtectedItems.ListAsync(
Func<Microsoft.Rest.Azure.IPage<ProtectedItemResource>> listAsync =
() => BmsAdapter.Client.ProtectedItems.ListWithHttpMessagesAsync(
resourceName,
resourceGroupName,
resourceName,
queryFilter,
paginationParams,
skipToken,
BmsAdapter.GetCustomRequestHeaders(),
BmsAdapter.CmdletCancellationToken).Result;
}

Func<string, Microsoft.Rest.Azure.IPage<ProtectedItemResource>> listNextAsync =
nextLink => BmsAdapter.Client.ProtectedItems.ListNextWithHttpMessagesAsync(nextLink,
BmsAdapter.GetCustomRequestHeaders(),
BmsAdapter.CmdletCancellationToken).Result;

return HelperUtils.GetPagedList<ProtectedItemResource>(listAsync, listNextAsync);
}

/// <summary>
/// Triggers backup on the specified item
/// </summary>
/// <param name="containerName">Name of the container which this item belongs to</param>
/// <param name="itemName">Name of the item</param>
/// <returns>Job created by this operation</returns>
public BaseRecoveryServicesJobResponse TriggerBackup(
public Microsoft.Rest.Azure.AzureOperationResponse TriggerBackup(
string containerName,
string itemName,
DateTime? expiryDateTimeUtc)
{
TriggerBackupRequest triggerBackupRequest = new TriggerBackupRequest();
triggerBackupRequest.Item = new BackupRequestResource();
IaaSVMBackupRequest iaasVmBackupRequest = new IaaSVMBackupRequest();
BackupRequestResource triggerBackupRequest = new BackupRequestResource();
IaasVMBackupRequest iaasVmBackupRequest = new IaasVMBackupRequest();
iaasVmBackupRequest.RecoveryPointExpiryTimeInUTC = expiryDateTimeUtc;
triggerBackupRequest.Item.Properties = iaasVmBackupRequest;
triggerBackupRequest.Properties = iaasVmBackupRequest;

return BmsAdapter.Client.Backups.TriggerBackupAsync(
BmsAdapter.GetResourceGroupName(),
return BmsAdapter.Client.Backups.TriggerWithHttpMessagesAsync(
BmsAdapter.GetResourceName(),
BmsAdapter.GetCustomRequestHeaders(),
BmsAdapter.GetResourceGroupName(),
ServiceClientAdapter.AzureFabricName,
containerName,
itemName,
triggerBackupRequest,
BmsAdapter.GetCustomRequestHeaders(),
BmsAdapter.CmdletCancellationToken).Result;
}
}
Expand Down
45 changes: 27 additions & 18 deletions ...ackup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RecoveryPointsAPIs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
using Microsoft.Rest.Azure.OData;
using System;
using System.Collections.Generic;
using System.Linq;
Expand All @@ -33,21 +35,21 @@ public partial class ServiceClientAdapter
public RecoveryPointResource GetRecoveryPointDetails
(
string containerName,
string protectedItemName,
string protectedItemName,
string recoveryPointId
)
{
string resourceGroupName = BmsAdapter.GetResourceGroupName();
string resourceName = BmsAdapter.GetResourceName();

var response = BmsAdapter.Client.RecoveryPoints.GetWithHttpMessagesAsync(
resourceGroupName,
resourceName,
BmsAdapter.GetCustomRequestHeaders(),
AzureFabricName,
resourceGroupName,
AzureFabricName,
containerName,
protectedItemName,
recoveryPointId,
protectedItemName,
recoveryPointId,
BmsAdapter.GetCustomRequestHeaders(),
BmsAdapter.CmdletCancellationToken).Result;

return response;
Expand All @@ -60,26 +62,33 @@ string recoveryPointId
/// <param name="protectedItemName">Name of the item</param>
/// <param name="queryFilter">Query filter</param>
/// <returns>List of recovery points</returns>
public RecoveryPointListResponse GetRecoveryPoints
public List<RecoveryPointResource> GetRecoveryPoints
(
string containerName,
string protectedItemName,
RecoveryPointQueryParameters queryFilter
string protectedItemName,
ODataQuery<BMSRPQueryObject> queryFilter
)
{
string resourceGroupName = BmsAdapter.GetResourceGroupName();
string resourceName = BmsAdapter.GetResourceName();

var response = BmsAdapter.Client.RecoveryPoints.ListAsync(
resourceGroupName,
resourceName,
BmsAdapter.GetCustomRequestHeaders(),
AzureFabricName,
containerName,
protectedItemName,
queryFilter,
BmsAdapter.CmdletCancellationToken).Result;
Func<Microsoft.Rest.Azure.IPage<RecoveryPointResource>> listAsync =
() => BmsAdapter.Client.RecoveryPoints.ListWithHttpMessagesAsync(
resourceName,
resourceGroupName,
AzureFabricName,
containerName,
protectedItemName,
queryFilter,
BmsAdapter.GetCustomRequestHeaders(),
BmsAdapter.CmdletCancellationToken).Result;

Func<string, Microsoft.Rest.Azure.IPage<RecoveryPointResource>> listNextAsync =
nextLink => BmsAdapter.Client.RecoveryPoints.ListNextWithHttpMessagesAsync(nextLink,
BmsAdapter.GetCustomRequestHeaders(),
BmsAdapter.CmdletCancellationToken).Result;

var response = HelperUtils.GetPagedList<RecoveryPointResource>(listAsync, listNextAsync);
return response;
}
}
Expand Down
18 changes: 8 additions & 10 deletions ...s.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/BMSAPIs/RestoreDiskAPIs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public partial class ServiceClientAdapter
/// <param name="storageAccountLocation">Location of the storage account where to restore the disk</param>
/// <param name="storageAccountType">Type of the storage account where to restore the disk</param>
/// <returns>Job created by this operation</returns>
public BaseRecoveryServicesJobResponse RestoreDisk(AzureVmRecoveryPoint rp, string storageAccountId,
public Microsoft.Rest.Azure.AzureOperationResponse RestoreDisk(AzureVmRecoveryPoint rp, string storageAccountId,
string storageAccountLocation, string storageAccountType)
{
string resourceGroupName = BmsAdapter.GetResourceGroupName();
Expand All @@ -56,7 +56,7 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureVmRecoveryPoint rp, stri
{
throw new Exception(String.Format(Resources.RestoreDiskStorageTypeError, vmType));
}

IaasVMRestoreRequest restoreRequest = new IaasVMRestoreRequest()
{
CreateNewCloudService = false,
Expand All @@ -67,20 +67,18 @@ public BaseRecoveryServicesJobResponse RestoreDisk(AzureVmRecoveryPoint rp, stri
SourceResourceId = rp.SourceResourceId,
};

TriggerRestoreRequest triggerRestoreRequest = new TriggerRestoreRequest();
triggerRestoreRequest.Item = new RestoreRequestResource();
triggerRestoreRequest.Item.Properties = new RestoreRequest();
triggerRestoreRequest.Item.Properties = restoreRequest;
RestoreRequestResource triggerRestoreRequest = new RestoreRequestResource();
triggerRestoreRequest.Properties = restoreRequest;

var response = BmsAdapter.Client.Restores.TriggerRestoreAsync(
var response = BmsAdapter.Client.Restores.TriggerWithHttpMessagesAsync(
resourceName,
resourceGroupName,
resourceName,
BmsAdapter.GetCustomRequestHeaders(),
AzureFabricName,
containerUri,
protectedItemUri,
recoveryPointId,
triggerRestoreRequest,
triggerRestoreRequest,
BmsAdapter.GetCustomRequestHeaders(),
BmsAdapter.CmdletCancellationToken).Result;

return response;
Expand Down
3 changes: 3 additions & 0 deletions ....Backup.ServiceClientAdapter/Commands.RecoveryServices.Backup.ServiceClientAdapter.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\tempDll\Debug-Net45\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Rest.ClientRuntime.Azure">
<HintPath>..\..\..\tempDll\Debug-Net45\net45\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
Expand Down