diff --git a/sdk/machinelearningservices/arm-machinelearningservices/LICENSE.txt b/sdk/machinelearningservices/arm-machinelearningservices/LICENSE.txt index ea8fb1516028..2d3163745319 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/LICENSE.txt +++ b/sdk/machinelearningservices/arm-machinelearningservices/LICENSE.txt @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2020 Microsoft +Copyright (c) 2021 Microsoft Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/sdk/machinelearningservices/arm-machinelearningservices/README.md b/sdk/machinelearningservices/arm-machinelearningservices/README.md index 33d5aa2d1e54..17bc6c8df2e1 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/README.md +++ b/sdk/machinelearningservices/arm-machinelearningservices/README.md @@ -1,11 +1,11 @@ ## Azure AzureMachineLearningWorkspaces SDK for JavaScript -This package contains an isomorphic SDK (runs both in Node.js and in browsers) for AzureMachineLearningWorkspaces. +This package contains an isomorphic SDK (runs both in node.js and in browsers) for AzureMachineLearningWorkspaces. ### Currently supported environments - [LTS versions of Node.js](https://nodejs.org/about/releases/) -- Latest versions of Safari, Chrome, Edge, and Firefox. +- Latest versions of Safari, Chrome, Edge and Firefox. ### Prerequisites @@ -21,7 +21,6 @@ Install both packages using the below command: ```bash npm install --save @azure/arm-machinelearningservices @azure/identity ``` - > **Note**: You may have used either `@azure/ms-rest-nodeauth` or `@azure/ms-rest-browserauth` in the past. These packages are in maintenance mode receiving critical bug fixes, but no new features. If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/), or are writing a client side browser application, we strongly encourage you to upgrade to `@azure/identity` which uses the latest versions of Azure Active Directory and MSAL APIs and provides more authentication options. @@ -37,7 +36,6 @@ If you are on a [Node.js that has LTS status](https://nodejs.org/about/releases/ In the below samples, we pass the credential and the Azure subscription id to instantiate the client. Once the client is created, explore the operations on it either in your favorite editor or in our [API reference documentation](https://docs.microsoft.com/javascript/api) to get started. - #### nodejs - Authentication, client creation, and list operations as an example written in JavaScript. ##### Sample code @@ -51,7 +49,6 @@ const subscriptionId = process.env["AZURE_SUBSCRIPTION_ID"]; // Please note that you can also use credentials from the `@azure/ms-rest-nodeauth` package instead. const creds = new DefaultAzureCredential(); const client = new AzureMachineLearningWorkspaces(creds, subscriptionId); - client.operations.list().then((result) => { console.log("The result is:"); console.log(result); @@ -86,7 +83,7 @@ In browser applications, we recommend using the `InteractiveBrowserCredential` t const credential = new InteractiveBrowserCredential( { clientId: "", - tenantId: "" + tenant: "" }); const client = new Azure.ArmMachinelearningservices.AzureMachineLearningWorkspaces(creds, subscriptionId); client.operations.list().then((result) => { diff --git a/sdk/machinelearningservices/arm-machinelearningservices/package.json b/sdk/machinelearningservices/arm-machinelearningservices/package.json index 058f1d98c45b..f9a1e0a4c738 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/package.json +++ b/sdk/machinelearningservices/arm-machinelearningservices/package.json @@ -27,7 +27,7 @@ "rollup-plugin-sourcemaps": "^0.4.2", "uglify-js": "^3.6.0" }, - "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/main/sdk/machinelearningservices/arm-machinelearningservices", + "homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/machinelearningservices/arm-machinelearningservices", "repository": { "type": "git", "url": "https://github.com/Azure/azure-sdk-for-js.git" diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspaces.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspaces.ts index 927e99eb1220..7fe1cf646786 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspaces.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspaces.ts @@ -11,7 +11,6 @@ import * as msRest from "@azure/ms-rest-js"; import { TokenCredential } from "@azure/core-auth"; import * as Models from "./models"; import * as Mappers from "./models/mappers"; -import * as Parameters from "./models/parameters"; import * as operations from "./operations"; import { AzureMachineLearningWorkspacesContext } from "./azureMachineLearningWorkspacesContext"; @@ -20,15 +19,15 @@ class AzureMachineLearningWorkspaces extends AzureMachineLearningWorkspacesConte // Operation groups operations: operations.Operations; workspaces: operations.Workspaces; - workspaceFeatures: operations.WorkspaceFeatures; - notebooks: operations.Notebooks; usages: operations.Usages; virtualMachineSizes: operations.VirtualMachineSizes; quotas: operations.Quotas; - workspaceConnections: operations.WorkspaceConnections; - machineLearningCompute: operations.MachineLearningCompute; + compute: operations.ComputeOperations; privateEndpointConnections: operations.PrivateEndpointConnections; privateLinkResources: operations.PrivateLinkResources; + workspaceConnections: operations.WorkspaceConnections; + workspaceFeatures: operations.WorkspaceFeatures; + workspaceSkus: operations.WorkspaceSkus; /** * Initializes a new instance of the AzureMachineLearningWorkspaces class. @@ -38,125 +37,26 @@ class AzureMachineLearningWorkspaces extends AzureMachineLearningWorkspacesConte * {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the * ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and * @azure/ms-rest-browserauth are also supported. - * @param subscriptionId Azure subscription identifier. + * @param subscriptionId The ID of the target subscription. * @param [options] The parameter options */ constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.AzureMachineLearningWorkspacesOptions) { super(credentials, subscriptionId, options); this.operations = new operations.Operations(this); this.workspaces = new operations.Workspaces(this); - this.workspaceFeatures = new operations.WorkspaceFeatures(this); - this.notebooks = new operations.Notebooks(this); this.usages = new operations.Usages(this); this.virtualMachineSizes = new operations.VirtualMachineSizes(this); this.quotas = new operations.Quotas(this); - this.workspaceConnections = new operations.WorkspaceConnections(this); - this.machineLearningCompute = new operations.MachineLearningCompute(this); + this.compute = new operations.ComputeOperations(this); this.privateEndpointConnections = new operations.PrivateEndpointConnections(this); this.privateLinkResources = new operations.PrivateLinkResources(this); - } - - /** - * Lists all skus with associated features - * @param [options] The optional parameters - * @returns Promise - */ - listSkus(options?: msRest.RequestOptionsBase): Promise; - /** - * @param callback The callback - */ - listSkus(callback: msRest.ServiceCallback): void; - /** - * @param options The optional parameters - * @param callback The callback - */ - listSkus(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listSkus(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.sendOperationRequest( - { - options - }, - listSkusOperationSpec, - callback) as Promise; - } - - /** - * Lists all skus with associated features - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param [options] The optional parameters - * @returns Promise - */ - listSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param callback The callback - */ - listSkusNext(nextPageLink: string, callback: msRest.ServiceCallback): void; - /** - * @param nextPageLink The NextLink from the previous successful call to List operation. - * @param options The optional parameters - * @param callback The callback - */ - listSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.sendOperationRequest( - { - nextPageLink, - options - }, - listSkusNextOperationSpec, - callback) as Promise; + this.workspaceConnections = new operations.WorkspaceConnections(this); + this.workspaceFeatures = new operations.WorkspaceFeatures(this); + this.workspaceSkus = new operations.WorkspaceSkus(this); } } // Operation Specifications -const serializer = new msRest.Serializer(Mappers); -const listSkusOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/workspaces/skus", - urlParameters: [ - Parameters.subscriptionId - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.SkuListResult - }, - default: { - bodyMapper: Mappers.MachineLearningServiceError - } - }, - serializer -}; - -const listSkusNextOperationSpec: msRest.OperationSpec = { - httpMethod: "GET", - baseUrl: "https://management.azure.com", - path: "{nextLink}", - urlParameters: [ - Parameters.nextPageLink - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.SkuListResult - }, - default: { - bodyMapper: Mappers.MachineLearningServiceError - } - }, - serializer -}; export { AzureMachineLearningWorkspaces, diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts index 4d352d0f53f4..e844599bd9e2 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts @@ -9,16 +9,16 @@ import * as Models from "./models"; import * as msRest from "@azure/ms-rest-js"; -import { TokenCredential } from "@azure/core-auth"; import * as msRestAzure from "@azure/ms-rest-azure-js"; +import { TokenCredential } from "@azure/core-auth"; const packageName = "@azure/arm-machinelearningservices"; const packageVersion = "4.1.0"; export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServiceClient { credentials: msRest.ServiceClientCredentials | TokenCredential; - subscriptionId: string; apiVersion?: string; + subscriptionId: string; /** * Initializes a new instance of the AzureMachineLearningWorkspaces class. @@ -28,7 +28,7 @@ export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServ * {@link https://www.npmjs.com/package/@azure/identity}. Credentials implementing the * ServiceClientCredentials interface from the older packages @azure/ms-rest-nodeauth and * @azure/ms-rest-browserauth are also supported. - * @param subscriptionId Azure subscription identifier. + * @param subscriptionId The ID of the target subscription. * @param [options] The parameter options */ constructor(credentials: msRest.ServiceClientCredentials | TokenCredential, subscriptionId: string, options?: Models.AzureMachineLearningWorkspacesOptions) { @@ -42,14 +42,14 @@ export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServ if (!options) { options = {}; } - if(!options.userAgent) { + if (!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } super(credentials, options); - this.apiVersion = '2020-08-01'; + this.apiVersion = '2021-07-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; @@ -57,10 +57,10 @@ export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServ this.credentials = credentials; this.subscriptionId = subscriptionId; - if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { + if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } - if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { + if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout; } } diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/machineLearningComputeMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/computeOperationsMappers.ts similarity index 74% rename from sdk/machinelearningservices/arm-machinelearningservices/src/models/machineLearningComputeMappers.ts rename to sdk/machinelearningservices/arm-machinelearningservices/src/models/computeOperationsMappers.ts index 456a73c75208..3424c3f44aa2 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/machineLearningComputeMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/computeOperationsMappers.ts @@ -9,16 +9,21 @@ export { discriminators, AKS, - AksComputeSecrets, AksNetworkingConfiguration, AKSProperties, AmlCompute, AmlComputeNodeInformation, AmlComputeNodesInformation, AmlComputeProperties, + AssignedUser, + AutoPauseProperties, + AutoScaleProperties, + AzureEntityResource, BaseResource, ClusterUpdateParameters, Compute, + ComputeCreateOrUpdateHeaders, + ComputeDeleteHeaders, ComputeInstance, ComputeInstanceApplication, ComputeInstanceConnectivityEndpoints, @@ -26,43 +31,53 @@ export { ComputeInstanceLastOperation, ComputeInstanceProperties, ComputeInstanceSshSettings, - ComputeNodesInformation, ComputeResource, ComputeSecrets, + CosmosDbSettings, Databricks, - DatabricksComputeSecrets, DatabricksProperties, DataFactory, DataLakeAnalytics, DataLakeAnalyticsProperties, EncryptionProperty, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, HDInsight, HDInsightProperties, Identity, - IdentityUserAssignedIdentitiesValue, + IdentityForCmk, KeyVaultProperties, - MachineLearningComputeCreateOrUpdateHeaders, - MachineLearningComputeDeleteHeaders, - MachineLearningServiceError, NodeStateCounts, NotebookPreparationError, NotebookResourceInfo, PaginatedComputeResourcesList, + PersonalComputeInstanceSettings, PrivateEndpoint, PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, + ProxyResource, Resource, ResourceId, ScaleSettings, + ScaleSettingsInformation, + ScriptReference, + ScriptsToExecute, + ServiceManagedResourcesSettings, + SetupScripts, SharedPrivateLinkResource, Sku, SslConfiguration, + SynapseSpark, + SynapseSparkProperties, + SystemData, SystemService, + TrackedResource, UserAccountCredentials, + UserAssignedIdentity, VirtualMachine, + VirtualMachineImage, VirtualMachineProperties, VirtualMachineSecrets, VirtualMachineSshCredentials, diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/index.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/index.ts index 77ada3593b7f..e9a058b63e8b 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/index.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/index.ts @@ -48,34 +48,14 @@ export interface Operation { } /** - * An interface representing NotebookListCredentialsResult. + * Identity that will be used to access key vault for encryption at rest */ -export interface NotebookListCredentialsResult { - primaryAccessKey?: string; - secondaryAccessKey?: string; -} - -/** - * An interface representing NotebookPreparationError. - */ -export interface NotebookPreparationError { - errorMessage?: string; - statusCode?: number; -} - -/** - * An interface representing NotebookResourceInfo. - */ -export interface NotebookResourceInfo { - fqdn?: string; - /** - * the data plane resourceId that used to initialize notebook component - */ - resourceId?: string; +export interface IdentityForCmk { /** - * The error that occurs when preparing notebook. + * The ArmId of the user assigned identity that will be used to access the customer managed key + * vault */ - notebookPreparationError?: NotebookPreparationError; + userAssignedIdentity?: string; } /** @@ -105,6 +85,10 @@ export interface EncryptionProperty { * 'Enabled', 'Disabled' */ status: EncryptionStatus; + /** + * The identity that will be used to access the key vault for encryption at rest. + */ + identity?: IdentityForCmk; /** * Customer Key vault properties. */ @@ -120,6 +104,11 @@ export interface PrivateEndpoint { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly id?: string; + /** + * The ARM identifier for Subnet resource that private endpoint links to + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly subnetArmId?: string; } /** @@ -143,24 +132,125 @@ export interface PrivateLinkServiceConnectionState { } /** - * The Private Endpoint Connection resource. + * User Assigned Identity + */ +export interface UserAssignedIdentity { + /** + * The principal ID of the user assigned identity. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly principalId?: string; + /** + * The tenant ID of the user assigned identity. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly tenantId?: string; + /** + * The clientId(aka appId) of the user assigned identity. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly clientId?: string; +} + +/** + * Identity for the resource. + */ +export interface Identity { + /** + * The principal ID of resource identity. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly principalId?: string; + /** + * The tenant ID of resource. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly tenantId?: string; + /** + * The identity type. Possible values include: 'SystemAssigned', 'SystemAssigned,UserAssigned', + * 'UserAssigned', 'None' + */ + type?: ResourceIdentityType; + /** + * The user assigned identities associated with the resource. + */ + userAssignedIdentities?: { [propertyName: string]: UserAssignedIdentity }; +} + +/** + * Sku of the resource */ -export interface PrivateEndpointConnection extends BaseResource { +export interface Sku { + /** + * Name of the sku + */ + name?: string; + /** + * Tier of the sku like Basic or Enterprise + */ + tier?: string; +} + +/** + * Metadata pertaining to creation and last modification of the resource. + */ +export interface SystemData { + /** + * The identity that created the resource. + */ + createdBy?: string; + /** + * The type of identity that created the resource. Possible values include: 'User', + * 'Application', 'ManagedIdentity', 'Key' + */ + createdByType?: CreatedByType; + /** + * The timestamp of resource creation (UTC). + */ + createdAt?: Date; + /** + * The identity that last modified the resource. + */ + lastModifiedBy?: string; + /** + * The type of identity that last modified the resource. Possible values include: 'User', + * 'Application', 'ManagedIdentity', 'Key' + */ + lastModifiedByType?: CreatedByType; + /** + * The timestamp of resource last modification (UTC) + */ + lastModifiedAt?: Date; +} + +/** + * Common fields that are returned in the response for all Azure Resource Manager resources + * @summary Resource + */ +export interface Resource extends BaseResource { /** - * ResourceId of the private endpoint connection. + * Fully qualified resource ID for the resource. Ex - + * /subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName} * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly id?: string; /** - * Friendly name of the private endpoint connection. + * The name of the resource * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly name?: string; /** - * Resource type of private endpoint connection. + * The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or + * "Microsoft.Storage/storageAccounts" * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly type?: string; +} + +/** + * The Private Endpoint Connection resource. + */ +export interface PrivateEndpointConnection extends Resource { /** * The resource of private end point. */ @@ -175,6 +265,26 @@ export interface PrivateEndpointConnection extends BaseResource { * 'Succeeded', 'Creating', 'Deleting', 'Failed' */ provisioningState?: PrivateEndpointConnectionProvisioningState; + /** + * The identity of the resource. + */ + identity?: Identity; + /** + * Specifies the location of the resource. + */ + location?: string; + /** + * Contains resource tags defined as key/value pairs. + */ + tags?: { [propertyName: string]: string }; + /** + * The sku of the workspace. + */ + sku?: Sku; + /** + * System data + */ + systemData?: SystemData; } /** @@ -205,40 +315,46 @@ export interface SharedPrivateLinkResource { } /** - * Azure Resource Manager resource envelope. + * An interface representing NotebookPreparationError. */ -export interface Resource extends BaseResource { - /** - * Specifies the resource ID. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly id?: string; - /** - * Specifies the name of the resource. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly name?: string; - /** - * The identity of the resource. - */ - identity?: Identity; +export interface NotebookPreparationError { + errorMessage?: string; + statusCode?: number; +} + +/** + * An interface representing NotebookResourceInfo. + */ +export interface NotebookResourceInfo { + fqdn?: string; /** - * Specifies the location of the resource. + * the data plane resourceId that used to initialize notebook component */ - location?: string; + resourceId?: string; /** - * Specifies the type of the resource. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * The error that occurs when preparing notebook. */ - readonly type?: string; + notebookPreparationError?: NotebookPreparationError; +} + +/** + * An interface representing CosmosDbSettings. + */ +export interface CosmosDbSettings { /** - * Contains resource tags defined as key/value pairs. + * The throughput of the collections in cosmosdb database */ - tags?: { [propertyName: string]: string }; + collectionsThroughput?: number; +} + +/** + * An interface representing ServiceManagedResourcesSettings. + */ +export interface ServiceManagedResourcesSettings { /** - * The sku of the workspace. + * The settings for the service managed cosmosdb account. */ - sku?: Sku; + cosmosDb?: CosmosDbSettings; } /** @@ -258,11 +374,6 @@ export interface Workspace extends Resource { * The friendly name for this workspace. This name in mutable */ friendlyName?: string; - /** - * The creation time of the machine learning workspace in ISO8601 format. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly creationTime?: Date; /** * ARM id of the key vault associated with this workspace. This cannot be changed once the * workspace has been created @@ -323,6 +434,11 @@ export interface Workspace extends Resource { * The flag to indicate whether to allow public access when behind VNet. Default value: false. */ allowPublicAccessWhenBehindVnet?: boolean; + /** + * Whether requests from Public Network are allowed. Possible values include: 'Enabled', + * 'Disabled' + */ + publicNetworkAccess?: PublicNetworkAccess; /** * The list of private endpoint connections in the workspace. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -337,20 +453,50 @@ export interface Workspace extends Resource { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly notebookInfo?: NotebookResourceInfo; -} - -/** - * Sku of the resource - */ -export interface Sku { /** - * Name of the sku + * The service managed resource settings. */ - name?: string; + serviceManagedResourcesSettings?: ServiceManagedResourcesSettings; /** - * Tier of the sku like Basic or Enterprise + * The user assigned identity resource id that represents the workspace identity. */ - tier?: string; + primaryUserAssignedIdentity?: string; + /** + * The tenant id associated with this workspace. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly tenantId?: string; + /** + * If the storage associated with the workspace has hierarchical namespace(HNS) enabled. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly storageHnsEnabled?: boolean; + /** + * The URI associated with this workspace that machine learning flow must point at to set up + * tracking. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly mlFlowTrackingUri?: string; + /** + * The identity of the resource. + */ + identity?: Identity; + /** + * Specifies the location of the resource. + */ + location?: string; + /** + * Contains resource tags defined as key/value pairs. + */ + tags?: { [propertyName: string]: string }; + /** + * The sku of the workspace. + */ + sku?: Sku; + /** + * System data + */ + systemData?: SystemData; } /** @@ -365,6 +511,10 @@ export interface WorkspaceUpdateParameters { * The sku of the workspace. */ sku?: Sku; + /** + * The identity of the resource. + */ + identity?: Identity; /** * The description of this workspace. */ @@ -373,24 +523,23 @@ export interface WorkspaceUpdateParameters { * The friendly name for this workspace. */ friendlyName?: string; -} - -/** - * Features enabled for a workspace - */ -export interface AmlUserFeature { /** - * Specifies the feature ID + * The compute name for image build */ - id?: string; + imageBuildCompute?: string; /** - * Specifies the feature name + * The service managed resource settings. */ - displayName?: string; + serviceManagedResourcesSettings?: ServiceManagedResourcesSettings; /** - * Describes the feature for user experience + * The user assigned identity resource id that represents the workspace identity. */ - description?: string; + primaryUserAssignedIdentity?: string; + /** + * Whether requests from Public Network are allowed. Possible values include: 'Enabled', + * 'Disabled' + */ + publicNetworkAccess?: PublicNetworkAccess; } /** @@ -418,6 +567,11 @@ export interface Usage { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly id?: string; + /** + * Region of the AML workspace in the id. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly amlWorkspaceLocation?: string; /** * Specifies the resource type. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -540,7 +694,7 @@ export interface VirtualMachineSizeListResult { /** * The list of virtual machine sizes supported by AmlCompute. */ - amlCompute?: VirtualMachineSize[]; + value?: VirtualMachineSize[]; } /** @@ -573,77 +727,111 @@ export interface QuotaUpdateParameters { * The list for update quota. */ value?: QuotaBaseProperties[]; + /** + * Region of workspace quota to be updated. + */ + location?: string; } /** - * The properties for update Quota response. + * An interface representing DiagnoseRequestProperties. */ -export interface UpdateWorkspaceQuotas { +export interface DiagnoseRequestProperties { /** - * Specifies the resource ID. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Setting for diagnosing user defined routing */ - readonly id?: string; + udr?: { [propertyName: string]: any }; /** - * Specifies the resource type. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Setting for diagnosing network security group */ - readonly type?: string; + nsg?: { [propertyName: string]: any }; /** - * Limit. The maximum permitted quota of the resource. + * Setting for diagnosing resource lock */ - limit?: number; + resourceLock?: { [propertyName: string]: any }; /** - * An enum describing the unit of quota measurement. Possible values include: 'Count' - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Setting for diagnosing dns resolution */ - readonly unit?: QuotaUnit; + dnsResolution?: { [propertyName: string]: any }; /** - * Update Workspace Quota Status. Status of update workspace quota. Possible values include: - * 'Undefined', 'Success', 'Failure', 'InvalidQuotaBelowClusterMinimum', - * 'InvalidQuotaExceedsSubscriptionLimit', 'InvalidVMFamilyName', 'OperationNotSupportedForSku', - * 'OperationNotEnabledForRegion' + * Setting for diagnosing dependent storage account */ - status?: Status; -} - -/** - * The result of update workspace quota. - */ -export interface UpdateWorkspaceQuotasResult { + storageAccount?: { [propertyName: string]: any }; /** - * The list of workspace quota update result. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Setting for diagnosing dependent key vault */ - readonly value?: UpdateWorkspaceQuotas[]; + keyVault?: { [propertyName: string]: any }; /** - * The URI to fetch the next page of workspace quota update result. Call ListNext() with this to - * fetch the next page of Workspace Quota update result. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Setting for diagnosing dependent container registry */ - readonly nextLink?: string; + containerRegistry?: { [propertyName: string]: any }; + /** + * Setting for diagnosing dependent application insights + */ + applicationInsights?: { [propertyName: string]: any }; + /** + * Setting for diagnosing unclassified category of problems + */ + others?: { [propertyName: string]: any }; } /** - * The Resource Name. + * Parameters to diagnose a workspace */ -export interface ResourceName { +export interface DiagnoseWorkspaceParameters { /** - * The name of the resource. + * Value of Parameters + */ + value?: DiagnoseRequestProperties; +} + +/** + * Result of Diagnose + */ +export interface DiagnoseResult { + /** + * Code for workspace setup error * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly value?: string; + readonly code?: string; /** - * The localized name of the resource. + * Level of workspace setup error. Possible values include: 'Warning', 'Error', 'Information' * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly localizedValue?: string; + readonly level?: DiagnoseResultLevel; + /** + * Message of workspace setup error + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly message?: string; } /** - * The quota assigned to a resource. + * An interface representing DiagnoseResponseResultValue. */ -export interface ResourceQuota { +export interface DiagnoseResponseResultValue { + userDefinedRouteResults?: DiagnoseResult[]; + networkSecurityRuleResults?: DiagnoseResult[]; + resourceLockResults?: DiagnoseResult[]; + dnsResolutionResults?: DiagnoseResult[]; + storageAccountResults?: DiagnoseResult[]; + keyVaultResults?: DiagnoseResult[]; + containerRegistryResults?: DiagnoseResult[]; + applicationInsightsResults?: DiagnoseResult[]; + otherResults?: DiagnoseResult[]; +} + +/** + * An interface representing DiagnoseResponseResult. + */ +export interface DiagnoseResponseResult { + value?: DiagnoseResponseResultValue; +} + +/** + * The properties for update Quota response. + */ +export interface UpdateWorkspaceQuotas { /** * Specifies the resource ID. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -655,63 +843,90 @@ export interface ResourceQuota { */ readonly type?: string; /** - * Name of the resource. + * Limit. The maximum permitted quota of the resource. + */ + limit?: number; + /** + * An enum describing the unit of quota measurement. Possible values include: 'Count' * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly name?: ResourceName; + readonly unit?: QuotaUnit; /** - * Limit. The maximum permitted quota of the resource. + * Update Workspace Quota Status. Status of update workspace quota. Possible values include: + * 'Undefined', 'Success', 'Failure', 'InvalidQuotaBelowClusterMinimum', + * 'InvalidQuotaExceedsSubscriptionLimit', 'InvalidVMFamilyName', 'OperationNotSupportedForSku', + * 'OperationNotEnabledForRegion' + */ + status?: Status; +} + +/** + * The result of update workspace quota. + */ +export interface UpdateWorkspaceQuotasResult { + /** + * The list of workspace quota update result. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly limit?: number; + readonly value?: UpdateWorkspaceQuotas[]; /** - * An enum describing the unit of quota measurement. Possible values include: 'Count' + * The URI to fetch the next page of workspace quota update result. Call ListNext() with this to + * fetch the next page of Workspace Quota update result. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly unit?: QuotaUnit; + readonly nextLink?: string; } /** - * An interface representing IdentityUserAssignedIdentitiesValue. + * The Resource Name. */ -export interface IdentityUserAssignedIdentitiesValue { +export interface ResourceName { /** - * The principal id of user assigned identity. + * The name of the resource. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly principalId?: string; + readonly value?: string; /** - * The client id of user assigned identity. + * The localized name of the resource. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly clientId?: string; + readonly localizedValue?: string; } /** - * Identity for the resource. + * The quota assigned to a resource. */ -export interface Identity { +export interface ResourceQuota { /** - * The principal ID of resource identity. + * Specifies the resource ID. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly principalId?: string; + readonly id?: string; /** - * The tenant ID of resource. + * Region of the AML workspace in the id. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly tenantId?: string; + readonly amlWorkspaceLocation?: string; + /** + * Specifies the resource type. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly type?: string; + /** + * Name of the resource. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly name?: ResourceName; /** - * The identity type. Possible values include: 'SystemAssigned', 'UserAssigned', - * 'SystemAssigned,UserAssigned', 'None' + * Limit. The maximum permitted quota of the resource. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - type: ResourceIdentityType; + readonly limit?: number; /** - * The list of user identities associated with resource. The user identity dictionary key - * references will be ARM resource ids in the form: - * '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'. + * An enum describing the unit of quota measurement. Possible values include: 'Count' + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - userAssignedIdentities?: { [propertyName: string]: IdentityUserAssignedIdentitiesValue }; + readonly unit?: QuotaUnit; } /** @@ -753,6 +968,20 @@ export interface RegistryListCredentialsResult { passwords?: Password[]; } +/** + * An interface representing ListNotebookKeysResult. + */ +export interface ListNotebookKeysResult { + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly primaryAccessKey?: string; + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly secondaryAccessKey?: string; +} + /** * An interface representing ListWorkspaceKeysResult. */ @@ -773,59 +1002,113 @@ export interface ListWorkspaceKeysResult { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly containerRegistryCredentials?: RegistryListCredentialsResult; - notebookAccessKeys?: NotebookListCredentialsResult; + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly notebookAccessKeys?: ListNotebookKeysResult; } /** - * Error detail information. + * An interface representing NotebookAccessTokenResult. */ -export interface ErrorDetail { +export interface NotebookAccessTokenResult { + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly notebookResourceId?: string; + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly hostName?: string; + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly publicDns?: string; + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly accessToken?: string; + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly tokenType?: string; /** - * Error code. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly expiresIn?: number; + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - code: string; + readonly refreshToken?: string; /** - * Error message. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - message: string; + readonly scope?: string; } /** - * Error response information. + * The resource management error additional info. */ -export interface ErrorResponse { +export interface ErrorAdditionalInfo { + /** + * The additional info type. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly type?: string; + /** + * The additional info. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly info?: any; +} + +/** + * The error detail. + */ +export interface ErrorDetail { /** - * Error code. + * The error code. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly code?: string; /** - * Error message. + * The error message. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly message?: string; /** - * An array of error detail objects. + * The error target. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly target?: string; + /** + * The error details. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly details?: ErrorDetail[]; + /** + * The error additional info. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly additionalInfo?: ErrorAdditionalInfo[]; } /** - * Wrapper for error response to follow ARM guidelines. + * Common error response for all Azure Resource Manager APIs to return error details for failed + * operations. (This also follows the OData error response format.). + * @summary Error response */ -export interface MachineLearningServiceError { +export interface ErrorResponse { /** - * The error response. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * The error object. */ - readonly error?: ErrorResponse; + error?: ErrorDetail; } /** * Contains the possible cases for Compute. */ -export type ComputeUnion = Compute | AKS | AmlCompute | ComputeInstance | VirtualMachine | HDInsight | DataFactory | Databricks | DataLakeAnalytics; +export type ComputeUnion = Compute | AKS | AmlCompute | ComputeInstance | VirtualMachine | HDInsight | DataFactory | Databricks | DataLakeAnalytics | SynapseSpark; /** * Machine Learning compute object. @@ -851,12 +1134,12 @@ export interface Compute { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -868,13 +1151,18 @@ export interface Compute { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly isAttachedCompute?: boolean; + /** + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; } /** @@ -885,6 +1173,26 @@ export interface ComputeResource extends Resource { * Compute properties */ properties?: ComputeUnion; + /** + * The identity of the resource. + */ + identity?: Identity; + /** + * Specifies the location of the resource. + */ + location?: string; + /** + * Contains resource tags defined as key/value pairs. + */ + tags?: { [propertyName: string]: string }; + /** + * The sku of the workspace. + */ + sku?: Sku; + /** + * System data + */ + systemData?: SystemData; } /** @@ -913,7 +1221,7 @@ export interface SystemService { */ export interface SslConfiguration { /** - * Enable or disable ssl for scoring. Possible values include: 'Disabled', 'Enabled' + * Enable or disable ssl for scoring. Possible values include: 'Disabled', 'Enabled', 'Auto' */ status?: Status1; /** @@ -928,6 +1236,14 @@ export interface SslConfiguration { * CNAME of the cert */ cname?: string; + /** + * Leaf domain label of public endpoint + */ + leafDomainLabel?: string; + /** + * Indicates whether to overwrite existing domain label. + */ + overwriteExistingDomain?: boolean; } /** @@ -975,7 +1291,12 @@ export interface AKSProperties { /** * Agent virtual machine size */ - agentVMSize?: string; + agentVmSize?: string; + /** + * Intended usage of the cluster. Possible values include: 'FastProd', 'DenseProd', 'DevTest'. + * Default value: 'FastProd'. + */ + clusterPurpose?: ClusterPurpose; /** * SSL configuration */ @@ -984,6 +1305,15 @@ export interface AKSProperties { * AKS networking configuration for vnet */ aksNetworkingConfiguration?: AksNetworkingConfiguration; + /** + * Load Balancer Type. Possible values include: 'PublicIp', 'InternalLoadBalancer'. Default + * value: 'PublicIp'. + */ + loadBalancerType?: LoadBalancerType; + /** + * Load Balancer Subnet + */ + loadBalancerSubnet?: string; } /** @@ -1010,12 +1340,12 @@ export interface AKS { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -1027,13 +1357,18 @@ export interface AKS { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly isAttachedCompute?: boolean; + /** + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; /** * AKS properties */ @@ -1041,102 +1376,261 @@ export interface AKS { } /** - * scale settings for AML Compute + * Resource requests/limits for this instance type */ -export interface ScaleSettings { +export interface InstanceTypeSchemaResources { /** - * Max number of nodes to use - */ - maxNodeCount: number; - /** - * Min number of nodes to use. Default value: 0. + * Resource requests for this instance type */ - minNodeCount?: number; + requests?: { [propertyName: string]: string }; /** - * Node Idle Time before scaling down amlCompute + * Resource limits for this instance type */ - nodeIdleTimeBeforeScaleDown?: string; + limits?: { [propertyName: string]: string }; } /** - * Settings for user account that gets created on each on the nodes of a compute. + * Instance type schema. */ -export interface UserAccountCredentials { - /** - * User name. Name of the administrator user account which can be used to SSH to nodes. - */ - adminUserName: string; +export interface InstanceTypeSchema { /** - * SSH public key. SSH public key of the administrator user account. + * Node Selector */ - adminUserSshPublicKey?: string; + nodeSelector?: { [propertyName: string]: string }; /** - * Password. Password of the administrator user account. + * Resource requests/limits for this instance type */ - adminUserPassword?: string; + resources?: InstanceTypeSchemaResources; } /** - * Counts of various compute node states on the amlCompute. + * Kubernetes properties */ -export interface NodeStateCounts { +export interface KubernetesProperties { /** - * Idle node count. Number of compute nodes in idle state. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Relay connection string. */ - readonly idleNodeCount?: number; + relayConnectionString?: string; /** - * Running node count. Number of compute nodes which are running jobs. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * ServiceBus connection string. */ - readonly runningNodeCount?: number; + serviceBusConnectionString?: string; /** - * Preparing node count. Number of compute nodes which are being prepared. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Extension principal-id. */ - readonly preparingNodeCount?: number; + extensionPrincipalId?: string; /** - * Unusable node count. Number of compute nodes which are in unusable state. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Extension instance release train. */ - readonly unusableNodeCount?: number; + extensionInstanceReleaseTrain?: string; /** - * Leaving node count. Number of compute nodes which are leaving the amlCompute. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * VC name. */ - readonly leavingNodeCount?: number; + vcName?: string; /** - * Preempted node count. Number of compute nodes which are in preempted state. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Compute namespace. Default value: 'default'. */ - readonly preemptedNodeCount?: number; + namespace?: string; + /** + * Default instance type + */ + defaultInstanceType?: string; + /** + * Instance Type Schema + */ + instanceTypes?: { [propertyName: string]: InstanceTypeSchema }; } /** - * AML Compute properties + * A Machine Learning compute based on Kubernetes Compute. */ -export interface AmlComputeProperties { +export interface Kubernetes { /** - * Virtual Machine Size + * The type of compute. Possible values include: 'AKS', 'Kubernetes', 'AmlCompute', + * 'ComputeInstance', 'DataFactory', 'VirtualMachine', 'HDInsight', 'Databricks', + * 'DataLakeAnalytics', 'SynapseSpark' */ - vmSize?: string; + computeType: ComputeType; /** - * Virtual Machine priority. Possible values include: 'Dedicated', 'LowPriority' + * Location for the underlying compute */ - vmPriority?: VmPriority; + computeLocation?: string; /** - * Scale settings for AML Compute + * The provision state of the cluster. Valid values are Unknown, Updating, Provisioning, + * Succeeded, and Failed. Possible values include: 'Unknown', 'Updating', 'Creating', 'Deleting', + * 'Succeeded', 'Failed', 'Canceled' + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - scaleSettings?: ScaleSettings; + readonly provisioningState?: ProvisioningState; /** - * User account credentials. Credentials for an administrator user account that will be created - * on each compute node. + * The description of the Machine Learning compute. */ - userAccountCredentials?: UserAccountCredentials; + description?: string; /** - * Subnet. Virtual network subnet resource ID the compute nodes belong to. + * The time at which the compute was created. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - subnet?: ResourceId; + readonly createdOn?: Date; + /** + * The time at which the compute was last modified. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly modifiedOn?: Date; + /** + * ARM resource id of the underlying compute + */ + resourceId?: string; + /** + * Errors during provisioning + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningErrors?: ErrorResponse[]; + /** + * Indicating whether the compute was provisioned by user and brought from outside if true, or + * machine learning service provisioned it if false. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly isAttachedCompute?: boolean; + /** + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; + /** + * Properties of Kubernetes + */ + properties?: KubernetesProperties; +} + +/** + * Kubernetes Compute Schema + */ +export interface KubernetesSchema { + /** + * Properties of Kubernetes + */ + properties?: KubernetesProperties; +} + +/** + * Virtual Machine image for Windows AML Compute + */ +export interface VirtualMachineImage { + /** + * Virtual Machine image path + */ + id: string; +} + +/** + * scale settings for AML Compute + */ +export interface ScaleSettings { + /** + * Max number of nodes to use + */ + maxNodeCount: number; + /** + * Min number of nodes to use. Default value: 0. + */ + minNodeCount?: number; + /** + * Node Idle Time before scaling down amlCompute. This string needs to be in the RFC Format. + */ + nodeIdleTimeBeforeScaleDown?: string; +} + +/** + * Settings for user account that gets created on each on the nodes of a compute. + */ +export interface UserAccountCredentials { + /** + * User name. Name of the administrator user account which can be used to SSH to nodes. + */ + adminUserName: string; + /** + * SSH public key. SSH public key of the administrator user account. + */ + adminUserSshPublicKey?: string; + /** + * Password. Password of the administrator user account. + */ + adminUserPassword?: string; +} + +/** + * Counts of various compute node states on the amlCompute. + */ +export interface NodeStateCounts { + /** + * Idle node count. Number of compute nodes in idle state. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly idleNodeCount?: number; + /** + * Running node count. Number of compute nodes which are running jobs. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly runningNodeCount?: number; + /** + * Preparing node count. Number of compute nodes which are being prepared. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly preparingNodeCount?: number; + /** + * Unusable node count. Number of compute nodes which are in unusable state. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly unusableNodeCount?: number; + /** + * Leaving node count. Number of compute nodes which are leaving the amlCompute. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly leavingNodeCount?: number; + /** + * Preempted node count. Number of compute nodes which are in preempted state. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly preemptedNodeCount?: number; +} + +/** + * AML Compute properties + */ +export interface AmlComputeProperties { + /** + * Compute OS Type. Possible values include: 'Linux', 'Windows'. Default value: 'Linux'. + */ + osType?: OsType; + /** + * Virtual Machine Size + */ + vmSize?: string; + /** + * Virtual Machine priority. Possible values include: 'Dedicated', 'LowPriority' + */ + vmPriority?: VmPriority; + /** + * Virtual Machine image for AML Compute - windows only + */ + virtualMachineImage?: VirtualMachineImage; + /** + * Network is isolated or not + */ + isolatedNetwork?: boolean; + /** + * Scale settings for AML Compute + */ + scaleSettings?: ScaleSettings; + /** + * User account credentials. Credentials for an administrator user account that will be created + * on each compute node. + */ + userAccountCredentials?: UserAccountCredentials; + /** + * Subnet. Virtual network subnet resource ID the compute nodes belong to. + */ + subnet?: ResourceId; /** * Close remote Login Access Port. State of the public SSH port. Possible values are: Disabled - * Indicates that the public ssh port is closed on all nodes of the cluster. Enabled - Indicates @@ -1167,7 +1661,7 @@ export interface AmlComputeProperties { * Errors. Collection of errors encountered by various compute nodes during node setup. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly errors?: MachineLearningServiceError[]; + readonly errors?: ErrorResponse[]; /** * Current node count. The number of compute nodes currently assigned to the compute. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -1186,6 +1680,13 @@ export interface AmlComputeProperties { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly nodeStateCounts?: NodeStateCounts; + /** + * Enable node public IP. Enable or disable node public IP address provisioning. Possible values + * are: Possible values are: true - Indicates that the compute nodes will have public IPs + * provisioned. false - Indicates that the compute nodes will have a private endpoint and no + * public IPs. Default value: true. + */ + enableNodePublicIp?: boolean; } /** @@ -1212,12 +1713,12 @@ export interface AmlCompute { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -1229,7 +1730,7 @@ export interface AmlCompute { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. @@ -1237,7 +1738,12 @@ export interface AmlCompute { */ readonly isAttachedCompute?: boolean; /** - * AML Compute properties + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; + /** + * Properties of AmlCompute */ properties?: AmlComputeProperties; } @@ -1271,7 +1777,7 @@ export interface ComputeInstanceSshSettings { } /** - * Defines all connectivity endpoints and properties for a ComputeInstance. + * Defines all connectivity endpoints and properties for an ComputeInstance. */ export interface ComputeInstanceConnectivityEndpoints { /** @@ -1322,6 +1828,76 @@ export interface ComputeInstanceCreatedBy { readonly userId?: string; } +/** + * A user that can be assigned to a compute instance. + */ +export interface AssignedUser { + /** + * User’s AAD Object Id. + */ + objectId: string; + /** + * User’s AAD Tenant Id. + */ + tenantId: string; +} + +/** + * Settings for a personal compute instance. + */ +export interface PersonalComputeInstanceSettings { + /** + * Assigned User. A user explicitly assigned to a personal compute instance. + */ + assignedUser?: AssignedUser; +} + +/** + * Script reference + */ +export interface ScriptReference { + /** + * The storage source of the script: inline, workspace. + */ + scriptSource?: string; + /** + * The location of scripts in the mounted volume. + */ + scriptData?: string; + /** + * Optional command line arguments passed to the script to run. + */ + scriptArguments?: string; + /** + * Optional time period passed to timeout command. + */ + timeout?: string; +} + +/** + * Customized setup scripts + */ +export interface ScriptsToExecute { + /** + * Script that's run every time the machine starts. + */ + startupScript?: ScriptReference; + /** + * Script that's run only once during provision of the compute. + */ + creationScript?: ScriptReference; +} + +/** + * Details of customized scripts to execute for setting up the cluster. + */ +export interface SetupScripts { + /** + * Customized setup scripts + */ + scripts?: ScriptsToExecute; +} + /** * The last operation on ComputeInstance. */ @@ -1385,7 +1961,7 @@ export interface ComputeInstanceProperties { * Errors. Collection of errors encountered on this ComputeInstance. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly errors?: MachineLearningServiceError[]; + readonly errors?: ErrorResponse[]; /** * The current state of this ComputeInstance. Possible values include: 'Creating', * 'CreateFailed', 'Deleting', 'Running', 'Restarting', 'JobRunning', 'SettingUp', 'SetupFailed', @@ -1393,6 +1969,19 @@ export interface ComputeInstanceProperties { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly state?: ComputeInstanceState; + /** + * Compute Instance Authorization type. The Compute Instance Authorization type. Available values + * are personal (default). Possible values include: 'personal'. Default value: 'personal'. + */ + computeInstanceAuthorizationType?: ComputeInstanceAuthorizationType; + /** + * Personal Compute Instance settings. Settings for a personal compute instance. + */ + personalComputeInstanceSettings?: PersonalComputeInstanceSettings; + /** + * Details of customized scripts to execute for setting up the cluster. + */ + setupScripts?: SetupScripts; /** * The last operation on ComputeInstance. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -1424,12 +2013,12 @@ export interface ComputeInstance { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -1441,7 +2030,7 @@ export interface ComputeInstance { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. @@ -1449,7 +2038,12 @@ export interface ComputeInstance { */ readonly isAttachedCompute?: boolean; /** - * Compute Instance properties + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; + /** + * Properties of ComputeInstance */ properties?: ComputeInstanceProperties; } @@ -1496,6 +2090,10 @@ export interface VirtualMachineProperties { * Admin credentials for virtual machine */ administratorAccount?: VirtualMachineSshCredentials; + /** + * Indicates whether this compute will be used for running notebooks. + */ + isNotebookInstanceCompute?: boolean; } /** @@ -1522,12 +2120,12 @@ export interface VirtualMachine { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -1539,18 +2137,23 @@ export interface VirtualMachine { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly isAttachedCompute?: boolean; + /** + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; properties?: VirtualMachineProperties; } /** - * An interface representing HDInsightProperties. + * HDInsight compute properties */ export interface HDInsightProperties { /** @@ -1591,12 +2194,12 @@ export interface HDInsight { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -1608,13 +2211,18 @@ export interface HDInsight { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly isAttachedCompute?: boolean; + /** + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; properties?: HDInsightProperties; } @@ -1642,12 +2250,12 @@ export interface DataFactory { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -1659,23 +2267,32 @@ export interface DataFactory { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly isAttachedCompute?: boolean; + /** + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; } /** - * An interface representing DatabricksProperties. + * Properties of Databricks */ export interface DatabricksProperties { /** * Databricks access token */ databricksAccessToken?: string; + /** + * Workspace Url + */ + workspaceUrl?: string; } /** @@ -1702,12 +2319,12 @@ export interface Databricks { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -1719,13 +2336,18 @@ export interface Databricks { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly isAttachedCompute?: boolean; + /** + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; properties?: DatabricksProperties; } @@ -1763,12 +2385,12 @@ export interface DataLakeAnalytics { */ description?: string; /** - * The date and time when the compute was created. + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly createdOn?: Date; /** - * The date and time when the compute was last modified. + * The time at which the compute was last modified. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly modifiedOn?: Date; @@ -1780,123 +2402,216 @@ export interface DataLakeAnalytics { * Errors during provisioning * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly provisioningErrors?: MachineLearningServiceError[]; + readonly provisioningErrors?: ErrorResponse[]; /** * Indicating whether the compute was provisioned by user and brought from outside if true, or * machine learning service provisioned it if false. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly isAttachedCompute?: boolean; - properties?: DataLakeAnalyticsProperties; -} - -/** - * Service principal credentials. - */ -export interface ServicePrincipalCredentials { - /** - * Client Id - */ - clientId: string; /** - * Client secret + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. */ - clientSecret: string; + disableLocalAuth?: boolean; + properties?: DataLakeAnalyticsProperties; } /** - * AmlCompute update parameters. + * Auto scale properties */ -export interface ClusterUpdateParameters { - /** - * Scale settings. Desired scale settings for the amlCompute. - */ - scaleSettings?: ScaleSettings; +export interface AutoScaleProperties { + minNodeCount?: number; + enabled?: boolean; + maxNodeCount?: number; } /** - * Contains the possible cases for ComputeNodesInformation. + * Auto pause properties */ -export type ComputeNodesInformationUnion = ComputeNodesInformation | AmlComputeNodesInformation; +export interface AutoPauseProperties { + delayInMinutes?: number; + enabled?: boolean; +} /** - * Compute nodes information related to a Machine Learning compute. Might differ for every type of - * compute. + * An interface representing SynapseSparkProperties. */ -export interface ComputeNodesInformation { +export interface SynapseSparkProperties { /** - * Polymorphic Discriminator + * Auto scale properties. */ - computeType: "ComputeNodesInformation"; + autoScaleProperties?: AutoScaleProperties; /** - * The continuation token. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Auto pause properties. */ - readonly nextLink?: string; -} - -/** - * Compute node information related to a AmlCompute. - */ -export interface AmlComputeNodeInformation { + autoPauseProperties?: AutoPauseProperties; /** - * Node ID. ID of the compute node. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Spark version. */ - readonly nodeId?: string; + sparkVersion?: string; /** - * Private IP address. Private IP address of the compute node. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * The number of compute nodes currently assigned to the compute. */ - readonly privateIpAddress?: string; + nodeCount?: number; /** - * Public IP address. Public IP address of the compute node. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Node size. */ - readonly publicIpAddress?: string; + nodeSize?: string; /** - * Port. SSH port number of the node. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Node size family. */ - readonly port?: number; + nodeSizeFamily?: string; /** - * State of the compute node. Values are idle, running, preparing, unusable, leaving and - * preempted. Possible values include: 'idle', 'running', 'preparing', 'unusable', 'leaving', - * 'preempted' - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Azure subscription identifier. */ - readonly nodeState?: NodeState; + subscriptionId?: string; /** - * Run ID. ID of the Experiment running on the node, if any else null. - * **NOTE: This property will not be serialized. It can only be populated by the server.** + * Name of the resource group in which workspace is located. */ - readonly runId?: string; -} + resourceGroup?: string; + /** + * Name of Azure Machine Learning workspace. + */ + workspaceName?: string; + /** + * Pool name. + */ + poolName?: string; +} /** - * Compute node information related to a AmlCompute. + * A SynapseSpark compute. */ -export interface AmlComputeNodesInformation { +export interface SynapseSpark { /** * Polymorphic Discriminator */ - computeType: "AmlCompute"; + computeType: "SynapseSpark"; /** - * The continuation token. + * Location for the underlying compute + */ + computeLocation?: string; + /** + * The provision state of the cluster. Valid values are Unknown, Updating, Provisioning, + * Succeeded, and Failed. Possible values include: 'Unknown', 'Updating', 'Creating', 'Deleting', + * 'Succeeded', 'Failed', 'Canceled' * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly nextLink?: string; + readonly provisioningState?: ProvisioningState; /** - * The collection of returned AmlCompute nodes details. + * The description of the Machine Learning compute. + */ + description?: string; + /** + * The time at which the compute was created. * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - readonly nodes?: AmlComputeNodeInformation[]; + readonly createdOn?: Date; + /** + * The time at which the compute was last modified. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly modifiedOn?: Date; + /** + * ARM resource id of the underlying compute + */ + resourceId?: string; + /** + * Errors during provisioning + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly provisioningErrors?: ErrorResponse[]; + /** + * Indicating whether the compute was provisioned by user and brought from outside if true, or + * machine learning service provisioned it if false. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly isAttachedCompute?: boolean; + /** + * Opt-out of local authentication and ensure customers can use only MSI and AAD exclusively for + * authentication. + */ + disableLocalAuth?: boolean; + properties?: SynapseSparkProperties; +} + +/** + * Service principal credentials. + */ +export interface ServicePrincipalCredentials { + /** + * Client Id + */ + clientId: string; + /** + * Client secret + */ + clientSecret: string; +} + +/** + * Desired scale settings for the amlCompute. + */ +export interface ScaleSettingsInformation { + /** + * Scale settings. + */ + scaleSettings?: ScaleSettings; +} + +/** + * AmlCompute update parameters. + */ +export interface ClusterUpdateParameters { + /** + * Properties of ClusterUpdate + */ + properties?: ScaleSettingsInformation; +} + +/** + * Compute node information related to a AmlCompute. + */ +export interface AmlComputeNodeInformation { + /** + * Node ID. ID of the compute node. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly nodeId?: string; + /** + * Private IP address. Private IP address of the compute node. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly privateIpAddress?: string; + /** + * Public IP address. Public IP address of the compute node. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly publicIpAddress?: string; + /** + * Port. SSH port number of the node. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly port?: number; + /** + * State of the compute node. Values are idle, running, preparing, unusable, leaving and + * preempted. Possible values include: 'idle', 'running', 'preparing', 'unusable', 'leaving', + * 'preempted' + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly nodeState?: NodeState; + /** + * Run ID. ID of the Experiment running on the node, if any else null. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly runId?: string; } /** * Contains the possible cases for ComputeSecrets. */ -export type ComputeSecretsUnion = ComputeSecrets | AksComputeSecrets | VirtualMachineSecrets | DatabricksComputeSecrets; +export type ComputeSecretsUnion = ComputeSecrets | VirtualMachineSecrets; /** * Secrets related to a Machine Learning compute. Might differ for every type of compute. @@ -1908,14 +2623,34 @@ export interface ComputeSecrets { computeType: "ComputeSecrets"; } +/** + * Properties of AksComputeSecrets + */ +export interface AksComputeSecretsProperties { + /** + * Content of kubeconfig file that can be used to connect to the Kubernetes cluster. + */ + userKubeConfig?: string; + /** + * Content of kubeconfig file that can be used to connect to the Kubernetes cluster. + */ + adminKubeConfig?: string; + /** + * Image registry pull secret. + */ + imagePullSecretName?: string; +} + /** * Secrets related to a Machine Learning compute based on AKS. */ export interface AksComputeSecrets { /** - * Polymorphic Discriminator + * The type of compute. Possible values include: 'AKS', 'Kubernetes', 'AmlCompute', + * 'ComputeInstance', 'DataFactory', 'VirtualMachine', 'HDInsight', 'Databricks', + * 'DataLakeAnalytics', 'SynapseSpark' */ - computeType: "AKS"; + computeType: ComputeType; /** * Content of kubeconfig file that can be used to connect to the Kubernetes cluster. */ @@ -1944,20 +2679,258 @@ export interface VirtualMachineSecrets { administratorAccount?: VirtualMachineSshCredentials; } +/** + * Properties of Databricks Compute Secrets + */ +export interface DatabricksComputeSecretsProperties { + /** + * access token for databricks account. + */ + databricksAccessToken?: string; +} + /** * Secrets related to a Machine Learning compute based on Databricks. */ export interface DatabricksComputeSecrets { /** - * Polymorphic Discriminator + * The type of compute. Possible values include: 'AKS', 'Kubernetes', 'AmlCompute', + * 'ComputeInstance', 'DataFactory', 'VirtualMachine', 'HDInsight', 'Databricks', + * 'DataLakeAnalytics', 'SynapseSpark' */ - computeType: "Databricks"; + computeType: ComputeType; /** * access token for databricks account. */ databricksAccessToken?: string; } +/** + * A private link resource + */ +export interface PrivateLinkResource extends Resource { + /** + * The private link resource group id. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly groupId?: string; + /** + * The private link resource required member names. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly requiredMembers?: string[]; + /** + * The private link resource Private link DNS zone name. + */ + requiredZoneNames?: string[]; + /** + * The identity of the resource. + */ + identity?: Identity; + /** + * Specifies the location of the resource. + */ + location?: string; + /** + * Contains resource tags defined as key/value pairs. + */ + tags?: { [propertyName: string]: string }; + /** + * The sku of the workspace. + */ + sku?: Sku; + /** + * System data + */ + systemData?: SystemData; +} + +/** + * A list of private link resources + */ +export interface PrivateLinkResourceListResult { + /** + * Array of private link resources + */ + value?: PrivateLinkResource[]; +} + +/** + * The resource requirements for the container (cpu and memory). + */ +export interface ContainerResourceRequirements { + /** + * The minimum amount of CPU cores to be used by the container. More info: + * https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ + */ + cpu?: number; + /** + * The maximum amount of CPU cores allowed to be used by the container. More info: + * https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ + */ + cpuLimit?: number; + /** + * The minimum amount of memory (in GB) to be used by the container. More info: + * https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ + */ + memoryInGB?: number; + /** + * The maximum amount of memory (in GB) allowed to be used by the container. More info: + * https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/ + */ + memoryInGBLimit?: number; + /** + * The number of GPU cores in the container. + */ + gpu?: number; + /** + * The number of FPGA PCIE devices exposed to the container. Must be multiple of 2. + */ + fpga?: number; +} + +/** + * An interface representing ListStorageAccountKeysResult. + */ +export interface ListStorageAccountKeysResult { + /** + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly userStorageKey?: string; +} + +/** + * Workspace connection. + */ +export interface WorkspaceConnection extends BaseResource { + /** + * ResourceId of the workspace connection. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly id?: string; + /** + * Friendly name of the workspace connection. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly name?: string; + /** + * Resource type of workspace connection. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly type?: string; + /** + * Category of the workspace connection. + */ + category?: string; + /** + * Target of the workspace connection. + */ + target?: string; + /** + * Authorization type of the workspace connection. + */ + authType?: string; + /** + * Value details of the workspace connection. + */ + value?: string; + /** + * format for the workspace connection value. Possible values include: 'JSON' + */ + valueFormat?: ValueFormat; +} + +/** + * An interface representing FQDNEndpointDetail. + */ +export interface FQDNEndpointDetail { + port?: number; +} + +/** + * An interface representing FQDNEndpoint. + */ +export interface FQDNEndpoint { + domainName?: string; + endpointDetails?: FQDNEndpointDetail[]; +} + +/** + * An interface representing FQDNEndpointsProperties. + */ +export interface FQDNEndpointsProperties { + category?: string; + endpoints?: FQDNEndpoint[]; +} + +/** + * An interface representing FQDNEndpoints. + */ +export interface FQDNEndpoints { + properties?: FQDNEndpointsProperties; +} + +/** + * An interface representing ExternalFQDNResponse. + */ +export interface ExternalFQDNResponse { + value?: FQDNEndpoints[]; +} + +/** + * The resource model definition for a Azure Resource Manager proxy resource. It will not have tags + * and a location + * @summary Proxy Resource + */ +export interface ProxyResource extends Resource { +} + +/** + * The resource model definition for an Azure Resource Manager tracked top level resource which has + * 'tags' and a 'location' + * @summary Tracked Resource + */ +export interface TrackedResource extends Resource { + /** + * Resource tags. + */ + tags?: { [propertyName: string]: string }; + /** + * The geo-location where the resource lives + */ + location: string; +} + +/** + * The resource model definition for an Azure Resource Manager resource with an etag. + * @summary Entity Resource + */ +export interface AzureEntityResource extends Resource { + /** + * Resource Etag. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly etag?: string; +} + +/** + * Features enabled for a workspace + */ +export interface AmlUserFeature { + /** + * Specifies the feature ID + */ + id?: string; + /** + * Specifies the feature name + */ + displayName?: string; + /** + * Describes the feature for user experience + */ + description?: string; +} + /** * Features/user capabilities associated with the sku */ @@ -2034,7 +3007,7 @@ export interface Restriction { /** * Describes Workspace Sku details and features */ -export interface SkuSettings { +export interface WorkspaceSku { /** * The set of locations that the SKU is available. This will be supported and registered Azure * Geo Regions (e.g. West US, East US, Southeast Asia, etc.). @@ -2072,165 +3045,83 @@ export interface SkuSettings { } /** - * AML workspace sku information - */ -export interface WorkspaceSku { - /** - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly resourceType?: string; - /** - * The list of workspace sku settings - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly skus?: SkuSettings[]; -} - -/** - * A private link resource - */ -export interface PrivateLinkResource extends Resource { - /** - * The private link resource group id. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly groupId?: string; - /** - * The private link resource required member names. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly requiredMembers?: string[]; - /** - * The private link resource Private link DNS zone name. - */ - requiredZoneNames?: string[]; -} - -/** - * A list of private link resources + * Optional Parameters. */ -export interface PrivateLinkResourceListResult { +export interface WorkspacesListByResourceGroupOptionalParams extends msRest.RequestOptionsBase { /** - * Array of private link resources + * Continuation token for pagination. */ - value?: PrivateLinkResource[]; + skip?: string; } /** - * Workspace connection. + * Optional Parameters. */ -export interface WorkspaceConnection extends BaseResource { - /** - * ResourceId of the workspace connection. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly id?: string; - /** - * Friendly name of the workspace connection. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly name?: string; - /** - * Resource type of workspace connection. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly type?: string; +export interface WorkspacesDiagnoseOptionalParams extends msRest.RequestOptionsBase { /** - * Category of the workspace connection. - */ - category?: string; - /** - * Target of the workspace connection. - */ - target?: string; - /** - * Authorization type of the workspace connection. - */ - authType?: string; - /** - * Value details of the workspace connection. + * The parameter of diagnosing workspace health */ - value?: string; + parameters?: DiagnoseWorkspaceParameters; } /** - * object used for creating workspace connection. + * Optional Parameters. */ -export interface WorkspaceConnectionDto { - /** - * Friendly name of the workspace connection - */ - name?: string; - /** - * Category of the workspace connection. - */ - category?: string; - /** - * Target of the workspace connection. - */ - target?: string; - /** - * Authorization type of the workspace connection. - */ - authType?: string; +export interface WorkspacesListBySubscriptionOptionalParams extends msRest.RequestOptionsBase { /** - * Value details of the workspace connection. + * Continuation token for pagination. */ - value?: string; + skip?: string; } /** * Optional Parameters. */ -export interface WorkspacesListByResourceGroupOptionalParams extends msRest.RequestOptionsBase { +export interface WorkspacesBeginDiagnoseOptionalParams extends msRest.RequestOptionsBase { /** - * Continuation token for pagination. + * The parameter of diagnosing workspace health */ - skiptoken?: string; + parameters?: DiagnoseWorkspaceParameters; } /** * Optional Parameters. */ -export interface WorkspacesListBySubscriptionOptionalParams extends msRest.RequestOptionsBase { +export interface WorkspacesListByResourceGroupNextOptionalParams extends msRest.RequestOptionsBase { /** * Continuation token for pagination. */ - skiptoken?: string; + skip?: string; } /** * Optional Parameters. */ -export interface WorkspacesListByResourceGroupNextOptionalParams extends msRest.RequestOptionsBase { +export interface WorkspacesListBySubscriptionNextOptionalParams extends msRest.RequestOptionsBase { /** * Continuation token for pagination. */ - skiptoken?: string; + skip?: string; } /** * Optional Parameters. */ -export interface WorkspacesListBySubscriptionNextOptionalParams extends msRest.RequestOptionsBase { +export interface ComputeListOptionalParams extends msRest.RequestOptionsBase { /** * Continuation token for pagination. */ - skiptoken?: string; + skip?: string; } /** * Optional Parameters. */ -export interface VirtualMachineSizesListOptionalParams extends msRest.RequestOptionsBase { - /** - * Type of compute to filter by. - */ - computeType?: string; +export interface ComputeListNextOptionalParams extends msRest.RequestOptionsBase { /** - * Specifies whether to return recommended vm sizes or all vm sizes + * Continuation token for pagination. */ - recommended?: boolean; + skip?: string; } /** @@ -2248,36 +3139,30 @@ export interface WorkspaceConnectionsListOptionalParams extends msRest.RequestOp } /** - * Optional Parameters. + * An interface representing AzureMachineLearningWorkspacesOptions. */ -export interface MachineLearningComputeListByWorkspaceOptionalParams extends msRest.RequestOptionsBase { - /** - * Continuation token for pagination. - */ - skiptoken?: string; +export interface AzureMachineLearningWorkspacesOptions extends AzureServiceClientOptions { + baseUri?: string; } /** - * Optional Parameters. + * Defines headers for Diagnose operation. */ -export interface MachineLearningComputeListByWorkspaceNextOptionalParams extends msRest.RequestOptionsBase { +export interface WorkspacesDiagnoseHeaders { /** - * Continuation token for pagination. + * URI to poll for asynchronous operation result. */ - skiptoken?: string; -} - -/** - * An interface representing AzureMachineLearningWorkspacesOptions. - */ -export interface AzureMachineLearningWorkspacesOptions extends AzureServiceClientOptions { - baseUri?: string; + location: string; + /** + * Duration the client should wait between requests, in seconds. + */ + retryAfter: number; } /** * Defines headers for CreateOrUpdate operation. */ -export interface MachineLearningComputeCreateOrUpdateHeaders { +export interface ComputeCreateOrUpdateHeaders { /** * URI to poll for asynchronous operation status. */ @@ -2287,7 +3172,7 @@ export interface MachineLearningComputeCreateOrUpdateHeaders { /** * Defines headers for Delete operation. */ -export interface MachineLearningComputeDeleteHeaders { +export interface ComputeDeleteHeaders { /** * URI to poll for asynchronous operation status. */ @@ -2318,20 +3203,6 @@ export interface WorkspaceListResult extends Array { nextLink?: string; } -/** - * @interface - * The List Aml user feature operation response. - * @extends Array - */ -export interface ListAmlUserFeatureResult extends Array { - /** - * The URI to fetch the next page of AML user features information. Call ListNext() with this to - * fetch the next page of AML user features information. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly nextLink?: string; -} - /** * @interface * The List Usages operation response. @@ -2360,6 +3231,44 @@ export interface ListWorkspaceQuotas extends Array { readonly nextLink?: string; } +/** + * @interface + * Paginated list of Machine Learning compute objects wrapped in ARM resource envelope. + * @extends Array + */ +export interface PaginatedComputeResourcesList extends Array { + /** + * A continuation link (absolute URI) to the next page of results in the list. + */ + nextLink?: string; +} + +/** + * @interface + * Result of AmlCompute Nodes + * @extends Array + */ +export interface AmlComputeNodesInformation extends Array { + /** + * The collection of returned AmlCompute nodes details. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly nodes?: AmlComputeNodeInformation[]; + /** + * The continuation token. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly nextLink?: string; +} + +/** + * @interface + * List of private endpoint connection associated with the specified workspace + * @extends Array + */ +export interface PrivateEndpointConnectionListResult extends Array { +} + /** * @interface * Paginated list of Workspace connection objects. @@ -2374,14 +3283,16 @@ export interface PaginatedWorkspaceConnectionsList extends Array + * The List Aml user feature operation response. + * @extends Array */ -export interface PaginatedComputeResourcesList extends Array { +export interface ListAmlUserFeatureResult extends Array { /** - * A continuation link (absolute URI) to the next page of results in the list. + * The URI to fetch the next page of AML user features information. Call ListNext() with this to + * fetch the next page of AML user features information. + * **NOTE: This property will not be serialized. It can only be populated by the server.** */ - nextLink?: string; + readonly nextLink?: string; } /** @@ -2414,21 +3325,45 @@ export type ProvisioningState = 'Unknown' | 'Updating' | 'Creating' | 'Deleting' */ export type EncryptionStatus = 'Enabled' | 'Disabled'; +/** + * Defines values for PublicNetworkAccess. + * Possible values include: 'Enabled', 'Disabled' + * @readonly + * @enum {string} + */ +export type PublicNetworkAccess = 'Enabled' | 'Disabled'; + /** * Defines values for PrivateEndpointServiceConnectionStatus. * Possible values include: 'Pending', 'Approved', 'Rejected', 'Disconnected', 'Timeout' * @readonly * @enum {string} */ -export type PrivateEndpointServiceConnectionStatus = 'Pending' | 'Approved' | 'Rejected' | 'Disconnected' | 'Timeout'; +export type PrivateEndpointServiceConnectionStatus = 'Pending' | 'Approved' | 'Rejected' | 'Disconnected' | 'Timeout'; + +/** + * Defines values for PrivateEndpointConnectionProvisioningState. + * Possible values include: 'Succeeded', 'Creating', 'Deleting', 'Failed' + * @readonly + * @enum {string} + */ +export type PrivateEndpointConnectionProvisioningState = 'Succeeded' | 'Creating' | 'Deleting' | 'Failed'; + +/** + * Defines values for ResourceIdentityType. + * Possible values include: 'SystemAssigned', 'SystemAssigned,UserAssigned', 'UserAssigned', 'None' + * @readonly + * @enum {string} + */ +export type ResourceIdentityType = 'SystemAssigned' | 'SystemAssigned,UserAssigned' | 'UserAssigned' | 'None'; /** - * Defines values for PrivateEndpointConnectionProvisioningState. - * Possible values include: 'Succeeded', 'Creating', 'Deleting', 'Failed' + * Defines values for CreatedByType. + * Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key' * @readonly * @enum {string} */ -export type PrivateEndpointConnectionProvisioningState = 'Succeeded' | 'Creating' | 'Deleting' | 'Failed'; +export type CreatedByType = 'User' | 'Application' | 'ManagedIdentity' | 'Key'; /** * Defines values for UsageUnit. @@ -2462,6 +3397,14 @@ export type VMTier = 'Standard' | 'LowPriority' | 'Spot'; */ export type QuotaUnit = 'Count'; +/** + * Defines values for DiagnoseResultLevel. + * Possible values include: 'Warning', 'Error', 'Information' + * @readonly + * @enum {string} + */ +export type DiagnoseResultLevel = 'Warning' | 'Error' | 'Information'; + /** * Defines values for Status. * Possible values include: 'Undefined', 'Success', 'Failure', 'InvalidQuotaBelowClusterMinimum', @@ -2473,12 +3416,37 @@ export type QuotaUnit = 'Count'; export type Status = 'Undefined' | 'Success' | 'Failure' | 'InvalidQuotaBelowClusterMinimum' | 'InvalidQuotaExceedsSubscriptionLimit' | 'InvalidVMFamilyName' | 'OperationNotSupportedForSku' | 'OperationNotEnabledForRegion'; /** - * Defines values for ResourceIdentityType. - * Possible values include: 'SystemAssigned', 'UserAssigned', 'SystemAssigned,UserAssigned', 'None' + * Defines values for ClusterPurpose. + * Possible values include: 'FastProd', 'DenseProd', 'DevTest' + * @readonly + * @enum {string} + */ +export type ClusterPurpose = 'FastProd' | 'DenseProd' | 'DevTest'; + +/** + * Defines values for LoadBalancerType. + * Possible values include: 'PublicIp', 'InternalLoadBalancer' + * @readonly + * @enum {string} + */ +export type LoadBalancerType = 'PublicIp' | 'InternalLoadBalancer'; + +/** + * Defines values for ComputeType. + * Possible values include: 'AKS', 'Kubernetes', 'AmlCompute', 'ComputeInstance', 'DataFactory', + * 'VirtualMachine', 'HDInsight', 'Databricks', 'DataLakeAnalytics', 'SynapseSpark' + * @readonly + * @enum {string} + */ +export type ComputeType = 'AKS' | 'Kubernetes' | 'AmlCompute' | 'ComputeInstance' | 'DataFactory' | 'VirtualMachine' | 'HDInsight' | 'Databricks' | 'DataLakeAnalytics' | 'SynapseSpark'; + +/** + * Defines values for OsType. + * Possible values include: 'Linux', 'Windows' * @readonly * @enum {string} */ -export type ResourceIdentityType = 'SystemAssigned' | 'UserAssigned' | 'SystemAssigned,UserAssigned' | 'None'; +export type OsType = 'Linux' | 'Windows'; /** * Defines values for VmPriority. @@ -2530,6 +3498,14 @@ export type SshPublicAccess = 'Enabled' | 'Disabled'; */ export type ComputeInstanceState = 'Creating' | 'CreateFailed' | 'Deleting' | 'Running' | 'Restarting' | 'JobRunning' | 'SettingUp' | 'SetupFailed' | 'Starting' | 'Stopped' | 'Stopping' | 'UserSettingUp' | 'UserSetupFailed' | 'Unknown' | 'Unusable'; +/** + * Defines values for ComputeInstanceAuthorizationType. + * Possible values include: 'personal' + * @readonly + * @enum {string} + */ +export type ComputeInstanceAuthorizationType = 'personal'; + /** * Defines values for OperationName. * Possible values include: 'Create', 'Start', 'Stop', 'Restart', 'Reimage', 'Delete' @@ -2556,13 +3532,12 @@ export type OperationStatus = 'InProgress' | 'Succeeded' | 'CreateFailed' | 'Sta export type NodeState = 'idle' | 'running' | 'preparing' | 'unusable' | 'leaving' | 'preempted'; /** - * Defines values for ComputeType. - * Possible values include: 'AKS', 'AmlCompute', 'ComputeInstance', 'DataFactory', - * 'VirtualMachine', 'HDInsight', 'Databricks', 'DataLakeAnalytics' + * Defines values for ValueFormat. + * Possible values include: 'JSON' * @readonly * @enum {string} */ -export type ComputeType = 'AKS' | 'AmlCompute' | 'ComputeInstance' | 'DataFactory' | 'VirtualMachine' | 'HDInsight' | 'Databricks' | 'DataLakeAnalytics'; +export type ValueFormat = 'JSON'; /** * Defines values for ReasonCode. @@ -2582,11 +3557,11 @@ export type UnderlyingResourceAction = 'Delete' | 'Detach'; /** * Defines values for Status1. - * Possible values include: 'Disabled', 'Enabled' + * Possible values include: 'Disabled', 'Enabled', 'Auto' * @readonly * @enum {string} */ -export type Status1 = 'Disabled' | 'Enabled'; +export type Status1 = 'Disabled' | 'Enabled' | 'Auto'; /** * Contains response data for the list operation. @@ -2688,6 +3663,31 @@ export type WorkspacesListByResourceGroupResponse = WorkspaceListResult & { }; }; +/** + * Contains response data for the diagnose operation. + */ +export type WorkspacesDiagnoseResponse = DiagnoseResponseResult & WorkspacesDiagnoseHeaders & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The parsed HTTP response headers. + */ + parsedHeaders: WorkspacesDiagnoseHeaders; + + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: DiagnoseResponseResult; + }; +}; + /** * Contains response data for the listKeys operation. */ @@ -2729,9 +3729,9 @@ export type WorkspacesListBySubscriptionResponse = WorkspaceListResult & { }; /** - * Contains response data for the beginCreateOrUpdate operation. + * Contains response data for the listNotebookAccessToken operation. */ -export type WorkspacesBeginCreateOrUpdateResponse = Workspace & { +export type WorkspacesListNotebookAccessTokenResponse = NotebookAccessTokenResult & { /** * The underlying HTTP response. */ @@ -2744,14 +3744,14 @@ export type WorkspacesBeginCreateOrUpdateResponse = Workspace & { /** * The response body as parsed JSON or XML */ - parsedBody: Workspace; + parsedBody: NotebookAccessTokenResult; }; }; /** - * Contains response data for the listByResourceGroupNext operation. + * Contains response data for the prepareNotebook operation. */ -export type WorkspacesListByResourceGroupNextResponse = WorkspaceListResult & { +export type WorkspacesPrepareNotebookResponse = NotebookResourceInfo & { /** * The underlying HTTP response. */ @@ -2764,14 +3764,14 @@ export type WorkspacesListByResourceGroupNextResponse = WorkspaceListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: WorkspaceListResult; + parsedBody: NotebookResourceInfo; }; }; /** - * Contains response data for the listBySubscriptionNext operation. + * Contains response data for the listStorageAccountKeys operation. */ -export type WorkspacesListBySubscriptionNextResponse = WorkspaceListResult & { +export type WorkspacesListStorageAccountKeysResponse = ListStorageAccountKeysResult & { /** * The underlying HTTP response. */ @@ -2784,14 +3784,14 @@ export type WorkspacesListBySubscriptionNextResponse = WorkspaceListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: WorkspaceListResult; + parsedBody: ListStorageAccountKeysResult; }; }; /** - * Contains response data for the list operation. + * Contains response data for the listNotebookKeys operation. */ -export type WorkspaceFeaturesListResponse = ListAmlUserFeatureResult & { +export type WorkspacesListNotebookKeysResponse = ListNotebookKeysResult & { /** * The underlying HTTP response. */ @@ -2804,14 +3804,14 @@ export type WorkspaceFeaturesListResponse = ListAmlUserFeatureResult & { /** * The response body as parsed JSON or XML */ - parsedBody: ListAmlUserFeatureResult; + parsedBody: ListNotebookKeysResult; }; }; /** - * Contains response data for the listNext operation. + * Contains response data for the listOutboundNetworkDependenciesEndpoints operation. */ -export type WorkspaceFeaturesListNextResponse = ListAmlUserFeatureResult & { +export type WorkspacesListOutboundNetworkDependenciesEndpointsResponse = ExternalFQDNResponse & { /** * The underlying HTTP response. */ @@ -2824,14 +3824,14 @@ export type WorkspaceFeaturesListNextResponse = ListAmlUserFeatureResult & { /** * The response body as parsed JSON or XML */ - parsedBody: ListAmlUserFeatureResult; + parsedBody: ExternalFQDNResponse; }; }; /** - * Contains response data for the prepare operation. + * Contains response data for the beginCreateOrUpdate operation. */ -export type NotebooksPrepareResponse = NotebookResourceInfo & { +export type WorkspacesBeginCreateOrUpdateResponse = Workspace & { /** * The underlying HTTP response. */ @@ -2844,14 +3844,14 @@ export type NotebooksPrepareResponse = NotebookResourceInfo & { /** * The response body as parsed JSON or XML */ - parsedBody: NotebookResourceInfo; + parsedBody: Workspace; }; }; /** - * Contains response data for the beginPrepare operation. + * Contains response data for the beginPrepareNotebook operation. */ -export type NotebooksBeginPrepareResponse = NotebookResourceInfo & { +export type WorkspacesBeginPrepareNotebookResponse = NotebookResourceInfo & { /** * The underlying HTTP response. */ @@ -2868,6 +3868,46 @@ export type NotebooksBeginPrepareResponse = NotebookResourceInfo & { }; }; +/** + * Contains response data for the listByResourceGroupNext operation. + */ +export type WorkspacesListByResourceGroupNextResponse = WorkspaceListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: WorkspaceListResult; + }; +}; + +/** + * Contains response data for the listBySubscriptionNext operation. + */ +export type WorkspacesListBySubscriptionNextResponse = WorkspaceListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: WorkspaceListResult; + }; +}; + /** * Contains response data for the list operation. */ @@ -2991,7 +4031,7 @@ export type QuotasListNextResponse = ListWorkspaceQuotas & { /** * Contains response data for the list operation. */ -export type WorkspaceConnectionsListResponse = PaginatedWorkspaceConnectionsList & { +export type ComputeListResponse = PaginatedComputeResourcesList & { /** * The underlying HTTP response. */ @@ -3004,14 +4044,14 @@ export type WorkspaceConnectionsListResponse = PaginatedWorkspaceConnectionsList /** * The response body as parsed JSON or XML */ - parsedBody: PaginatedWorkspaceConnectionsList; + parsedBody: PaginatedComputeResourcesList; }; }; /** - * Contains response data for the create operation. + * Contains response data for the get operation. */ -export type WorkspaceConnectionsCreateResponse = WorkspaceConnection & { +export type ComputeGetResponse = ComputeResource & { /** * The underlying HTTP response. */ @@ -3024,18 +4064,23 @@ export type WorkspaceConnectionsCreateResponse = WorkspaceConnection & { /** * The response body as parsed JSON or XML */ - parsedBody: WorkspaceConnection; + parsedBody: ComputeResource; }; }; /** - * Contains response data for the get operation. + * Contains response data for the createOrUpdate operation. */ -export type WorkspaceConnectionsGetResponse = WorkspaceConnection & { +export type ComputeCreateOrUpdateResponse = ComputeResource & ComputeCreateOrUpdateHeaders & { /** * The underlying HTTP response. */ _response: msRest.HttpResponse & { + /** + * The parsed HTTP response headers. + */ + parsedHeaders: ComputeCreateOrUpdateHeaders; + /** * The response body as text (string format) */ @@ -3044,14 +4089,14 @@ export type WorkspaceConnectionsGetResponse = WorkspaceConnection & { /** * The response body as parsed JSON or XML */ - parsedBody: WorkspaceConnection; + parsedBody: ComputeResource; }; }; /** - * Contains response data for the listByWorkspace operation. + * Contains response data for the update operation. */ -export type MachineLearningComputeListByWorkspaceResponse = PaginatedComputeResourcesList & { +export type ComputeUpdateResponse = ComputeResource & { /** * The underlying HTTP response. */ @@ -3064,14 +4109,29 @@ export type MachineLearningComputeListByWorkspaceResponse = PaginatedComputeReso /** * The response body as parsed JSON or XML */ - parsedBody: PaginatedComputeResourcesList; + parsedBody: ComputeResource; }; }; /** - * Contains response data for the get operation. + * Contains response data for the deleteMethod operation. + */ +export type ComputeDeleteResponse = ComputeDeleteHeaders & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The parsed HTTP response headers. + */ + parsedHeaders: ComputeDeleteHeaders; + }; +}; + +/** + * Contains response data for the listNodes operation. */ -export type MachineLearningComputeGetResponse = ComputeResource & { +export type ComputeListNodesResponse = AmlComputeNodesInformation & { /** * The underlying HTTP response. */ @@ -3084,23 +4144,38 @@ export type MachineLearningComputeGetResponse = ComputeResource & { /** * The response body as parsed JSON or XML */ - parsedBody: ComputeResource; + parsedBody: AmlComputeNodesInformation; }; }; /** - * Contains response data for the createOrUpdate operation. + * Contains response data for the listKeys operation. */ -export type MachineLearningComputeCreateOrUpdateResponse = ComputeResource & MachineLearningComputeCreateOrUpdateHeaders & { +export type ComputeListKeysResponse = ComputeSecretsUnion & { /** * The underlying HTTP response. */ _response: msRest.HttpResponse & { /** - * The parsed HTTP response headers. + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML */ - parsedHeaders: MachineLearningComputeCreateOrUpdateHeaders; + parsedBody: ComputeSecretsUnion; + }; +}; +/** + * Contains response data for the beginUpdate operation. + */ +export type ComputeBeginUpdateResponse = ComputeResource & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { /** * The response body as text (string format) */ @@ -3114,9 +4189,9 @@ export type MachineLearningComputeCreateOrUpdateResponse = ComputeResource & Mac }; /** - * Contains response data for the update operation. + * Contains response data for the listNext operation. */ -export type MachineLearningComputeUpdateResponse = ComputeResource & { +export type ComputeListNextResponse = PaginatedComputeResourcesList & { /** * The underlying HTTP response. */ @@ -3129,29 +4204,34 @@ export type MachineLearningComputeUpdateResponse = ComputeResource & { /** * The response body as parsed JSON or XML */ - parsedBody: ComputeResource; + parsedBody: PaginatedComputeResourcesList; }; }; /** - * Contains response data for the deleteMethod operation. + * Contains response data for the listNodesNext operation. */ -export type MachineLearningComputeDeleteResponse = MachineLearningComputeDeleteHeaders & { +export type ComputeListNodesNextResponse = AmlComputeNodesInformation & { /** * The underlying HTTP response. */ _response: msRest.HttpResponse & { /** - * The parsed HTTP response headers. + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML */ - parsedHeaders: MachineLearningComputeDeleteHeaders; + parsedBody: AmlComputeNodesInformation; }; }; /** - * Contains response data for the listNodes operation. + * Contains response data for the list operation. */ -export type MachineLearningComputeListNodesResponse = AmlComputeNodesInformation & { +export type PrivateEndpointConnectionsListResponse = PrivateEndpointConnectionListResult & { /** * The underlying HTTP response. */ @@ -3164,14 +4244,14 @@ export type MachineLearningComputeListNodesResponse = AmlComputeNodesInformation /** * The response body as parsed JSON or XML */ - parsedBody: AmlComputeNodesInformation; + parsedBody: PrivateEndpointConnectionListResult; }; }; /** - * Contains response data for the listKeys operation. + * Contains response data for the get operation. */ -export type MachineLearningComputeListKeysResponse = ComputeSecretsUnion & { +export type PrivateEndpointConnectionsGetResponse = PrivateEndpointConnection & { /** * The underlying HTTP response. */ @@ -3184,14 +4264,14 @@ export type MachineLearningComputeListKeysResponse = ComputeSecretsUnion & { /** * The response body as parsed JSON or XML */ - parsedBody: ComputeSecretsUnion; + parsedBody: PrivateEndpointConnection; }; }; /** - * Contains response data for the beginUpdate operation. + * Contains response data for the createOrUpdate operation. */ -export type MachineLearningComputeBeginUpdateResponse = ComputeResource & { +export type PrivateEndpointConnectionsCreateOrUpdateResponse = PrivateEndpointConnection & { /** * The underlying HTTP response. */ @@ -3204,14 +4284,14 @@ export type MachineLearningComputeBeginUpdateResponse = ComputeResource & { /** * The response body as parsed JSON or XML */ - parsedBody: ComputeResource; + parsedBody: PrivateEndpointConnection; }; }; /** - * Contains response data for the listByWorkspaceNext operation. + * Contains response data for the list operation. */ -export type MachineLearningComputeListByWorkspaceNextResponse = PaginatedComputeResourcesList & { +export type PrivateLinkResourcesListResponse = PrivateLinkResourceListResult & { /** * The underlying HTTP response. */ @@ -3224,14 +4304,14 @@ export type MachineLearningComputeListByWorkspaceNextResponse = PaginatedCompute /** * The response body as parsed JSON or XML */ - parsedBody: PaginatedComputeResourcesList; + parsedBody: PrivateLinkResourceListResult; }; }; /** - * Contains response data for the listSkus operation. + * Contains response data for the list operation. */ -export type ListSkusResponse = SkuListResult & { +export type WorkspaceConnectionsListResponse = PaginatedWorkspaceConnectionsList & { /** * The underlying HTTP response. */ @@ -3244,14 +4324,14 @@ export type ListSkusResponse = SkuListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: SkuListResult; + parsedBody: PaginatedWorkspaceConnectionsList; }; }; /** - * Contains response data for the listSkusNext operation. + * Contains response data for the create operation. */ -export type ListSkusNextResponse = SkuListResult & { +export type WorkspaceConnectionsCreateResponse = WorkspaceConnection & { /** * The underlying HTTP response. */ @@ -3264,14 +4344,14 @@ export type ListSkusNextResponse = SkuListResult & { /** * The response body as parsed JSON or XML */ - parsedBody: SkuListResult; + parsedBody: WorkspaceConnection; }; }; /** * Contains response data for the get operation. */ -export type PrivateEndpointConnectionsGetResponse = PrivateEndpointConnection & { +export type WorkspaceConnectionsGetResponse = WorkspaceConnection & { /** * The underlying HTTP response. */ @@ -3284,14 +4364,14 @@ export type PrivateEndpointConnectionsGetResponse = PrivateEndpointConnection & /** * The response body as parsed JSON or XML */ - parsedBody: PrivateEndpointConnection; + parsedBody: WorkspaceConnection; }; }; /** - * Contains response data for the put operation. + * Contains response data for the list operation. */ -export type PrivateEndpointConnectionsPutResponse = PrivateEndpointConnection & { +export type WorkspaceFeaturesListResponse = ListAmlUserFeatureResult & { /** * The underlying HTTP response. */ @@ -3304,14 +4384,14 @@ export type PrivateEndpointConnectionsPutResponse = PrivateEndpointConnection & /** * The response body as parsed JSON or XML */ - parsedBody: PrivateEndpointConnection; + parsedBody: ListAmlUserFeatureResult; }; }; /** - * Contains response data for the listByWorkspace operation. + * Contains response data for the listNext operation. */ -export type PrivateLinkResourcesListByWorkspaceResponse = PrivateLinkResourceListResult & { +export type WorkspaceFeaturesListNextResponse = ListAmlUserFeatureResult & { /** * The underlying HTTP response. */ @@ -3324,6 +4404,46 @@ export type PrivateLinkResourcesListByWorkspaceResponse = PrivateLinkResourceLis /** * The response body as parsed JSON or XML */ - parsedBody: PrivateLinkResourceListResult; + parsedBody: ListAmlUserFeatureResult; + }; +}; + +/** + * Contains response data for the list operation. + */ +export type WorkspaceSkusListResponse = SkuListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: SkuListResult; + }; +}; + +/** + * Contains response data for the listNext operation. + */ +export type WorkspaceSkusListNextResponse = SkuListResult & { + /** + * The underlying HTTP response. + */ + _response: msRest.HttpResponse & { + /** + * The response body as text (string format) + */ + bodyAsText: string; + + /** + * The response body as parsed JSON or XML + */ + parsedBody: SkuListResult; }; }; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/mappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/mappers.ts index 122cb25e5b8b..ab03873af155 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/mappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/mappers.ts @@ -69,74 +69,17 @@ export const Operation: msRest.CompositeMapper = { } }; -export const NotebookListCredentialsResult: msRest.CompositeMapper = { - serializedName: "NotebookListCredentialsResult", +export const IdentityForCmk: msRest.CompositeMapper = { + serializedName: "IdentityForCmk", type: { name: "Composite", - className: "NotebookListCredentialsResult", + className: "IdentityForCmk", modelProperties: { - primaryAccessKey: { - serializedName: "primaryAccessKey", - type: { - name: "String" - } - }, - secondaryAccessKey: { - serializedName: "secondaryAccessKey", - type: { - name: "String" - } - } - } - } -}; - -export const NotebookPreparationError: msRest.CompositeMapper = { - serializedName: "NotebookPreparationError", - type: { - name: "Composite", - className: "NotebookPreparationError", - modelProperties: { - errorMessage: { - serializedName: "errorMessage", - type: { - name: "String" - } - }, - statusCode: { - serializedName: "statusCode", - type: { - name: "Number" - } - } - } - } -}; - -export const NotebookResourceInfo: msRest.CompositeMapper = { - serializedName: "NotebookResourceInfo", - type: { - name: "Composite", - className: "NotebookResourceInfo", - modelProperties: { - fqdn: { - serializedName: "fqdn", - type: { - name: "String" - } - }, - resourceId: { - serializedName: "resourceId", + userAssignedIdentity: { + serializedName: "userAssignedIdentity", type: { name: "String" } - }, - notebookPreparationError: { - serializedName: "notebookPreparationError", - type: { - name: "Composite", - className: "NotebookPreparationError" - } } } } @@ -185,6 +128,13 @@ export const EncryptionProperty: msRest.CompositeMapper = { name: "String" } }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "IdentityForCmk" + } + }, keyVaultProperties: { required: true, serializedName: "keyVaultProperties", @@ -209,6 +159,13 @@ export const PrivateEndpoint: msRest.CompositeMapper = { type: { name: "String" } + }, + subnetArmId: { + readOnly: true, + serializedName: "subnetArmId", + type: { + name: "String" + } } } } @@ -242,63 +199,90 @@ export const PrivateLinkServiceConnectionState: msRest.CompositeMapper = { } }; -export const PrivateEndpointConnection: msRest.CompositeMapper = { - serializedName: "PrivateEndpointConnection", +export const UserAssignedIdentity: msRest.CompositeMapper = { + serializedName: "UserAssignedIdentity", type: { name: "Composite", - className: "PrivateEndpointConnection", + className: "UserAssignedIdentity", modelProperties: { - id: { + principalId: { readOnly: true, - serializedName: "id", + serializedName: "principalId", type: { name: "String" } }, - name: { + tenantId: { readOnly: true, - serializedName: "name", + serializedName: "tenantId", type: { name: "String" } }, - type: { + clientId: { readOnly: true, - serializedName: "type", + serializedName: "clientId", + type: { + name: "String" + } + } + } + } +}; + +export const Identity: msRest.CompositeMapper = { + serializedName: "Identity", + type: { + name: "Composite", + className: "Identity", + modelProperties: { + principalId: { + readOnly: true, + serializedName: "principalId", type: { name: "String" } }, - privateEndpoint: { - serializedName: "properties.privateEndpoint", + tenantId: { + readOnly: true, + serializedName: "tenantId", type: { - name: "Composite", - className: "PrivateEndpoint" + name: "String" } }, - privateLinkServiceConnectionState: { - required: true, - serializedName: "properties.privateLinkServiceConnectionState", + type: { + serializedName: "type", type: { - name: "Composite", - className: "PrivateLinkServiceConnectionState" + name: "Enum", + allowedValues: [ + "SystemAssigned", + "SystemAssigned,UserAssigned", + "UserAssigned", + "None" + ] } }, - provisioningState: { - serializedName: "properties.provisioningState", + userAssignedIdentities: { + serializedName: "userAssignedIdentities", type: { - name: "String" + name: "Dictionary", + value: { + type: { + name: "Composite", + className: "UserAssignedIdentity" + } + } } } } } }; -export const SharedPrivateLinkResource: msRest.CompositeMapper = { - serializedName: "SharedPrivateLinkResource", +export const Sku: msRest.CompositeMapper = { + serializedName: "Sku", type: { name: "Composite", - className: "SharedPrivateLinkResource", + className: "Sku", modelProperties: { name: { serializedName: "name", @@ -306,29 +290,57 @@ export const SharedPrivateLinkResource: msRest.CompositeMapper = { name: "String" } }, - privateLinkResourceId: { - serializedName: "properties.privateLinkResourceId", + tier: { + serializedName: "tier", + type: { + name: "String" + } + } + } + } +}; + +export const SystemData: msRest.CompositeMapper = { + serializedName: "systemData", + type: { + name: "Composite", + className: "SystemData", + modelProperties: { + createdBy: { + serializedName: "createdBy", type: { name: "String" } }, - groupId: { - serializedName: "properties.groupId", + createdByType: { + serializedName: "createdByType", type: { name: "String" } }, - requestMessage: { - serializedName: "properties.requestMessage", + createdAt: { + serializedName: "createdAt", + type: { + name: "DateTime" + } + }, + lastModifiedBy: { + serializedName: "lastModifiedBy", type: { name: "String" } }, - status: { - serializedName: "properties.status", + lastModifiedByType: { + serializedName: "lastModifiedByType", type: { name: "String" } + }, + lastModifiedAt: { + serializedName: "lastModifiedAt", + type: { + name: "DateTime" + } } } } @@ -354,6 +366,45 @@ export const Resource: msRest.CompositeMapper = { name: "String" } }, + type: { + readOnly: true, + serializedName: "type", + type: { + name: "String" + } + } + } + } +}; + +export const PrivateEndpointConnection: msRest.CompositeMapper = { + serializedName: "PrivateEndpointConnection", + type: { + name: "Composite", + className: "PrivateEndpointConnection", + modelProperties: { + ...Resource.type.modelProperties, + privateEndpoint: { + serializedName: "properties.privateEndpoint", + type: { + name: "Composite", + className: "PrivateEndpoint" + } + }, + privateLinkServiceConnectionState: { + required: true, + serializedName: "properties.privateLinkServiceConnectionState", + type: { + name: "Composite", + className: "PrivateLinkServiceConnectionState" + } + }, + provisioningState: { + serializedName: "properties.provisioningState", + type: { + name: "String" + } + }, identity: { serializedName: "identity", type: { @@ -367,13 +418,6 @@ export const Resource: msRest.CompositeMapper = { name: "String" } }, - type: { - readOnly: true, - serializedName: "type", - type: { - name: "String" - } - }, tags: { serializedName: "tags", type: { @@ -391,57 +435,183 @@ export const Resource: msRest.CompositeMapper = { name: "Composite", className: "Sku" } + }, + systemData: { + serializedName: "systemData", + type: { + name: "Composite", + className: "SystemData" + } } } } }; -export const Workspace: msRest.CompositeMapper = { - serializedName: "Workspace", +export const SharedPrivateLinkResource: msRest.CompositeMapper = { + serializedName: "SharedPrivateLinkResource", type: { name: "Composite", - className: "Workspace", + className: "SharedPrivateLinkResource", modelProperties: { - ...Resource.type.modelProperties, - workspaceId: { - readOnly: true, - serializedName: "properties.workspaceId", + name: { + serializedName: "name", type: { name: "String" } }, - description: { - serializedName: "properties.description", + privateLinkResourceId: { + serializedName: "properties.privateLinkResourceId", type: { name: "String" } }, - friendlyName: { - serializedName: "properties.friendlyName", + groupId: { + serializedName: "properties.groupId", type: { name: "String" } }, - creationTime: { - readOnly: true, - serializedName: "properties.creationTime", - type: { - name: "DateTime" - } - }, - keyVault: { - serializedName: "properties.keyVault", + requestMessage: { + serializedName: "properties.requestMessage", type: { name: "String" } }, - applicationInsights: { - serializedName: "properties.applicationInsights", + status: { + serializedName: "properties.status", type: { name: "String" } - }, + } + } + } +}; + +export const NotebookPreparationError: msRest.CompositeMapper = { + serializedName: "NotebookPreparationError", + type: { + name: "Composite", + className: "NotebookPreparationError", + modelProperties: { + errorMessage: { + serializedName: "errorMessage", + type: { + name: "String" + } + }, + statusCode: { + serializedName: "statusCode", + type: { + name: "Number" + } + } + } + } +}; + +export const NotebookResourceInfo: msRest.CompositeMapper = { + serializedName: "NotebookResourceInfo", + type: { + name: "Composite", + className: "NotebookResourceInfo", + modelProperties: { + fqdn: { + serializedName: "fqdn", + type: { + name: "String" + } + }, + resourceId: { + serializedName: "resourceId", + type: { + name: "String" + } + }, + notebookPreparationError: { + nullable: true, + serializedName: "notebookPreparationError", + type: { + name: "Composite", + className: "NotebookPreparationError" + } + } + } + } +}; + +export const CosmosDbSettings: msRest.CompositeMapper = { + serializedName: "CosmosDbSettings", + type: { + name: "Composite", + className: "CosmosDbSettings", + modelProperties: { + collectionsThroughput: { + serializedName: "collectionsThroughput", + type: { + name: "Number" + } + } + } + } +}; + +export const ServiceManagedResourcesSettings: msRest.CompositeMapper = { + serializedName: "ServiceManagedResourcesSettings", + type: { + name: "Composite", + className: "ServiceManagedResourcesSettings", + modelProperties: { + cosmosDb: { + serializedName: "cosmosDb", + type: { + name: "Composite", + className: "CosmosDbSettings" + } + } + } + } +}; + +export const Workspace: msRest.CompositeMapper = { + serializedName: "Workspace", + type: { + name: "Composite", + className: "Workspace", + modelProperties: { + ...Resource.type.modelProperties, + workspaceId: { + readOnly: true, + serializedName: "properties.workspaceId", + type: { + name: "String" + } + }, + description: { + serializedName: "properties.description", + type: { + name: "String" + } + }, + friendlyName: { + serializedName: "properties.friendlyName", + type: { + name: "String" + } + }, + keyVault: { + serializedName: "properties.keyVault", + type: { + name: "String" + } + }, + applicationInsights: { + serializedName: "properties.applicationInsights", + type: { + name: "String" + } + }, containerRegistry: { + nullable: true, serializedName: "properties.containerRegistry", type: { name: "String" @@ -507,6 +677,12 @@ export const Workspace: msRest.CompositeMapper = { name: "Boolean" } }, + publicNetworkAccess: { + serializedName: "properties.publicNetworkAccess", + type: { + name: "String" + } + }, privateEndpointConnections: { readOnly: true, serializedName: "properties.privateEndpointConnections", @@ -539,28 +715,78 @@ export const Workspace: msRest.CompositeMapper = { name: "Composite", className: "NotebookResourceInfo" } - } - } - } -}; - -export const Sku: msRest.CompositeMapper = { - serializedName: "Sku", - type: { - name: "Composite", - className: "Sku", - modelProperties: { - name: { - serializedName: "name", + }, + serviceManagedResourcesSettings: { + serializedName: "properties.serviceManagedResourcesSettings", + type: { + name: "Composite", + className: "ServiceManagedResourcesSettings" + } + }, + primaryUserAssignedIdentity: { + serializedName: "properties.primaryUserAssignedIdentity", type: { name: "String" } }, - tier: { - serializedName: "tier", + tenantId: { + readOnly: true, + serializedName: "properties.tenantId", + type: { + name: "String" + } + }, + storageHnsEnabled: { + readOnly: true, + serializedName: "properties.storageHnsEnabled", + type: { + name: "Boolean" + } + }, + mlFlowTrackingUri: { + readOnly: true, + serializedName: "properties.mlFlowTrackingUri", + type: { + name: "String" + } + }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "Identity" + } + }, + location: { + serializedName: "location", type: { name: "String" } + }, + tags: { + serializedName: "tags", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + }, + sku: { + serializedName: "sku", + type: { + name: "Composite", + className: "Sku" + } + }, + systemData: { + serializedName: "systemData", + type: { + name: "Composite", + className: "SystemData" + } } } } @@ -590,6 +816,13 @@ export const WorkspaceUpdateParameters: msRest.CompositeMapper = { className: "Sku" } }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "Identity" + } + }, description: { serializedName: "properties.description", type: { @@ -601,31 +834,28 @@ export const WorkspaceUpdateParameters: msRest.CompositeMapper = { type: { name: "String" } - } - } - } -}; - -export const AmlUserFeature: msRest.CompositeMapper = { - serializedName: "AmlUserFeature", - type: { - name: "Composite", - className: "AmlUserFeature", - modelProperties: { - id: { - serializedName: "id", + }, + imageBuildCompute: { + serializedName: "properties.imageBuildCompute", type: { name: "String" } }, - displayName: { - serializedName: "displayName", + serviceManagedResourcesSettings: { + serializedName: "properties.serviceManagedResourcesSettings", + type: { + name: "Composite", + className: "ServiceManagedResourcesSettings" + } + }, + primaryUserAssignedIdentity: { + serializedName: "properties.primaryUserAssignedIdentity", type: { name: "String" } }, - description: { - serializedName: "description", + publicNetworkAccess: { + serializedName: "properties.publicNetworkAccess", type: { name: "String" } @@ -671,6 +901,13 @@ export const Usage: msRest.CompositeMapper = { name: "String" } }, + amlWorkspaceLocation: { + readOnly: true, + serializedName: "amlWorkspaceLocation", + type: { + name: "String" + } + }, type: { readOnly: true, serializedName: "type", @@ -880,8 +1117,8 @@ export const VirtualMachineSizeListResult: msRest.CompositeMapper = { name: "Composite", className: "VirtualMachineSizeListResult", modelProperties: { - amlCompute: { - serializedName: "amlCompute", + value: { + serializedName: "value", type: { name: "Sequence", element: { @@ -947,36 +1184,334 @@ export const QuotaUpdateParameters: msRest.CompositeMapper = { } } } + }, + location: { + serializedName: "location", + type: { + name: "String" + } } } } }; -export const UpdateWorkspaceQuotas: msRest.CompositeMapper = { - serializedName: "UpdateWorkspaceQuotas", +export const DiagnoseRequestProperties: msRest.CompositeMapper = { + serializedName: "DiagnoseRequestProperties", type: { name: "Composite", - className: "UpdateWorkspaceQuotas", + className: "DiagnoseRequestProperties", modelProperties: { - id: { - readOnly: true, - serializedName: "id", + udr: { + serializedName: "udr", type: { - name: "String" + name: "Dictionary", + value: { + type: { + name: "Object" + } + } } }, - type: { - readOnly: true, - serializedName: "type", + nsg: { + serializedName: "nsg", type: { - name: "String" + name: "Dictionary", + value: { + type: { + name: "Object" + } + } } }, - limit: { - serializedName: "limit", + resourceLock: { + serializedName: "resourceLock", type: { - name: "Number" - } + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + }, + dnsResolution: { + serializedName: "dnsResolution", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + }, + storageAccount: { + serializedName: "storageAccount", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + }, + keyVault: { + serializedName: "keyVault", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + }, + containerRegistry: { + serializedName: "containerRegistry", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + }, + applicationInsights: { + serializedName: "applicationInsights", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + }, + others: { + serializedName: "others", + type: { + name: "Dictionary", + value: { + type: { + name: "Object" + } + } + } + } + } + } +}; + +export const DiagnoseWorkspaceParameters: msRest.CompositeMapper = { + serializedName: "DiagnoseWorkspaceParameters", + type: { + name: "Composite", + className: "DiagnoseWorkspaceParameters", + modelProperties: { + value: { + serializedName: "value", + type: { + name: "Composite", + className: "DiagnoseRequestProperties" + } + } + } + } +}; + +export const DiagnoseResult: msRest.CompositeMapper = { + serializedName: "DiagnoseResult", + type: { + name: "Composite", + className: "DiagnoseResult", + modelProperties: { + code: { + readOnly: true, + serializedName: "code", + type: { + name: "String" + } + }, + level: { + readOnly: true, + serializedName: "level", + type: { + name: "String" + } + }, + message: { + readOnly: true, + serializedName: "message", + type: { + name: "String" + } + } + } + } +}; + +export const DiagnoseResponseResultValue: msRest.CompositeMapper = { + serializedName: "DiagnoseResponseResult_value", + type: { + name: "Composite", + className: "DiagnoseResponseResultValue", + modelProperties: { + userDefinedRouteResults: { + serializedName: "userDefinedRouteResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + }, + networkSecurityRuleResults: { + serializedName: "networkSecurityRuleResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + }, + resourceLockResults: { + serializedName: "resourceLockResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + }, + dnsResolutionResults: { + serializedName: "dnsResolutionResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + }, + storageAccountResults: { + serializedName: "storageAccountResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + }, + keyVaultResults: { + serializedName: "keyVaultResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + }, + containerRegistryResults: { + serializedName: "containerRegistryResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + }, + applicationInsightsResults: { + serializedName: "applicationInsightsResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + }, + otherResults: { + serializedName: "otherResults", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "DiagnoseResult" + } + } + } + } + } + } +}; + +export const DiagnoseResponseResult: msRest.CompositeMapper = { + serializedName: "DiagnoseResponseResult", + type: { + name: "Composite", + className: "DiagnoseResponseResult", + modelProperties: { + value: { + serializedName: "value", + type: { + name: "Composite", + className: "DiagnoseResponseResultValue" + } + } + } + } +}; + +export const UpdateWorkspaceQuotas: msRest.CompositeMapper = { + serializedName: "UpdateWorkspaceQuotas", + type: { + name: "Composite", + className: "UpdateWorkspaceQuotas", + modelProperties: { + id: { + readOnly: true, + serializedName: "id", + type: { + name: "String" + } + }, + type: { + readOnly: true, + serializedName: "type", + type: { + name: "String" + } + }, + limit: { + serializedName: "limit", + type: { + name: "Number" + } }, unit: { readOnly: true, @@ -1062,6 +1597,13 @@ export const ResourceQuota: msRest.CompositeMapper = { name: "String" } }, + amlWorkspaceLocation: { + readOnly: true, + serializedName: "amlWorkspaceLocation", + type: { + name: "String" + } + }, type: { readOnly: true, serializedName: "type", @@ -1095,22 +1637,15 @@ export const ResourceQuota: msRest.CompositeMapper = { } }; -export const IdentityUserAssignedIdentitiesValue: msRest.CompositeMapper = { - serializedName: "Identity_userAssignedIdentitiesValue", +export const ResourceId: msRest.CompositeMapper = { + serializedName: "ResourceId", type: { name: "Composite", - className: "IdentityUserAssignedIdentitiesValue", + className: "ResourceId", modelProperties: { - principalId: { - readOnly: true, - serializedName: "principalId", - type: { - name: "String" - } - }, - clientId: { - readOnly: true, - serializedName: "clientId", + id: { + required: true, + serializedName: "id", type: { name: "String" } @@ -1119,77 +1654,11 @@ export const IdentityUserAssignedIdentitiesValue: msRest.CompositeMapper = { } }; -export const Identity: msRest.CompositeMapper = { - serializedName: "Identity", +export const Password: msRest.CompositeMapper = { + serializedName: "Password", type: { name: "Composite", - className: "Identity", - modelProperties: { - principalId: { - readOnly: true, - serializedName: "principalId", - type: { - name: "String" - } - }, - tenantId: { - readOnly: true, - serializedName: "tenantId", - type: { - name: "String" - } - }, - type: { - required: true, - serializedName: "type", - type: { - name: "Enum", - allowedValues: [ - "SystemAssigned", - "UserAssigned", - "SystemAssigned,UserAssigned", - "None" - ] - } - }, - userAssignedIdentities: { - serializedName: "userAssignedIdentities", - type: { - name: "Dictionary", - value: { - type: { - name: "Composite", - className: "IdentityUserAssignedIdentitiesValue" - } - } - } - } - } - } -}; - -export const ResourceId: msRest.CompositeMapper = { - serializedName: "ResourceId", - type: { - name: "Composite", - className: "ResourceId", - modelProperties: { - id: { - required: true, - serializedName: "id", - type: { - name: "String" - } - } - } - } -}; - -export const Password: msRest.CompositeMapper = { - serializedName: "Password", - type: { - name: "Composite", - className: "Password", + className: "Password", modelProperties: { name: { readOnly: true, @@ -1245,6 +1714,30 @@ export const RegistryListCredentialsResult: msRest.CompositeMapper = { } }; +export const ListNotebookKeysResult: msRest.CompositeMapper = { + serializedName: "ListNotebookKeysResult", + type: { + name: "Composite", + className: "ListNotebookKeysResult", + modelProperties: { + primaryAccessKey: { + readOnly: true, + serializedName: "primaryAccessKey", + type: { + name: "String" + } + }, + secondaryAccessKey: { + readOnly: true, + serializedName: "secondaryAccessKey", + type: { + name: "String" + } + } + } + } +}; + export const ListWorkspaceKeysResult: msRest.CompositeMapper = { serializedName: "ListWorkspaceKeysResult", type: { @@ -1281,32 +1774,75 @@ export const ListWorkspaceKeysResult: msRest.CompositeMapper = { } }, notebookAccessKeys: { + readOnly: true, serializedName: "notebookAccessKeys", type: { name: "Composite", - className: "NotebookListCredentialsResult" + className: "ListNotebookKeysResult" } } } } }; -export const ErrorDetail: msRest.CompositeMapper = { - serializedName: "ErrorDetail", +export const NotebookAccessTokenResult: msRest.CompositeMapper = { + serializedName: "NotebookAccessTokenResult", type: { name: "Composite", - className: "ErrorDetail", + className: "NotebookAccessTokenResult", modelProperties: { - code: { - required: true, - serializedName: "code", + notebookResourceId: { + readOnly: true, + serializedName: "notebookResourceId", type: { name: "String" } }, - message: { - required: true, - serializedName: "message", + hostName: { + readOnly: true, + serializedName: "hostName", + type: { + name: "String" + } + }, + publicDns: { + readOnly: true, + serializedName: "publicDns", + type: { + name: "String" + } + }, + accessToken: { + readOnly: true, + serializedName: "accessToken", + type: { + name: "String" + } + }, + tokenType: { + readOnly: true, + serializedName: "tokenType", + type: { + name: "String" + } + }, + expiresIn: { + readOnly: true, + serializedName: "expiresIn", + type: { + name: "Number" + } + }, + refreshToken: { + readOnly: true, + serializedName: "refreshToken", + type: { + name: "String" + } + }, + scope: { + readOnly: true, + serializedName: "scope", type: { name: "String" } @@ -1315,11 +1851,35 @@ export const ErrorDetail: msRest.CompositeMapper = { } }; -export const ErrorResponse: msRest.CompositeMapper = { - serializedName: "ErrorResponse", +export const ErrorAdditionalInfo: msRest.CompositeMapper = { + serializedName: "ErrorAdditionalInfo", type: { name: "Composite", - className: "ErrorResponse", + className: "ErrorAdditionalInfo", + modelProperties: { + type: { + readOnly: true, + serializedName: "type", + type: { + name: "String" + } + }, + info: { + readOnly: true, + serializedName: "info", + type: { + name: "Object" + } + } + } + } +}; + +export const ErrorDetail: msRest.CompositeMapper = { + serializedName: "ErrorDetail", + type: { + name: "Composite", + className: "ErrorDetail", modelProperties: { code: { readOnly: true, @@ -1335,6 +1895,13 @@ export const ErrorResponse: msRest.CompositeMapper = { name: "String" } }, + target: { + readOnly: true, + serializedName: "target", + type: { + name: "String" + } + }, details: { readOnly: true, serializedName: "details", @@ -1347,23 +1914,35 @@ export const ErrorResponse: msRest.CompositeMapper = { } } } + }, + additionalInfo: { + readOnly: true, + serializedName: "additionalInfo", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ErrorAdditionalInfo" + } + } + } } } } }; -export const MachineLearningServiceError: msRest.CompositeMapper = { - serializedName: "MachineLearningServiceError", +export const ErrorResponse: msRest.CompositeMapper = { + serializedName: "ErrorResponse", type: { name: "Composite", - className: "MachineLearningServiceError", + className: "ErrorResponse", modelProperties: { error: { - readOnly: true, serializedName: "error", type: { name: "Composite", - className: "ErrorResponse" + className: "ErrorDetail" } } } @@ -1428,7 +2007,7 @@ export const Compute: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "MachineLearningServiceError" + className: "ErrorResponse" } } } @@ -1440,6 +2019,12 @@ export const Compute: msRest.CompositeMapper = { name: "Boolean" } }, + disableLocalAuth: { + serializedName: "disableLocalAuth", + type: { + name: "Boolean" + } + }, computeType: { required: true, serializedName: "computeType", @@ -1464,6 +2049,44 @@ export const ComputeResource: msRest.CompositeMapper = { name: "Composite", className: "Compute" } + }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "Identity" + } + }, + location: { + serializedName: "location", + type: { + name: "String" + } + }, + tags: { + serializedName: "tags", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + }, + sku: { + serializedName: "sku", + type: { + name: "Composite", + className: "Sku" + } + }, + systemData: { + serializedName: "systemData", + type: { + name: "Composite", + className: "SystemData" + } } } } @@ -1529,6 +2152,18 @@ export const SslConfiguration: msRest.CompositeMapper = { type: { name: "String" } + }, + leafDomainLabel: { + serializedName: "leafDomainLabel", + type: { + name: "String" + } + }, + overwriteExistingDomain: { + serializedName: "overwriteExistingDomain", + type: { + name: "Boolean" + } } } } @@ -1605,14 +2240,21 @@ export const AKSProperties: msRest.CompositeMapper = { agentCount: { serializedName: "agentCount", constraints: { - InclusiveMinimum: 1 + InclusiveMinimum: 0 }, type: { name: "Number" } }, - agentVMSize: { - serializedName: "agentVMSize", + agentVmSize: { + serializedName: "agentVmSize", + type: { + name: "String" + } + }, + clusterPurpose: { + serializedName: "clusterPurpose", + defaultValue: 'FastProd', type: { name: "String" } @@ -1630,6 +2272,19 @@ export const AKSProperties: msRest.CompositeMapper = { name: "Composite", className: "AksNetworkingConfiguration" } + }, + loadBalancerType: { + serializedName: "loadBalancerType", + defaultValue: 'PublicIp', + type: { + name: "String" + } + }, + loadBalancerSubnet: { + serializedName: "loadBalancerSubnet", + type: { + name: "String" + } } } } @@ -1655,28 +2310,276 @@ export const AKS: msRest.CompositeMapper = { } }; -export const ScaleSettings: msRest.CompositeMapper = { - serializedName: "ScaleSettings", +export const InstanceTypeSchemaResources: msRest.CompositeMapper = { + serializedName: "InstanceTypeSchema_resources", type: { name: "Composite", - className: "ScaleSettings", + className: "InstanceTypeSchemaResources", modelProperties: { - maxNodeCount: { - required: true, - serializedName: "maxNodeCount", + requests: { + serializedName: "requests", type: { - name: "Number" + name: "Dictionary", + value: { + type: { + name: "String" + } + } } }, - minNodeCount: { - serializedName: "minNodeCount", - defaultValue: 0, + limits: { + serializedName: "limits", type: { - name: "Number" + name: "Dictionary", + value: { + type: { + name: "String" + } + } } - }, - nodeIdleTimeBeforeScaleDown: { - serializedName: "nodeIdleTimeBeforeScaleDown", + } + } + } +}; + +export const InstanceTypeSchema: msRest.CompositeMapper = { + serializedName: "InstanceTypeSchema", + type: { + name: "Composite", + className: "InstanceTypeSchema", + modelProperties: { + nodeSelector: { + serializedName: "nodeSelector", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + }, + resources: { + serializedName: "resources", + type: { + name: "Composite", + className: "InstanceTypeSchemaResources" + } + } + } + } +}; + +export const KubernetesProperties: msRest.CompositeMapper = { + serializedName: "KubernetesProperties", + type: { + name: "Composite", + className: "KubernetesProperties", + modelProperties: { + relayConnectionString: { + serializedName: "relayConnectionString", + type: { + name: "String" + } + }, + serviceBusConnectionString: { + serializedName: "serviceBusConnectionString", + type: { + name: "String" + } + }, + extensionPrincipalId: { + serializedName: "extensionPrincipalId", + type: { + name: "String" + } + }, + extensionInstanceReleaseTrain: { + serializedName: "extensionInstanceReleaseTrain", + type: { + name: "String" + } + }, + vcName: { + serializedName: "vcName", + type: { + name: "String" + } + }, + namespace: { + serializedName: "namespace", + defaultValue: 'default', + type: { + name: "String" + } + }, + defaultInstanceType: { + serializedName: "defaultInstanceType", + type: { + name: "String" + } + }, + instanceTypes: { + serializedName: "instanceTypes", + type: { + name: "Dictionary", + value: { + type: { + name: "Composite", + className: "InstanceTypeSchema" + } + } + } + } + } + } +}; + +export const Kubernetes: msRest.CompositeMapper = { + serializedName: "Kubernetes", + type: { + name: "Composite", + className: "Kubernetes", + modelProperties: { + computeType: { + required: true, + serializedName: "computeType", + type: { + name: "String" + } + }, + computeLocation: { + serializedName: "computeLocation", + type: { + name: "String" + } + }, + provisioningState: { + readOnly: true, + serializedName: "provisioningState", + type: { + name: "String" + } + }, + description: { + serializedName: "description", + type: { + name: "String" + } + }, + createdOn: { + readOnly: true, + serializedName: "createdOn", + type: { + name: "DateTime" + } + }, + modifiedOn: { + readOnly: true, + serializedName: "modifiedOn", + type: { + name: "DateTime" + } + }, + resourceId: { + serializedName: "resourceId", + type: { + name: "String" + } + }, + provisioningErrors: { + readOnly: true, + serializedName: "provisioningErrors", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ErrorResponse" + } + } + } + }, + isAttachedCompute: { + readOnly: true, + serializedName: "isAttachedCompute", + type: { + name: "Boolean" + } + }, + disableLocalAuth: { + serializedName: "disableLocalAuth", + type: { + name: "Boolean" + } + }, + properties: { + serializedName: "properties", + type: { + name: "Composite", + className: "KubernetesProperties" + } + } + } + } +}; + +export const KubernetesSchema: msRest.CompositeMapper = { + serializedName: "KubernetesSchema", + type: { + name: "Composite", + className: "KubernetesSchema", + modelProperties: { + properties: { + serializedName: "properties", + type: { + name: "Composite", + className: "KubernetesProperties" + } + } + } + } +}; + +export const VirtualMachineImage: msRest.CompositeMapper = { + serializedName: "VirtualMachineImage", + type: { + name: "Composite", + className: "VirtualMachineImage", + modelProperties: { + id: { + required: true, + serializedName: "id", + type: { + name: "String" + } + } + } + } +}; + +export const ScaleSettings: msRest.CompositeMapper = { + serializedName: "ScaleSettings", + type: { + name: "Composite", + className: "ScaleSettings", + modelProperties: { + maxNodeCount: { + required: true, + serializedName: "maxNodeCount", + type: { + name: "Number" + } + }, + minNodeCount: { + serializedName: "minNodeCount", + defaultValue: 0, + type: { + name: "Number" + } + }, + nodeIdleTimeBeforeScaleDown: { + serializedName: "nodeIdleTimeBeforeScaleDown", type: { name: "TimeSpan" } @@ -1767,11 +2670,18 @@ export const NodeStateCounts: msRest.CompositeMapper = { }; export const AmlComputeProperties: msRest.CompositeMapper = { - serializedName: "AmlCompute_properties", + serializedName: "AmlComputeProperties", type: { name: "Composite", className: "AmlComputeProperties", modelProperties: { + osType: { + serializedName: "osType", + defaultValue: 'Linux', + type: { + name: "String" + } + }, vmSize: { serializedName: "vmSize", type: { @@ -1784,6 +2694,19 @@ export const AmlComputeProperties: msRest.CompositeMapper = { name: "String" } }, + virtualMachineImage: { + serializedName: "virtualMachineImage", + type: { + name: "Composite", + className: "VirtualMachineImage" + } + }, + isolatedNetwork: { + serializedName: "isolatedNetwork", + type: { + name: "Boolean" + } + }, scaleSettings: { serializedName: "scaleSettings", type: { @@ -1834,7 +2757,7 @@ export const AmlComputeProperties: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "MachineLearningServiceError" + className: "ErrorResponse" } } } @@ -1860,6 +2783,13 @@ export const AmlComputeProperties: msRest.CompositeMapper = { name: "Composite", className: "NodeStateCounts" } + }, + enableNodePublicIp: { + serializedName: "enableNodePublicIp", + defaultValue: true, + type: { + name: "Boolean" + } } } } @@ -1999,56 +2929,172 @@ export const ComputeInstanceCreatedBy: msRest.CompositeMapper = { } }; -export const ComputeInstanceLastOperation: msRest.CompositeMapper = { - serializedName: "ComputeInstanceLastOperation", +export const AssignedUser: msRest.CompositeMapper = { + serializedName: "AssignedUser", type: { name: "Composite", - className: "ComputeInstanceLastOperation", + className: "AssignedUser", modelProperties: { - operationName: { - serializedName: "operationName", + objectId: { + required: true, + serializedName: "objectId", type: { name: "String" } }, - operationTime: { - serializedName: "operationTime", + tenantId: { + required: true, + serializedName: "tenantId", type: { - name: "DateTime" + name: "String" } - }, - operationStatus: { - serializedName: "operationStatus", + } + } + } +}; + +export const PersonalComputeInstanceSettings: msRest.CompositeMapper = { + serializedName: "PersonalComputeInstanceSettings", + type: { + name: "Composite", + className: "PersonalComputeInstanceSettings", + modelProperties: { + assignedUser: { + serializedName: "assignedUser", type: { - name: "String" + name: "Composite", + className: "AssignedUser" } } } } }; -export const ComputeInstanceProperties: msRest.CompositeMapper = { - serializedName: "ComputeInstance_properties", +export const ScriptReference: msRest.CompositeMapper = { + serializedName: "ScriptReference", type: { name: "Composite", - className: "ComputeInstanceProperties", + className: "ScriptReference", modelProperties: { - vmSize: { - serializedName: "vmSize", + scriptSource: { + serializedName: "scriptSource", type: { name: "String" } }, - subnet: { - serializedName: "subnet", + scriptData: { + serializedName: "scriptData", type: { - name: "Composite", - className: "ResourceId" + name: "String" } }, - applicationSharingPolicy: { - serializedName: "applicationSharingPolicy", - defaultValue: 'Shared', + scriptArguments: { + serializedName: "scriptArguments", + type: { + name: "String" + } + }, + timeout: { + serializedName: "timeout", + type: { + name: "String" + } + } + } + } +}; + +export const ScriptsToExecute: msRest.CompositeMapper = { + serializedName: "ScriptsToExecute", + type: { + name: "Composite", + className: "ScriptsToExecute", + modelProperties: { + startupScript: { + serializedName: "startupScript", + type: { + name: "Composite", + className: "ScriptReference" + } + }, + creationScript: { + serializedName: "creationScript", + type: { + name: "Composite", + className: "ScriptReference" + } + } + } + } +}; + +export const SetupScripts: msRest.CompositeMapper = { + serializedName: "SetupScripts", + type: { + name: "Composite", + className: "SetupScripts", + modelProperties: { + scripts: { + serializedName: "scripts", + type: { + name: "Composite", + className: "ScriptsToExecute" + } + } + } + } +}; + +export const ComputeInstanceLastOperation: msRest.CompositeMapper = { + serializedName: "ComputeInstanceLastOperation", + type: { + name: "Composite", + className: "ComputeInstanceLastOperation", + modelProperties: { + operationName: { + serializedName: "operationName", + type: { + name: "String" + } + }, + operationTime: { + serializedName: "operationTime", + type: { + name: "DateTime" + } + }, + operationStatus: { + serializedName: "operationStatus", + type: { + name: "String" + } + } + } + } +}; + +export const ComputeInstanceProperties: msRest.CompositeMapper = { + serializedName: "ComputeInstanceProperties", + type: { + name: "Composite", + className: "ComputeInstanceProperties", + modelProperties: { + vmSize: { + serializedName: "vmSize", + type: { + name: "String" + } + }, + subnet: { + serializedName: "subnet", + type: { + name: "Composite", + className: "ResourceId" + } + }, + applicationSharingPolicy: { + serializedName: "applicationSharingPolicy", + defaultValue: 'Shared', type: { name: "String" } @@ -2097,7 +3143,7 @@ export const ComputeInstanceProperties: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "MachineLearningServiceError" + className: "ErrorResponse" } } } @@ -2109,6 +3155,27 @@ export const ComputeInstanceProperties: msRest.CompositeMapper = { name: "String" } }, + computeInstanceAuthorizationType: { + serializedName: "computeInstanceAuthorizationType", + defaultValue: 'personal', + type: { + name: "String" + } + }, + personalComputeInstanceSettings: { + serializedName: "personalComputeInstanceSettings", + type: { + name: "Composite", + className: "PersonalComputeInstanceSettings" + } + }, + setupScripts: { + serializedName: "setupScripts", + type: { + name: "Composite", + className: "SetupScripts" + } + }, lastOperation: { readOnly: true, serializedName: "lastOperation", @@ -2205,6 +3272,12 @@ export const VirtualMachineProperties: msRest.CompositeMapper = { name: "Composite", className: "VirtualMachineSshCredentials" } + }, + isNotebookInstanceCompute: { + serializedName: "isNotebookInstanceCompute", + type: { + name: "Boolean" + } } } } @@ -2231,7 +3304,7 @@ export const VirtualMachine: msRest.CompositeMapper = { }; export const HDInsightProperties: msRest.CompositeMapper = { - serializedName: "HDInsight_properties", + serializedName: "HDInsightProperties", type: { name: "Composite", className: "HDInsightProperties", @@ -2293,7 +3366,7 @@ export const DataFactory: msRest.CompositeMapper = { }; export const DatabricksProperties: msRest.CompositeMapper = { - serializedName: "Databricks_properties", + serializedName: "DatabricksProperties", type: { name: "Composite", className: "DatabricksProperties", @@ -2303,6 +3376,12 @@ export const DatabricksProperties: msRest.CompositeMapper = { type: { name: "String" } + }, + workspaceUrl: { + serializedName: "workspaceUrl", + type: { + name: "String" + } } } } @@ -2364,6 +3443,148 @@ export const DataLakeAnalytics: msRest.CompositeMapper = { } }; +export const AutoScaleProperties: msRest.CompositeMapper = { + serializedName: "AutoScaleProperties", + type: { + name: "Composite", + className: "AutoScaleProperties", + modelProperties: { + minNodeCount: { + serializedName: "minNodeCount", + type: { + name: "Number" + } + }, + enabled: { + serializedName: "enabled", + type: { + name: "Boolean" + } + }, + maxNodeCount: { + serializedName: "maxNodeCount", + type: { + name: "Number" + } + } + } + } +}; + +export const AutoPauseProperties: msRest.CompositeMapper = { + serializedName: "AutoPauseProperties", + type: { + name: "Composite", + className: "AutoPauseProperties", + modelProperties: { + delayInMinutes: { + serializedName: "delayInMinutes", + type: { + name: "Number" + } + }, + enabled: { + serializedName: "enabled", + type: { + name: "Boolean" + } + } + } + } +}; + +export const SynapseSparkProperties: msRest.CompositeMapper = { + serializedName: "SynapseSpark_properties", + type: { + name: "Composite", + className: "SynapseSparkProperties", + modelProperties: { + autoScaleProperties: { + serializedName: "autoScaleProperties", + type: { + name: "Composite", + className: "AutoScaleProperties" + } + }, + autoPauseProperties: { + serializedName: "autoPauseProperties", + type: { + name: "Composite", + className: "AutoPauseProperties" + } + }, + sparkVersion: { + serializedName: "sparkVersion", + type: { + name: "String" + } + }, + nodeCount: { + serializedName: "nodeCount", + type: { + name: "Number" + } + }, + nodeSize: { + serializedName: "nodeSize", + type: { + name: "String" + } + }, + nodeSizeFamily: { + serializedName: "nodeSizeFamily", + type: { + name: "String" + } + }, + subscriptionId: { + serializedName: "subscriptionId", + type: { + name: "String" + } + }, + resourceGroup: { + serializedName: "resourceGroup", + type: { + name: "String" + } + }, + workspaceName: { + serializedName: "workspaceName", + type: { + name: "String" + } + }, + poolName: { + serializedName: "poolName", + type: { + name: "String" + } + } + } + } +}; + +export const SynapseSpark: msRest.CompositeMapper = { + serializedName: "SynapseSpark", + type: { + name: "Composite", + polymorphicDiscriminator: Compute.type.polymorphicDiscriminator, + uberParent: "Compute", + className: "SynapseSpark", + modelProperties: { + ...Compute.type.modelProperties, + properties: { + serializedName: "properties", + type: { + name: "Composite", + className: "SynapseSparkProperties" + } + } + } + } +}; + export const ServicePrincipalCredentials: msRest.CompositeMapper = { serializedName: "ServicePrincipalCredentials", type: { @@ -2388,14 +3609,14 @@ export const ServicePrincipalCredentials: msRest.CompositeMapper = { } }; -export const ClusterUpdateParameters: msRest.CompositeMapper = { - serializedName: "ClusterUpdateParameters", +export const ScaleSettingsInformation: msRest.CompositeMapper = { + serializedName: "ScaleSettingsInformation", type: { name: "Composite", - className: "ClusterUpdateParameters", + className: "ScaleSettingsInformation", modelProperties: { scaleSettings: { - serializedName: "properties.scaleSettings", + serializedName: "scaleSettings", type: { name: "Composite", className: "ScaleSettings" @@ -2405,29 +3626,17 @@ export const ClusterUpdateParameters: msRest.CompositeMapper = { } }; -export const ComputeNodesInformation: msRest.CompositeMapper = { - serializedName: "ComputeNodesInformation", +export const ClusterUpdateParameters: msRest.CompositeMapper = { + serializedName: "ClusterUpdateParameters", type: { name: "Composite", - polymorphicDiscriminator: { - serializedName: "computeType", - clientName: "computeType" - }, - uberParent: "ComputeNodesInformation", - className: "ComputeNodesInformation", + className: "ClusterUpdateParameters", modelProperties: { - nextLink: { - readOnly: true, - serializedName: "nextLink", - type: { - name: "String" - } - }, - computeType: { - required: true, - serializedName: "computeType", + properties: { + serializedName: "properties.properties", type: { - name: "String" + name: "Composite", + className: "ScaleSettingsInformation" } } } @@ -2435,7 +3644,7 @@ export const ComputeNodesInformation: msRest.CompositeMapper = { }; export const AmlComputeNodeInformation: msRest.CompositeMapper = { - serializedName: "AmlCompute", + serializedName: "AmlComputeNodeInformation", type: { name: "Composite", className: "AmlComputeNodeInformation", @@ -2486,32 +3695,6 @@ export const AmlComputeNodeInformation: msRest.CompositeMapper = { } }; -export const AmlComputeNodesInformation: msRest.CompositeMapper = { - serializedName: "AmlCompute", - type: { - name: "Composite", - polymorphicDiscriminator: ComputeNodesInformation.type.polymorphicDiscriminator, - uberParent: "ComputeNodesInformation", - className: "AmlComputeNodesInformation", - modelProperties: { - ...ComputeNodesInformation.type.modelProperties, - nodes: { - readOnly: true, - serializedName: "nodes", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "AmlComputeNodeInformation" - } - } - } - } - } - } -}; - export const ComputeSecrets: msRest.CompositeMapper = { serializedName: "ComputeSecrets", type: { @@ -2534,15 +3717,47 @@ export const ComputeSecrets: msRest.CompositeMapper = { } }; -export const AksComputeSecrets: msRest.CompositeMapper = { +export const AksComputeSecretsProperties: msRest.CompositeMapper = { + serializedName: "AksComputeSecretsProperties", + type: { + name: "Composite", + className: "AksComputeSecretsProperties", + modelProperties: { + userKubeConfig: { + serializedName: "userKubeConfig", + type: { + name: "String" + } + }, + adminKubeConfig: { + serializedName: "adminKubeConfig", + type: { + name: "String" + } + }, + imagePullSecretName: { + serializedName: "imagePullSecretName", + type: { + name: "String" + } + } + } + } +}; + +export const AksComputeSecrets: msRest.CompositeMapper = { serializedName: "AKS", type: { name: "Composite", - polymorphicDiscriminator: ComputeSecrets.type.polymorphicDiscriminator, - uberParent: "ComputeSecrets", className: "AksComputeSecrets", modelProperties: { - ...ComputeSecrets.type.modelProperties, + computeType: { + required: true, + serializedName: "computeType", + type: { + name: "String" + } + }, userKubeConfig: { serializedName: "userKubeConfig", type: { @@ -2585,15 +3800,35 @@ export const VirtualMachineSecrets: msRest.CompositeMapper = { } }; +export const DatabricksComputeSecretsProperties: msRest.CompositeMapper = { + serializedName: "DatabricksComputeSecretsProperties", + type: { + name: "Composite", + className: "DatabricksComputeSecretsProperties", + modelProperties: { + databricksAccessToken: { + serializedName: "databricksAccessToken", + type: { + name: "String" + } + } + } + } +}; + export const DatabricksComputeSecrets: msRest.CompositeMapper = { serializedName: "Databricks", type: { name: "Composite", - polymorphicDiscriminator: ComputeSecrets.type.polymorphicDiscriminator, - uberParent: "ComputeSecrets", className: "DatabricksComputeSecrets", modelProperties: { - ...ComputeSecrets.type.modelProperties, + computeType: { + required: true, + serializedName: "computeType", + type: { + name: "String" + } + }, databricksAccessToken: { serializedName: "databricksAccessToken", type: { @@ -2604,6 +3839,428 @@ export const DatabricksComputeSecrets: msRest.CompositeMapper = { } }; +export const PrivateLinkResource: msRest.CompositeMapper = { + serializedName: "PrivateLinkResource", + type: { + name: "Composite", + className: "PrivateLinkResource", + modelProperties: { + ...Resource.type.modelProperties, + groupId: { + readOnly: true, + serializedName: "properties.groupId", + type: { + name: "String" + } + }, + requiredMembers: { + readOnly: true, + serializedName: "properties.requiredMembers", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + requiredZoneNames: { + serializedName: "properties.requiredZoneNames", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + identity: { + serializedName: "identity", + type: { + name: "Composite", + className: "Identity" + } + }, + location: { + serializedName: "location", + type: { + name: "String" + } + }, + tags: { + serializedName: "tags", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + }, + sku: { + serializedName: "sku", + type: { + name: "Composite", + className: "Sku" + } + }, + systemData: { + serializedName: "systemData", + type: { + name: "Composite", + className: "SystemData" + } + } + } + } +}; + +export const PrivateLinkResourceListResult: msRest.CompositeMapper = { + serializedName: "PrivateLinkResourceListResult", + type: { + name: "Composite", + className: "PrivateLinkResourceListResult", + modelProperties: { + value: { + serializedName: "value", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "PrivateLinkResource" + } + } + } + } + } + } +}; + +export const ContainerResourceRequirements: msRest.CompositeMapper = { + serializedName: "ContainerResourceRequirements", + type: { + name: "Composite", + className: "ContainerResourceRequirements", + modelProperties: { + cpu: { + serializedName: "cpu", + type: { + name: "Number" + } + }, + cpuLimit: { + serializedName: "cpuLimit", + type: { + name: "Number" + } + }, + memoryInGB: { + serializedName: "memoryInGB", + type: { + name: "Number" + } + }, + memoryInGBLimit: { + serializedName: "memoryInGBLimit", + type: { + name: "Number" + } + }, + gpu: { + serializedName: "gpu", + type: { + name: "Number" + } + }, + fpga: { + serializedName: "fpga", + type: { + name: "Number" + } + } + } + } +}; + +export const ListStorageAccountKeysResult: msRest.CompositeMapper = { + serializedName: "ListStorageAccountKeysResult", + type: { + name: "Composite", + className: "ListStorageAccountKeysResult", + modelProperties: { + userStorageKey: { + readOnly: true, + serializedName: "userStorageKey", + type: { + name: "String" + } + } + } + } +}; + +export const WorkspaceConnection: msRest.CompositeMapper = { + serializedName: "WorkspaceConnection", + type: { + name: "Composite", + className: "WorkspaceConnection", + modelProperties: { + id: { + readOnly: true, + serializedName: "id", + type: { + name: "String" + } + }, + name: { + readOnly: true, + serializedName: "name", + type: { + name: "String" + } + }, + type: { + readOnly: true, + serializedName: "type", + type: { + name: "String" + } + }, + category: { + serializedName: "properties.category", + type: { + name: "String" + } + }, + target: { + serializedName: "properties.target", + type: { + name: "String" + } + }, + authType: { + serializedName: "properties.authType", + type: { + name: "String" + } + }, + value: { + serializedName: "properties.value", + type: { + name: "String" + } + }, + valueFormat: { + serializedName: "properties.valueFormat", + type: { + name: "String" + } + } + } + } +}; + +export const FQDNEndpointDetail: msRest.CompositeMapper = { + serializedName: "FQDNEndpointDetail", + type: { + name: "Composite", + className: "FQDNEndpointDetail", + modelProperties: { + port: { + serializedName: "port", + type: { + name: "Number" + } + } + } + } +}; + +export const FQDNEndpoint: msRest.CompositeMapper = { + serializedName: "FQDNEndpoint", + type: { + name: "Composite", + className: "FQDNEndpoint", + modelProperties: { + domainName: { + serializedName: "domainName", + type: { + name: "String" + } + }, + endpointDetails: { + serializedName: "endpointDetails", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "FQDNEndpointDetail" + } + } + } + } + } + } +}; + +export const FQDNEndpointsProperties: msRest.CompositeMapper = { + serializedName: "FQDNEndpointsProperties", + type: { + name: "Composite", + className: "FQDNEndpointsProperties", + modelProperties: { + category: { + serializedName: "category", + type: { + name: "String" + } + }, + endpoints: { + serializedName: "endpoints", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "FQDNEndpoint" + } + } + } + } + } + } +}; + +export const FQDNEndpoints: msRest.CompositeMapper = { + serializedName: "FQDNEndpoints", + type: { + name: "Composite", + className: "FQDNEndpoints", + modelProperties: { + properties: { + serializedName: "properties", + type: { + name: "Composite", + className: "FQDNEndpointsProperties" + } + } + } + } +}; + +export const ExternalFQDNResponse: msRest.CompositeMapper = { + serializedName: "ExternalFQDNResponse", + type: { + name: "Composite", + className: "ExternalFQDNResponse", + modelProperties: { + value: { + serializedName: "value", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "FQDNEndpoints" + } + } + } + } + } + } +}; + +export const ProxyResource: msRest.CompositeMapper = { + serializedName: "ProxyResource", + type: { + name: "Composite", + className: "ProxyResource", + modelProperties: { + ...Resource.type.modelProperties + } + } +}; + +export const TrackedResource: msRest.CompositeMapper = { + serializedName: "TrackedResource", + type: { + name: "Composite", + className: "TrackedResource", + modelProperties: { + ...Resource.type.modelProperties, + tags: { + serializedName: "tags", + type: { + name: "Dictionary", + value: { + type: { + name: "String" + } + } + } + }, + location: { + required: true, + serializedName: "location", + type: { + name: "String" + } + } + } + } +}; + +export const AzureEntityResource: msRest.CompositeMapper = { + serializedName: "AzureEntityResource", + type: { + name: "Composite", + className: "AzureEntityResource", + modelProperties: { + ...Resource.type.modelProperties, + etag: { + readOnly: true, + serializedName: "etag", + type: { + name: "String" + } + } + } + } +}; + +export const AmlUserFeature: msRest.CompositeMapper = { + serializedName: "AmlUserFeature", + type: { + name: "Composite", + className: "AmlUserFeature", + modelProperties: { + id: { + serializedName: "id", + type: { + name: "String" + } + }, + displayName: { + serializedName: "displayName", + type: { + name: "String" + } + }, + description: { + serializedName: "description", + type: { + name: "String" + } + } + } + } +}; + export const SKUCapability: msRest.CompositeMapper = { serializedName: "SKUCapability", type: { @@ -2738,11 +4395,11 @@ export const Restriction: msRest.CompositeMapper = { } }; -export const SkuSettings: msRest.CompositeMapper = { - serializedName: "SkuSettings", +export const WorkspaceSku: msRest.CompositeMapper = { + serializedName: "WorkspaceSku", type: { name: "Composite", - className: "SkuSettings", + className: "WorkspaceSku", modelProperties: { locations: { readOnly: true, @@ -2819,199 +4476,33 @@ export const SkuSettings: msRest.CompositeMapper = { } }; -export const WorkspaceSku: msRest.CompositeMapper = { - serializedName: "WorkspaceSku", - type: { - name: "Composite", - className: "WorkspaceSku", - modelProperties: { - resourceType: { - readOnly: true, - serializedName: "resourceType", - type: { - name: "String" - } - }, - skus: { - readOnly: true, - serializedName: "skus", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "SkuSettings" - } - } - } - } - } - } -}; - -export const PrivateLinkResource: msRest.CompositeMapper = { - serializedName: "PrivateLinkResource", - type: { - name: "Composite", - className: "PrivateLinkResource", - modelProperties: { - ...Resource.type.modelProperties, - groupId: { - readOnly: true, - serializedName: "properties.groupId", - type: { - name: "String" - } - }, - requiredMembers: { - readOnly: true, - serializedName: "properties.requiredMembers", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } - }, - requiredZoneNames: { - serializedName: "properties.requiredZoneNames", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } - } - } - } -}; - -export const PrivateLinkResourceListResult: msRest.CompositeMapper = { - serializedName: "PrivateLinkResourceListResult", - type: { - name: "Composite", - className: "PrivateLinkResourceListResult", - modelProperties: { - value: { - serializedName: "value", - type: { - name: "Sequence", - element: { - type: { - name: "Composite", - className: "PrivateLinkResource" - } - } - } - } - } - } -}; - -export const WorkspaceConnection: msRest.CompositeMapper = { - serializedName: "WorkspaceConnection", - type: { - name: "Composite", - className: "WorkspaceConnection", - modelProperties: { - id: { - readOnly: true, - serializedName: "id", - type: { - name: "String" - } - }, - name: { - readOnly: true, - serializedName: "name", - type: { - name: "String" - } - }, - type: { - readOnly: true, - serializedName: "type", - type: { - name: "String" - } - }, - category: { - serializedName: "properties.category", - type: { - name: "String" - } - }, - target: { - serializedName: "properties.target", - type: { - name: "String" - } - }, - authType: { - serializedName: "properties.authType", - type: { - name: "String" - } - }, - value: { - serializedName: "properties.value", - type: { - name: "String" - } - } - } - } -}; - -export const WorkspaceConnectionDto: msRest.CompositeMapper = { - serializedName: "WorkspaceConnectionDto", +export const WorkspacesDiagnoseHeaders: msRest.CompositeMapper = { + serializedName: "workspaces-diagnose-headers", type: { name: "Composite", - className: "WorkspaceConnectionDto", + className: "WorkspacesDiagnoseHeaders", modelProperties: { - name: { - serializedName: "name", - type: { - name: "String" - } - }, - category: { - serializedName: "properties.category", - type: { - name: "String" - } - }, - target: { - serializedName: "properties.target", - type: { - name: "String" - } - }, - authType: { - serializedName: "properties.authType", + location: { + serializedName: "location", type: { name: "String" } }, - value: { - serializedName: "properties.value", + retryAfter: { + serializedName: "retry-after", type: { - name: "String" + name: "Number" } } } } }; -export const MachineLearningComputeCreateOrUpdateHeaders: msRest.CompositeMapper = { - serializedName: "machinelearningcompute-createorupdate-headers", +export const ComputeCreateOrUpdateHeaders: msRest.CompositeMapper = { + serializedName: "compute-createorupdate-headers", type: { name: "Composite", - className: "MachineLearningComputeCreateOrUpdateHeaders", + className: "ComputeCreateOrUpdateHeaders", modelProperties: { azureAsyncOperation: { serializedName: "azure-asyncoperation", @@ -3023,11 +4514,11 @@ export const MachineLearningComputeCreateOrUpdateHeaders: msRest.CompositeMapper } }; -export const MachineLearningComputeDeleteHeaders: msRest.CompositeMapper = { - serializedName: "machinelearningcompute-delete-headers", +export const ComputeDeleteHeaders: msRest.CompositeMapper = { + serializedName: "compute-delete-headers", type: { name: "Composite", - className: "MachineLearningComputeDeleteHeaders", + className: "ComputeDeleteHeaders", modelProperties: { azureAsyncOperation: { serializedName: "azure-asyncoperation", @@ -3095,11 +4586,11 @@ export const WorkspaceListResult: msRest.CompositeMapper = { } }; -export const ListAmlUserFeatureResult: msRest.CompositeMapper = { - serializedName: "ListAmlUserFeatureResult", +export const ListUsagesResult: msRest.CompositeMapper = { + serializedName: "ListUsagesResult", type: { name: "Composite", - className: "ListAmlUserFeatureResult", + className: "ListUsagesResult", modelProperties: { value: { readOnly: true, @@ -3109,7 +4600,7 @@ export const ListAmlUserFeatureResult: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "AmlUserFeature" + className: "Usage" } } } @@ -3125,11 +4616,11 @@ export const ListAmlUserFeatureResult: msRest.CompositeMapper = { } }; -export const ListUsagesResult: msRest.CompositeMapper = { - serializedName: "ListUsagesResult", +export const ListWorkspaceQuotas: msRest.CompositeMapper = { + serializedName: "ListWorkspaceQuotas", type: { name: "Composite", - className: "ListUsagesResult", + className: "ListWorkspaceQuotas", modelProperties: { value: { readOnly: true, @@ -3139,7 +4630,7 @@ export const ListUsagesResult: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "Usage" + className: "ResourceQuota" } } } @@ -3155,13 +4646,41 @@ export const ListUsagesResult: msRest.CompositeMapper = { } }; -export const ListWorkspaceQuotas: msRest.CompositeMapper = { - serializedName: "ListWorkspaceQuotas", +export const PaginatedComputeResourcesList: msRest.CompositeMapper = { + serializedName: "PaginatedComputeResourcesList", type: { name: "Composite", - className: "ListWorkspaceQuotas", + className: "PaginatedComputeResourcesList", modelProperties: { value: { + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "ComputeResource" + } + } + } + }, + nextLink: { + serializedName: "nextLink", + type: { + name: "String" + } + } + } + } +}; + +export const AmlComputeNodesInformation: msRest.CompositeMapper = { + serializedName: "AmlComputeNodesInformation", + type: { + name: "Composite", + className: "AmlComputeNodesInformation", + modelProperties: { + nodes: { readOnly: true, serializedName: "", type: { @@ -3169,7 +4688,7 @@ export const ListWorkspaceQuotas: msRest.CompositeMapper = { element: { type: { name: "Composite", - className: "ResourceQuota" + className: "AmlComputeNodeInformation" } } } @@ -3185,6 +4704,28 @@ export const ListWorkspaceQuotas: msRest.CompositeMapper = { } }; +export const PrivateEndpointConnectionListResult: msRest.CompositeMapper = { + serializedName: "PrivateEndpointConnectionListResult", + type: { + name: "Composite", + className: "PrivateEndpointConnectionListResult", + modelProperties: { + value: { + serializedName: "", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "PrivateEndpointConnection" + } + } + } + } + } + } +}; + export const PaginatedWorkspaceConnectionsList: msRest.CompositeMapper = { serializedName: "PaginatedWorkspaceConnectionsList", type: { @@ -3207,25 +4748,27 @@ export const PaginatedWorkspaceConnectionsList: msRest.CompositeMapper = { } }; -export const PaginatedComputeResourcesList: msRest.CompositeMapper = { - serializedName: "PaginatedComputeResourcesList", +export const ListAmlUserFeatureResult: msRest.CompositeMapper = { + serializedName: "ListAmlUserFeatureResult", type: { name: "Composite", - className: "PaginatedComputeResourcesList", + className: "ListAmlUserFeatureResult", modelProperties: { value: { + readOnly: true, serializedName: "", type: { name: "Sequence", element: { type: { name: "Composite", - className: "ComputeResource" + className: "AmlUserFeature" } } } }, nextLink: { + readOnly: true, serializedName: "nextLink", type: { name: "String" @@ -3273,11 +4816,8 @@ export const discriminators = { 'Compute.DataFactory' : DataFactory, 'Compute.Databricks' : Databricks, 'Compute.DataLakeAnalytics' : DataLakeAnalytics, - 'ComputeNodesInformation' : ComputeNodesInformation, - 'ComputeNodesInformation.AmlCompute' : AmlComputeNodesInformation, + 'Compute.SynapseSpark' : SynapseSpark, 'ComputeSecrets' : ComputeSecrets, - 'ComputeSecrets.AKS' : AksComputeSecrets, - 'ComputeSecrets.VirtualMachine' : VirtualMachineSecrets, - 'ComputeSecrets.Databricks' : DatabricksComputeSecrets + 'ComputeSecrets.VirtualMachine' : VirtualMachineSecrets }; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/operationsMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/operationsMappers.ts index ac101ae5f270..392eafc4561b 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/operationsMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/operationsMappers.ts @@ -8,9 +8,9 @@ export { discriminators, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, - MachineLearningServiceError, Operation, OperationDisplay, OperationListResult diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/parameters.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/parameters.ts index 4f5b252b51c1..cb887c4e94d6 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/parameters.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/parameters.ts @@ -24,6 +24,9 @@ export const apiVersion: msRest.OperationQueryParameter = { mapper: { required: true, serializedName: "api-version", + constraints: { + MinLength: 1 + }, type: { name: "String" } @@ -51,18 +54,6 @@ export const computeName: msRest.OperationURLParameter = { } } }; -export const computeType: msRest.OperationQueryParameter = { - parameterPath: [ - "options", - "computeType" - ], - mapper: { - serializedName: "compute-type", - type: { - name: "String" - } - } -}; export const connectionName: msRest.OperationURLParameter = { parameterPath: "connectionName", mapper: { @@ -107,35 +98,27 @@ export const privateEndpointConnectionName: msRest.OperationURLParameter = { } } }; -export const recommended: msRest.OperationQueryParameter = { - parameterPath: [ - "options", - "recommended" - ], - mapper: { - serializedName: "recommended", - type: { - name: "Boolean" - } - } -}; export const resourceGroupName: msRest.OperationURLParameter = { parameterPath: "resourceGroupName", mapper: { required: true, serializedName: "resourceGroupName", + constraints: { + MaxLength: 90, + MinLength: 1 + }, type: { name: "String" } } }; -export const skiptoken: msRest.OperationQueryParameter = { +export const skip: msRest.OperationQueryParameter = { parameterPath: [ "options", - "skiptoken" + "skip" ], mapper: { - serializedName: "$skiptoken", + serializedName: "$skip", type: { name: "String" } @@ -146,6 +129,9 @@ export const subscriptionId: msRest.OperationURLParameter = { mapper: { required: true, serializedName: "subscriptionId", + constraints: { + MinLength: 1 + }, type: { name: "String" } diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/privateEndpointConnectionsMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/privateEndpointConnectionsMappers.ts index e21b80f26ac8..e9bd9f99604d 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/privateEndpointConnectionsMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/privateEndpointConnectionsMappers.ts @@ -13,6 +13,10 @@ export { AKSProperties, AmlCompute, AmlComputeProperties, + AssignedUser, + AutoPauseProperties, + AutoScaleProperties, + AzureEntityResource, BaseResource, Compute, ComputeInstance, @@ -23,36 +27,50 @@ export { ComputeInstanceProperties, ComputeInstanceSshSettings, ComputeResource, + CosmosDbSettings, Databricks, DatabricksProperties, DataFactory, DataLakeAnalytics, DataLakeAnalyticsProperties, EncryptionProperty, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, HDInsight, HDInsightProperties, Identity, - IdentityUserAssignedIdentitiesValue, + IdentityForCmk, KeyVaultProperties, - MachineLearningServiceError, NodeStateCounts, NotebookPreparationError, NotebookResourceInfo, + PersonalComputeInstanceSettings, PrivateEndpoint, PrivateEndpointConnection, + PrivateEndpointConnectionListResult, PrivateLinkResource, PrivateLinkServiceConnectionState, + ProxyResource, Resource, ResourceId, ScaleSettings, + ScriptReference, + ScriptsToExecute, + ServiceManagedResourcesSettings, + SetupScripts, SharedPrivateLinkResource, Sku, SslConfiguration, + SynapseSpark, + SynapseSparkProperties, + SystemData, SystemService, + TrackedResource, UserAccountCredentials, + UserAssignedIdentity, VirtualMachine, + VirtualMachineImage, VirtualMachineProperties, VirtualMachineSshCredentials, Workspace, diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/privateLinkResourcesMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/privateLinkResourcesMappers.ts index 07a5f2631978..a0ff2ed12fcc 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/privateLinkResourcesMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/privateLinkResourcesMappers.ts @@ -13,6 +13,10 @@ export { AKSProperties, AmlCompute, AmlComputeProperties, + AssignedUser, + AutoPauseProperties, + AutoScaleProperties, + AzureEntityResource, BaseResource, CloudError, Compute, @@ -24,37 +28,50 @@ export { ComputeInstanceProperties, ComputeInstanceSshSettings, ComputeResource, + CosmosDbSettings, Databricks, DatabricksProperties, DataFactory, DataLakeAnalytics, DataLakeAnalyticsProperties, EncryptionProperty, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, HDInsight, HDInsightProperties, Identity, - IdentityUserAssignedIdentitiesValue, + IdentityForCmk, KeyVaultProperties, - MachineLearningServiceError, NodeStateCounts, NotebookPreparationError, NotebookResourceInfo, + PersonalComputeInstanceSettings, PrivateEndpoint, PrivateEndpointConnection, PrivateLinkResource, PrivateLinkResourceListResult, PrivateLinkServiceConnectionState, + ProxyResource, Resource, ResourceId, ScaleSettings, + ScriptReference, + ScriptsToExecute, + ServiceManagedResourcesSettings, + SetupScripts, SharedPrivateLinkResource, Sku, SslConfiguration, + SynapseSpark, + SynapseSparkProperties, + SystemData, SystemService, + TrackedResource, UserAccountCredentials, + UserAssignedIdentity, VirtualMachine, + VirtualMachineImage, VirtualMachineProperties, VirtualMachineSshCredentials, Workspace, diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/quotasMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/quotasMappers.ts index aa49de236b1e..43ce8d7dc55d 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/quotasMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/quotasMappers.ts @@ -8,11 +8,10 @@ export { discriminators, - CloudError, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, ListWorkspaceQuotas, - MachineLearningServiceError, QuotaBaseProperties, QuotaUpdateParameters, ResourceName, diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceConnectionsMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceConnectionsMappers.ts index 448b8d85198f..d5133e81da04 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceConnectionsMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceConnectionsMappers.ts @@ -13,6 +13,10 @@ export { AKSProperties, AmlCompute, AmlComputeProperties, + AssignedUser, + AutoPauseProperties, + AutoScaleProperties, + AzureEntityResource, BaseResource, Compute, ComputeInstance, @@ -23,40 +27,52 @@ export { ComputeInstanceProperties, ComputeInstanceSshSettings, ComputeResource, + CosmosDbSettings, Databricks, DatabricksProperties, DataFactory, DataLakeAnalytics, DataLakeAnalyticsProperties, EncryptionProperty, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, HDInsight, HDInsightProperties, Identity, - IdentityUserAssignedIdentitiesValue, + IdentityForCmk, KeyVaultProperties, - MachineLearningServiceError, NodeStateCounts, NotebookPreparationError, NotebookResourceInfo, PaginatedWorkspaceConnectionsList, + PersonalComputeInstanceSettings, PrivateEndpoint, PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, + ProxyResource, Resource, ResourceId, ScaleSettings, + ScriptReference, + ScriptsToExecute, + ServiceManagedResourcesSettings, + SetupScripts, SharedPrivateLinkResource, Sku, SslConfiguration, + SynapseSpark, + SynapseSparkProperties, + SystemData, SystemService, + TrackedResource, UserAccountCredentials, + UserAssignedIdentity, VirtualMachine, + VirtualMachineImage, VirtualMachineProperties, VirtualMachineSshCredentials, Workspace, - WorkspaceConnection, - WorkspaceConnectionDto + WorkspaceConnection } from "../models/mappers"; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceFeaturesMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceFeaturesMappers.ts index 5115670bfab0..c9e6fb6c5495 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceFeaturesMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceFeaturesMappers.ts @@ -9,8 +9,8 @@ export { discriminators, AmlUserFeature, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, - ListAmlUserFeatureResult, - MachineLearningServiceError + ListAmlUserFeatureResult } from "../models/mappers"; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/notebooksMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceSkusMappers.ts similarity index 69% rename from sdk/machinelearningservices/arm-machinelearningservices/src/models/notebooksMappers.ts rename to sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceSkusMappers.ts index 3088316919ec..d6a41db203ad 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/notebooksMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspaceSkusMappers.ts @@ -8,9 +8,13 @@ export { discriminators, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, - MachineLearningServiceError, - NotebookPreparationError, - NotebookResourceInfo + ResourceSkuLocationInfo, + ResourceSkuZoneDetails, + Restriction, + SKUCapability, + SkuListResult, + WorkspaceSku } from "../models/mappers"; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspacesMappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspacesMappers.ts index d8e1137cd946..02c73d8ce2e0 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspacesMappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/workspacesMappers.ts @@ -13,6 +13,10 @@ export { AKSProperties, AmlCompute, AmlComputeProperties, + AssignedUser, + AutoPauseProperties, + AutoScaleProperties, + AzureEntityResource, BaseResource, Compute, ComputeInstance, @@ -23,44 +27,70 @@ export { ComputeInstanceProperties, ComputeInstanceSshSettings, ComputeResource, + CosmosDbSettings, Databricks, DatabricksProperties, DataFactory, DataLakeAnalytics, DataLakeAnalyticsProperties, + DiagnoseRequestProperties, + DiagnoseResponseResult, + DiagnoseResponseResultValue, + DiagnoseResult, + DiagnoseWorkspaceParameters, EncryptionProperty, + ErrorAdditionalInfo, ErrorDetail, ErrorResponse, + ExternalFQDNResponse, + FQDNEndpoint, + FQDNEndpointDetail, + FQDNEndpoints, + FQDNEndpointsProperties, HDInsight, HDInsightProperties, Identity, - IdentityUserAssignedIdentitiesValue, + IdentityForCmk, KeyVaultProperties, + ListNotebookKeysResult, + ListStorageAccountKeysResult, ListWorkspaceKeysResult, - MachineLearningServiceError, NodeStateCounts, - NotebookListCredentialsResult, + NotebookAccessTokenResult, NotebookPreparationError, NotebookResourceInfo, Password, + PersonalComputeInstanceSettings, PrivateEndpoint, PrivateEndpointConnection, PrivateLinkResource, PrivateLinkServiceConnectionState, + ProxyResource, RegistryListCredentialsResult, Resource, ResourceId, ScaleSettings, + ScriptReference, + ScriptsToExecute, + ServiceManagedResourcesSettings, + SetupScripts, SharedPrivateLinkResource, Sku, SslConfiguration, + SynapseSpark, + SynapseSparkProperties, + SystemData, SystemService, + TrackedResource, UserAccountCredentials, + UserAssignedIdentity, VirtualMachine, + VirtualMachineImage, VirtualMachineProperties, VirtualMachineSshCredentials, Workspace, WorkspaceConnection, WorkspaceListResult, + WorkspacesDiagnoseHeaders, WorkspaceUpdateParameters } from "../models/mappers"; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/machineLearningCompute.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/computeOperations.ts similarity index 67% rename from sdk/machinelearningservices/arm-machinelearningservices/src/operations/machineLearningCompute.ts rename to sdk/machinelearningservices/arm-machinelearningservices/src/operations/computeOperations.ts index 1fc94951a321..582bbca8a8d3 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/machineLearningCompute.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/computeOperations.ts @@ -10,16 +10,16 @@ import * as msRest from "@azure/ms-rest-js"; import * as msRestAzure from "@azure/ms-rest-azure-js"; import * as Models from "../models"; -import * as Mappers from "../models/machineLearningComputeMappers"; +import * as Mappers from "../models/computeOperationsMappers"; import * as Parameters from "../models/parameters"; import { AzureMachineLearningWorkspacesContext } from "../azureMachineLearningWorkspacesContext"; -/** Class representing a MachineLearningCompute. */ -export class MachineLearningCompute { +/** Class representing a ComputeOperations. */ +export class ComputeOperations { private readonly client: AzureMachineLearningWorkspacesContext; /** - * Create a MachineLearningCompute. + * Create a ComputeOperations. * @param {AzureMachineLearningWorkspacesContext} client Reference to the service client. */ constructor(client: AzureMachineLearningWorkspacesContext) { @@ -28,62 +28,62 @@ export class MachineLearningCompute { /** * Gets computes in specified workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listByWorkspace(resourceGroupName: string, workspaceName: string, options?: Models.MachineLearningComputeListByWorkspaceOptionalParams): Promise; + list(resourceGroupName: string, workspaceName: string, options?: Models.ComputeListOptionalParams): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param callback The callback */ - listByWorkspace(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param options The optional parameters * @param callback The callback */ - listByWorkspace(resourceGroupName: string, workspaceName: string, options: Models.MachineLearningComputeListByWorkspaceOptionalParams, callback: msRest.ServiceCallback): void; - listByWorkspace(resourceGroupName: string, workspaceName: string, options?: Models.MachineLearningComputeListByWorkspaceOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + list(resourceGroupName: string, workspaceName: string, options: Models.ComputeListOptionalParams, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, workspaceName: string, options?: Models.ComputeListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, workspaceName, options }, - listByWorkspaceOperationSpec, - callback) as Promise; + listOperationSpec, + callback) as Promise; } /** * Gets compute definition by its name. Any secrets (storage keys, service credentials, etc) are * not returned - use 'keys' nested resource to get them. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - get(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; + get(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param callback The callback */ get(resourceGroupName: string, workspaceName: string, computeName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param options The optional parameters * @param callback The callback */ get(resourceGroupName: string, workspaceName: string, computeName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - get(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + get(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -92,80 +92,80 @@ export class MachineLearningCompute { options }, getOperationSpec, - callback) as Promise; + callback) as Promise; } /** * Creates or updates compute. This call will overwrite a compute if it exists. This is a * nonrecoverable operation. If your intent is to create a new compute, do a GET first to verify * that it does not exist yet. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param parameters Payload with Machine Learning compute definition. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - createOrUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: Models.ComputeResource, options?: msRest.RequestOptionsBase): Promise { + createOrUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: Models.ComputeResource, options?: msRest.RequestOptionsBase): Promise { return this.beginCreateOrUpdate(resourceGroupName,workspaceName,computeName,parameters,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; } /** * Updates properties of a compute. This call will overwrite a compute if it exists. This is a * nonrecoverable operation. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param parameters Additional parameters for cluster update. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - update(resourceGroupName: string, workspaceName: string, computeName: string, parameters: Models.ClusterUpdateParameters, options?: msRest.RequestOptionsBase): Promise { + update(resourceGroupName: string, workspaceName: string, computeName: string, parameters: Models.ClusterUpdateParameters, options?: msRest.RequestOptionsBase): Promise { return this.beginUpdate(resourceGroupName,workspaceName,computeName,parameters,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; } /** * Deletes specified Machine Learning compute. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param underlyingResourceAction Delete the underlying compute if 'Delete', or detach the * underlying compute from workspace if 'Detach'. Possible values include: 'Delete', 'Detach' * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - deleteMethod(resourceGroupName: string, workspaceName: string, computeName: string, underlyingResourceAction: Models.UnderlyingResourceAction, options?: msRest.RequestOptionsBase): Promise { + deleteMethod(resourceGroupName: string, workspaceName: string, computeName: string, underlyingResourceAction: Models.UnderlyingResourceAction, options?: msRest.RequestOptionsBase): Promise { return this.beginDeleteMethod(resourceGroupName,workspaceName,computeName,underlyingResourceAction,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; } /** * Get the details (e.g IP address, port etc) of all the compute nodes in the compute. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listNodes(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; + listNodes(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param callback The callback */ listNodes(resourceGroupName: string, workspaceName: string, computeName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param options The optional parameters * @param callback The callback */ listNodes(resourceGroupName: string, workspaceName: string, computeName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listNodes(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listNodes(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -174,34 +174,34 @@ export class MachineLearningCompute { options }, listNodesOperationSpec, - callback) as Promise; + callback) as Promise; } /** * Gets secrets related to Machine Learning compute (storage keys, service credentials, etc). - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listKeys(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; + listKeys(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param callback The callback */ listKeys(resourceGroupName: string, workspaceName: string, computeName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param options The optional parameters * @param callback The callback */ listKeys(resourceGroupName: string, workspaceName: string, computeName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listKeys(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listKeys(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -210,184 +210,175 @@ export class MachineLearningCompute { options }, listKeysOperationSpec, - callback) as Promise; + callback) as Promise; } /** * Posts a start action to a compute instance - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param [options] The optional parameters * @returns Promise */ - start(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param resourceGroupName Name of the resource group in which workspace is located. - * @param workspaceName Name of Azure Machine Learning workspace. - * @param computeName Name of the Azure Machine Learning compute. - * @param callback The callback - */ - start(resourceGroupName: string, workspaceName: string, computeName: string, callback: msRest.ServiceCallback): void; - /** - * @param resourceGroupName Name of the resource group in which workspace is located. - * @param workspaceName Name of Azure Machine Learning workspace. - * @param computeName Name of the Azure Machine Learning compute. - * @param options The optional parameters - * @param callback The callback - */ - start(resourceGroupName: string, workspaceName: string, computeName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - start(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( - { - resourceGroupName, - workspaceName, - computeName, - options - }, - startOperationSpec, - callback); + start(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginStart(resourceGroupName,workspaceName,computeName,options) + .then(lroPoller => lroPoller.pollUntilFinished()); } /** * Posts a stop action to a compute instance - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. * @param [options] The optional parameters * @returns Promise */ - stop(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; + stop(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginStop(resourceGroupName,workspaceName,computeName,options) + .then(lroPoller => lroPoller.pollUntilFinished()); + } + /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * Posts a restart action to a compute instance + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. - * @param callback The callback + * @param [options] The optional parameters + * @returns Promise */ - stop(resourceGroupName: string, workspaceName: string, computeName: string, callback: msRest.ServiceCallback): void; + restart(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginRestart(resourceGroupName,workspaceName,computeName,options) + .then(lroPoller => lroPoller.pollUntilFinished()); + } + /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * Creates or updates compute. This call will overwrite a compute if it exists. This is a + * nonrecoverable operation. If your intent is to create a new compute, do a GET first to verify + * that it does not exist yet. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. - * @param options The optional parameters - * @param callback The callback + * @param parameters Payload with Machine Learning compute definition. + * @param [options] The optional parameters + * @returns Promise */ - stop(resourceGroupName: string, workspaceName: string, computeName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - stop(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( + beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: Models.ComputeResource, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( { resourceGroupName, workspaceName, computeName, + parameters, options }, - stopOperationSpec, - callback); + beginCreateOrUpdateOperationSpec, + options); } /** - * Posts a restart action to a compute instance - * @param resourceGroupName Name of the resource group in which workspace is located. + * Updates properties of a compute. This call will overwrite a compute if it exists. This is a + * nonrecoverable operation. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. + * @param parameters Additional parameters for cluster update. * @param [options] The optional parameters - * @returns Promise - */ - restart(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise; - /** - * @param resourceGroupName Name of the resource group in which workspace is located. - * @param workspaceName Name of Azure Machine Learning workspace. - * @param computeName Name of the Azure Machine Learning compute. - * @param callback The callback + * @returns Promise */ - restart(resourceGroupName: string, workspaceName: string, computeName: string, callback: msRest.ServiceCallback): void; + beginUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: Models.ClusterUpdateParameters, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( + { + resourceGroupName, + workspaceName, + computeName, + parameters, + options + }, + beginUpdateOperationSpec, + options); + } + /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * Deletes specified Machine Learning compute. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. - * @param options The optional parameters - * @param callback The callback + * @param underlyingResourceAction Delete the underlying compute if 'Delete', or detach the + * underlying compute from workspace if 'Detach'. Possible values include: 'Delete', 'Detach' + * @param [options] The optional parameters + * @returns Promise */ - restart(resourceGroupName: string, workspaceName: string, computeName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - restart(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { - return this.client.sendOperationRequest( + beginDeleteMethod(resourceGroupName: string, workspaceName: string, computeName: string, underlyingResourceAction: Models.UnderlyingResourceAction, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( { resourceGroupName, workspaceName, computeName, + underlyingResourceAction, options }, - restartOperationSpec, - callback); + beginDeleteMethodOperationSpec, + options); } /** - * Creates or updates compute. This call will overwrite a compute if it exists. This is a - * nonrecoverable operation. If your intent is to create a new compute, do a GET first to verify - * that it does not exist yet. - * @param resourceGroupName Name of the resource group in which workspace is located. + * Posts a start action to a compute instance + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. - * @param parameters Payload with Machine Learning compute definition. * @param [options] The optional parameters * @returns Promise */ - beginCreateOrUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: Models.ComputeResource, options?: msRest.RequestOptionsBase): Promise { + beginStart(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise { return this.client.sendLRORequest( { resourceGroupName, workspaceName, computeName, - parameters, options }, - beginCreateOrUpdateOperationSpec, + beginStartOperationSpec, options); } /** - * Updates properties of a compute. This call will overwrite a compute if it exists. This is a - * nonrecoverable operation. - * @param resourceGroupName Name of the resource group in which workspace is located. + * Posts a stop action to a compute instance + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. - * @param parameters Additional parameters for cluster update. * @param [options] The optional parameters * @returns Promise */ - beginUpdate(resourceGroupName: string, workspaceName: string, computeName: string, parameters: Models.ClusterUpdateParameters, options?: msRest.RequestOptionsBase): Promise { + beginStop(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise { return this.client.sendLRORequest( { resourceGroupName, workspaceName, computeName, - parameters, options }, - beginUpdateOperationSpec, + beginStopOperationSpec, options); } /** - * Deletes specified Machine Learning compute. - * @param resourceGroupName Name of the resource group in which workspace is located. + * Posts a restart action to a compute instance + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param computeName Name of the Azure Machine Learning compute. - * @param underlyingResourceAction Delete the underlying compute if 'Delete', or detach the - * underlying compute from workspace if 'Detach'. Possible values include: 'Delete', 'Detach' * @param [options] The optional parameters * @returns Promise */ - beginDeleteMethod(resourceGroupName: string, workspaceName: string, computeName: string, underlyingResourceAction: Models.UnderlyingResourceAction, options?: msRest.RequestOptionsBase): Promise { + beginRestart(resourceGroupName: string, workspaceName: string, computeName: string, options?: msRest.RequestOptionsBase): Promise { return this.client.sendLRORequest( { resourceGroupName, workspaceName, computeName, - underlyingResourceAction, options }, - beginDeleteMethodOperationSpec, + beginRestartOperationSpec, options); } @@ -395,34 +386,62 @@ export class MachineLearningCompute { * Gets computes in specified workspace. * @param nextPageLink The NextLink from the previous successful call to List operation. * @param [options] The optional parameters - * @returns Promise + * @returns Promise + */ + listNext(nextPageLink: string, options?: Models.ComputeListNextOptionalParams): Promise; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param callback The callback + */ + listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param options The optional parameters + * @param callback The callback + */ + listNext(nextPageLink: string, options: Models.ComputeListNextOptionalParams, callback: msRest.ServiceCallback): void; + listNext(nextPageLink: string, options?: Models.ComputeListNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + nextPageLink, + options + }, + listNextOperationSpec, + callback) as Promise; + } + + /** + * Get the details (e.g IP address, port etc) of all the compute nodes in the compute. + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param [options] The optional parameters + * @returns Promise */ - listByWorkspaceNext(nextPageLink: string, options?: Models.MachineLearningComputeListByWorkspaceNextOptionalParams): Promise; + listNodesNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param callback The callback */ - listByWorkspaceNext(nextPageLink: string, callback: msRest.ServiceCallback): void; + listNodesNext(nextPageLink: string, callback: msRest.ServiceCallback): void; /** * @param nextPageLink The NextLink from the previous successful call to List operation. * @param options The optional parameters * @param callback The callback */ - listByWorkspaceNext(nextPageLink: string, options: Models.MachineLearningComputeListByWorkspaceNextOptionalParams, callback: msRest.ServiceCallback): void; - listByWorkspaceNext(nextPageLink: string, options?: Models.MachineLearningComputeListByWorkspaceNextOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listNodesNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listNodesNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { nextPageLink, options }, - listByWorkspaceNextOperationSpec, - callback) as Promise; + listNodesNextOperationSpec, + callback) as Promise; } } // Operation Specifications const serializer = new msRest.Serializer(Mappers); -const listByWorkspaceOperationSpec: msRest.OperationSpec = { +const listOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes", urlParameters: [ @@ -432,7 +451,7 @@ const listByWorkspaceOperationSpec: msRest.OperationSpec = { ], queryParameters: [ Parameters.apiVersion, - Parameters.skiptoken + Parameters.skip ], headerParameters: [ Parameters.acceptLanguage @@ -442,7 +461,7 @@ const listByWorkspaceOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.PaginatedComputeResourcesList }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -468,7 +487,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ComputeResource }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -494,7 +513,7 @@ const listNodesOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.AmlComputeNodesInformation }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -520,15 +539,15 @@ const listKeysOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ComputeSecrets }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const startOperationSpec: msRest.OperationSpec = { - httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/start", +const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { + httpMethod: "PUT", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -541,18 +560,33 @@ const startOperationSpec: msRest.OperationSpec = { headerParameters: [ Parameters.acceptLanguage ], + requestBody: { + parameterPath: "parameters", + mapper: { + ...Mappers.ComputeResource, + required: true + } + }, responses: { - 200: {}, + 200: { + bodyMapper: Mappers.ComputeResource, + headersMapper: Mappers.ComputeCreateOrUpdateHeaders + }, + 201: { + bodyMapper: Mappers.ComputeResource, + headersMapper: Mappers.ComputeCreateOrUpdateHeaders + }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse, + headersMapper: Mappers.ComputeCreateOrUpdateHeaders } }, serializer }; -const stopOperationSpec: msRest.OperationSpec = { - httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/stop", +const beginUpdateOperationSpec: msRest.OperationSpec = { + httpMethod: "PATCH", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -565,18 +599,27 @@ const stopOperationSpec: msRest.OperationSpec = { headerParameters: [ Parameters.acceptLanguage ], + requestBody: { + parameterPath: "parameters", + mapper: { + ...Mappers.ClusterUpdateParameters, + required: true + } + }, responses: { - 200: {}, + 200: { + bodyMapper: Mappers.ComputeResource + }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const restartOperationSpec: msRest.OperationSpec = { - httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/restart", +const beginDeleteMethodOperationSpec: msRest.OperationSpec = { + httpMethod: "DELETE", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -584,23 +627,30 @@ const restartOperationSpec: msRest.OperationSpec = { Parameters.computeName ], queryParameters: [ - Parameters.apiVersion + Parameters.apiVersion, + Parameters.underlyingResourceAction ], headerParameters: [ Parameters.acceptLanguage ], responses: { - 200: {}, + 200: { + headersMapper: Mappers.ComputeDeleteHeaders + }, + 202: { + headersMapper: Mappers.ComputeDeleteHeaders + }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse, + headersMapper: Mappers.ComputeDeleteHeaders } }, serializer }; -const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { - httpMethod: "PUT", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}", +const beginStartOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/start", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -613,33 +663,18 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { headerParameters: [ Parameters.acceptLanguage ], - requestBody: { - parameterPath: "parameters", - mapper: { - ...Mappers.ComputeResource, - required: true - } - }, responses: { - 200: { - bodyMapper: Mappers.ComputeResource, - headersMapper: Mappers.MachineLearningComputeCreateOrUpdateHeaders - }, - 201: { - bodyMapper: Mappers.ComputeResource, - headersMapper: Mappers.MachineLearningComputeCreateOrUpdateHeaders - }, + 202: {}, default: { - bodyMapper: Mappers.MachineLearningServiceError, - headersMapper: Mappers.MachineLearningComputeCreateOrUpdateHeaders + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const beginUpdateOperationSpec: msRest.OperationSpec = { - httpMethod: "PATCH", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}", +const beginStopOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/stop", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -652,27 +687,18 @@ const beginUpdateOperationSpec: msRest.OperationSpec = { headerParameters: [ Parameters.acceptLanguage ], - requestBody: { - parameterPath: "parameters", - mapper: { - ...Mappers.ClusterUpdateParameters, - required: true - } - }, responses: { - 200: { - bodyMapper: Mappers.ComputeResource - }, + 202: {}, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const beginDeleteMethodOperationSpec: msRest.OperationSpec = { - httpMethod: "DELETE", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}", +const beginRestartOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/computes/{computeName}/restart", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -680,28 +706,21 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { Parameters.computeName ], queryParameters: [ - Parameters.apiVersion, - Parameters.underlyingResourceAction + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage ], responses: { - 200: { - headersMapper: Mappers.MachineLearningComputeDeleteHeaders - }, - 202: { - headersMapper: Mappers.MachineLearningComputeDeleteHeaders - }, + 202: {}, default: { - bodyMapper: Mappers.MachineLearningServiceError, - headersMapper: Mappers.MachineLearningComputeDeleteHeaders + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const listByWorkspaceNextOperationSpec: msRest.OperationSpec = { +const listNextOperationSpec: msRest.OperationSpec = { httpMethod: "GET", baseUrl: "https://management.azure.com", path: "{nextLink}", @@ -710,7 +729,7 @@ const listByWorkspaceNextOperationSpec: msRest.OperationSpec = { ], queryParameters: [ Parameters.apiVersion, - Parameters.skiptoken + Parameters.skip ], headerParameters: [ Parameters.acceptLanguage @@ -720,7 +739,31 @@ const listByWorkspaceNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.PaginatedComputeResourcesList }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const listNodesNextOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + baseUrl: "https://management.azure.com", + path: "{nextLink}", + urlParameters: [ + Parameters.nextPageLink + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.AmlComputeNodesInformation + }, + default: { + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/index.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/index.ts index 3ddc3bba43e8..9c3d81297dd3 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/index.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/index.ts @@ -9,12 +9,12 @@ export * from "./operations"; export * from "./workspaces"; -export * from "./workspaceFeatures"; -export * from "./notebooks"; export * from "./usages"; export * from "./virtualMachineSizes"; export * from "./quotas"; -export * from "./workspaceConnections"; -export * from "./machineLearningCompute"; +export * from "./computeOperations"; export * from "./privateEndpointConnections"; export * from "./privateLinkResources"; +export * from "./workspaceConnections"; +export * from "./workspaceFeatures"; +export * from "./workspaceSkus"; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/notebooks.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/notebooks.ts deleted file mode 100644 index b399aaaf57f3..000000000000 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/notebooks.ts +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright (c) Microsoft Corporation. - * Licensed under the MIT License. - * - * Code generated by Microsoft (R) AutoRest Code Generator. - * Changes may cause incorrect behavior and will be lost if the code is - * regenerated. - */ - -import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; -import * as Models from "../models"; -import * as Mappers from "../models/notebooksMappers"; -import * as Parameters from "../models/parameters"; -import { AzureMachineLearningWorkspacesContext } from "../azureMachineLearningWorkspacesContext"; - -/** Class representing a Notebooks. */ -export class Notebooks { - private readonly client: AzureMachineLearningWorkspacesContext; - - /** - * Create a Notebooks. - * @param {AzureMachineLearningWorkspacesContext} client Reference to the service client. - */ - constructor(client: AzureMachineLearningWorkspacesContext) { - this.client = client; - } - - /** - * @param resourceGroupName Name of the resource group in which workspace is located. - * @param workspaceName Name of Azure Machine Learning workspace. - * @param [options] The optional parameters - * @returns Promise - */ - prepare(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise { - return this.beginPrepare(resourceGroupName,workspaceName,options) - .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; - } - - /** - * @param resourceGroupName Name of the resource group in which workspace is located. - * @param workspaceName Name of Azure Machine Learning workspace. - * @param [options] The optional parameters - * @returns Promise - */ - beginPrepare(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise { - return this.client.sendLRORequest( - { - resourceGroupName, - workspaceName, - options - }, - beginPrepareOperationSpec, - options); - } -} - -// Operation Specifications -const serializer = new msRest.Serializer(Mappers); -const beginPrepareOperationSpec: msRest.OperationSpec = { - httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/prepareNotebook", - urlParameters: [ - Parameters.subscriptionId, - Parameters.resourceGroupName, - Parameters.workspaceName - ], - queryParameters: [ - Parameters.apiVersion - ], - headerParameters: [ - Parameters.acceptLanguage - ], - responses: { - 200: { - bodyMapper: Mappers.NotebookResourceInfo - }, - 202: {}, - default: { - bodyMapper: Mappers.MachineLearningServiceError - } - }, - serializer -}; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/operations.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/operations.ts index 7ffd14de81bc..a68a2144639e 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/operations.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/operations.ts @@ -66,7 +66,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.OperationListResult }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/privateEndpointConnections.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/privateEndpointConnections.ts index 187767656333..dbe044b051ac 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/privateEndpointConnections.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/privateEndpointConnections.ts @@ -8,7 +8,6 @@ */ import * as msRest from "@azure/ms-rest-js"; -import * as msRestAzure from "@azure/ms-rest-azure-js"; import * as Models from "../models"; import * as Mappers from "../models/privateEndpointConnectionsMappers"; import * as Parameters from "../models/parameters"; @@ -26,9 +25,41 @@ export class PrivateEndpointConnections { this.client = client; } + /** + * List all the private endpoint connections associated with the workspace. + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + list(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param callback The callback + */ + list(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param options The optional parameters + * @param callback The callback + */ + list(resourceGroupName: string, workspaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + workspaceName, + options + }, + listOperationSpec, + callback) as Promise; + } + /** * Gets the specified private endpoint connection associated with the workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param privateEndpointConnectionName The name of the private endpoint connection associated with * the workspace @@ -37,7 +68,7 @@ export class PrivateEndpointConnections { */ get(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param privateEndpointConnectionName The name of the private endpoint connection associated with * the workspace @@ -45,7 +76,7 @@ export class PrivateEndpointConnections { */ get(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param privateEndpointConnectionName The name of the private endpoint connection associated with * the workspace @@ -67,26 +98,26 @@ export class PrivateEndpointConnections { /** * Update the state of specified private endpoint connection associated with the workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param privateEndpointConnectionName The name of the private endpoint connection associated with * the workspace * @param properties The private endpoint connection properties. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - put(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, options?: msRest.RequestOptionsBase): Promise; + createOrUpdate(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param privateEndpointConnectionName The name of the private endpoint connection associated with * the workspace * @param properties The private endpoint connection properties. * @param callback The callback */ - put(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, callback: msRest.ServiceCallback): void; + createOrUpdate(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param privateEndpointConnectionName The name of the private endpoint connection associated with * the workspace @@ -94,8 +125,8 @@ export class PrivateEndpointConnections { * @param options The optional parameters * @param callback The callback */ - put(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - put(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + createOrUpdate(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + createOrUpdate(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, properties: Models.PrivateEndpointConnection, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -104,48 +135,77 @@ export class PrivateEndpointConnections { properties, options }, - putOperationSpec, - callback) as Promise; + createOrUpdateOperationSpec, + callback) as Promise; } /** * Deletes the specified private endpoint connection associated with the workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param privateEndpointConnectionName The name of the private endpoint connection associated with * the workspace * @param [options] The optional parameters * @returns Promise */ - deleteMethod(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase): Promise { - return this.beginDeleteMethod(resourceGroupName,workspaceName,privateEndpointConnectionName,options) - .then(lroPoller => lroPoller.pollUntilFinished()); - } - + deleteMethod(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase): Promise; /** - * Deletes the specified private endpoint connection associated with the workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param privateEndpointConnectionName The name of the private endpoint connection associated with * the workspace - * @param [options] The optional parameters - * @returns Promise + * @param callback The callback + */ + deleteMethod(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param privateEndpointConnectionName The name of the private endpoint connection associated with + * the workspace + * @param options The optional parameters + * @param callback The callback */ - beginDeleteMethod(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase): Promise { - return this.client.sendLRORequest( + deleteMethod(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + deleteMethod(resourceGroupName: string, workspaceName: string, privateEndpointConnectionName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( { resourceGroupName, workspaceName, privateEndpointConnectionName, options }, - beginDeleteMethodOperationSpec, - options); + deleteMethodOperationSpec, + callback); } } // Operation Specifications const serializer = new msRest.Serializer(Mappers); +const listOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections", + urlParameters: [ + Parameters.resourceGroupName, + Parameters.workspaceName, + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.PrivateEndpointConnectionListResult + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + const getOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections/{privateEndpointConnectionName}", @@ -166,13 +226,13 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.PrivateEndpointConnection }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const putOperationSpec: msRest.OperationSpec = { +const createOrUpdateOperationSpec: msRest.OperationSpec = { httpMethod: "PUT", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections/{privateEndpointConnectionName}", urlParameters: [ @@ -199,13 +259,13 @@ const putOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.PrivateEndpointConnection }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const beginDeleteMethodOperationSpec: msRest.OperationSpec = { +const deleteMethodOperationSpec: msRest.OperationSpec = { httpMethod: "DELETE", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateEndpointConnections/{privateEndpointConnectionName}", urlParameters: [ @@ -222,10 +282,9 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { ], responses: { 200: {}, - 202: {}, 204: {}, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/privateLinkResources.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/privateLinkResources.ts index a0de2b6f5817..e38e28fe8ca7 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/privateLinkResources.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/privateLinkResources.ts @@ -27,40 +27,40 @@ export class PrivateLinkResources { /** * Gets the private link resources that need to be created for a workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listByWorkspace(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; + list(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param callback The callback */ - listByWorkspace(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param options The optional parameters * @param callback The callback */ - listByWorkspace(resourceGroupName: string, workspaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - listByWorkspace(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + list(resourceGroupName: string, workspaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, workspaceName, options }, - listByWorkspaceOperationSpec, - callback) as Promise; + listOperationSpec, + callback) as Promise; } } // Operation Specifications const serializer = new msRest.Serializer(Mappers); -const listByWorkspaceOperationSpec: msRest.OperationSpec = { +const listOperationSpec: msRest.OperationSpec = { httpMethod: "GET", path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/privateLinkResources", urlParameters: [ diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/quotas.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/quotas.ts index fbf9d1cc0c0d..54d2d869d7e1 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/quotas.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/quotas.ts @@ -141,7 +141,7 @@ const updateOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.UpdateWorkspaceQuotasResult }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -149,7 +149,7 @@ const updateOperationSpec: msRest.OperationSpec = { const listOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/locations/{location}/Quotas", + path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/locations/{location}/quotas", urlParameters: [ Parameters.subscriptionId, Parameters.location @@ -165,7 +165,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ListWorkspaceQuotas }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -189,7 +189,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ListWorkspaceQuotas }, default: { - bodyMapper: Mappers.CloudError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/virtualMachineSizes.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/virtualMachineSizes.ts index 9be626180c93..5a99cbbea522 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/virtualMachineSizes.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/virtualMachineSizes.ts @@ -31,7 +31,7 @@ export class VirtualMachineSizes { * @param [options] The optional parameters * @returns Promise */ - list(location: string, options?: Models.VirtualMachineSizesListOptionalParams): Promise; + list(location: string, options?: msRest.RequestOptionsBase): Promise; /** * @param location The location upon which virtual-machine-sizes is queried. * @param callback The callback @@ -42,8 +42,8 @@ export class VirtualMachineSizes { * @param options The optional parameters * @param callback The callback */ - list(location: string, options: Models.VirtualMachineSizesListOptionalParams, callback: msRest.ServiceCallback): void; - list(location: string, options?: Models.VirtualMachineSizesListOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + list(location: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(location: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { location, @@ -64,9 +64,7 @@ const listOperationSpec: msRest.OperationSpec = { Parameters.subscriptionId ], queryParameters: [ - Parameters.apiVersion, - Parameters.computeType, - Parameters.recommended + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceConnections.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceConnections.ts index 77864d7360ee..02bd84048028 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceConnections.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceConnections.ts @@ -27,20 +27,20 @@ export class WorkspaceConnections { /** * List all connections under a AML workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters * @returns Promise */ list(resourceGroupName: string, workspaceName: string, options?: Models.WorkspaceConnectionsListOptionalParams): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param callback The callback */ list(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param options The optional parameters * @param callback The callback @@ -59,32 +59,32 @@ export class WorkspaceConnections { /** * Add a new workspace connection. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param parameters The object for creating or updating a new workspace connection * @param [options] The optional parameters * @returns Promise */ - create(resourceGroupName: string, workspaceName: string, connectionName: string, parameters: Models.WorkspaceConnectionDto, options?: msRest.RequestOptionsBase): Promise; + create(resourceGroupName: string, workspaceName: string, connectionName: string, parameters: Models.WorkspaceConnection, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param parameters The object for creating or updating a new workspace connection * @param callback The callback */ - create(resourceGroupName: string, workspaceName: string, connectionName: string, parameters: Models.WorkspaceConnectionDto, callback: msRest.ServiceCallback): void; + create(resourceGroupName: string, workspaceName: string, connectionName: string, parameters: Models.WorkspaceConnection, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param parameters The object for creating or updating a new workspace connection * @param options The optional parameters * @param callback The callback */ - create(resourceGroupName: string, workspaceName: string, connectionName: string, parameters: Models.WorkspaceConnectionDto, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - create(resourceGroupName: string, workspaceName: string, connectionName: string, parameters: Models.WorkspaceConnectionDto, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + create(resourceGroupName: string, workspaceName: string, connectionName: string, parameters: Models.WorkspaceConnection, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + create(resourceGroupName: string, workspaceName: string, connectionName: string, parameters: Models.WorkspaceConnection, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, @@ -99,7 +99,7 @@ export class WorkspaceConnections { /** * Get the detail of a workspace connection. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param [options] The optional parameters @@ -107,14 +107,14 @@ export class WorkspaceConnections { */ get(resourceGroupName: string, workspaceName: string, connectionName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param callback The callback */ get(resourceGroupName: string, workspaceName: string, connectionName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param options The optional parameters @@ -135,7 +135,7 @@ export class WorkspaceConnections { /** * Delete a workspace connection. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param [options] The optional parameters @@ -143,14 +143,14 @@ export class WorkspaceConnections { */ deleteMethod(resourceGroupName: string, workspaceName: string, connectionName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param callback The callback */ deleteMethod(resourceGroupName: string, workspaceName: string, connectionName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param connectionName Friendly name of the workspace connection * @param options The optional parameters @@ -193,7 +193,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.PaginatedWorkspaceConnectionsList }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -217,7 +217,7 @@ const createOperationSpec: msRest.OperationSpec = { requestBody: { parameterPath: "parameters", mapper: { - ...Mappers.WorkspaceConnectionDto, + ...Mappers.WorkspaceConnection, required: true } }, @@ -226,7 +226,7 @@ const createOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.WorkspaceConnection }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -252,7 +252,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.WorkspaceConnection }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -277,7 +277,7 @@ const deleteMethodOperationSpec: msRest.OperationSpec = { 200: {}, 204: {}, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceFeatures.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceFeatures.ts index a887c0669d7f..136f02269a30 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceFeatures.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceFeatures.ts @@ -27,20 +27,20 @@ export class WorkspaceFeatures { /** * Lists all enabled features for a workspace - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters * @returns Promise */ list(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param callback The callback */ list(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param options The optional parameters * @param callback The callback @@ -107,7 +107,7 @@ const listOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ListAmlUserFeatureResult }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -131,7 +131,7 @@ const listNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ListAmlUserFeatureResult }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceSkus.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceSkus.ts new file mode 100644 index 000000000000..f386df5179ad --- /dev/null +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaceSkus.ts @@ -0,0 +1,128 @@ +/* + * Copyright (c) Microsoft Corporation. + * Licensed under the MIT License. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +import * as msRest from "@azure/ms-rest-js"; +import * as Models from "../models"; +import * as Mappers from "../models/workspaceSkusMappers"; +import * as Parameters from "../models/parameters"; +import { AzureMachineLearningWorkspacesContext } from "../azureMachineLearningWorkspacesContext"; + +/** Class representing a WorkspaceSkus. */ +export class WorkspaceSkus { + private readonly client: AzureMachineLearningWorkspacesContext; + + /** + * Create a WorkspaceSkus. + * @param {AzureMachineLearningWorkspacesContext} client Reference to the service client. + */ + constructor(client: AzureMachineLearningWorkspacesContext) { + this.client = client; + } + + /** + * Lists all skus with associated features + * @param [options] The optional parameters + * @returns Promise + */ + list(options?: msRest.RequestOptionsBase): Promise; + /** + * @param callback The callback + */ + list(callback: msRest.ServiceCallback): void; + /** + * @param options The optional parameters + * @param callback The callback + */ + list(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + list(options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + options + }, + listOperationSpec, + callback) as Promise; + } + + /** + * Lists all skus with associated features + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param [options] The optional parameters + * @returns Promise + */ + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param callback The callback + */ + listNext(nextPageLink: string, callback: msRest.ServiceCallback): void; + /** + * @param nextPageLink The NextLink from the previous successful call to List operation. + * @param options The optional parameters + * @param callback The callback + */ + listNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + nextPageLink, + options + }, + listNextOperationSpec, + callback) as Promise; + } +} + +// Operation Specifications +const serializer = new msRest.Serializer(Mappers); +const listOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/workspaces/skus", + urlParameters: [ + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.SkuListResult + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const listNextOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + baseUrl: "https://management.azure.com", + path: "{nextLink}", + urlParameters: [ + Parameters.nextPageLink + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.SkuListResult + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaces.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaces.ts index 9fc610c5256c..ead27cd989cf 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaces.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/operations/workspaces.ts @@ -28,20 +28,20 @@ export class Workspaces { /** * Gets the properties of the specified machine learning workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters * @returns Promise */ get(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param callback The callback */ get(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param options The optional parameters * @param callback The callback @@ -60,7 +60,7 @@ export class Workspaces { /** * Creates or updates a workspace with the specified parameters. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param parameters The parameters for creating or updating a machine learning workspace. * @param [options] The optional parameters @@ -73,7 +73,7 @@ export class Workspaces { /** * Deletes a machine learning workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters * @returns Promise @@ -85,7 +85,7 @@ export class Workspaces { /** * Updates a machine learning workspace with the specified parameters. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param parameters The parameters for updating a machine learning workspace. * @param [options] The optional parameters @@ -93,14 +93,14 @@ export class Workspaces { */ update(resourceGroupName: string, workspaceName: string, parameters: Models.WorkspaceUpdateParameters, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param parameters The parameters for updating a machine learning workspace. * @param callback The callback */ update(resourceGroupName: string, workspaceName: string, parameters: Models.WorkspaceUpdateParameters, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param parameters The parameters for updating a machine learning workspace. * @param options The optional parameters @@ -121,18 +121,18 @@ export class Workspaces { /** * Lists all the available machine learning workspaces under the specified resource group. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param [options] The optional parameters * @returns Promise */ listByResourceGroup(resourceGroupName: string, options?: Models.WorkspacesListByResourceGroupOptionalParams): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param callback The callback */ listByResourceGroup(resourceGroupName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param options The optional parameters * @param callback The callback */ @@ -147,23 +147,35 @@ export class Workspaces { callback) as Promise; } + /** + * @summary Diagnose workspace setup issue. + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + diagnose(resourceGroupName: string, workspaceName: string, options?: Models.WorkspacesDiagnoseOptionalParams): Promise { + return this.beginDiagnose(resourceGroupName,workspaceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + } + /** * Lists all the keys associated with this workspace. This includes keys for the storage account, * app insights and password for container registry - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters * @returns Promise */ listKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param callback The callback */ listKeys(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param options The optional parameters * @param callback The callback @@ -183,63 +195,184 @@ export class Workspaces { /** * Resync all the keys associated with this workspace. This includes keys for the storage account, * app insights and password for container registry - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters * @returns Promise */ - resyncKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; + resyncKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginResyncKeys(resourceGroupName,workspaceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()); + } + + /** + * Lists all the available machine learning workspaces under the specified subscription. + * @param [options] The optional parameters + * @returns Promise + */ + listBySubscription(options?: Models.WorkspacesListBySubscriptionOptionalParams): Promise; + /** + * @param callback The callback + */ + listBySubscription(callback: msRest.ServiceCallback): void; + /** + * @param options The optional parameters + * @param callback The callback + */ + listBySubscription(options: Models.WorkspacesListBySubscriptionOptionalParams, callback: msRest.ServiceCallback): void; + listBySubscription(options?: Models.WorkspacesListBySubscriptionOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + options + }, + listBySubscriptionOperationSpec, + callback) as Promise; + } + + /** + * return notebook access token and refresh token + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + listNotebookAccessToken(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param callback The callback */ - resyncKeys(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; + listNotebookAccessToken(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; /** - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param options The optional parameters * @param callback The callback */ - resyncKeys(resourceGroupName: string, workspaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; - resyncKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listNotebookAccessToken(resourceGroupName: string, workspaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listNotebookAccessToken(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { resourceGroupName, workspaceName, options }, - resyncKeysOperationSpec, - callback); + listNotebookAccessTokenOperationSpec, + callback) as Promise; } /** - * Lists all the available machine learning workspaces under the specified subscription. + * Prepare a notebook. + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters - * @returns Promise + * @returns Promise */ - listBySubscription(options?: Models.WorkspacesListBySubscriptionOptionalParams): Promise; + prepareNotebook(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.beginPrepareNotebook(resourceGroupName,workspaceName,options) + .then(lroPoller => lroPoller.pollUntilFinished()) as Promise; + } + + /** + * List storage account keys of a workspace. + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + listStorageAccountKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. * @param callback The callback */ - listBySubscription(callback: msRest.ServiceCallback): void; + listStorageAccountKeys(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. * @param options The optional parameters * @param callback The callback */ - listBySubscription(options: Models.WorkspacesListBySubscriptionOptionalParams, callback: msRest.ServiceCallback): void; - listBySubscription(options?: Models.WorkspacesListBySubscriptionOptionalParams | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + listStorageAccountKeys(resourceGroupName: string, workspaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listStorageAccountKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { return this.client.sendOperationRequest( { + resourceGroupName, + workspaceName, options }, - listBySubscriptionOperationSpec, - callback) as Promise; + listStorageAccountKeysOperationSpec, + callback) as Promise; + } + + /** + * List keys of a notebook. + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + listNotebookKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param callback The callback + */ + listNotebookKeys(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param options The optional parameters + * @param callback The callback + */ + listNotebookKeys(resourceGroupName: string, workspaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listNotebookKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + workspaceName, + options + }, + listNotebookKeysOperationSpec, + callback) as Promise; + } + + /** + * @summary Called by Client (Portal, CLI, etc) to get a list of all external outbound dependencies + * (FQDNs) programmatically. + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + listOutboundNetworkDependenciesEndpoints(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise; + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param callback The callback + */ + listOutboundNetworkDependenciesEndpoints(resourceGroupName: string, workspaceName: string, callback: msRest.ServiceCallback): void; + /** + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param options The optional parameters + * @param callback The callback + */ + listOutboundNetworkDependenciesEndpoints(resourceGroupName: string, workspaceName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; + listOutboundNetworkDependenciesEndpoints(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise { + return this.client.sendOperationRequest( + { + resourceGroupName, + workspaceName, + options + }, + listOutboundNetworkDependenciesEndpointsOperationSpec, + callback) as Promise; } /** * Creates or updates a workspace with the specified parameters. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param parameters The parameters for creating or updating a machine learning workspace. * @param [options] The optional parameters @@ -259,7 +392,7 @@ export class Workspaces { /** * Deletes a machine learning workspace. - * @param resourceGroupName Name of the resource group in which workspace is located. + * @param resourceGroupName The name of the resource group. The name is case insensitive. * @param workspaceName Name of Azure Machine Learning workspace. * @param [options] The optional parameters * @returns Promise @@ -275,6 +408,61 @@ export class Workspaces { options); } + /** + * @summary Diagnose workspace setup issue. + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + beginDiagnose(resourceGroupName: string, workspaceName: string, options?: Models.WorkspacesBeginDiagnoseOptionalParams): Promise { + return this.client.sendLRORequest( + { + resourceGroupName, + workspaceName, + options + }, + beginDiagnoseOperationSpec, + options); + } + + /** + * Resync all the keys associated with this workspace. This includes keys for the storage account, + * app insights and password for container registry + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + beginResyncKeys(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( + { + resourceGroupName, + workspaceName, + options + }, + beginResyncKeysOperationSpec, + options); + } + + /** + * Prepare a notebook. + * @param resourceGroupName The name of the resource group. The name is case insensitive. + * @param workspaceName Name of Azure Machine Learning workspace. + * @param [options] The optional parameters + * @returns Promise + */ + beginPrepareNotebook(resourceGroupName: string, workspaceName: string, options?: msRest.RequestOptionsBase): Promise { + return this.client.sendLRORequest( + { + resourceGroupName, + workspaceName, + options + }, + beginPrepareNotebookOperationSpec, + options); + } + /** * Lists all the available machine learning workspaces under the specified resource group. * @param nextPageLink The NextLink from the previous successful call to List operation. @@ -353,7 +541,7 @@ const getOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.Workspace }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -385,7 +573,7 @@ const updateOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.Workspace }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -400,7 +588,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = { ], queryParameters: [ Parameters.apiVersion, - Parameters.skiptoken + Parameters.skip ], headerParameters: [ Parameters.acceptLanguage @@ -410,7 +598,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.WorkspaceListResult }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -435,15 +623,39 @@ const listKeysOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.ListWorkspaceKeysResult }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const resyncKeysOperationSpec: msRest.OperationSpec = { +const listBySubscriptionOperationSpec: msRest.OperationSpec = { + httpMethod: "GET", + path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/workspaces", + urlParameters: [ + Parameters.subscriptionId + ], + queryParameters: [ + Parameters.apiVersion, + Parameters.skip + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.WorkspaceListResult + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const listNotebookAccessTokenOperationSpec: msRest.OperationSpec = { httpMethod: "POST", - path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/resyncKeys", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/listNotebookAccessToken", urlParameters: [ Parameters.subscriptionId, Parameters.resourceGroupName, @@ -456,33 +668,86 @@ const resyncKeysOperationSpec: msRest.OperationSpec = { Parameters.acceptLanguage ], responses: { - 200: {}, + 200: { + bodyMapper: Mappers.NotebookAccessTokenResult + }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer }; -const listBySubscriptionOperationSpec: msRest.OperationSpec = { +const listStorageAccountKeysOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/listStorageAccountKeys", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.workspaceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.ListStorageAccountKeysResult + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const listNotebookKeysOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/listNotebookKeys", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.workspaceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.ListNotebookKeysResult + }, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const listOutboundNetworkDependenciesEndpointsOperationSpec: msRest.OperationSpec = { httpMethod: "GET", - path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/workspaces", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/outboundNetworkDependenciesEndpoints", urlParameters: [ - Parameters.subscriptionId + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.workspaceName ], queryParameters: [ - Parameters.apiVersion, - Parameters.skiptoken + Parameters.apiVersion ], headerParameters: [ Parameters.acceptLanguage ], responses: { 200: { - bodyMapper: Mappers.WorkspaceListResult + bodyMapper: Mappers.ExternalFQDNResponse }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -513,12 +778,9 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = { 200: { bodyMapper: Mappers.Workspace }, - 201: { - bodyMapper: Mappers.Workspace - }, 202: {}, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -543,7 +805,94 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = { 202: {}, 204: {}, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const beginDiagnoseOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/diagnose", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.workspaceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + requestBody: { + parameterPath: [ + "options", + "parameters" + ], + mapper: Mappers.DiagnoseWorkspaceParameters + }, + responses: { + 200: { + bodyMapper: Mappers.DiagnoseResponseResult, + headersMapper: Mappers.WorkspacesDiagnoseHeaders + }, + 202: { + headersMapper: Mappers.WorkspacesDiagnoseHeaders + }, + default: { + bodyMapper: Mappers.ErrorResponse, + headersMapper: Mappers.WorkspacesDiagnoseHeaders + } + }, + serializer +}; + +const beginResyncKeysOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/resyncKeys", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.workspaceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: {}, + 202: {}, + default: { + bodyMapper: Mappers.ErrorResponse + } + }, + serializer +}; + +const beginPrepareNotebookOperationSpec: msRest.OperationSpec = { + httpMethod: "POST", + path: "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MachineLearningServices/workspaces/{workspaceName}/prepareNotebook", + urlParameters: [ + Parameters.subscriptionId, + Parameters.resourceGroupName, + Parameters.workspaceName + ], + queryParameters: [ + Parameters.apiVersion + ], + headerParameters: [ + Parameters.acceptLanguage + ], + responses: { + 200: { + bodyMapper: Mappers.NotebookResourceInfo + }, + 202: {}, + default: { + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -558,7 +907,7 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { ], queryParameters: [ Parameters.apiVersion, - Parameters.skiptoken + Parameters.skip ], headerParameters: [ Parameters.acceptLanguage @@ -568,7 +917,7 @@ const listByResourceGroupNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.WorkspaceListResult }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer @@ -583,7 +932,7 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = { ], queryParameters: [ Parameters.apiVersion, - Parameters.skiptoken + Parameters.skip ], headerParameters: [ Parameters.acceptLanguage @@ -593,7 +942,7 @@ const listBySubscriptionNextOperationSpec: msRest.OperationSpec = { bodyMapper: Mappers.WorkspaceListResult }, default: { - bodyMapper: Mappers.MachineLearningServiceError + bodyMapper: Mappers.ErrorResponse } }, serializer