@azure/arm-billing 3.1.1 → 4.0.0

package/src/operations/products.ts

@@ -1,165 +1,415 @@
 /*
- * Copyright (c) Microsoft Corporation. All rights reserved.
- * Licensed under the MIT License. See License.txt in the project root for
- * license information.
+ * Copyright (c) Microsoft Corporation.
+ * Licensed under the MIT License.
  *
  * Code generated by Microsoft (R) AutoRest Code Generator.
- * Changes may cause incorrect behavior and will be lost if the code is
- * regenerated.
+ * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import * as msRest from "@azure/ms-rest-js";
-import * as Models from "../models";
-import * as Mappers from "../models/productsMappers";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { Products } from "../operationsInterfaces";
+import * as coreClient from "@azure/core-client";
+import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { BillingManagementClientContext } from "../billingManagementClientContext";
+import { BillingManagementClient } from "../billingManagementClient";
+import {
+  Product,
+  ProductsListByCustomerNextOptionalParams,
+  ProductsListByCustomerOptionalParams,
+  ProductsListByBillingAccountNextOptionalParams,
+  ProductsListByBillingAccountOptionalParams,
+  ProductsListByBillingProfileNextOptionalParams,
+  ProductsListByBillingProfileOptionalParams,
+  ProductsListByInvoiceSectionNextOptionalParams,
+  ProductsListByInvoiceSectionOptionalParams,
+  ProductsListByCustomerResponse,
+  ProductsListByBillingAccountResponse,
+  ProductsListByBillingProfileResponse,
+  ProductsListByInvoiceSectionResponse,
+  ProductsGetOptionalParams,
+  ProductsGetResponse,
+  ProductsUpdateOptionalParams,
+  ProductsUpdateResponse,
+  TransferProductRequestProperties,
+  ProductsMoveOptionalParams,
+  ProductsMoveResponse,
+  ProductsValidateMoveOptionalParams,
+  ProductsValidateMoveResponse,
+  ProductsListByCustomerNextResponse,
+  ProductsListByBillingAccountNextResponse,
+  ProductsListByBillingProfileNextResponse,
+  ProductsListByInvoiceSectionNextResponse
+} from "../models";
 
-/** Class representing a Products. */
-export class Products {
-  private readonly client: BillingManagementClientContext;
+/// <reference lib="esnext.asynciterable" />
+/** Class containing Products operations. */
+export class ProductsImpl implements Products {
+  private readonly client: BillingManagementClient;
 
   /**
-   * Create a Products.
-   * @param {BillingManagementClientContext} client Reference to the service client.
+   * Initialize a new instance of the class Products class.
+   * @param client Reference to the service client
    */
-  constructor(client: BillingManagementClientContext) {
+  constructor(client: BillingManagementClient) {
     this.client = client;
   }
 
   /**
-   * Lists the products for a customer. These don't include products billed based on usage.The
-   * operation is supported only for billing accounts with agreement type Microsoft Partner
-   * Agreement.
+   * Lists the products for a customer. These don't include products billed based on usage.The operation
+   * is supported only for billing accounts with agreement type Microsoft Partner Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param customerName The ID that uniquely identifies a customer.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsListByCustomerResponse>
-   */
-  listByCustomer(billingAccountName: string, customerName: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductsListByCustomerResponse>;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param customerName The ID that uniquely identifies a customer.
-   * @param callback The callback
-   */
-  listByCustomer(billingAccountName: string, customerName: string, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param customerName The ID that uniquely identifies a customer.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listByCustomer(billingAccountName: string, customerName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  listByCustomer(billingAccountName: string, customerName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductsListResult>, callback?: msRest.ServiceCallback<Models.ProductsListResult>): Promise<Models.ProductsListByCustomerResponse> {
-    return this.client.sendOperationRequest(
-      {
+   * @param options The options parameters.
+   */
+  public listByCustomer(
+    billingAccountName: string,
+    customerName: string,
+    options?: ProductsListByCustomerOptionalParams
+  ): PagedAsyncIterableIterator<Product> {
+    const iter = this.listByCustomerPagingAll(
+      billingAccountName,
+      customerName,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listByCustomerPagingPage(
+          billingAccountName,
+          customerName,
+          options
+        );
+      }
+    };
+  }
+
+  private async *listByCustomerPagingPage(
+    billingAccountName: string,
+    customerName: string,
+    options?: ProductsListByCustomerOptionalParams
+  ): AsyncIterableIterator<Product[]> {
+    let result = await this._listByCustomer(
+      billingAccountName,
+      customerName,
+      options
+    );
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listByCustomerNext(
         billingAccountName,
         customerName,
+        continuationToken,
         options
-      },
-      listByCustomerOperationSpec,
-      callback) as Promise<Models.ProductsListByCustomerResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listByCustomerPagingAll(
+    billingAccountName: string,
+    customerName: string,
+    options?: ProductsListByCustomerOptionalParams
+  ): AsyncIterableIterator<Product> {
+    for await (const page of this.listByCustomerPagingPage(
+      billingAccountName,
+      customerName,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
-   * Lists the products for a billing account. These don't include products billed based on usage.
-   * The operation is supported for billing accounts with agreement type Microsoft Customer Agreement
-   * or Microsoft Partner Agreement.
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsListByBillingAccountResponse>
-   */
-  listByBillingAccount(billingAccountName: string, options?: Models.ProductsListByBillingAccountOptionalParams): Promise<Models.ProductsListByBillingAccountResponse>;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param callback The callback
-   */
-  listByBillingAccount(billingAccountName: string, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  /**
+   * Lists the products for a billing account. These don't include products billed based on usage. The
+   * operation is supported for billing accounts with agreement type Microsoft Customer Agreement or
+   * Microsoft Partner Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listByBillingAccount(billingAccountName: string, options: Models.ProductsListByBillingAccountOptionalParams, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  listByBillingAccount(billingAccountName: string, options?: Models.ProductsListByBillingAccountOptionalParams | msRest.ServiceCallback<Models.ProductsListResult>, callback?: msRest.ServiceCallback<Models.ProductsListResult>): Promise<Models.ProductsListByBillingAccountResponse> {
-    return this.client.sendOperationRequest(
-      {
+   * @param options The options parameters.
+   */
+  public listByBillingAccount(
+    billingAccountName: string,
+    options?: ProductsListByBillingAccountOptionalParams
+  ): PagedAsyncIterableIterator<Product> {
+    const iter = this.listByBillingAccountPagingAll(
+      billingAccountName,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listByBillingAccountPagingPage(billingAccountName, options);
+      }
+    };
+  }
+
+  private async *listByBillingAccountPagingPage(
+    billingAccountName: string,
+    options?: ProductsListByBillingAccountOptionalParams
+  ): AsyncIterableIterator<Product[]> {
+    let result = await this._listByBillingAccount(billingAccountName, options);
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listByBillingAccountNext(
         billingAccountName,
+        continuationToken,
         options
-      },
-      listByBillingAccountOperationSpec,
-      callback) as Promise<Models.ProductsListByBillingAccountResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listByBillingAccountPagingAll(
+    billingAccountName: string,
+    options?: ProductsListByBillingAccountOptionalParams
+  ): AsyncIterableIterator<Product> {
+    for await (const page of this.listByBillingAccountPagingPage(
+      billingAccountName,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
-   * Lists the products for a billing profile. These don't include products billed based on usage.
-   * The operation is supported for billing accounts with agreement type Microsoft Customer Agreement
-   * or Microsoft Partner Agreement.
+   * Lists the products for a billing profile. These don't include products billed based on usage. The
+   * operation is supported for billing accounts with agreement type Microsoft Customer Agreement or
+   * Microsoft Partner Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param billingProfileName The ID that uniquely identifies a billing profile.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsListByBillingProfileResponse>
-   */
-  listByBillingProfile(billingAccountName: string, billingProfileName: string, options?: Models.ProductsListByBillingProfileOptionalParams): Promise<Models.ProductsListByBillingProfileResponse>;
+   * @param options The options parameters.
+   */
+  public listByBillingProfile(
+    billingAccountName: string,
+    billingProfileName: string,
+    options?: ProductsListByBillingProfileOptionalParams
+  ): PagedAsyncIterableIterator<Product> {
+    const iter = this.listByBillingProfilePagingAll(
+      billingAccountName,
+      billingProfileName,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listByBillingProfilePagingPage(
+          billingAccountName,
+          billingProfileName,
+          options
+        );
+      }
+    };
+  }
+
+  private async *listByBillingProfilePagingPage(
+    billingAccountName: string,
+    billingProfileName: string,
+    options?: ProductsListByBillingProfileOptionalParams
+  ): AsyncIterableIterator<Product[]> {
+    let result = await this._listByBillingProfile(
+      billingAccountName,
+      billingProfileName,
+      options
+    );
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listByBillingProfileNext(
+        billingAccountName,
+        billingProfileName,
+        continuationToken,
+        options
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listByBillingProfilePagingAll(
+    billingAccountName: string,
+    billingProfileName: string,
+    options?: ProductsListByBillingProfileOptionalParams
+  ): AsyncIterableIterator<Product> {
+    for await (const page of this.listByBillingProfilePagingPage(
+      billingAccountName,
+      billingProfileName,
+      options
+    )) {
+      yield* page;
+    }
+  }
+
   /**
+   * Lists the products for an invoice section. These don't include products billed based on usage. The
+   * operation is supported only for billing accounts with agreement type Microsoft Customer Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param billingProfileName The ID that uniquely identifies a billing profile.
-   * @param callback The callback
-   */
-  listByBillingProfile(billingAccountName: string, billingProfileName: string, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
+   * @param invoiceSectionName The ID that uniquely identifies an invoice section.
+   * @param options The options parameters.
+   */
+  public listByInvoiceSection(
+    billingAccountName: string,
+    billingProfileName: string,
+    invoiceSectionName: string,
+    options?: ProductsListByInvoiceSectionOptionalParams
+  ): PagedAsyncIterableIterator<Product> {
+    const iter = this.listByInvoiceSectionPagingAll(
+      billingAccountName,
+      billingProfileName,
+      invoiceSectionName,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listByInvoiceSectionPagingPage(
+          billingAccountName,
+          billingProfileName,
+          invoiceSectionName,
+          options
+        );
+      }
+    };
+  }
+
+  private async *listByInvoiceSectionPagingPage(
+    billingAccountName: string,
+    billingProfileName: string,
+    invoiceSectionName: string,
+    options?: ProductsListByInvoiceSectionOptionalParams
+  ): AsyncIterableIterator<Product[]> {
+    let result = await this._listByInvoiceSection(
+      billingAccountName,
+      billingProfileName,
+      invoiceSectionName,
+      options
+    );
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listByInvoiceSectionNext(
+        billingAccountName,
+        billingProfileName,
+        invoiceSectionName,
+        continuationToken,
+        options
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listByInvoiceSectionPagingAll(
+    billingAccountName: string,
+    billingProfileName: string,
+    invoiceSectionName: string,
+    options?: ProductsListByInvoiceSectionOptionalParams
+  ): AsyncIterableIterator<Product> {
+    for await (const page of this.listByInvoiceSectionPagingPage(
+      billingAccountName,
+      billingProfileName,
+      invoiceSectionName,
+      options
+    )) {
+      yield* page;
+    }
+  }
+
   /**
+   * Lists the products for a customer. These don't include products billed based on usage.The operation
+   * is supported only for billing accounts with agreement type Microsoft Partner Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param billingProfileName The ID that uniquely identifies a billing profile.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param customerName The ID that uniquely identifies a customer.
+   * @param options The options parameters.
    */
-  listByBillingProfile(billingAccountName: string, billingProfileName: string, options: Models.ProductsListByBillingProfileOptionalParams, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  listByBillingProfile(billingAccountName: string, billingProfileName: string, options?: Models.ProductsListByBillingProfileOptionalParams | msRest.ServiceCallback<Models.ProductsListResult>, callback?: msRest.ServiceCallback<Models.ProductsListResult>): Promise<Models.ProductsListByBillingProfileResponse> {
+  private _listByCustomer(
+    billingAccountName: string,
+    customerName: string,
+    options?: ProductsListByCustomerOptionalParams
+  ): Promise<ProductsListByCustomerResponse> {
     return this.client.sendOperationRequest(
-      {
-        billingAccountName,
-        billingProfileName,
-        options
-      },
-      listByBillingProfileOperationSpec,
-      callback) as Promise<Models.ProductsListByBillingProfileResponse>;
+      { billingAccountName, customerName, options },
+      listByCustomerOperationSpec
+    );
   }
 
   /**
-   * Lists the products for an invoice section. These don't include products billed based on usage.
-   * The operation is supported only for billing accounts with agreement type Microsoft Customer
-   * Agreement.
+   * Lists the products for a billing account. These don't include products billed based on usage. The
+   * operation is supported for billing accounts with agreement type Microsoft Customer Agreement or
+   * Microsoft Partner Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param billingProfileName The ID that uniquely identifies a billing profile.
-   * @param invoiceSectionName The ID that uniquely identifies an invoice section.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsListByInvoiceSectionResponse>
+   * @param options The options parameters.
    */
-  listByInvoiceSection(billingAccountName: string, billingProfileName: string, invoiceSectionName: string, options?: Models.ProductsListByInvoiceSectionOptionalParams): Promise<Models.ProductsListByInvoiceSectionResponse>;
+  private _listByBillingAccount(
+    billingAccountName: string,
+    options?: ProductsListByBillingAccountOptionalParams
+  ): Promise<ProductsListByBillingAccountResponse> {
+    return this.client.sendOperationRequest(
+      { billingAccountName, options },
+      listByBillingAccountOperationSpec
+    );
+  }
+
   /**
+   * Lists the products for a billing profile. These don't include products billed based on usage. The
+   * operation is supported for billing accounts with agreement type Microsoft Customer Agreement or
+   * Microsoft Partner Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param billingProfileName The ID that uniquely identifies a billing profile.
-   * @param invoiceSectionName The ID that uniquely identifies an invoice section.
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  listByInvoiceSection(billingAccountName: string, billingProfileName: string, invoiceSectionName: string, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
+  private _listByBillingProfile(
+    billingAccountName: string,
+    billingProfileName: string,
+    options?: ProductsListByBillingProfileOptionalParams
+  ): Promise<ProductsListByBillingProfileResponse> {
+    return this.client.sendOperationRequest(
+      { billingAccountName, billingProfileName, options },
+      listByBillingProfileOperationSpec
+    );
+  }
+
   /**
+   * Lists the products for an invoice section. These don't include products billed based on usage. The
+   * operation is supported only for billing accounts with agreement type Microsoft Customer Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param billingProfileName The ID that uniquely identifies a billing profile.
    * @param invoiceSectionName The ID that uniquely identifies an invoice section.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listByInvoiceSection(billingAccountName: string, billingProfileName: string, invoiceSectionName: string, options: Models.ProductsListByInvoiceSectionOptionalParams, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  listByInvoiceSection(billingAccountName: string, billingProfileName: string, invoiceSectionName: string, options?: Models.ProductsListByInvoiceSectionOptionalParams | msRest.ServiceCallback<Models.ProductsListResult>, callback?: msRest.ServiceCallback<Models.ProductsListResult>): Promise<Models.ProductsListByInvoiceSectionResponse> {
+   * @param options The options parameters.
+   */
+  private _listByInvoiceSection(
+    billingAccountName: string,
+    billingProfileName: string,
+    invoiceSectionName: string,
+    options?: ProductsListByInvoiceSectionOptionalParams
+  ): Promise<ProductsListByInvoiceSectionResponse> {
     return this.client.sendOperationRequest(
-      {
-        billingAccountName,
-        billingProfileName,
-        invoiceSectionName,
-        options
-      },
-      listByInvoiceSectionOperationSpec,
-      callback) as Promise<Models.ProductsListByInvoiceSectionResponse>;
+      { billingAccountName, billingProfileName, invoiceSectionName, options },
+      listByInvoiceSectionOperationSpec
+    );
   }
 
   /**
@@ -167,32 +417,17 @@ export class Products {
    * Microsoft Customer Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param productName The ID that uniquely identifies a product.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsGetResponse>
-   */
-  get(billingAccountName: string, productName: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductsGetResponse>;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param productName The ID that uniquely identifies a product.
-   * @param callback The callback
-   */
-  get(billingAccountName: string, productName: string, callback: msRest.ServiceCallback<Models.Product>): void;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param productName The ID that uniquely identifies a product.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  get(billingAccountName: string, productName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Product>): void;
-  get(billingAccountName: string, productName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Product>, callback?: msRest.ServiceCallback<Models.Product>): Promise<Models.ProductsGetResponse> {
+  get(
+    billingAccountName: string,
+    productName: string,
+    options?: ProductsGetOptionalParams
+  ): Promise<ProductsGetResponse> {
     return this.client.sendOperationRequest(
-      {
-        billingAccountName,
-        productName,
-        options
-      },
-      getOperationSpec,
-      callback) as Promise<Models.ProductsGetResponse>;
+      { billingAccountName, productName, options },
+      getOperationSpec
+    );
   }
 
   /**
@@ -201,242 +436,152 @@ export class Products {
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param productName The ID that uniquely identifies a product.
    * @param parameters Request parameters that are provided to the update product operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsUpdateResponse>
-   */
-  update(billingAccountName: string, productName: string, parameters: Models.Product, options?: msRest.RequestOptionsBase): Promise<Models.ProductsUpdateResponse>;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param productName The ID that uniquely identifies a product.
-   * @param parameters Request parameters that are provided to the update product operation.
-   * @param callback The callback
-   */
-  update(billingAccountName: string, productName: string, parameters: Models.Product, callback: msRest.ServiceCallback<Models.Product>): void;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param productName The ID that uniquely identifies a product.
-   * @param parameters Request parameters that are provided to the update product operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  update(billingAccountName: string, productName: string, parameters: Models.Product, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Product>): void;
-  update(billingAccountName: string, productName: string, parameters: Models.Product, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Product>, callback?: msRest.ServiceCallback<Models.Product>): Promise<Models.ProductsUpdateResponse> {
+   * @param options The options parameters.
+   */
+  update(
+    billingAccountName: string,
+    productName: string,
+    parameters: Product,
+    options?: ProductsUpdateOptionalParams
+  ): Promise<ProductsUpdateResponse> {
     return this.client.sendOperationRequest(
-      {
-        billingAccountName,
-        productName,
-        parameters,
-        options
-      },
-      updateOperationSpec,
-      callback) as Promise<Models.ProductsUpdateResponse>;
+      { billingAccountName, productName, parameters, options },
+      updateOperationSpec
+    );
   }
 
   /**
-   * Moves a product's charges to a new invoice section. The new invoice section must belong to the
-   * same billing profile as the existing invoice section. This operation is supported only for
-   * products that are purchased with a recurring charge and for billing accounts with agreement type
-   * Microsoft Customer Agreement.
+   * Moves a product's charges to a new invoice section. The new invoice section must belong to the same
+   * billing profile as the existing invoice section. This operation is supported only for products that
+   * are purchased with a recurring charge and for billing accounts with agreement type Microsoft
+   * Customer Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param productName The ID that uniquely identifies a product.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsMoveResponse>
-   */
-  move(billingAccountName: string, productName: string, options?: Models.ProductsMoveOptionalParams): Promise<Models.ProductsMoveResponse>;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param productName The ID that uniquely identifies a product.
-   * @param callback The callback
-   */
-  move(billingAccountName: string, productName: string, callback: msRest.ServiceCallback<Models.Product>): void;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param productName The ID that uniquely identifies a product.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  move(billingAccountName: string, productName: string, options: Models.ProductsMoveOptionalParams, callback: msRest.ServiceCallback<Models.Product>): void;
-  move(billingAccountName: string, productName: string, options?: Models.ProductsMoveOptionalParams | msRest.ServiceCallback<Models.Product>, callback?: msRest.ServiceCallback<Models.Product>): Promise<Models.ProductsMoveResponse> {
+   * @param parameters Request parameters that are provided to the move product operation.
+   * @param options The options parameters.
+   */
+  move(
+    billingAccountName: string,
+    productName: string,
+    parameters: TransferProductRequestProperties,
+    options?: ProductsMoveOptionalParams
+  ): Promise<ProductsMoveResponse> {
     return this.client.sendOperationRequest(
-      {
-        billingAccountName,
-        productName,
-        options
-      },
-      moveOperationSpec,
-      callback) as Promise<Models.ProductsMoveResponse>;
+      { billingAccountName, productName, parameters, options },
+      moveOperationSpec
+    );
   }
 
   /**
-   * Validates if a product's charges can be moved to a new invoice section. This operation is
-   * supported only for products that are purchased with a recurring charge and for billing accounts
-   * with agreement type Microsoft Customer Agreement.
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param productName The ID that uniquely identifies a product.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsValidateMoveResponse>
-   */
-  validateMove(billingAccountName: string, productName: string, options?: Models.ProductsValidateMoveOptionalParams): Promise<Models.ProductsValidateMoveResponse>;
-  /**
+   * Validates if a product's charges can be moved to a new invoice section. This operation is supported
+   * only for products that are purchased with a recurring charge and for billing accounts with agreement
+   * type Microsoft Customer Agreement.
    * @param billingAccountName The ID that uniquely identifies a billing account.
    * @param productName The ID that uniquely identifies a product.
-   * @param callback The callback
-   */
-  validateMove(billingAccountName: string, productName: string, callback: msRest.ServiceCallback<Models.ValidateProductTransferEligibilityResult>): void;
-  /**
-   * @param billingAccountName The ID that uniquely identifies a billing account.
-   * @param productName The ID that uniquely identifies a product.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  validateMove(billingAccountName: string, productName: string, options: Models.ProductsValidateMoveOptionalParams, callback: msRest.ServiceCallback<Models.ValidateProductTransferEligibilityResult>): void;
-  validateMove(billingAccountName: string, productName: string, options?: Models.ProductsValidateMoveOptionalParams | msRest.ServiceCallback<Models.ValidateProductTransferEligibilityResult>, callback?: msRest.ServiceCallback<Models.ValidateProductTransferEligibilityResult>): Promise<Models.ProductsValidateMoveResponse> {
+   * @param parameters Request parameters that are provided to the validate move eligibility operation.
+   * @param options The options parameters.
+   */
+  validateMove(
+    billingAccountName: string,
+    productName: string,
+    parameters: TransferProductRequestProperties,
+    options?: ProductsValidateMoveOptionalParams
+  ): Promise<ProductsValidateMoveResponse> {
     return this.client.sendOperationRequest(
-      {
-        billingAccountName,
-        productName,
-        options
-      },
-      validateMoveOperationSpec,
-      callback) as Promise<Models.ProductsValidateMoveResponse>;
+      { billingAccountName, productName, parameters, options },
+      validateMoveOperationSpec
+    );
   }
 
   /**
-   * Lists the products for a customer. These don't include products billed based on usage.The
-   * operation is supported only for billing accounts with agreement type Microsoft Partner
-   * Agreement.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsListByCustomerNextResponse>
-   */
-  listByCustomerNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductsListByCustomerNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listByCustomerNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listByCustomerNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  listByCustomerNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductsListResult>, callback?: msRest.ServiceCallback<Models.ProductsListResult>): Promise<Models.ProductsListByCustomerNextResponse> {
+   * ListByCustomerNext
+   * @param billingAccountName The ID that uniquely identifies a billing account.
+   * @param customerName The ID that uniquely identifies a customer.
+   * @param nextLink The nextLink from the previous successful call to the ListByCustomer method.
+   * @param options The options parameters.
+   */
+  private _listByCustomerNext(
+    billingAccountName: string,
+    customerName: string,
+    nextLink: string,
+    options?: ProductsListByCustomerNextOptionalParams
+  ): Promise<ProductsListByCustomerNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listByCustomerNextOperationSpec,
-      callback) as Promise<Models.ProductsListByCustomerNextResponse>;
+      { billingAccountName, customerName, nextLink, options },
+      listByCustomerNextOperationSpec
+    );
   }
 
   /**
-   * Lists the products for a billing account. These don't include products billed based on usage.
-   * The operation is supported for billing accounts with agreement type Microsoft Customer Agreement
-   * or Microsoft Partner Agreement.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsListByBillingAccountNextResponse>
-   */
-  listByBillingAccountNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductsListByBillingAccountNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listByBillingAccountNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listByBillingAccountNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  listByBillingAccountNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductsListResult>, callback?: msRest.ServiceCallback<Models.ProductsListResult>): Promise<Models.ProductsListByBillingAccountNextResponse> {
+   * ListByBillingAccountNext
+   * @param billingAccountName The ID that uniquely identifies a billing account.
+   * @param nextLink The nextLink from the previous successful call to the ListByBillingAccount method.
+   * @param options The options parameters.
+   */
+  private _listByBillingAccountNext(
+    billingAccountName: string,
+    nextLink: string,
+    options?: ProductsListByBillingAccountNextOptionalParams
+  ): Promise<ProductsListByBillingAccountNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listByBillingAccountNextOperationSpec,
-      callback) as Promise<Models.ProductsListByBillingAccountNextResponse>;
+      { billingAccountName, nextLink, options },
+      listByBillingAccountNextOperationSpec
+    );
   }
 
   /**
-   * Lists the products for a billing profile. These don't include products billed based on usage.
-   * The operation is supported for billing accounts with agreement type Microsoft Customer Agreement
-   * or Microsoft Partner Agreement.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsListByBillingProfileNextResponse>
-   */
-  listByBillingProfileNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductsListByBillingProfileNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listByBillingProfileNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listByBillingProfileNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  listByBillingProfileNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductsListResult>, callback?: msRest.ServiceCallback<Models.ProductsListResult>): Promise<Models.ProductsListByBillingProfileNextResponse> {
+   * ListByBillingProfileNext
+   * @param billingAccountName The ID that uniquely identifies a billing account.
+   * @param billingProfileName The ID that uniquely identifies a billing profile.
+   * @param nextLink The nextLink from the previous successful call to the ListByBillingProfile method.
+   * @param options The options parameters.
+   */
+  private _listByBillingProfileNext(
+    billingAccountName: string,
+    billingProfileName: string,
+    nextLink: string,
+    options?: ProductsListByBillingProfileNextOptionalParams
+  ): Promise<ProductsListByBillingProfileNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listByBillingProfileNextOperationSpec,
-      callback) as Promise<Models.ProductsListByBillingProfileNextResponse>;
+      { billingAccountName, billingProfileName, nextLink, options },
+      listByBillingProfileNextOperationSpec
+    );
   }
 
   /**
-   * Lists the products for an invoice section. These don't include products billed based on usage.
-   * The operation is supported only for billing accounts with agreement type Microsoft Customer
-   * Agreement.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ProductsListByInvoiceSectionNextResponse>
-   */
-  listByInvoiceSectionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ProductsListByInvoiceSectionNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listByInvoiceSectionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listByInvoiceSectionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.ProductsListResult>): void;
-  listByInvoiceSectionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.ProductsListResult>, callback?: msRest.ServiceCallback<Models.ProductsListResult>): Promise<Models.ProductsListByInvoiceSectionNextResponse> {
+   * ListByInvoiceSectionNext
+   * @param billingAccountName The ID that uniquely identifies a billing account.
+   * @param billingProfileName The ID that uniquely identifies a billing profile.
+   * @param invoiceSectionName The ID that uniquely identifies an invoice section.
+   * @param nextLink The nextLink from the previous successful call to the ListByInvoiceSection method.
+   * @param options The options parameters.
+   */
+  private _listByInvoiceSectionNext(
+    billingAccountName: string,
+    billingProfileName: string,
+    invoiceSectionName: string,
+    nextLink: string,
+    options?: ProductsListByInvoiceSectionNextOptionalParams
+  ): Promise<ProductsListByInvoiceSectionNextResponse> {
     return this.client.sendOperationRequest(
       {
-        nextPageLink,
+        billingAccountName,
+        billingProfileName,
+        invoiceSectionName,
+        nextLink,
         options
       },
-      listByInvoiceSectionNextOperationSpec,
-      callback) as Promise<Models.ProductsListByInvoiceSectionNextResponse>;
+      listByInvoiceSectionNextOperationSpec
+    );
   }
 }
-
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listByCustomerOperationSpec: msRest.OperationSpec = {
+const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
+
+const listByCustomerOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}/products",
   httpMethod: "GET",
-  path: "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/customers/{customerName}/products",
-  urlParameters: [
-    Parameters.billingAccountName,
-    Parameters.customerName
-  ],
-  queryParameters: [
-    Parameters.apiVersion0
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
   responses: {
     200: {
       bodyMapper: Mappers.ProductsListResult
@@ -445,22 +590,19 @@ const listByCustomerOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.billingAccountName,
+    Parameters.customerName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listByBillingAccountOperationSpec: msRest.OperationSpec = {
+const listByBillingAccountOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products",
   httpMethod: "GET",
-  path: "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products",
-  urlParameters: [
-    Parameters.billingAccountName
-  ],
-  queryParameters: [
-    Parameters.apiVersion0,
-    Parameters.filter
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
   responses: {
     200: {
       bodyMapper: Mappers.ProductsListResult
@@ -469,23 +611,15 @@ const listByBillingAccountOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion, Parameters.filter],
+  urlParameters: [Parameters.$host, Parameters.billingAccountName],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listByBillingProfileOperationSpec: msRest.OperationSpec = {
+const listByBillingProfileOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/products",
   httpMethod: "GET",
-  path: "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/products",
-  urlParameters: [
-    Parameters.billingAccountName,
-    Parameters.billingProfileName
-  ],
-  queryParameters: [
-    Parameters.apiVersion0,
-    Parameters.filter
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
   responses: {
     200: {
       bodyMapper: Mappers.ProductsListResult
@@ -494,24 +628,19 @@ const listByBillingProfileOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const listByInvoiceSectionOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/products",
+  queryParameters: [Parameters.apiVersion, Parameters.filter],
   urlParameters: [
+    Parameters.$host,
     Parameters.billingAccountName,
-    Parameters.billingProfileName,
-    Parameters.invoiceSectionName
-  ],
-  queryParameters: [
-    Parameters.apiVersion0,
-    Parameters.filter
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
+    Parameters.billingProfileName
   ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const listByInvoiceSectionOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/billingProfiles/{billingProfileName}/invoiceSections/{invoiceSectionName}/products",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.ProductsListResult
@@ -520,22 +649,20 @@ const listByInvoiceSectionOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const getOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}",
+  queryParameters: [Parameters.apiVersion, Parameters.filter],
   urlParameters: [
+    Parameters.$host,
     Parameters.billingAccountName,
-    Parameters.productName
-  ],
-  queryParameters: [
-    Parameters.apiVersion0
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
+    Parameters.billingProfileName,
+    Parameters.invoiceSectionName
   ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const getOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.Product
@@ -544,29 +671,19 @@ const getOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const updateOperationSpec: msRest.OperationSpec = {
-  httpMethod: "PATCH",
-  path: "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}",
+  queryParameters: [Parameters.apiVersion],
   urlParameters: [
+    Parameters.$host,
     Parameters.billingAccountName,
     Parameters.productName
   ],
-  queryParameters: [
-    Parameters.apiVersion0
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  requestBody: {
-    parameterPath: "parameters",
-    mapper: {
-      ...Mappers.Product,
-      required: true
-    }
-  },
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const updateOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}",
+  httpMethod: "PATCH",
   responses: {
     200: {
       bodyMapper: Mappers.Product
@@ -575,75 +692,47 @@ const updateOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const moveOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}/move",
+  requestBody: Parameters.parameters6,
+  queryParameters: [Parameters.apiVersion],
   urlParameters: [
+    Parameters.$host,
     Parameters.billingAccountName,
     Parameters.productName
   ],
-  queryParameters: [
-    Parameters.apiVersion0
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  requestBody: {
-    parameterPath: {
-      destinationInvoiceSectionId: [
-        "options",
-        "destinationInvoiceSectionId"
-      ]
-    },
-    mapper: {
-      ...Mappers.TransferProductRequestProperties,
-      required: true
-    }
-  },
+  headerParameters: [Parameters.accept, Parameters.contentType],
+  mediaType: "json",
+  serializer
+};
+const moveOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}/move",
+  httpMethod: "POST",
   responses: {
     200: {
-      bodyMapper: Mappers.Product,
-      headersMapper: Mappers.ProductsMoveHeaders
+      bodyMapper: Mappers.Product
     },
     202: {
       headersMapper: Mappers.ProductsMoveHeaders
     },
     default: {
-      bodyMapper: Mappers.ErrorResponse,
-      headersMapper: Mappers.ProductsMoveHeaders
+      bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const validateMoveOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}/validateMoveEligibility",
+  requestBody: Parameters.parameters7,
+  queryParameters: [Parameters.apiVersion],
   urlParameters: [
+    Parameters.$host,
     Parameters.billingAccountName,
     Parameters.productName
   ],
-  queryParameters: [
-    Parameters.apiVersion0
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  requestBody: {
-    parameterPath: {
-      destinationInvoiceSectionId: [
-        "options",
-        "destinationInvoiceSectionId"
-      ]
-    },
-    mapper: {
-      ...Mappers.TransferProductRequestProperties,
-      required: true
-    }
-  },
+  headerParameters: [Parameters.accept, Parameters.contentType],
+  mediaType: "json",
+  serializer
+};
+const validateMoveOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/Microsoft.Billing/billingAccounts/{billingAccountName}/products/{productName}/validateMoveEligibility",
+  httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.ValidateProductTransferEligibilityResult
@@ -652,19 +741,20 @@ const validateMoveOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  requestBody: Parameters.parameters7,
+  queryParameters: [Parameters.apiVersion],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.billingAccountName,
+    Parameters.productName
+  ],
+  headerParameters: [Parameters.accept, Parameters.contentType],
+  mediaType: "json",
   serializer
 };
-
-const listByCustomerNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
+const listByCustomerNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.ProductsListResult
@@ -673,19 +763,19 @@ const listByCustomerNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.billingAccountName,
+    Parameters.nextLink,
+    Parameters.customerName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listByBillingAccountNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
+const listByBillingAccountNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.ProductsListResult
@@ -694,19 +784,18 @@ const listByBillingAccountNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion, Parameters.filter],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.billingAccountName,
+    Parameters.nextLink
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listByBillingProfileNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
+const listByBillingProfileNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.ProductsListResult
@@ -715,19 +804,19 @@ const listByBillingProfileNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion, Parameters.filter],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.billingAccountName,
+    Parameters.nextLink,
+    Parameters.billingProfileName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listByInvoiceSectionNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
+const listByInvoiceSectionNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.ProductsListResult
@@ -736,5 +825,14 @@ const listByInvoiceSectionNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion, Parameters.filter],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.billingAccountName,
+    Parameters.nextLink,
+    Parameters.billingProfileName,
+    Parameters.invoiceSectionName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };