@azure/arm-compute 19.2.1-alpha.20230104.1 → 20.0.0

package/src/models/parameters.ts

@@ -110,7 +110,7 @@ export const $host: OperationURLParameter = {
 export const apiVersion: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2022-08-01",
+    defaultValue: "2022-11-01",
     isConstant: true,
     serializedName: "api-version",
     type: {
@@ -1079,7 +1079,7 @@ export const galleryName: OperationURLParameter = {
 export const apiVersion3: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2022-01-03",
+    defaultValue: "2022-03-03",
     isConstant: true,
     serializedName: "api-version",
     type: {
@@ -1269,7 +1269,7 @@ export const cloudServiceName: OperationURLParameter = {
 export const apiVersion4: OperationQueryParameter = {
   parameterPath: "apiVersion",
   mapper: {
-    defaultValue: "2022-04-04",
+    defaultValue: "2022-09-04",
     isConstant: true,
     serializedName: "api-version",
     type: {

package/src/operations/availabilitySets.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { AvailabilitySets } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,10 +17,13 @@ import {
   AvailabilitySet,
   AvailabilitySetsListBySubscriptionNextOptionalParams,
   AvailabilitySetsListBySubscriptionOptionalParams,
+  AvailabilitySetsListBySubscriptionResponse,
   AvailabilitySetsListNextOptionalParams,
   AvailabilitySetsListOptionalParams,
+  AvailabilitySetsListResponse,
   VirtualMachineSize,
   AvailabilitySetsListAvailableSizesOptionalParams,
+  AvailabilitySetsListAvailableSizesResponse,
   AvailabilitySetsCreateOrUpdateOptionalParams,
   AvailabilitySetsCreateOrUpdateResponse,
   AvailabilitySetUpdate,
@@ -28,9 +32,6 @@ import {
   AvailabilitySetsDeleteOptionalParams,
   AvailabilitySetsGetOptionalParams,
   AvailabilitySetsGetResponse,
-  AvailabilitySetsListBySubscriptionResponse,
-  AvailabilitySetsListResponse,
-  AvailabilitySetsListAvailableSizesResponse,
   AvailabilitySetsListBySubscriptionNextResponse,
   AvailabilitySetsListNextResponse
 } from "../models";
@@ -63,22 +64,34 @@ export class AvailabilitySetsImpl implements AvailabilitySets {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listBySubscriptionPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listBySubscriptionPagingPage(options, settings);
       }
     };
   }
 
   private async *listBySubscriptionPagingPage(
-    options?: AvailabilitySetsListBySubscriptionOptionalParams
+    options?: AvailabilitySetsListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<AvailabilitySet[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: AvailabilitySetsListBySubscriptionResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listBySubscription(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listBySubscriptionNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -107,19 +120,29 @@ export class AvailabilitySetsImpl implements AvailabilitySets {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listPagingPage(resourceGroupName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listPagingPage(resourceGroupName, options, settings);
       }
     };
   }
 
   private async *listPagingPage(
     resourceGroupName: string,
-    options?: AvailabilitySetsListOptionalParams
+    options?: AvailabilitySetsListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<AvailabilitySet[]> {
-    let result = await this._list(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: AvailabilitySetsListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(resourceGroupName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         resourceGroupName,
@@ -127,7 +150,9 @@ export class AvailabilitySetsImpl implements AvailabilitySets {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -164,11 +189,15 @@ export class AvailabilitySetsImpl implements AvailabilitySets {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listAvailableSizesPagingPage(
           resourceGroupName,
           availabilitySetName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -177,9 +206,11 @@ export class AvailabilitySetsImpl implements AvailabilitySets {
   private async *listAvailableSizesPagingPage(
     resourceGroupName: string,
     availabilitySetName: string,
-    options?: AvailabilitySetsListAvailableSizesOptionalParams
+    options?: AvailabilitySetsListAvailableSizesOptionalParams,
+    _settings?: PageSettings
   ): AsyncIterableIterator<VirtualMachineSize[]> {
-    let result = await this._listAvailableSizes(
+    let result: AvailabilitySetsListAvailableSizesResponse;
+    result = await this._listAvailableSizes(
       resourceGroupName,
       availabilitySetName,
       options
@@ -516,7 +547,6 @@ const listBySubscriptionNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.expand1],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -536,7 +566,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/capacityReservationGroups.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { CapacityReservationGroups } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,8 +17,10 @@ import {
   CapacityReservationGroup,
   CapacityReservationGroupsListByResourceGroupNextOptionalParams,
   CapacityReservationGroupsListByResourceGroupOptionalParams,
+  CapacityReservationGroupsListByResourceGroupResponse,
   CapacityReservationGroupsListBySubscriptionNextOptionalParams,
   CapacityReservationGroupsListBySubscriptionOptionalParams,
+  CapacityReservationGroupsListBySubscriptionResponse,
   CapacityReservationGroupsCreateOrUpdateOptionalParams,
   CapacityReservationGroupsCreateOrUpdateResponse,
   CapacityReservationGroupUpdate,
@@ -26,8 +29,6 @@ import {
   CapacityReservationGroupsDeleteOptionalParams,
   CapacityReservationGroupsGetOptionalParams,
   CapacityReservationGroupsGetResponse,
-  CapacityReservationGroupsListByResourceGroupResponse,
-  CapacityReservationGroupsListBySubscriptionResponse,
   CapacityReservationGroupsListByResourceGroupNextResponse,
   CapacityReservationGroupsListBySubscriptionNextResponse
 } from "../models";
@@ -64,19 +65,33 @@ export class CapacityReservationGroupsImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listByResourceGroupPagingPage(resourceGroupName, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listByResourceGroupPagingPage(
+          resourceGroupName,
+          options,
+          settings
+        );
       }
     };
   }
 
   private async *listByResourceGroupPagingPage(
     resourceGroupName: string,
-    options?: CapacityReservationGroupsListByResourceGroupOptionalParams
+    options?: CapacityReservationGroupsListByResourceGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<CapacityReservationGroup[]> {
-    let result = await this._listByResourceGroup(resourceGroupName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: CapacityReservationGroupsListByResourceGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByResourceGroup(resourceGroupName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByResourceGroupNext(
         resourceGroupName,
@@ -84,7 +99,9 @@ export class CapacityReservationGroupsImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -116,22 +133,34 @@ export class CapacityReservationGroupsImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listBySubscriptionPagingPage(options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listBySubscriptionPagingPage(options, settings);
       }
     };
   }
 
   private async *listBySubscriptionPagingPage(
-    options?: CapacityReservationGroupsListBySubscriptionOptionalParams
+    options?: CapacityReservationGroupsListBySubscriptionOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<CapacityReservationGroup[]> {
-    let result = await this._listBySubscription(options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: CapacityReservationGroupsListBySubscriptionResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listBySubscription(options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listBySubscriptionNext(continuationToken, options);
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -429,7 +458,6 @@ const listByResourceGroupNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.expand6],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -450,7 +478,6 @@ const listBySubscriptionNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion, Parameters.expand6],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/capacityReservations.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { CapacityReservations } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,6 +19,7 @@ import {
   CapacityReservation,
   CapacityReservationsListByCapacityReservationGroupNextOptionalParams,
   CapacityReservationsListByCapacityReservationGroupOptionalParams,
+  CapacityReservationsListByCapacityReservationGroupResponse,
   CapacityReservationsCreateOrUpdateOptionalParams,
   CapacityReservationsCreateOrUpdateResponse,
   CapacityReservationUpdate,
@@ -26,7 +28,6 @@ import {
   CapacityReservationsDeleteOptionalParams,
   CapacityReservationsGetOptionalParams,
   CapacityReservationsGetResponse,
-  CapacityReservationsListByCapacityReservationGroupResponse,
   CapacityReservationsListByCapacityReservationGroupNextResponse
 } from "../models";
 
@@ -67,11 +68,15 @@ export class CapacityReservationsImpl implements CapacityReservations {
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listByCapacityReservationGroupPagingPage(
           resourceGroupName,
           capacityReservationGroupName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -80,15 +85,22 @@ export class CapacityReservationsImpl implements CapacityReservations {
   private async *listByCapacityReservationGroupPagingPage(
     resourceGroupName: string,
     capacityReservationGroupName: string,
-    options?: CapacityReservationsListByCapacityReservationGroupOptionalParams
+    options?: CapacityReservationsListByCapacityReservationGroupOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<CapacityReservation[]> {
-    let result = await this._listByCapacityReservationGroup(
-      resourceGroupName,
-      capacityReservationGroupName,
-      options
-    );
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: CapacityReservationsListByCapacityReservationGroupResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listByCapacityReservationGroup(
+        resourceGroupName,
+        capacityReservationGroupName,
+        options
+      );
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listByCapacityReservationGroupNext(
         resourceGroupName,
@@ -97,7 +109,9 @@ export class CapacityReservationsImpl implements CapacityReservations {
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -634,7 +648,6 @@ const listByCapacityReservationGroupNextOperationSpec: coreClient.OperationSpec
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/cloudServiceOperatingSystems.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { CloudServiceOperatingSystems } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -16,15 +17,15 @@ import {
   OSVersion,
   CloudServiceOperatingSystemsListOSVersionsNextOptionalParams,
   CloudServiceOperatingSystemsListOSVersionsOptionalParams,
+  CloudServiceOperatingSystemsListOSVersionsResponse,
   OSFamily,
   CloudServiceOperatingSystemsListOSFamiliesNextOptionalParams,
   CloudServiceOperatingSystemsListOSFamiliesOptionalParams,
+  CloudServiceOperatingSystemsListOSFamiliesResponse,
   CloudServiceOperatingSystemsGetOSVersionOptionalParams,
   CloudServiceOperatingSystemsGetOSVersionResponse,
-  CloudServiceOperatingSystemsListOSVersionsResponse,
   CloudServiceOperatingSystemsGetOSFamilyOptionalParams,
   CloudServiceOperatingSystemsGetOSFamilyResponse,
-  CloudServiceOperatingSystemsListOSFamiliesResponse,
   CloudServiceOperatingSystemsListOSVersionsNextResponse,
   CloudServiceOperatingSystemsListOSFamiliesNextResponse
 } from "../models";
@@ -62,19 +63,29 @@ export class CloudServiceOperatingSystemsImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listOSVersionsPagingPage(location, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listOSVersionsPagingPage(location, options, settings);
       }
     };
   }
 
   private async *listOSVersionsPagingPage(
     location: string,
-    options?: CloudServiceOperatingSystemsListOSVersionsOptionalParams
+    options?: CloudServiceOperatingSystemsListOSVersionsOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<OSVersion[]> {
-    let result = await this._listOSVersions(location, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: CloudServiceOperatingSystemsListOSVersionsResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listOSVersions(location, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listOSVersionsNext(
         location,
@@ -82,7 +93,9 @@ export class CloudServiceOperatingSystemsImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -114,19 +127,29 @@ export class CloudServiceOperatingSystemsImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
-        return this.listOSFamiliesPagingPage(location, options);
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
+        return this.listOSFamiliesPagingPage(location, options, settings);
       }
     };
   }
 
   private async *listOSFamiliesPagingPage(
     location: string,
-    options?: CloudServiceOperatingSystemsListOSFamiliesOptionalParams
+    options?: CloudServiceOperatingSystemsListOSFamiliesOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<OSFamily[]> {
-    let result = await this._listOSFamilies(location, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: CloudServiceOperatingSystemsListOSFamiliesResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._listOSFamilies(location, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listOSFamiliesNext(
         location,
@@ -134,7 +157,9 @@ export class CloudServiceOperatingSystemsImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -351,7 +376,6 @@ const listOSVersionsNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion4],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,
@@ -372,7 +396,6 @@ const listOSFamiliesNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.apiVersion4],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,

package/src/operations/cloudServiceRoleInstances.ts

@@ -6,7 +6,8 @@
  * Changes may cause incorrect behavior and will be lost if the code is regenerated.
  */
 
-import { PagedAsyncIterableIterator } from "@azure/core-paging";
+import { PagedAsyncIterableIterator, PageSettings } from "@azure/core-paging";
+import { setContinuationToken } from "../pagingHelper";
 import { CloudServiceRoleInstances } from "../operationsInterfaces";
 import * as coreClient from "@azure/core-client";
 import * as Mappers from "../models/mappers";
@@ -18,12 +19,12 @@ import {
   RoleInstance,
   CloudServiceRoleInstancesListNextOptionalParams,
   CloudServiceRoleInstancesListOptionalParams,
+  CloudServiceRoleInstancesListResponse,
   CloudServiceRoleInstancesDeleteOptionalParams,
   CloudServiceRoleInstancesGetOptionalParams,
   CloudServiceRoleInstancesGetResponse,
   CloudServiceRoleInstancesGetInstanceViewOptionalParams,
   CloudServiceRoleInstancesGetInstanceViewResponse,
-  CloudServiceRoleInstancesListResponse,
   CloudServiceRoleInstancesRestartOptionalParams,
   CloudServiceRoleInstancesReimageOptionalParams,
   CloudServiceRoleInstancesRebuildOptionalParams,
@@ -70,11 +71,15 @@ export class CloudServiceRoleInstancesImpl
       [Symbol.asyncIterator]() {
         return this;
       },
-      byPage: () => {
+      byPage: (settings?: PageSettings) => {
+        if (settings?.maxPageSize) {
+          throw new Error("maxPageSize is not supported by this operation.");
+        }
         return this.listPagingPage(
           resourceGroupName,
           cloudServiceName,
-          options
+          options,
+          settings
         );
       }
     };
@@ -83,11 +88,18 @@ export class CloudServiceRoleInstancesImpl
   private async *listPagingPage(
     resourceGroupName: string,
     cloudServiceName: string,
-    options?: CloudServiceRoleInstancesListOptionalParams
+    options?: CloudServiceRoleInstancesListOptionalParams,
+    settings?: PageSettings
   ): AsyncIterableIterator<RoleInstance[]> {
-    let result = await this._list(resourceGroupName, cloudServiceName, options);
-    yield result.value || [];
-    let continuationToken = result.nextLink;
+    let result: CloudServiceRoleInstancesListResponse;
+    let continuationToken = settings?.continuationToken;
+    if (!continuationToken) {
+      result = await this._list(resourceGroupName, cloudServiceName, options);
+      let page = result.value || [];
+      continuationToken = result.nextLink;
+      setContinuationToken(page, continuationToken);
+      yield page;
+    }
     while (continuationToken) {
       result = await this._listNext(
         resourceGroupName,
@@ -96,7 +108,9 @@ export class CloudServiceRoleInstancesImpl
         options
       );
       continuationToken = result.nextLink;
-      yield result.value || [];
+      let page = result.value || [];
+      setContinuationToken(page, continuationToken);
+      yield page;
     }
   }
 
@@ -763,7 +777,6 @@ const listNextOperationSpec: coreClient.OperationSpec = {
       bodyMapper: Mappers.CloudError
     }
   },
-  queryParameters: [Parameters.expand2, Parameters.apiVersion4],
   urlParameters: [
     Parameters.$host,
     Parameters.subscriptionId,