diff --git a/src/SDKs/DataLake.Analytics/DataLakeAnalytics.Tests/ScenarioTests/AccountOperationTests.cs b/src/SDKs/DataLake.Analytics/DataLakeAnalytics.Tests/ScenarioTests/AccountOperationTests.cs index f00025a8a9f9..17b1b79d791b 100644 --- a/src/SDKs/DataLake.Analytics/DataLakeAnalytics.Tests/ScenarioTests/AccountOperationTests.cs +++ b/src/SDKs/DataLake.Analytics/DataLakeAnalytics.Tests/ScenarioTests/AccountOperationTests.cs @@ -290,7 +290,7 @@ public void ComputePolicyCrudTest() // validate compute policy CRUD // add another account - var computePolicy = clientToUse.ComputePolicy.CreateOrUpdate( + var computePolicy = clientToUse.ComputePolicies.CreateOrUpdate( commonData.ResourceGroupName, adlaAccountName, groupPolicyName, @@ -308,7 +308,7 @@ public void ComputePolicyCrudTest() Assert.Equal(AADObjectType.Group, computePolicy.ObjectType); // Get the compute policy - computePolicy = clientToUse.ComputePolicy.Get( + computePolicy = clientToUse.ComputePolicies.Get( commonData.ResourceGroupName, adlaAccountName, groupPolicyName); @@ -319,19 +319,19 @@ public void ComputePolicyCrudTest() Assert.Equal(AADObjectType.Group, computePolicy.ObjectType); // list all policies - var policyList = clientToUse.ComputePolicy.ListByAccount( + var policyList = clientToUse.ComputePolicies.ListByAccount( commonData.ResourceGroupName, adlaAccountName); Assert.Equal(2, policyList.Count()); // Remove the new policy - clientToUse.ComputePolicy.Delete( + clientToUse.ComputePolicies.Delete( commonData.ResourceGroupName, adlaAccountName, groupPolicyName); - policyList = clientToUse.ComputePolicy.ListByAccount( + policyList = clientToUse.ComputePolicies.ListByAccount( commonData.ResourceGroupName, adlaAccountName); diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePolicyOperations.cs b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePoliciesOperations.cs similarity index 99% rename from src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePolicyOperations.cs rename to src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePoliciesOperations.cs index cf88c0b28900..56e22537dd81 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePolicyOperations.cs +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePoliciesOperations.cs @@ -24,12 +24,12 @@ namespace Microsoft.Azure.Management.DataLake.Analytics using System.Threading.Tasks; /// - /// ComputePolicyOperations operations. + /// ComputePoliciesOperations operations. /// - internal partial class ComputePolicyOperations : IServiceOperations, IComputePolicyOperations + internal partial class ComputePoliciesOperations : IServiceOperations, IComputePoliciesOperations { /// - /// Initializes a new instance of the ComputePolicyOperations class. + /// Initializes a new instance of the ComputePoliciesOperations class. /// /// /// Reference to the service client. @@ -37,7 +37,7 @@ internal partial class ComputePolicyOperations : IServiceOperations /// Thrown when a required parameter is null /// - internal ComputePolicyOperations(DataLakeAnalyticsAccountManagementClient client) + internal ComputePoliciesOperations(DataLakeAnalyticsAccountManagementClient client) { if (client == null) { diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePolicyOperationsExtensions.cs b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePoliciesOperationsExtensions.cs similarity index 87% rename from src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePolicyOperationsExtensions.cs rename to src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePoliciesOperationsExtensions.cs index c89c3887c9e2..76db89835294 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePolicyOperationsExtensions.cs +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/ComputePoliciesOperationsExtensions.cs @@ -18,9 +18,9 @@ namespace Microsoft.Azure.Management.DataLake.Analytics using System.Threading.Tasks; /// - /// Extension methods for ComputePolicyOperations. + /// Extension methods for ComputePoliciesOperations. /// - public static partial class ComputePolicyOperationsExtensions + public static partial class ComputePoliciesOperationsExtensions { /// /// Creates or updates the specified compute policy. During update, the compute @@ -46,7 +46,7 @@ public static partial class ComputePolicyOperationsExtensions /// of parallelism per job property, min priority per job property, or both /// must be present. /// - public static ComputePolicy CreateOrUpdate(this IComputePolicyOperations operations, string resourceGroupName, string accountName, string computePolicyName, ComputePolicyCreateOrUpdateParameters parameters) + public static ComputePolicy CreateOrUpdate(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, string computePolicyName, ComputePolicyCreateOrUpdateParameters parameters) { return operations.CreateOrUpdateAsync(resourceGroupName, accountName, computePolicyName, parameters).GetAwaiter().GetResult(); } @@ -78,7 +78,7 @@ public static ComputePolicy CreateOrUpdate(this IComputePolicyOperations operati /// /// The cancellation token. /// - public static async Task CreateOrUpdateAsync(this IComputePolicyOperations operations, string resourceGroupName, string accountName, string computePolicyName, ComputePolicyCreateOrUpdateParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task CreateOrUpdateAsync(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, string computePolicyName, ComputePolicyCreateOrUpdateParameters parameters, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.CreateOrUpdateWithHttpMessagesAsync(resourceGroupName, accountName, computePolicyName, parameters, null, cancellationToken).ConfigureAwait(false)) { @@ -106,7 +106,7 @@ public static ComputePolicy CreateOrUpdate(this IComputePolicyOperations operati /// /// Parameters supplied to update the compute policy. /// - public static ComputePolicy Update(this IComputePolicyOperations operations, string resourceGroupName, string accountName, string computePolicyName, ComputePolicy parameters = default(ComputePolicy)) + public static ComputePolicy Update(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, string computePolicyName, ComputePolicy parameters = default(ComputePolicy)) { return operations.UpdateAsync(resourceGroupName, accountName, computePolicyName, parameters).GetAwaiter().GetResult(); } @@ -134,7 +134,7 @@ public static ComputePolicy CreateOrUpdate(this IComputePolicyOperations operati /// /// The cancellation token. /// - public static async Task UpdateAsync(this IComputePolicyOperations operations, string resourceGroupName, string accountName, string computePolicyName, ComputePolicy parameters = default(ComputePolicy), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task UpdateAsync(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, string computePolicyName, ComputePolicy parameters = default(ComputePolicy), CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, accountName, computePolicyName, parameters, null, cancellationToken).ConfigureAwait(false)) { @@ -160,7 +160,7 @@ public static ComputePolicy CreateOrUpdate(this IComputePolicyOperations operati /// /// The name of the compute policy to delete. /// - public static void Delete(this IComputePolicyOperations operations, string resourceGroupName, string accountName, string computePolicyName) + public static void Delete(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, string computePolicyName) { operations.DeleteAsync(resourceGroupName, accountName, computePolicyName).GetAwaiter().GetResult(); } @@ -186,7 +186,7 @@ public static void Delete(this IComputePolicyOperations operations, string resou /// /// The cancellation token. /// - public static async Task DeleteAsync(this IComputePolicyOperations operations, string resourceGroupName, string accountName, string computePolicyName, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task DeleteAsync(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, string computePolicyName, CancellationToken cancellationToken = default(CancellationToken)) { (await operations.DeleteWithHttpMessagesAsync(resourceGroupName, accountName, computePolicyName, null, cancellationToken).ConfigureAwait(false)).Dispose(); } @@ -208,7 +208,7 @@ public static void Delete(this IComputePolicyOperations operations, string resou /// /// The name of the compute policy to retrieve. /// - public static ComputePolicy Get(this IComputePolicyOperations operations, string resourceGroupName, string accountName, string computePolicyName) + public static ComputePolicy Get(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, string computePolicyName) { return operations.GetAsync(resourceGroupName, accountName, computePolicyName).GetAwaiter().GetResult(); } @@ -233,7 +233,7 @@ public static ComputePolicy Get(this IComputePolicyOperations operations, string /// /// The cancellation token. /// - public static async Task GetAsync(this IComputePolicyOperations operations, string resourceGroupName, string accountName, string computePolicyName, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetAsync(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, string computePolicyName, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, accountName, computePolicyName, null, cancellationToken).ConfigureAwait(false)) { @@ -256,7 +256,7 @@ public static ComputePolicy Get(this IComputePolicyOperations operations, string /// The name of the Data Lake Analytics account from which to get the compute /// policies. /// - public static IPage ListByAccount(this IComputePolicyOperations operations, string resourceGroupName, string accountName) + public static IPage ListByAccount(this IComputePoliciesOperations operations, string resourceGroupName, string accountName) { return operations.ListByAccountAsync(resourceGroupName, accountName).GetAwaiter().GetResult(); } @@ -279,7 +279,7 @@ public static IPage ListByAccount(this IComputePolicyOperations o /// /// The cancellation token. /// - public static async Task> ListByAccountAsync(this IComputePolicyOperations operations, string resourceGroupName, string accountName, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListByAccountAsync(this IComputePoliciesOperations operations, string resourceGroupName, string accountName, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListByAccountWithHttpMessagesAsync(resourceGroupName, accountName, null, cancellationToken).ConfigureAwait(false)) { @@ -297,7 +297,7 @@ public static IPage ListByAccount(this IComputePolicyOperations o /// /// The NextLink from the previous successful call to List operation. /// - public static IPage ListByAccountNext(this IComputePolicyOperations operations, string nextPageLink) + public static IPage ListByAccountNext(this IComputePoliciesOperations operations, string nextPageLink) { return operations.ListByAccountNextAsync(nextPageLink).GetAwaiter().GetResult(); } @@ -315,7 +315,7 @@ public static IPage ListByAccountNext(this IComputePolicyOperatio /// /// The cancellation token. /// - public static async Task> ListByAccountNextAsync(this IComputePolicyOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListByAccountNextAsync(this IComputePoliciesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListByAccountNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) { diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/DataLakeAnalyticsAccountManagementClient.cs b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/DataLakeAnalyticsAccountManagementClient.cs index 2a8ba217b3f5..d5d9b73ed99e 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/DataLakeAnalyticsAccountManagementClient.cs +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/DataLakeAnalyticsAccountManagementClient.cs @@ -77,9 +77,9 @@ public partial class DataLakeAnalyticsAccountManagementClient : ServiceClient - /// Gets the IComputePolicyOperations. + /// Gets the IComputePoliciesOperations. /// - public virtual IComputePolicyOperations ComputePolicy { get; private set; } + public virtual IComputePoliciesOperations ComputePolicies { get; private set; } /// /// Gets the IFirewallRulesOperations. @@ -302,7 +302,7 @@ internal DataLakeAnalyticsAccountManagementClient(System.Uri baseUri, ServiceCli /// private void Initialize() { - ComputePolicy = new ComputePolicyOperations(this); + ComputePolicies = new ComputePoliciesOperations(this); FirewallRules = new FirewallRulesOperations(this); StorageAccounts = new StorageAccountsOperations(this); DataLakeStoreAccounts = new DataLakeStoreAccountsOperations(this); diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IComputePolicyOperations.cs b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IComputePoliciesOperations.cs similarity index 99% rename from src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IComputePolicyOperations.cs rename to src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IComputePoliciesOperations.cs index a133c0d781a2..48ede85c975d 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IComputePolicyOperations.cs +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IComputePoliciesOperations.cs @@ -20,9 +20,9 @@ namespace Microsoft.Azure.Management.DataLake.Analytics using System.Threading.Tasks; /// - /// ComputePolicyOperations operations. + /// ComputePoliciesOperations operations. /// - public partial interface IComputePolicyOperations + public partial interface IComputePoliciesOperations { /// /// Creates or updates the specified compute policy. During update, the diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IDataLakeAnalyticsAccountManagementClient.cs b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IDataLakeAnalyticsAccountManagementClient.cs index 1d7f124b52ab..db2d2c4f7037 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IDataLakeAnalyticsAccountManagementClient.cs +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/Generated/IDataLakeAnalyticsAccountManagementClient.cs @@ -72,9 +72,9 @@ public partial interface IDataLakeAnalyticsAccountManagementClient : System.IDis /// - /// Gets the IComputePolicyOperations. + /// Gets the IComputePoliciesOperations. /// - IComputePolicyOperations ComputePolicy { get; } + IComputePoliciesOperations ComputePolicies { get; } /// /// Gets the IFirewallRulesOperations. diff --git a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/generate.cmd b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/generate.cmd index f2e70b03c090..e0eb69eba319 100644 --- a/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/generate.cmd +++ b/src/SDKs/DataLake.Analytics/Management.DataLake.Analytics/generate.cmd @@ -6,9 +6,9 @@ @echo off setlocal -set accountSpecFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/156cd442edf6badb940149878cecfba2d3198776/arm-datalake-analytics/account/2016-11-01/swagger/account.json" -set jobSpecFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/156cd442edf6badb940149878cecfba2d3198776/arm-datalake-analytics/job/2016-11-01/swagger/job.json" -set catalogSpecFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/156cd442edf6badb940149878cecfba2d3198776/arm-datalake-analytics/catalog/2016-11-01/swagger/catalog.json" +set accountSpecFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/12b641f181711ec1e9a50f1dcfc7861721aa3242/arm-datalake-analytics/account/2016-11-01/swagger/account.json" +set jobSpecFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/12b641f181711ec1e9a50f1dcfc7861721aa3242/arm-datalake-analytics/job/2016-11-01/swagger/job.json" +set catalogSpecFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/12b641f181711ec1e9a50f1dcfc7861721aa3242/arm-datalake-analytics/catalog/2016-11-01/swagger/catalog.json" set repoRoot=%~dp0..\..\..\.. set generateFolder=%~dp0Generated