Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/batch/batch/src/batchServiceClient.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class BatchServiceClient extends BatchServiceClientContext {
* @param batchUrl The base URL for all Azure Batch service requests.
* @param [options] The parameter options
*/
constructor(credentials: coreHttp.TokenCredential | coreHttp.ServiceClientCredentials, batchUrl: string, options?: coreArm.AzureServiceClientOptions) {
constructor(credentials: msRest.ServiceClientCredentials, batchUrl: string, options?: msRest.AzureServiceClientOptions) {
super(credentials, batchUrl, options);
this.application = new operations.Application(this);
this.pool = new operations.Pool(this);
Expand Down
4 changes: 2 additions & 2 deletions sdk/batch/batch/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8356,7 +8356,7 @@ export interface PoolListNextOptionalParams extends coreHttp.RequestOptionsBase
/**
* Optional Parameters.
*/
export interface AccountListSupportedImagesOptionalParams extends coreHttp.RequestOptionsBase {
export interface AccountListSupportedImagesOptionalParams extends msRest.RequestOptionsBase {
/**
* Additional parameters for the operation
*/
Expand All @@ -8376,7 +8376,7 @@ export interface AccountListPoolNodeCountsOptionalParams extends coreHttp.Reques
/**
* Optional Parameters.
*/
export interface AccountListSupportedImagesNextOptionalParams extends coreHttp.RequestOptionsBase {
export interface AccountListSupportedImagesNextOptionalParams extends msRest.RequestOptionsBase {
/**
* Additional parameters for the operation
*/
Expand Down
215 changes: 210 additions & 5 deletions sdk/batch/batch/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ export const ImageReference: coreHttp.CompositeMapper = {
}
};

export const ImageInformation: coreHttp.CompositeMapper = {
export const ImageInformation: msRest.CompositeMapper = {
serializedName: "ImageInformation",
type: {
name: "Composite",
Expand Down Expand Up @@ -2213,6 +2213,211 @@ export const NetworkConfiguration: coreHttp.CompositeMapper = {
}
};

export const AzureBlobFileSystemConfiguration: msRest.CompositeMapper = {
serializedName: "AzureBlobFileSystemConfiguration",
type: {
name: "Composite",
className: "AzureBlobFileSystemConfiguration",
modelProperties: {
accountName: {
required: true,
serializedName: "accountName",
type: {
name: "String"
}
},
containerName: {
required: true,
serializedName: "containerName",
type: {
name: "String"
}
},
accountKey: {
serializedName: "accountKey",
type: {
name: "String"
}
},
sasKey: {
serializedName: "sasKey",
type: {
name: "String"
}
},
blobfuseOptions: {
serializedName: "blobfuseOptions",
type: {
name: "String"
}
},
relativeMountPath: {
required: true,
serializedName: "relativeMountPath",
type: {
name: "String"
}
}
}
}
};

export const NFSMountConfiguration: msRest.CompositeMapper = {
serializedName: "NFSMountConfiguration",
type: {
name: "Composite",
className: "NFSMountConfiguration",
modelProperties: {
source: {
required: true,
serializedName: "source",
type: {
name: "String"
}
},
relativeMountPath: {
required: true,
serializedName: "relativeMountPath",
type: {
name: "String"
}
},
mountOptions: {
serializedName: "mountOptions",
type: {
name: "String"
}
}
}
}
};

export const CIFSMountConfiguration: msRest.CompositeMapper = {
serializedName: "CIFSMountConfiguration",
type: {
name: "Composite",
className: "CIFSMountConfiguration",
modelProperties: {
username: {
required: true,
serializedName: "username",
type: {
name: "String"
}
},
source: {
required: true,
serializedName: "source",
type: {
name: "String"
}
},
relativeMountPath: {
required: true,
serializedName: "relativeMountPath",
type: {
name: "String"
}
},
mountOptions: {
serializedName: "mountOptions",
type: {
name: "String"
}
},
password: {
required: true,
serializedName: "password",
type: {
name: "String"
}
}
}
}
};

export const AzureFileShareConfiguration: msRest.CompositeMapper = {
serializedName: "AzureFileShareConfiguration",
type: {
name: "Composite",
className: "AzureFileShareConfiguration",
modelProperties: {
accountName: {
required: true,
serializedName: "accountName",
type: {
name: "String"
}
},
azureFileUrl: {
required: true,
serializedName: "azureFileUrl",
type: {
name: "String"
}
},
accountKey: {
required: true,
serializedName: "accountKey",
type: {
name: "String"
}
},
relativeMountPath: {
required: true,
serializedName: "relativeMountPath",
type: {
name: "String"
}
},
mountOptions: {
serializedName: "mountOptions",
type: {
name: "String"
}
}
}
}
};

export const MountConfiguration: msRest.CompositeMapper = {
serializedName: "MountConfiguration",
type: {
name: "Composite",
className: "MountConfiguration",
modelProperties: {
azureBlobFileSystemConfiguration: {
serializedName: "azureBlobFileSystemConfiguration",
type: {
name: "Composite",
className: "AzureBlobFileSystemConfiguration"
}
},
nfsMountConfiguration: {
serializedName: "nfsMountConfiguration",
type: {
name: "Composite",
className: "NFSMountConfiguration"
}
},
cifsMountConfiguration: {
serializedName: "cifsMountConfiguration",
type: {
name: "Composite",
className: "CIFSMountConfiguration"
}
},
azureFileShareConfiguration: {
serializedName: "azureFileShareConfiguration",
type: {
name: "Composite",
className: "AzureFileShareConfiguration"
}
}
}
}
};

export const AzureBlobFileSystemConfiguration: coreHttp.CompositeMapper = {
serializedName: "AzureBlobFileSystemConfiguration",
type: {
Expand Down Expand Up @@ -7380,7 +7585,7 @@ export const PoolRemoveNodesOptions: coreHttp.CompositeMapper = {
}
};

export const AccountListSupportedImagesOptions: coreHttp.CompositeMapper = {
export const AccountListSupportedImagesOptions: msRest.CompositeMapper = {
type: {
name: "Composite",
className: "AccountListSupportedImagesOptions",
Expand Down Expand Up @@ -9955,7 +10160,7 @@ export const PoolListNextOptions: coreHttp.CompositeMapper = {
}
};

export const AccountListSupportedImagesNextOptions: coreHttp.CompositeMapper = {
export const AccountListSupportedImagesNextOptions: msRest.CompositeMapper = {
type: {
name: "Composite",
className: "AccountListSupportedImagesNextOptions",
Expand Down Expand Up @@ -10332,7 +10537,7 @@ export const PoolListUsageMetricsHeaders: coreHttp.CompositeMapper = {
}
};

export const AccountListSupportedImagesHeaders: coreHttp.CompositeMapper = {
export const AccountListSupportedImagesHeaders: msRest.CompositeMapper = {
serializedName: "account-listsupportedimages-headers",
type: {
name: "Composite",
Expand Down Expand Up @@ -13114,7 +13319,7 @@ export const CloudPoolListResult: coreHttp.CompositeMapper = {
}
};

export const AccountListSupportedImagesResult: coreHttp.CompositeMapper = {
export const AccountListSupportedImagesResult: msRest.CompositeMapper = {
serializedName: "AccountListSupportedImagesResult",
type: {
name: "Composite",
Expand Down
18 changes: 9 additions & 9 deletions sdk/batch/batch/src/operations/account.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@ export class Account {
/**
* @param callback The callback
*/
listSupportedImages(callback: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
listSupportedImages(callback: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
/**
* @param options The optional parameters
* @param callback The callback
*/
listSupportedImages(options: Models.AccountListSupportedImagesOptionalParams, callback: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
listSupportedImages(options?: Models.AccountListSupportedImagesOptionalParams | coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>, callback?: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): Promise<Models.AccountListSupportedImagesResponse> {
listSupportedImages(options: Models.AccountListSupportedImagesOptionalParams, callback: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
listSupportedImages(options?: Models.AccountListSupportedImagesOptionalParams | msRest.ServiceCallback<Models.AccountListSupportedImagesResult>, callback?: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): Promise<Models.AccountListSupportedImagesResponse> {
return this.client.sendOperationRequest(
{
options
Expand Down Expand Up @@ -85,14 +85,14 @@ export class Account {
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param callback The callback
*/
listSupportedImagesNext(nextPageLink: string, callback: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
listSupportedImagesNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
/**
* @param nextPageLink The NextLink from the previous successful call to List operation.
* @param options The optional parameters
* @param callback The callback
*/
listSupportedImagesNext(nextPageLink: string, options: Models.AccountListSupportedImagesNextOptionalParams, callback: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
listSupportedImagesNext(nextPageLink: string, options?: Models.AccountListSupportedImagesNextOptionalParams | coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>, callback?: coreHttp.ServiceCallback<Models.AccountListSupportedImagesResult>): Promise<Models.AccountListSupportedImagesResponse> {
listSupportedImagesNext(nextPageLink: string, options: Models.AccountListSupportedImagesNextOptionalParams, callback: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): void;
listSupportedImagesNext(nextPageLink: string, options?: Models.AccountListSupportedImagesNextOptionalParams | msRest.ServiceCallback<Models.AccountListSupportedImagesResult>, callback?: msRest.ServiceCallback<Models.AccountListSupportedImagesResult>): Promise<Models.AccountListSupportedImagesResponse> {
return this.client.sendOperationRequest(
{
nextPageLink,
Expand Down Expand Up @@ -132,8 +132,8 @@ export class Account {
}

// Operation Specifications
const serializer = new coreHttp.Serializer(Mappers);
const listSupportedImagesOperationSpec: coreHttp.OperationSpec = {
const serializer = new msRest.Serializer(Mappers);
const listSupportedImagesOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
path: "supportedimages",
urlParameters: [
Expand Down Expand Up @@ -193,7 +193,7 @@ const listPoolNodeCountsOperationSpec: coreHttp.OperationSpec = {
serializer
};

const listSupportedImagesNextOperationSpec: coreHttp.OperationSpec = {
const listSupportedImagesNextOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
baseUrl: "{batchUrl}",
path: "{nextLink}",
Expand Down