@azure/arm-policyinsights 4.1.1 → 5.0.0

package/src/operations/remediations.ts

@@ -3,25 +3,94 @@
  * 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/remediationsMappers";
+import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { Remediations } from "../operationsInterfaces";
+import * as coreClient from "@azure/core-client";
+import * as Mappers from "../models/mappers";
 import * as Parameters from "../models/parameters";
-import { PolicyInsightsClientContext } from "../policyInsightsClientContext";
-
-/** Class representing a Remediations. */
-export class Remediations {
-  private readonly client: PolicyInsightsClientContext;
-
-  /**
-   * Create a Remediations.
-   * @param {PolicyInsightsClientContext} client Reference to the service client.
-   */
-  constructor(client: PolicyInsightsClientContext) {
+import { PolicyInsightsClient } from "../policyInsightsClient";
+import {
+  RemediationDeployment,
+  RemediationsListDeploymentsAtManagementGroupNextOptionalParams,
+  RemediationsListDeploymentsAtManagementGroupOptionalParams,
+  Remediation,
+  RemediationsListForManagementGroupNextOptionalParams,
+  RemediationsListForManagementGroupOptionalParams,
+  RemediationsListDeploymentsAtSubscriptionNextOptionalParams,
+  RemediationsListDeploymentsAtSubscriptionOptionalParams,
+  RemediationsListForSubscriptionNextOptionalParams,
+  RemediationsListForSubscriptionOptionalParams,
+  RemediationsListDeploymentsAtResourceGroupNextOptionalParams,
+  RemediationsListDeploymentsAtResourceGroupOptionalParams,
+  RemediationsListForResourceGroupNextOptionalParams,
+  RemediationsListForResourceGroupOptionalParams,
+  RemediationsListDeploymentsAtResourceNextOptionalParams,
+  RemediationsListDeploymentsAtResourceOptionalParams,
+  RemediationsListForResourceNextOptionalParams,
+  RemediationsListForResourceOptionalParams,
+  RemediationsListDeploymentsAtManagementGroupResponse,
+  RemediationsCancelAtManagementGroupOptionalParams,
+  RemediationsCancelAtManagementGroupResponse,
+  RemediationsListForManagementGroupResponse,
+  RemediationsCreateOrUpdateAtManagementGroupOptionalParams,
+  RemediationsCreateOrUpdateAtManagementGroupResponse,
+  RemediationsGetAtManagementGroupOptionalParams,
+  RemediationsGetAtManagementGroupResponse,
+  RemediationsDeleteAtManagementGroupOptionalParams,
+  RemediationsDeleteAtManagementGroupResponse,
+  RemediationsListDeploymentsAtSubscriptionResponse,
+  RemediationsCancelAtSubscriptionOptionalParams,
+  RemediationsCancelAtSubscriptionResponse,
+  RemediationsListForSubscriptionResponse,
+  RemediationsCreateOrUpdateAtSubscriptionOptionalParams,
+  RemediationsCreateOrUpdateAtSubscriptionResponse,
+  RemediationsGetAtSubscriptionOptionalParams,
+  RemediationsGetAtSubscriptionResponse,
+  RemediationsDeleteAtSubscriptionOptionalParams,
+  RemediationsDeleteAtSubscriptionResponse,
+  RemediationsListDeploymentsAtResourceGroupResponse,
+  RemediationsCancelAtResourceGroupOptionalParams,
+  RemediationsCancelAtResourceGroupResponse,
+  RemediationsListForResourceGroupResponse,
+  RemediationsCreateOrUpdateAtResourceGroupOptionalParams,
+  RemediationsCreateOrUpdateAtResourceGroupResponse,
+  RemediationsGetAtResourceGroupOptionalParams,
+  RemediationsGetAtResourceGroupResponse,
+  RemediationsDeleteAtResourceGroupOptionalParams,
+  RemediationsDeleteAtResourceGroupResponse,
+  RemediationsListDeploymentsAtResourceResponse,
+  RemediationsCancelAtResourceOptionalParams,
+  RemediationsCancelAtResourceResponse,
+  RemediationsListForResourceResponse,
+  RemediationsCreateOrUpdateAtResourceOptionalParams,
+  RemediationsCreateOrUpdateAtResourceResponse,
+  RemediationsGetAtResourceOptionalParams,
+  RemediationsGetAtResourceResponse,
+  RemediationsDeleteAtResourceOptionalParams,
+  RemediationsDeleteAtResourceResponse,
+  RemediationsListDeploymentsAtManagementGroupNextResponse,
+  RemediationsListForManagementGroupNextResponse,
+  RemediationsListDeploymentsAtSubscriptionNextResponse,
+  RemediationsListForSubscriptionNextResponse,
+  RemediationsListDeploymentsAtResourceGroupNextResponse,
+  RemediationsListForResourceGroupNextResponse,
+  RemediationsListDeploymentsAtResourceNextResponse,
+  RemediationsListForResourceNextResponse
+} from "../models";
+
+/// <reference lib="esnext.asynciterable" />
+/** Class containing Remediations operations. */
+export class RemediationsImpl implements Remediations {
+  private readonly client: PolicyInsightsClient;
+
+  /**
+   * Initialize a new instance of the class Remediations class.
+   * @param client Reference to the service client
+   */
+  constructor(client: PolicyInsightsClient) {
     this.client = client;
   }
 
@@ -29,692 +98,825 @@ export class Remediations {
    * Gets all deployments for a remediation at management group scope.
    * @param managementGroupId Management group ID.
    * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListDeploymentsAtManagementGroupResponse>
-   */
-  listDeploymentsAtManagementGroup(managementGroupId: string, remediationName: string, options?: Models.RemediationsListDeploymentsAtManagementGroupOptionalParams): Promise<Models.RemediationsListDeploymentsAtManagementGroupResponse>;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  listDeploymentsAtManagementGroup(managementGroupId: string, remediationName: string, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listDeploymentsAtManagementGroup(managementGroupId: string, remediationName: string, options: Models.RemediationsListDeploymentsAtManagementGroupOptionalParams, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  listDeploymentsAtManagementGroup(managementGroupId: string, remediationName: string, options?: Models.RemediationsListDeploymentsAtManagementGroupOptionalParams | msRest.ServiceCallback<Models.RemediationDeploymentsListResult>, callback?: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): Promise<Models.RemediationsListDeploymentsAtManagementGroupResponse> {
-    return this.client.sendOperationRequest(
-      {
-        managementGroupId,
-        remediationName,
-        options
+   * @param options The options parameters.
+   */
+  public listDeploymentsAtManagementGroup(
+    managementGroupId: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtManagementGroupOptionalParams
+  ): PagedAsyncIterableIterator<RemediationDeployment> {
+    const iter = this.listDeploymentsAtManagementGroupPagingAll(
+      managementGroupId,
+      remediationName,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
       },
-      listDeploymentsAtManagementGroupOperationSpec,
-      callback) as Promise<Models.RemediationsListDeploymentsAtManagementGroupResponse>;
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listDeploymentsAtManagementGroupPagingPage(
+          managementGroupId,
+          remediationName,
+          options
+        );
+      }
+    };
   }
 
-  /**
-   * Cancels a remediation at management group scope.
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsCancelAtManagementGroupResponse>
-   */
-  cancelAtManagementGroup(managementGroupId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsCancelAtManagementGroupResponse>;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  cancelAtManagementGroup(managementGroupId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  cancelAtManagementGroup(managementGroupId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  cancelAtManagementGroup(managementGroupId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsCancelAtManagementGroupResponse> {
-    return this.client.sendOperationRequest(
-      {
+  private async *listDeploymentsAtManagementGroupPagingPage(
+    managementGroupId: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtManagementGroupOptionalParams
+  ): AsyncIterableIterator<RemediationDeployment[]> {
+    let result = await this._listDeploymentsAtManagementGroup(
+      managementGroupId,
+      remediationName,
+      options
+    );
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listDeploymentsAtManagementGroupNext(
         managementGroupId,
         remediationName,
+        continuationToken,
         options
-      },
-      cancelAtManagementGroupOperationSpec,
-      callback) as Promise<Models.RemediationsCancelAtManagementGroupResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listDeploymentsAtManagementGroupPagingAll(
+    managementGroupId: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtManagementGroupOptionalParams
+  ): AsyncIterableIterator<RemediationDeployment> {
+    for await (const page of this.listDeploymentsAtManagementGroupPagingPage(
+      managementGroupId,
+      remediationName,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
    * Gets all remediations for the management group.
    * @param managementGroupId Management group ID.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListForManagementGroupResponse>
-   */
-  listForManagementGroup(managementGroupId: string, options?: Models.RemediationsListForManagementGroupOptionalParams): Promise<Models.RemediationsListForManagementGroupResponse>;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param callback The callback
-   */
-  listForManagementGroup(managementGroupId: string, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listForManagementGroup(managementGroupId: string, options: Models.RemediationsListForManagementGroupOptionalParams, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  listForManagementGroup(managementGroupId: string, options?: Models.RemediationsListForManagementGroupOptionalParams | msRest.ServiceCallback<Models.RemediationListResult>, callback?: msRest.ServiceCallback<Models.RemediationListResult>): Promise<Models.RemediationsListForManagementGroupResponse> {
-    return this.client.sendOperationRequest(
-      {
-        managementGroupId,
-        options
+   * @param options The options parameters.
+   */
+  public listForManagementGroup(
+    managementGroupId: string,
+    options?: RemediationsListForManagementGroupOptionalParams
+  ): PagedAsyncIterableIterator<Remediation> {
+    const iter = this.listForManagementGroupPagingAll(
+      managementGroupId,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
       },
-      listForManagementGroupOperationSpec,
-      callback) as Promise<Models.RemediationsListForManagementGroupResponse>;
+      byPage: () => {
+        return this.listForManagementGroupPagingPage(
+          managementGroupId,
+          options
+        );
+      }
+    };
   }
 
-  /**
-   * Creates or updates a remediation at management group scope.
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsCreateOrUpdateAtManagementGroupResponse>
-   */
-  createOrUpdateAtManagementGroup(managementGroupId: string, remediationName: string, parameters: Models.Remediation, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsCreateOrUpdateAtManagementGroupResponse>;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param callback The callback
-   */
-  createOrUpdateAtManagementGroup(managementGroupId: string, remediationName: string, parameters: Models.Remediation, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  createOrUpdateAtManagementGroup(managementGroupId: string, remediationName: string, parameters: Models.Remediation, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  createOrUpdateAtManagementGroup(managementGroupId: string, remediationName: string, parameters: Models.Remediation, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsCreateOrUpdateAtManagementGroupResponse> {
-    return this.client.sendOperationRequest(
-      {
+  private async *listForManagementGroupPagingPage(
+    managementGroupId: string,
+    options?: RemediationsListForManagementGroupOptionalParams
+  ): AsyncIterableIterator<Remediation[]> {
+    let result = await this._listForManagementGroup(managementGroupId, options);
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listForManagementGroupNext(
         managementGroupId,
-        remediationName,
-        parameters,
+        continuationToken,
         options
-      },
-      createOrUpdateAtManagementGroupOperationSpec,
-      callback) as Promise<Models.RemediationsCreateOrUpdateAtManagementGroupResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listForManagementGroupPagingAll(
+    managementGroupId: string,
+    options?: RemediationsListForManagementGroupOptionalParams
+  ): AsyncIterableIterator<Remediation> {
+    for await (const page of this.listForManagementGroupPagingPage(
+      managementGroupId,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
-   * Gets an existing remediation at management group scope.
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsGetAtManagementGroupResponse>
-   */
-  getAtManagementGroup(managementGroupId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsGetAtManagementGroupResponse>;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  getAtManagementGroup(managementGroupId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param managementGroupId Management group ID.
+   * Gets all deployments for a remediation at subscription scope.
    * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  getAtManagementGroup(managementGroupId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  getAtManagementGroup(managementGroupId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsGetAtManagementGroupResponse> {
-    return this.client.sendOperationRequest(
-      {
-        managementGroupId,
-        remediationName,
-        options
+   * @param options The options parameters.
+   */
+  public listDeploymentsAtSubscription(
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtSubscriptionOptionalParams
+  ): PagedAsyncIterableIterator<RemediationDeployment> {
+    const iter = this.listDeploymentsAtSubscriptionPagingAll(
+      remediationName,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
       },
-      getAtManagementGroupOperationSpec,
-      callback) as Promise<Models.RemediationsGetAtManagementGroupResponse>;
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listDeploymentsAtSubscriptionPagingPage(
+          remediationName,
+          options
+        );
+      }
+    };
   }
 
-  /**
-   * Deletes an existing remediation at management group scope.
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsDeleteAtManagementGroupResponse>
-   */
-  deleteAtManagementGroup(managementGroupId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsDeleteAtManagementGroupResponse>;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  deleteAtManagementGroup(managementGroupId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param managementGroupId Management group ID.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  deleteAtManagementGroup(managementGroupId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  deleteAtManagementGroup(managementGroupId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsDeleteAtManagementGroupResponse> {
-    return this.client.sendOperationRequest(
-      {
-        managementGroupId,
+  private async *listDeploymentsAtSubscriptionPagingPage(
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtSubscriptionOptionalParams
+  ): AsyncIterableIterator<RemediationDeployment[]> {
+    let result = await this._listDeploymentsAtSubscription(
+      remediationName,
+      options
+    );
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listDeploymentsAtSubscriptionNext(
         remediationName,
+        continuationToken,
         options
-      },
-      deleteAtManagementGroupOperationSpec,
-      callback) as Promise<Models.RemediationsDeleteAtManagementGroupResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listDeploymentsAtSubscriptionPagingAll(
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtSubscriptionOptionalParams
+  ): AsyncIterableIterator<RemediationDeployment> {
+    for await (const page of this.listDeploymentsAtSubscriptionPagingPage(
+      remediationName,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
-   * Gets all deployments for a remediation at subscription scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListDeploymentsAtSubscriptionResponse>
-   */
-  listDeploymentsAtSubscription(subscriptionId: string, remediationName: string, options?: Models.RemediationsListDeploymentsAtSubscriptionOptionalParams): Promise<Models.RemediationsListDeploymentsAtSubscriptionResponse>;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  listDeploymentsAtSubscription(subscriptionId: string, remediationName: string, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listDeploymentsAtSubscription(subscriptionId: string, remediationName: string, options: Models.RemediationsListDeploymentsAtSubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  listDeploymentsAtSubscription(subscriptionId: string, remediationName: string, options?: Models.RemediationsListDeploymentsAtSubscriptionOptionalParams | msRest.ServiceCallback<Models.RemediationDeploymentsListResult>, callback?: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): Promise<Models.RemediationsListDeploymentsAtSubscriptionResponse> {
-    return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        remediationName,
-        options
+   * Gets all remediations for the subscription.
+   * @param options The options parameters.
+   */
+  public listForSubscription(
+    options?: RemediationsListForSubscriptionOptionalParams
+  ): PagedAsyncIterableIterator<Remediation> {
+    const iter = this.listForSubscriptionPagingAll(options);
+    return {
+      next() {
+        return iter.next();
       },
-      listDeploymentsAtSubscriptionOperationSpec,
-      callback) as Promise<Models.RemediationsListDeploymentsAtSubscriptionResponse>;
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listForSubscriptionPagingPage(options);
+      }
+    };
+  }
+
+  private async *listForSubscriptionPagingPage(
+    options?: RemediationsListForSubscriptionOptionalParams
+  ): AsyncIterableIterator<Remediation[]> {
+    let result = await this._listForSubscription(options);
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listForSubscriptionNext(continuationToken, options);
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listForSubscriptionPagingAll(
+    options?: RemediationsListForSubscriptionOptionalParams
+  ): AsyncIterableIterator<Remediation> {
+    for await (const page of this.listForSubscriptionPagingPage(options)) {
+      yield* page;
+    }
   }
 
   /**
-   * Cancels a remediation at subscription scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsCancelAtSubscriptionResponse>
-   */
-  cancelAtSubscription(subscriptionId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsCancelAtSubscriptionResponse>;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  cancelAtSubscription(subscriptionId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Gets all deployments for a remediation at resource group scope.
+   * @param resourceGroupName Resource group name.
    * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  cancelAtSubscription(subscriptionId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  cancelAtSubscription(subscriptionId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsCancelAtSubscriptionResponse> {
-    return this.client.sendOperationRequest(
-      {
-        subscriptionId,
+   * @param options The options parameters.
+   */
+  public listDeploymentsAtResourceGroup(
+    resourceGroupName: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtResourceGroupOptionalParams
+  ): PagedAsyncIterableIterator<RemediationDeployment> {
+    const iter = this.listDeploymentsAtResourceGroupPagingAll(
+      resourceGroupName,
+      remediationName,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listDeploymentsAtResourceGroupPagingPage(
+          resourceGroupName,
+          remediationName,
+          options
+        );
+      }
+    };
+  }
+
+  private async *listDeploymentsAtResourceGroupPagingPage(
+    resourceGroupName: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtResourceGroupOptionalParams
+  ): AsyncIterableIterator<RemediationDeployment[]> {
+    let result = await this._listDeploymentsAtResourceGroup(
+      resourceGroupName,
+      remediationName,
+      options
+    );
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listDeploymentsAtResourceGroupNext(
+        resourceGroupName,
         remediationName,
+        continuationToken,
         options
-      },
-      cancelAtSubscriptionOperationSpec,
-      callback) as Promise<Models.RemediationsCancelAtSubscriptionResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listDeploymentsAtResourceGroupPagingAll(
+    resourceGroupName: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtResourceGroupOptionalParams
+  ): AsyncIterableIterator<RemediationDeployment> {
+    for await (const page of this.listDeploymentsAtResourceGroupPagingPage(
+      resourceGroupName,
+      remediationName,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
    * Gets all remediations for the subscription.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListForSubscriptionResponse>
-   */
-  listForSubscription(subscriptionId: string, options?: Models.RemediationsListForSubscriptionOptionalParams): Promise<Models.RemediationsListForSubscriptionResponse>;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param callback The callback
-   */
-  listForSubscription(subscriptionId: string, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listForSubscription(subscriptionId: string, options: Models.RemediationsListForSubscriptionOptionalParams, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  listForSubscription(subscriptionId: string, options?: Models.RemediationsListForSubscriptionOptionalParams | msRest.ServiceCallback<Models.RemediationListResult>, callback?: msRest.ServiceCallback<Models.RemediationListResult>): Promise<Models.RemediationsListForSubscriptionResponse> {
-    return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        options
+   * @param resourceGroupName Resource group name.
+   * @param options The options parameters.
+   */
+  public listForResourceGroup(
+    resourceGroupName: string,
+    options?: RemediationsListForResourceGroupOptionalParams
+  ): PagedAsyncIterableIterator<Remediation> {
+    const iter = this.listForResourceGroupPagingAll(resourceGroupName, options);
+    return {
+      next() {
+        return iter.next();
       },
-      listForSubscriptionOperationSpec,
-      callback) as Promise<Models.RemediationsListForSubscriptionResponse>;
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listForResourceGroupPagingPage(resourceGroupName, options);
+      }
+    };
   }
 
-  /**
-   * Creates or updates a remediation at subscription scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsCreateOrUpdateAtSubscriptionResponse>
-   */
-  createOrUpdateAtSubscription(subscriptionId: string, remediationName: string, parameters: Models.Remediation, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsCreateOrUpdateAtSubscriptionResponse>;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param callback The callback
-   */
-  createOrUpdateAtSubscription(subscriptionId: string, remediationName: string, parameters: Models.Remediation, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  createOrUpdateAtSubscription(subscriptionId: string, remediationName: string, parameters: Models.Remediation, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  createOrUpdateAtSubscription(subscriptionId: string, remediationName: string, parameters: Models.Remediation, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsCreateOrUpdateAtSubscriptionResponse> {
-    return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        remediationName,
-        parameters,
+  private async *listForResourceGroupPagingPage(
+    resourceGroupName: string,
+    options?: RemediationsListForResourceGroupOptionalParams
+  ): AsyncIterableIterator<Remediation[]> {
+    let result = await this._listForResourceGroup(resourceGroupName, options);
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listForResourceGroupNext(
+        resourceGroupName,
+        continuationToken,
         options
-      },
-      createOrUpdateAtSubscriptionOperationSpec,
-      callback) as Promise<Models.RemediationsCreateOrUpdateAtSubscriptionResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listForResourceGroupPagingAll(
+    resourceGroupName: string,
+    options?: RemediationsListForResourceGroupOptionalParams
+  ): AsyncIterableIterator<Remediation> {
+    for await (const page of this.listForResourceGroupPagingPage(
+      resourceGroupName,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
-   * Gets an existing remediation at subscription scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsGetAtSubscriptionResponse>
-   */
-  getAtSubscription(subscriptionId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsGetAtSubscriptionResponse>;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  getAtSubscription(subscriptionId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Gets all deployments for a remediation at resource scope.
+   * @param resourceId Resource ID.
    * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  getAtSubscription(subscriptionId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  getAtSubscription(subscriptionId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsGetAtSubscriptionResponse> {
-    return this.client.sendOperationRequest(
-      {
-        subscriptionId,
+   * @param options The options parameters.
+   */
+  public listDeploymentsAtResource(
+    resourceId: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtResourceOptionalParams
+  ): PagedAsyncIterableIterator<RemediationDeployment> {
+    const iter = this.listDeploymentsAtResourcePagingAll(
+      resourceId,
+      remediationName,
+      options
+    );
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listDeploymentsAtResourcePagingPage(
+          resourceId,
+          remediationName,
+          options
+        );
+      }
+    };
+  }
+
+  private async *listDeploymentsAtResourcePagingPage(
+    resourceId: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtResourceOptionalParams
+  ): AsyncIterableIterator<RemediationDeployment[]> {
+    let result = await this._listDeploymentsAtResource(
+      resourceId,
+      remediationName,
+      options
+    );
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listDeploymentsAtResourceNext(
+        resourceId,
         remediationName,
+        continuationToken,
         options
-      },
-      getAtSubscriptionOperationSpec,
-      callback) as Promise<Models.RemediationsGetAtSubscriptionResponse>;
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listDeploymentsAtResourcePagingAll(
+    resourceId: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtResourceOptionalParams
+  ): AsyncIterableIterator<RemediationDeployment> {
+    for await (const page of this.listDeploymentsAtResourcePagingPage(
+      resourceId,
+      remediationName,
+      options
+    )) {
+      yield* page;
+    }
   }
 
   /**
-   * Deletes an existing remediation at subscription scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsDeleteAtSubscriptionResponse>
-   */
-  deleteAtSubscription(subscriptionId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsDeleteAtSubscriptionResponse>;
+   * Gets all remediations for a resource.
+   * @param resourceId Resource ID.
+   * @param options The options parameters.
+   */
+  public listForResource(
+    resourceId: string,
+    options?: RemediationsListForResourceOptionalParams
+  ): PagedAsyncIterableIterator<Remediation> {
+    const iter = this.listForResourcePagingAll(resourceId, options);
+    return {
+      next() {
+        return iter.next();
+      },
+      [Symbol.asyncIterator]() {
+        return this;
+      },
+      byPage: () => {
+        return this.listForResourcePagingPage(resourceId, options);
+      }
+    };
+  }
+
+  private async *listForResourcePagingPage(
+    resourceId: string,
+    options?: RemediationsListForResourceOptionalParams
+  ): AsyncIterableIterator<Remediation[]> {
+    let result = await this._listForResource(resourceId, options);
+    yield result.value || [];
+    let continuationToken = result.nextLink;
+    while (continuationToken) {
+      result = await this._listForResourceNext(
+        resourceId,
+        continuationToken,
+        options
+      );
+      continuationToken = result.nextLink;
+      yield result.value || [];
+    }
+  }
+
+  private async *listForResourcePagingAll(
+    resourceId: string,
+    options?: RemediationsListForResourceOptionalParams
+  ): AsyncIterableIterator<Remediation> {
+    for await (const page of this.listForResourcePagingPage(
+      resourceId,
+      options
+    )) {
+      yield* page;
+    }
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Gets all deployments for a remediation at management group scope.
+   * @param managementGroupId Management group ID.
    * @param remediationName The name of the remediation.
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  deleteAtSubscription(subscriptionId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
+  private _listDeploymentsAtManagementGroup(
+    managementGroupId: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtManagementGroupOptionalParams
+  ): Promise<RemediationsListDeploymentsAtManagementGroupResponse> {
+    return this.client.sendOperationRequest(
+      { managementGroupId, remediationName, options },
+      listDeploymentsAtManagementGroupOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Cancels a remediation at management group scope.
+   * @param managementGroupId Management group ID.
    * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  deleteAtSubscription(subscriptionId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  deleteAtSubscription(subscriptionId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsDeleteAtSubscriptionResponse> {
+  cancelAtManagementGroup(
+    managementGroupId: string,
+    remediationName: string,
+    options?: RemediationsCancelAtManagementGroupOptionalParams
+  ): Promise<RemediationsCancelAtManagementGroupResponse> {
     return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        remediationName,
-        options
-      },
-      deleteAtSubscriptionOperationSpec,
-      callback) as Promise<Models.RemediationsDeleteAtSubscriptionResponse>;
+      { managementGroupId, remediationName, options },
+      cancelAtManagementGroupOperationSpec
+    );
   }
 
   /**
-   * Gets all deployments for a remediation at resource group scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
-   * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListDeploymentsAtResourceGroupResponse>
+   * Gets all remediations for the management group.
+   * @param managementGroupId Management group ID.
+   * @param options The options parameters.
    */
-  listDeploymentsAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options?: Models.RemediationsListDeploymentsAtResourceGroupOptionalParams): Promise<Models.RemediationsListDeploymentsAtResourceGroupResponse>;
+  private _listForManagementGroup(
+    managementGroupId: string,
+    options?: RemediationsListForManagementGroupOptionalParams
+  ): Promise<RemediationsListForManagementGroupResponse> {
+    return this.client.sendOperationRequest(
+      { managementGroupId, options },
+      listForManagementGroupOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
+   * Creates or updates a remediation at management group scope.
+   * @param managementGroupId Management group ID.
    * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  listDeploymentsAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
+   * @param parameters The remediation parameters.
+   * @param options The options parameters.
+   */
+  createOrUpdateAtManagementGroup(
+    managementGroupId: string,
+    remediationName: string,
+    parameters: Remediation,
+    options?: RemediationsCreateOrUpdateAtManagementGroupOptionalParams
+  ): Promise<RemediationsCreateOrUpdateAtManagementGroupResponse> {
+    return this.client.sendOperationRequest(
+      { managementGroupId, remediationName, parameters, options },
+      createOrUpdateAtManagementGroupOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
+   * Gets an existing remediation at management group scope.
+   * @param managementGroupId Management group ID.
    * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  listDeploymentsAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options: Models.RemediationsListDeploymentsAtResourceGroupOptionalParams, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  listDeploymentsAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options?: Models.RemediationsListDeploymentsAtResourceGroupOptionalParams | msRest.ServiceCallback<Models.RemediationDeploymentsListResult>, callback?: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): Promise<Models.RemediationsListDeploymentsAtResourceGroupResponse> {
+  getAtManagementGroup(
+    managementGroupId: string,
+    remediationName: string,
+    options?: RemediationsGetAtManagementGroupOptionalParams
+  ): Promise<RemediationsGetAtManagementGroupResponse> {
     return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        resourceGroupName,
-        remediationName,
-        options
-      },
-      listDeploymentsAtResourceGroupOperationSpec,
-      callback) as Promise<Models.RemediationsListDeploymentsAtResourceGroupResponse>;
+      { managementGroupId, remediationName, options },
+      getAtManagementGroupOperationSpec
+    );
   }
 
   /**
-   * Cancels a remediation at resource group scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
+   * Deletes an existing remediation at management group scope.
+   * @param managementGroupId Management group ID.
    * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsCancelAtResourceGroupResponse>
+   * @param options The options parameters.
    */
-  cancelAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsCancelAtResourceGroupResponse>;
+  deleteAtManagementGroup(
+    managementGroupId: string,
+    remediationName: string,
+    options?: RemediationsDeleteAtManagementGroupOptionalParams
+  ): Promise<RemediationsDeleteAtManagementGroupResponse> {
+    return this.client.sendOperationRequest(
+      { managementGroupId, remediationName, options },
+      deleteAtManagementGroupOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
+   * Gets all deployments for a remediation at subscription scope.
    * @param remediationName The name of the remediation.
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  cancelAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
+  private _listDeploymentsAtSubscription(
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtSubscriptionOptionalParams
+  ): Promise<RemediationsListDeploymentsAtSubscriptionResponse> {
+    return this.client.sendOperationRequest(
+      { remediationName, options },
+      listDeploymentsAtSubscriptionOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
+   * Cancels a remediation at subscription scope.
    * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  cancelAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  cancelAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsCancelAtResourceGroupResponse> {
+  cancelAtSubscription(
+    remediationName: string,
+    options?: RemediationsCancelAtSubscriptionOptionalParams
+  ): Promise<RemediationsCancelAtSubscriptionResponse> {
     return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        resourceGroupName,
-        remediationName,
-        options
-      },
-      cancelAtResourceGroupOperationSpec,
-      callback) as Promise<Models.RemediationsCancelAtResourceGroupResponse>;
+      { remediationName, options },
+      cancelAtSubscriptionOperationSpec
+    );
   }
 
   /**
    * Gets all remediations for the subscription.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListForResourceGroupResponse>
-   */
-  listForResourceGroup(subscriptionId: string, resourceGroupName: string, options?: Models.RemediationsListForResourceGroupOptionalParams): Promise<Models.RemediationsListForResourceGroupResponse>;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  listForResourceGroup(subscriptionId: string, resourceGroupName: string, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listForResourceGroup(subscriptionId: string, resourceGroupName: string, options: Models.RemediationsListForResourceGroupOptionalParams, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  listForResourceGroup(subscriptionId: string, resourceGroupName: string, options?: Models.RemediationsListForResourceGroupOptionalParams | msRest.ServiceCallback<Models.RemediationListResult>, callback?: msRest.ServiceCallback<Models.RemediationListResult>): Promise<Models.RemediationsListForResourceGroupResponse> {
+  private _listForSubscription(
+    options?: RemediationsListForSubscriptionOptionalParams
+  ): Promise<RemediationsListForSubscriptionResponse> {
     return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        resourceGroupName,
-        options
-      },
-      listForResourceGroupOperationSpec,
-      callback) as Promise<Models.RemediationsListForResourceGroupResponse>;
+      { options },
+      listForSubscriptionOperationSpec
+    );
   }
 
   /**
-   * Creates or updates a remediation at resource group scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
+   * Creates or updates a remediation at subscription scope.
    * @param remediationName The name of the remediation.
    * @param parameters The remediation parameters.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsCreateOrUpdateAtResourceGroupResponse>
+   * @param options The options parameters.
    */
-  createOrUpdateAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, parameters: Models.Remediation, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsCreateOrUpdateAtResourceGroupResponse>;
+  createOrUpdateAtSubscription(
+    remediationName: string,
+    parameters: Remediation,
+    options?: RemediationsCreateOrUpdateAtSubscriptionOptionalParams
+  ): Promise<RemediationsCreateOrUpdateAtSubscriptionResponse> {
+    return this.client.sendOperationRequest(
+      { remediationName, parameters, options },
+      createOrUpdateAtSubscriptionOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
+   * Gets an existing remediation at subscription scope.
    * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  createOrUpdateAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, parameters: Models.Remediation, callback: msRest.ServiceCallback<Models.Remediation>): void;
+  getAtSubscription(
+    remediationName: string,
+    options?: RemediationsGetAtSubscriptionOptionalParams
+  ): Promise<RemediationsGetAtSubscriptionResponse> {
+    return this.client.sendOperationRequest(
+      { remediationName, options },
+      getAtSubscriptionOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
-   * @param resourceGroupName Resource group name.
+   * Deletes an existing remediation at subscription scope.
    * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  createOrUpdateAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, parameters: Models.Remediation, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  createOrUpdateAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, parameters: Models.Remediation, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsCreateOrUpdateAtResourceGroupResponse> {
+  deleteAtSubscription(
+    remediationName: string,
+    options?: RemediationsDeleteAtSubscriptionOptionalParams
+  ): Promise<RemediationsDeleteAtSubscriptionResponse> {
     return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        resourceGroupName,
-        remediationName,
-        parameters,
-        options
-      },
-      createOrUpdateAtResourceGroupOperationSpec,
-      callback) as Promise<Models.RemediationsCreateOrUpdateAtResourceGroupResponse>;
+      { remediationName, options },
+      deleteAtSubscriptionOperationSpec
+    );
   }
 
   /**
-   * Gets an existing remediation at resource group scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Gets all deployments for a remediation at resource group scope.
    * @param resourceGroupName Resource group name.
    * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsGetAtResourceGroupResponse>
+   * @param options The options parameters.
    */
-  getAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsGetAtResourceGroupResponse>;
+  private _listDeploymentsAtResourceGroup(
+    resourceGroupName: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtResourceGroupOptionalParams
+  ): Promise<RemediationsListDeploymentsAtResourceGroupResponse> {
+    return this.client.sendOperationRequest(
+      { resourceGroupName, remediationName, options },
+      listDeploymentsAtResourceGroupOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Cancels a remediation at resource group scope.
    * @param resourceGroupName Resource group name.
    * @param remediationName The name of the remediation.
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  getAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
+  cancelAtResourceGroup(
+    resourceGroupName: string,
+    remediationName: string,
+    options?: RemediationsCancelAtResourceGroupOptionalParams
+  ): Promise<RemediationsCancelAtResourceGroupResponse> {
+    return this.client.sendOperationRequest(
+      { resourceGroupName, remediationName, options },
+      cancelAtResourceGroupOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Gets all remediations for the subscription.
    * @param resourceGroupName Resource group name.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  getAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  getAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsGetAtResourceGroupResponse> {
+  private _listForResourceGroup(
+    resourceGroupName: string,
+    options?: RemediationsListForResourceGroupOptionalParams
+  ): Promise<RemediationsListForResourceGroupResponse> {
     return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        resourceGroupName,
-        remediationName,
-        options
-      },
-      getAtResourceGroupOperationSpec,
-      callback) as Promise<Models.RemediationsGetAtResourceGroupResponse>;
+      { resourceGroupName, options },
+      listForResourceGroupOperationSpec
+    );
   }
 
   /**
-   * Deletes an existing remediation at resource group scope.
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Creates or updates a remediation at resource group scope.
    * @param resourceGroupName Resource group name.
    * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsDeleteAtResourceGroupResponse>
-   */
-  deleteAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsDeleteAtResourceGroupResponse>;
+   * @param parameters The remediation parameters.
+   * @param options The options parameters.
+   */
+  createOrUpdateAtResourceGroup(
+    resourceGroupName: string,
+    remediationName: string,
+    parameters: Remediation,
+    options?: RemediationsCreateOrUpdateAtResourceGroupOptionalParams
+  ): Promise<RemediationsCreateOrUpdateAtResourceGroupResponse> {
+    return this.client.sendOperationRequest(
+      { resourceGroupName, remediationName, parameters, options },
+      createOrUpdateAtResourceGroupOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Gets an existing remediation at resource group scope.
    * @param resourceGroupName Resource group name.
    * @param remediationName The name of the remediation.
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  deleteAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
+  getAtResourceGroup(
+    resourceGroupName: string,
+    remediationName: string,
+    options?: RemediationsGetAtResourceGroupOptionalParams
+  ): Promise<RemediationsGetAtResourceGroupResponse> {
+    return this.client.sendOperationRequest(
+      { resourceGroupName, remediationName, options },
+      getAtResourceGroupOperationSpec
+    );
+  }
+
   /**
-   * @param subscriptionId Microsoft Azure subscription ID.
+   * Deletes an existing remediation at resource group scope.
    * @param resourceGroupName Resource group name.
    * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  deleteAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  deleteAtResourceGroup(subscriptionId: string, resourceGroupName: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsDeleteAtResourceGroupResponse> {
+  deleteAtResourceGroup(
+    resourceGroupName: string,
+    remediationName: string,
+    options?: RemediationsDeleteAtResourceGroupOptionalParams
+  ): Promise<RemediationsDeleteAtResourceGroupResponse> {
     return this.client.sendOperationRequest(
-      {
-        subscriptionId,
-        resourceGroupName,
-        remediationName,
-        options
-      },
-      deleteAtResourceGroupOperationSpec,
-      callback) as Promise<Models.RemediationsDeleteAtResourceGroupResponse>;
+      { resourceGroupName, remediationName, options },
+      deleteAtResourceGroupOperationSpec
+    );
   }
 
   /**
    * Gets all deployments for a remediation at resource scope.
    * @param resourceId Resource ID.
    * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListDeploymentsAtResourceResponse>
-   */
-  listDeploymentsAtResource(resourceId: string, remediationName: string, options?: Models.RemediationsListDeploymentsAtResourceOptionalParams): Promise<Models.RemediationsListDeploymentsAtResourceResponse>;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  listDeploymentsAtResource(resourceId: string, remediationName: string, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  listDeploymentsAtResource(resourceId: string, remediationName: string, options: Models.RemediationsListDeploymentsAtResourceOptionalParams, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  listDeploymentsAtResource(resourceId: string, remediationName: string, options?: Models.RemediationsListDeploymentsAtResourceOptionalParams | msRest.ServiceCallback<Models.RemediationDeploymentsListResult>, callback?: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): Promise<Models.RemediationsListDeploymentsAtResourceResponse> {
+  private _listDeploymentsAtResource(
+    resourceId: string,
+    remediationName: string,
+    options?: RemediationsListDeploymentsAtResourceOptionalParams
+  ): Promise<RemediationsListDeploymentsAtResourceResponse> {
     return this.client.sendOperationRequest(
-      {
-        resourceId,
-        remediationName,
-        options
-      },
-      listDeploymentsAtResourceOperationSpec,
-      callback) as Promise<Models.RemediationsListDeploymentsAtResourceResponse>;
+      { resourceId, remediationName, options },
+      listDeploymentsAtResourceOperationSpec
+    );
   }
 
   /**
    * Cancel a remediation at resource scope.
    * @param resourceId Resource ID.
    * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsCancelAtResourceResponse>
-   */
-  cancelAtResource(resourceId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsCancelAtResourceResponse>;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  cancelAtResource(resourceId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  cancelAtResource(resourceId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  cancelAtResource(resourceId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsCancelAtResourceResponse> {
+  cancelAtResource(
+    resourceId: string,
+    remediationName: string,
+    options?: RemediationsCancelAtResourceOptionalParams
+  ): Promise<RemediationsCancelAtResourceResponse> {
     return this.client.sendOperationRequest(
-      {
-        resourceId,
-        remediationName,
-        options
-      },
-      cancelAtResourceOperationSpec,
-      callback) as Promise<Models.RemediationsCancelAtResourceResponse>;
+      { resourceId, remediationName, options },
+      cancelAtResourceOperationSpec
+    );
   }
 
   /**
    * Gets all remediations for a resource.
    * @param resourceId Resource ID.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListForResourceResponse>
-   */
-  listForResource(resourceId: string, options?: Models.RemediationsListForResourceOptionalParams): Promise<Models.RemediationsListForResourceResponse>;
-  /**
-   * @param resourceId Resource ID.
-   * @param callback The callback
-   */
-  listForResource(resourceId: string, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  /**
-   * @param resourceId Resource ID.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  listForResource(resourceId: string, options: Models.RemediationsListForResourceOptionalParams, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  listForResource(resourceId: string, options?: Models.RemediationsListForResourceOptionalParams | msRest.ServiceCallback<Models.RemediationListResult>, callback?: msRest.ServiceCallback<Models.RemediationListResult>): Promise<Models.RemediationsListForResourceResponse> {
+  private _listForResource(
+    resourceId: string,
+    options?: RemediationsListForResourceOptionalParams
+  ): Promise<RemediationsListForResourceResponse> {
     return this.client.sendOperationRequest(
-      {
-        resourceId,
-        options
-      },
-      listForResourceOperationSpec,
-      callback) as Promise<Models.RemediationsListForResourceResponse>;
+      { resourceId, options },
+      listForResourceOperationSpec
+    );
   }
 
   /**
@@ -722,343 +924,205 @@ export class Remediations {
    * @param resourceId Resource ID.
    * @param remediationName The name of the remediation.
    * @param parameters The remediation parameters.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsCreateOrUpdateAtResourceResponse>
-   */
-  createOrUpdateAtResource(resourceId: string, remediationName: string, parameters: Models.Remediation, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsCreateOrUpdateAtResourceResponse>;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param callback The callback
-   */
-  createOrUpdateAtResource(resourceId: string, remediationName: string, parameters: Models.Remediation, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param parameters The remediation parameters.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  createOrUpdateAtResource(resourceId: string, remediationName: string, parameters: Models.Remediation, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  createOrUpdateAtResource(resourceId: string, remediationName: string, parameters: Models.Remediation, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsCreateOrUpdateAtResourceResponse> {
+   * @param options The options parameters.
+   */
+  createOrUpdateAtResource(
+    resourceId: string,
+    remediationName: string,
+    parameters: Remediation,
+    options?: RemediationsCreateOrUpdateAtResourceOptionalParams
+  ): Promise<RemediationsCreateOrUpdateAtResourceResponse> {
     return this.client.sendOperationRequest(
-      {
-        resourceId,
-        remediationName,
-        parameters,
-        options
-      },
-      createOrUpdateAtResourceOperationSpec,
-      callback) as Promise<Models.RemediationsCreateOrUpdateAtResourceResponse>;
+      { resourceId, remediationName, parameters, options },
+      createOrUpdateAtResourceOperationSpec
+    );
   }
 
   /**
    * Gets an existing remediation at resource scope.
    * @param resourceId Resource ID.
    * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsGetAtResourceResponse>
-   */
-  getAtResource(resourceId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsGetAtResourceResponse>;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  getAtResource(resourceId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  getAtResource(resourceId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  getAtResource(resourceId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsGetAtResourceResponse> {
+  getAtResource(
+    resourceId: string,
+    remediationName: string,
+    options?: RemediationsGetAtResourceOptionalParams
+  ): Promise<RemediationsGetAtResourceResponse> {
     return this.client.sendOperationRequest(
-      {
-        resourceId,
-        remediationName,
-        options
-      },
-      getAtResourceOperationSpec,
-      callback) as Promise<Models.RemediationsGetAtResourceResponse>;
+      { resourceId, remediationName, options },
+      getAtResourceOperationSpec
+    );
   }
 
   /**
    * Deletes an existing remediation at individual resource scope.
    * @param resourceId Resource ID.
    * @param remediationName The name of the remediation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsDeleteAtResourceResponse>
-   */
-  deleteAtResource(resourceId: string, remediationName: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsDeleteAtResourceResponse>;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param callback The callback
-   */
-  deleteAtResource(resourceId: string, remediationName: string, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  /**
-   * @param resourceId Resource ID.
-   * @param remediationName The name of the remediation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * @param options The options parameters.
    */
-  deleteAtResource(resourceId: string, remediationName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.Remediation>): void;
-  deleteAtResource(resourceId: string, remediationName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.Remediation>, callback?: msRest.ServiceCallback<Models.Remediation>): Promise<Models.RemediationsDeleteAtResourceResponse> {
+  deleteAtResource(
+    resourceId: string,
+    remediationName: string,
+    options?: RemediationsDeleteAtResourceOptionalParams
+  ): Promise<RemediationsDeleteAtResourceResponse> {
     return this.client.sendOperationRequest(
-      {
-        resourceId,
-        remediationName,
-        options
-      },
-      deleteAtResourceOperationSpec,
-      callback) as Promise<Models.RemediationsDeleteAtResourceResponse>;
+      { resourceId, remediationName, options },
+      deleteAtResourceOperationSpec
+    );
   }
 
   /**
-   * Gets all deployments for a remediation at management group scope.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListDeploymentsAtManagementGroupNextResponse>
-   */
-  listDeploymentsAtManagementGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsListDeploymentsAtManagementGroupNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listDeploymentsAtManagementGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listDeploymentsAtManagementGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  listDeploymentsAtManagementGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RemediationDeploymentsListResult>, callback?: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): Promise<Models.RemediationsListDeploymentsAtManagementGroupNextResponse> {
+   * ListDeploymentsAtManagementGroupNext
+   * @param managementGroupId Management group ID.
+   * @param remediationName The name of the remediation.
+   * @param nextLink The nextLink from the previous successful call to the
+   *                 ListDeploymentsAtManagementGroup method.
+   * @param options The options parameters.
+   */
+  private _listDeploymentsAtManagementGroupNext(
+    managementGroupId: string,
+    remediationName: string,
+    nextLink: string,
+    options?: RemediationsListDeploymentsAtManagementGroupNextOptionalParams
+  ): Promise<RemediationsListDeploymentsAtManagementGroupNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listDeploymentsAtManagementGroupNextOperationSpec,
-      callback) as Promise<Models.RemediationsListDeploymentsAtManagementGroupNextResponse>;
+      { managementGroupId, remediationName, nextLink, options },
+      listDeploymentsAtManagementGroupNextOperationSpec
+    );
   }
 
   /**
-   * Gets all remediations for the management group.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListForManagementGroupNextResponse>
-   */
-  listForManagementGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsListForManagementGroupNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listForManagementGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listForManagementGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  listForManagementGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RemediationListResult>, callback?: msRest.ServiceCallback<Models.RemediationListResult>): Promise<Models.RemediationsListForManagementGroupNextResponse> {
+   * ListForManagementGroupNext
+   * @param managementGroupId Management group ID.
+   * @param nextLink The nextLink from the previous successful call to the ListForManagementGroup method.
+   * @param options The options parameters.
+   */
+  private _listForManagementGroupNext(
+    managementGroupId: string,
+    nextLink: string,
+    options?: RemediationsListForManagementGroupNextOptionalParams
+  ): Promise<RemediationsListForManagementGroupNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listForManagementGroupNextOperationSpec,
-      callback) as Promise<Models.RemediationsListForManagementGroupNextResponse>;
+      { managementGroupId, nextLink, options },
+      listForManagementGroupNextOperationSpec
+    );
   }
 
   /**
-   * Gets all deployments for a remediation at subscription scope.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListDeploymentsAtSubscriptionNextResponse>
-   */
-  listDeploymentsAtSubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsListDeploymentsAtSubscriptionNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listDeploymentsAtSubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listDeploymentsAtSubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  listDeploymentsAtSubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RemediationDeploymentsListResult>, callback?: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): Promise<Models.RemediationsListDeploymentsAtSubscriptionNextResponse> {
+   * ListDeploymentsAtSubscriptionNext
+   * @param remediationName The name of the remediation.
+   * @param nextLink The nextLink from the previous successful call to the ListDeploymentsAtSubscription
+   *                 method.
+   * @param options The options parameters.
+   */
+  private _listDeploymentsAtSubscriptionNext(
+    remediationName: string,
+    nextLink: string,
+    options?: RemediationsListDeploymentsAtSubscriptionNextOptionalParams
+  ): Promise<RemediationsListDeploymentsAtSubscriptionNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listDeploymentsAtSubscriptionNextOperationSpec,
-      callback) as Promise<Models.RemediationsListDeploymentsAtSubscriptionNextResponse>;
+      { remediationName, nextLink, options },
+      listDeploymentsAtSubscriptionNextOperationSpec
+    );
   }
 
   /**
-   * Gets all remediations for the subscription.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListForSubscriptionNextResponse>
-   */
-  listForSubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsListForSubscriptionNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listForSubscriptionNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
+   * ListForSubscriptionNext
+   * @param nextLink The nextLink from the previous successful call to the ListForSubscription method.
+   * @param options The options parameters.
    */
-  listForSubscriptionNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  listForSubscriptionNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RemediationListResult>, callback?: msRest.ServiceCallback<Models.RemediationListResult>): Promise<Models.RemediationsListForSubscriptionNextResponse> {
+  private _listForSubscriptionNext(
+    nextLink: string,
+    options?: RemediationsListForSubscriptionNextOptionalParams
+  ): Promise<RemediationsListForSubscriptionNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listForSubscriptionNextOperationSpec,
-      callback) as Promise<Models.RemediationsListForSubscriptionNextResponse>;
+      { nextLink, options },
+      listForSubscriptionNextOperationSpec
+    );
   }
 
   /**
-   * Gets all deployments for a remediation at resource group scope.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListDeploymentsAtResourceGroupNextResponse>
-   */
-  listDeploymentsAtResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsListDeploymentsAtResourceGroupNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listDeploymentsAtResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listDeploymentsAtResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  listDeploymentsAtResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RemediationDeploymentsListResult>, callback?: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): Promise<Models.RemediationsListDeploymentsAtResourceGroupNextResponse> {
+   * ListDeploymentsAtResourceGroupNext
+   * @param resourceGroupName Resource group name.
+   * @param remediationName The name of the remediation.
+   * @param nextLink The nextLink from the previous successful call to the ListDeploymentsAtResourceGroup
+   *                 method.
+   * @param options The options parameters.
+   */
+  private _listDeploymentsAtResourceGroupNext(
+    resourceGroupName: string,
+    remediationName: string,
+    nextLink: string,
+    options?: RemediationsListDeploymentsAtResourceGroupNextOptionalParams
+  ): Promise<RemediationsListDeploymentsAtResourceGroupNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listDeploymentsAtResourceGroupNextOperationSpec,
-      callback) as Promise<Models.RemediationsListDeploymentsAtResourceGroupNextResponse>;
+      { resourceGroupName, remediationName, nextLink, options },
+      listDeploymentsAtResourceGroupNextOperationSpec
+    );
   }
 
   /**
-   * Gets all remediations for the subscription.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListForResourceGroupNextResponse>
-   */
-  listForResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsListForResourceGroupNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listForResourceGroupNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listForResourceGroupNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  listForResourceGroupNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RemediationListResult>, callback?: msRest.ServiceCallback<Models.RemediationListResult>): Promise<Models.RemediationsListForResourceGroupNextResponse> {
+   * ListForResourceGroupNext
+   * @param resourceGroupName Resource group name.
+   * @param nextLink The nextLink from the previous successful call to the ListForResourceGroup method.
+   * @param options The options parameters.
+   */
+  private _listForResourceGroupNext(
+    resourceGroupName: string,
+    nextLink: string,
+    options?: RemediationsListForResourceGroupNextOptionalParams
+  ): Promise<RemediationsListForResourceGroupNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listForResourceGroupNextOperationSpec,
-      callback) as Promise<Models.RemediationsListForResourceGroupNextResponse>;
+      { resourceGroupName, nextLink, options },
+      listForResourceGroupNextOperationSpec
+    );
   }
 
   /**
-   * Gets all deployments for a remediation at resource scope.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListDeploymentsAtResourceNextResponse>
-   */
-  listDeploymentsAtResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsListDeploymentsAtResourceNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listDeploymentsAtResourceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listDeploymentsAtResourceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): void;
-  listDeploymentsAtResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RemediationDeploymentsListResult>, callback?: msRest.ServiceCallback<Models.RemediationDeploymentsListResult>): Promise<Models.RemediationsListDeploymentsAtResourceNextResponse> {
+   * ListDeploymentsAtResourceNext
+   * @param resourceId Resource ID.
+   * @param remediationName The name of the remediation.
+   * @param nextLink The nextLink from the previous successful call to the ListDeploymentsAtResource
+   *                 method.
+   * @param options The options parameters.
+   */
+  private _listDeploymentsAtResourceNext(
+    resourceId: string,
+    remediationName: string,
+    nextLink: string,
+    options?: RemediationsListDeploymentsAtResourceNextOptionalParams
+  ): Promise<RemediationsListDeploymentsAtResourceNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listDeploymentsAtResourceNextOperationSpec,
-      callback) as Promise<Models.RemediationsListDeploymentsAtResourceNextResponse>;
+      { resourceId, remediationName, nextLink, options },
+      listDeploymentsAtResourceNextOperationSpec
+    );
   }
 
   /**
-   * Gets all remediations for a resource.
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.RemediationsListForResourceNextResponse>
-   */
-  listForResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.RemediationsListForResourceNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listForResourceNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listForResourceNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.RemediationListResult>): void;
-  listForResourceNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.RemediationListResult>, callback?: msRest.ServiceCallback<Models.RemediationListResult>): Promise<Models.RemediationsListForResourceNextResponse> {
+   * ListForResourceNext
+   * @param resourceId Resource ID.
+   * @param nextLink The nextLink from the previous successful call to the ListForResource method.
+   * @param options The options parameters.
+   */
+  private _listForResourceNext(
+    resourceId: string,
+    nextLink: string,
+    options?: RemediationsListForResourceNextOptionalParams
+  ): Promise<RemediationsListForResourceNextResponse> {
     return this.client.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listForResourceNextOperationSpec,
-      callback) as Promise<Models.RemediationsListForResourceNextResponse>;
+      { resourceId, nextLink, options },
+      listForResourceNextOperationSpec
+    );
   }
 }
-
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listDeploymentsAtManagementGroupOperationSpec: msRest.OperationSpec = {
+const serializer = coreClient.createSerializer(Mappers, /* isXml */ false);
+
+const listDeploymentsAtManagementGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/listDeployments",
   httpMethod: "POST",
-  path: "providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/listDeployments",
-  urlParameters: [
-    Parameters.managementGroupsNamespace,
-    Parameters.managementGroupId,
-    Parameters.remediationName
-  ],
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.top
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
   responses: {
     200: {
       bodyMapper: Mappers.RemediationDeploymentsListResult
@@ -1067,23 +1131,20 @@ const listDeploymentsAtManagementGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const cancelAtManagementGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/cancel",
+  queryParameters: [Parameters.top, Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.managementGroupsNamespace,
     Parameters.managementGroupId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const cancelAtManagementGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/cancel",
+  httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1092,24 +1153,20 @@ const cancelAtManagementGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const listForManagementGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.managementGroupsNamespace,
-    Parameters.managementGroupId
-  ],
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.top,
-    Parameters.filter
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
+    Parameters.managementGroupId,
+    Parameters.remediationName
   ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const listForManagementGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationListResult
@@ -1118,30 +1175,19 @@ const listForManagementGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const createOrUpdateAtManagementGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "PUT",
-  path: "providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  queryParameters: [Parameters.top, Parameters.filter, Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.managementGroupsNamespace,
-    Parameters.managementGroupId,
-    Parameters.remediationName
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
+    Parameters.managementGroupId
   ],
-  requestBody: {
-    parameterPath: "parameters",
-    mapper: {
-      ...Mappers.Remediation,
-      required: true
-    }
-  },
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const createOrUpdateAtManagementGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "PUT",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1153,23 +1199,22 @@ const createOrUpdateAtManagementGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const getAtManagementGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  requestBody: Parameters.parameters,
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.managementGroupsNamespace,
     Parameters.managementGroupId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept, Parameters.contentType],
+  mediaType: "json",
+  serializer
+};
+const getAtManagementGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1178,23 +1223,20 @@ const getAtManagementGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const deleteAtManagementGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "DELETE",
-  path: "providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.managementGroupsNamespace,
     Parameters.managementGroupId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const deleteAtManagementGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/providers/{managementGroupsNamespace}/managementGroups/{managementGroupId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "DELETE",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1204,23 +1246,20 @@ const deleteAtManagementGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const listDeploymentsAtSubscriptionOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/listDeployments",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
-    Parameters.subscriptionId,
+    Parameters.$host,
+    Parameters.managementGroupsNamespace,
+    Parameters.managementGroupId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.top
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const listDeploymentsAtSubscriptionOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/listDeployments",
+  httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationDeploymentsListResult
@@ -1229,22 +1268,19 @@ const listDeploymentsAtSubscriptionOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const cancelAtSubscriptionOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/cancel",
+  queryParameters: [Parameters.top, Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const cancelAtSubscriptionOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/cancel",
+  httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1253,23 +1289,19 @@ const cancelAtSubscriptionOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.subscriptionId,
+    Parameters.remediationName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listForSubscriptionOperationSpec: msRest.OperationSpec = {
+const listForSubscriptionOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations",
   httpMethod: "GET",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations",
-  urlParameters: [
-    Parameters.subscriptionId
-  ],
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.top,
-    Parameters.filter
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
   responses: {
     200: {
       bodyMapper: Mappers.RemediationListResult
@@ -1278,29 +1310,15 @@ const listForSubscriptionOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.filter, Parameters.apiVersion1],
+  urlParameters: [Parameters.$host, Parameters.subscriptionId],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const createOrUpdateAtSubscriptionOperationSpec: msRest.OperationSpec = {
+const createOrUpdateAtSubscriptionOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
   httpMethod: "PUT",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
-  urlParameters: [
-    Parameters.subscriptionId,
-    Parameters.remediationName
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  requestBody: {
-    parameterPath: "parameters",
-    mapper: {
-      ...Mappers.Remediation,
-      required: true
-    }
-  },
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1312,22 +1330,21 @@ const createOrUpdateAtSubscriptionOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const getAtSubscriptionOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  requestBody: Parameters.parameters,
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept, Parameters.contentType],
+  mediaType: "json",
+  serializer
+};
+const getAtSubscriptionOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1336,22 +1353,19 @@ const getAtSubscriptionOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const deleteAtSubscriptionOperationSpec: msRest.OperationSpec = {
-  httpMethod: "DELETE",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const deleteAtSubscriptionOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "DELETE",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1361,24 +1375,19 @@ const deleteAtSubscriptionOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const listDeploymentsAtResourceGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/listDeployments",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
-    Parameters.resourceGroupName,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.top
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const listDeploymentsAtResourceGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/listDeployments",
+  httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationDeploymentsListResult
@@ -1387,23 +1396,20 @@ const listDeploymentsAtResourceGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const cancelAtResourceGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/cancel",
+  queryParameters: [Parameters.top, Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
     Parameters.resourceGroupName,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const cancelAtResourceGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/cancel",
+  httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1412,24 +1418,20 @@ const cancelAtResourceGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const listForResourceGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
-    Parameters.resourceGroupName
-  ],
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.top,
-    Parameters.filter
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
+    Parameters.resourceGroupName,
+    Parameters.remediationName
   ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const listForResourceGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationListResult
@@ -1438,30 +1440,19 @@ const listForResourceGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const createOrUpdateAtResourceGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "PUT",
-  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  queryParameters: [Parameters.top, Parameters.filter, Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
-    Parameters.resourceGroupName,
-    Parameters.remediationName
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
+    Parameters.resourceGroupName
   ],
-  requestBody: {
-    parameterPath: "parameters",
-    mapper: {
-      ...Mappers.Remediation,
-      required: true
-    }
-  },
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const createOrUpdateAtResourceGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "PUT",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1473,23 +1464,22 @@ const createOrUpdateAtResourceGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const getAtResourceGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  requestBody: Parameters.parameters,
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
     Parameters.resourceGroupName,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept, Parameters.contentType],
+  mediaType: "json",
+  serializer
+};
+const getAtResourceGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1498,23 +1488,20 @@ const getAtResourceGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const deleteAtResourceGroupOperationSpec: msRest.OperationSpec = {
-  httpMethod: "DELETE",
-  path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.subscriptionId,
     Parameters.resourceGroupName,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const deleteAtResourceGroupOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "DELETE",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1524,23 +1511,20 @@ const deleteAtResourceGroupOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const listDeploymentsAtResourceOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/listDeployments",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
-    Parameters.resourceId,
+    Parameters.$host,
+    Parameters.subscriptionId,
+    Parameters.resourceGroupName,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.top
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const listDeploymentsAtResourceOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/listDeployments",
+  httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationDeploymentsListResult
@@ -1549,22 +1533,19 @@ const listDeploymentsAtResourceOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const cancelAtResourceOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  path: "{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/cancel",
+  queryParameters: [Parameters.top, Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.resourceId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const cancelAtResourceOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}/cancel",
+  httpMethod: "POST",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1573,23 +1554,18 @@ const cancelAtResourceOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.resourceId,
+    Parameters.remediationName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listForResourceOperationSpec: msRest.OperationSpec = {
+const listForResourceOperationSpec: coreClient.OperationSpec = {
+  path: "/{resourceId}/providers/Microsoft.PolicyInsights/remediations",
   httpMethod: "GET",
-  path: "{resourceId}/providers/Microsoft.PolicyInsights/remediations",
-  urlParameters: [
-    Parameters.resourceId
-  ],
-  queryParameters: [
-    Parameters.apiVersion1,
-    Parameters.top,
-    Parameters.filter
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
   responses: {
     200: {
       bodyMapper: Mappers.RemediationListResult
@@ -1598,29 +1574,15 @@ const listForResourceOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.filter, Parameters.apiVersion1],
+  urlParameters: [Parameters.$host, Parameters.resourceId],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const createOrUpdateAtResourceOperationSpec: msRest.OperationSpec = {
+const createOrUpdateAtResourceOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
   httpMethod: "PUT",
-  path: "{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
-  urlParameters: [
-    Parameters.resourceId,
-    Parameters.remediationName
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  requestBody: {
-    parameterPath: "parameters",
-    mapper: {
-      ...Mappers.Remediation,
-      required: true
-    }
-  },
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1632,22 +1594,21 @@ const createOrUpdateAtResourceOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const getAtResourceOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  requestBody: Parameters.parameters,
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.resourceId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept, Parameters.contentType],
+  mediaType: "json",
+  serializer
+};
+const getAtResourceOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1656,22 +1617,19 @@ const getAtResourceOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
-  serializer
-};
-
-const deleteAtResourceOperationSpec: msRest.OperationSpec = {
-  httpMethod: "DELETE",
-  path: "{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  queryParameters: [Parameters.apiVersion1],
   urlParameters: [
+    Parameters.$host,
     Parameters.resourceId,
     Parameters.remediationName
   ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  headerParameters: [Parameters.accept],
+  serializer
+};
+const deleteAtResourceOperationSpec: coreClient.OperationSpec = {
+  path:
+    "/{resourceId}/providers/Microsoft.PolicyInsights/remediations/{remediationName}",
+  httpMethod: "DELETE",
   responses: {
     200: {
       bodyMapper: Mappers.Remediation
@@ -1681,22 +1639,18 @@ const deleteAtResourceOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.resourceId,
+    Parameters.remediationName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listDeploymentsAtManagementGroupNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  baseUrl: "https://management.azure.com",
+const listDeploymentsAtManagementGroupNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationDeploymentsListResult
@@ -1705,22 +1659,20 @@ const listDeploymentsAtManagementGroupNextOperationSpec: msRest.OperationSpec =
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.managementGroupsNamespace,
+    Parameters.nextLink,
+    Parameters.managementGroupId,
+    Parameters.remediationName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listForManagementGroupNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
+const listForManagementGroupNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationListResult
@@ -1729,22 +1681,19 @@ const listForManagementGroupNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.filter, Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.managementGroupsNamespace,
+    Parameters.nextLink,
+    Parameters.managementGroupId
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listDeploymentsAtSubscriptionNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  baseUrl: "https://management.azure.com",
+const listDeploymentsAtSubscriptionNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationDeploymentsListResult
@@ -1753,22 +1702,19 @@ const listDeploymentsAtSubscriptionNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.subscriptionId,
+    Parameters.nextLink,
+    Parameters.remediationName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listForSubscriptionNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
+const listForSubscriptionNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationListResult
@@ -1777,22 +1723,18 @@ const listForSubscriptionNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.filter, Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.subscriptionId,
+    Parameters.nextLink
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listDeploymentsAtResourceGroupNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  baseUrl: "https://management.azure.com",
+const listDeploymentsAtResourceGroupNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationDeploymentsListResult
@@ -1801,22 +1743,20 @@ const listDeploymentsAtResourceGroupNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.subscriptionId,
+    Parameters.resourceGroupName,
+    Parameters.nextLink,
+    Parameters.remediationName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listForResourceGroupNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
+const listForResourceGroupNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationListResult
@@ -1825,22 +1765,19 @@ const listForResourceGroupNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.filter, Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.subscriptionId,
+    Parameters.resourceGroupName,
+    Parameters.nextLink
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listDeploymentsAtResourceNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "POST",
-  baseUrl: "https://management.azure.com",
+const listDeploymentsAtResourceNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationDeploymentsListResult
@@ -1849,22 +1786,19 @@ const listDeploymentsAtResourceNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.apiVersion1],
+  urlParameters: [
+    Parameters.$host,
+    Parameters.resourceId,
+    Parameters.nextLink,
+    Parameters.remediationName
+  ],
+  headerParameters: [Parameters.accept],
   serializer
 };
-
-const listForResourceNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
+const listForResourceNextOperationSpec: coreClient.OperationSpec = {
   path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion1
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
+  httpMethod: "GET",
   responses: {
     200: {
       bodyMapper: Mappers.RemediationListResult
@@ -1873,5 +1807,8 @@ const listForResourceNextOperationSpec: msRest.OperationSpec = {
       bodyMapper: Mappers.ErrorResponse
     }
   },
+  queryParameters: [Parameters.top, Parameters.filter, Parameters.apiVersion1],
+  urlParameters: [Parameters.$host, Parameters.resourceId, Parameters.nextLink],
+  headerParameters: [Parameters.accept],
   serializer
 };