Skip to content

New sdk version 2019-08-08-preview for azure stack srp #7479

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
isra-fel merged 7 commits into from
Sep 19, 2019
Merged

New sdk version 2019-08-08-preview for azure stack srp #7479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b97e7c4
Generate new sdk for 2019-08-08-preview
wenjlu-lgy Aug 7, 2019
23683f4
Update test session records
wenjlu-lgy Aug 8, 2019
249630a
Revise .net sdk according to new spec.
wenjlu-lgy Sep 4, 2019
59f95df
Undo unnecessary changes.
wenjlu-lgy Sep 5, 2019
a5d3f09
Add paging header for storage account.
wenjlu-lgy Sep 17, 2019
0a84a6e
Add rp.txt
wenjlu-lgy Sep 17, 2019
d200bec
Change version and release note.
wenjlu-lgy Sep 19, 2019
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
14 changes: 14 additions & 0 deletions eng/mgmt/mgmtmetadata/azsadmin_resource-manager_storage.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Installing AutoRest version: latest
AutoRest installed successfully.
Commencing code generation
Generating CSharp code
Executing AutoRest command
cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/azsadmin/resource-manager/storage/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=D:\
2019-09-17 02:51:26 UTC
Azure-rest-api-specs repository information
GitHub fork: Azure
Branch: master
Commit: 69674f9e1ee44ad38e162381782e4773ae06ab1a
AutoRest information
Requested version: latest
Bootstrapper version: autorest@2.0.4283
2 changes: 1 addition & 1 deletion sdk/azurestack/Microsoft.AzureStack.Management.Storage.Admin/AzSdk.RP.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!--This file and it's contents are updated at build time moving or editing might result in build failure. Take due deligence while editing this file-->
<PropertyGroup>
<AzureApiTag>Storage.Admin_2015-12-01-preview;</AzureApiTag>
<AzureApiTag>Storage.Admin_2019-08-08-preview;</AzureApiTag>
<PackageTags>$(PackageTags);$(CommonTags);$(AzureApiTag);</PackageTags>
</PropertyGroup>
</Project>
52 changes: 15 additions & 37 deletions ...ack/Microsoft.AzureStack.Management.Storage.Admin/src/Generated/AcquisitionsOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,24 +51,18 @@ internal AcquisitionsOperations(StorageAdminClient client)
public StorageAdminClient Client { get; private set; }

/// <summary>
/// Returns a list of BLOB acquistions.
/// Returns a list of BLOB acquisitions.
/// </summary>
/// <param name='resourceGroupName'>
/// Resource group name.
/// </param>
/// <param name='farmId'>
/// Farm Id.
/// </param>
/// <param name='filter'>
/// Filter string
/// <param name='location'>
/// Resource location.
/// </param>
/// <param name='customHeaders'>
/// Headers that will be added to request.
/// </param>
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
/// <exception cref="CloudException">
/// <exception cref="ErrorResponseException">
/// Thrown when the operation returned an invalid status code
/// </exception>
/// <exception cref="SerializationException">
Expand All @@ -83,19 +77,15 @@ internal AcquisitionsOperations(StorageAdminClient client)
/// <return>
/// A response object containing the response body and response headers.
/// </return>
public async Task<AzureOperationResponse<IList<Acquisition>>> ListWithHttpMessagesAsync(string resourceGroupName, string farmId, string filter = default(string), Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
public async Task<AzureOperationResponse<AcquisitionList>> ListWithHttpMessagesAsync(string location, Dictionary<string, List<string>> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken))
{
if (Client.SubscriptionId == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
}
if (resourceGroupName == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName");
}
if (farmId == null)
if (location == null)
{
throw new ValidationException(ValidationRules.CannotBeNull, "farmId");
throw new ValidationException(ValidationRules.CannotBeNull, "location");
}
if (Client.ApiVersion == null)
{
Expand All @@ -108,27 +98,20 @@ internal AcquisitionsOperations(StorageAdminClient client)
{
_invocationId = ServiceClientTracing.NextInvocationId.ToString();
Dictionary<string, object> tracingParameters = new Dictionary<string, object>();
tracingParameters.Add("resourceGroupName", resourceGroupName);
tracingParameters.Add("farmId", farmId);
tracingParameters.Add("filter", filter);
tracingParameters.Add("location", location);
tracingParameters.Add("cancellationToken", cancellationToken);
ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters);
}
// Construct URL
var _baseUrl = Client.BaseUri.AbsoluteUri;
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.Storage.Admin/farms/{farmId}/acquisitions").ToString();
var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Storage.Admin/locations/{location}/acquisitions").ToString();
_url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId));
_url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
_url = _url.Replace("{farmId}", System.Uri.EscapeDataString(farmId));
_url = _url.Replace("{location}", System.Uri.EscapeDataString(location));
List<string> _queryParameters = new List<string>();
if (Client.ApiVersion != null)
{
_queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion)));
}
if (filter != null)
{
_queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
}
if (_queryParameters.Count > 0)
{
_url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
Expand Down Expand Up @@ -187,16 +170,15 @@ internal AcquisitionsOperations(StorageAdminClient client)
HttpStatusCode _statusCode = _httpResponse.StatusCode;
cancellationToken.ThrowIfCancellationRequested();
string _responseContent = null;
if ((int)_statusCode != 200 && (int)_statusCode != 404)
if ((int)_statusCode != 200)
{
var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
try
{
_responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject<CloudError>(_responseContent, Client.DeserializationSettings);
ErrorResponse _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject<ErrorResponse>(_responseContent, Client.DeserializationSettings);
if (_errorBody != null)
{
ex = new CloudException(_errorBody.Message);
ex.Body = _errorBody;
}
}
Expand All @@ -206,10 +188,6 @@ internal AcquisitionsOperations(StorageAdminClient client)
}
ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent);
ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent);
if (_httpResponse.Headers.Contains("x-ms-request-id"))
{
ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
}
if (_shouldTrace)
{
ServiceClientTracing.Error(_invocationId, ex);
Expand All @@ -222,7 +200,7 @@ internal AcquisitionsOperations(StorageAdminClient client)
throw ex;
}
// Create Result
var _result = new AzureOperationResponse<IList<Acquisition>>();
var _result = new AzureOperationResponse<AcquisitionList>();
_result.Request = _httpRequest;
_result.Response = _httpResponse;
if (_httpResponse.Headers.Contains("x-ms-request-id"))
Expand All @@ -235,7 +213,7 @@ internal AcquisitionsOperations(StorageAdminClient client)
_responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
try
{
_result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<IList<Acquisition>>(_responseContent, Client.DeserializationSettings);
_result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject<AcquisitionList>(_responseContent, Client.DeserializationSettings);
}
catch (JsonException ex)
{
Expand Down
34 changes: 10 additions & 24 deletions ...oft.AzureStack.Management.Storage.Admin/src/Generated/AcquisitionsOperationsExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ namespace Microsoft.AzureStack.Management.Storage.Admin
using Microsoft.Rest;
using Microsoft.Rest.Azure;
using Models;
using System.Collections;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;

Expand All @@ -24,46 +22,34 @@ namespace Microsoft.AzureStack.Management.Storage.Admin
public static partial class AcquisitionsOperationsExtensions
{
/// <summary>
/// Returns a list of BLOB acquistions.
/// Returns a list of BLOB acquisitions.
/// </summary>
/// <param name='operations'>
/// The operations group for this extension method.
/// </param>
/// <param name='resourceGroupName'>
/// Resource group name.
/// <param name='location'>
/// Resource location.
/// </param>
/// <param name='farmId'>
/// Farm Id.
/// </param>
/// <param name='filter'>
/// Filter string
/// </param>
public static IList<Acquisition> List(this IAcquisitionsOperations operations, string resourceGroupName, string farmId, string filter = default(string))
public static AcquisitionList List(this IAcquisitionsOperations operations, string location)
{
return operations.ListAsync(resourceGroupName, farmId, filter).GetAwaiter().GetResult();
return operations.ListAsync(location).GetAwaiter().GetResult();
}

/// <summary>
/// Returns a list of BLOB acquistions.
/// Returns a list of BLOB acquisitions.
/// </summary>
/// <param name='operations'>
/// The operations group for this extension method.
/// </param>
/// <param name='resourceGroupName'>
/// Resource group name.
/// </param>
/// <param name='farmId'>
/// Farm Id.
/// </param>
/// <param name='filter'>
/// Filter string
/// <param name='location'>
/// Resource location.
/// </param>
/// <param name='cancellationToken'>
/// The cancellation token.
/// </param>
public static async Task<IList<Acquisition>> ListAsync(this IAcquisitionsOperations operations, string resourceGroupName, string farmId, string filter = default(string), CancellationToken cancellationToken = default(CancellationToken))
public static async Task<AcquisitionList> ListAsync(this IAcquisitionsOperations operations, string location, CancellationToken cancellationToken = default(CancellationToken))
{
using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, farmId, filter, null, cancellationToken).ConfigureAwait(false))
using (var _result = await operations.ListWithHttpMessagesAsync(location, null, cancellationToken).ConfigureAwait(false))
{
return _result.Body;
}
Expand Down
Loading