From 13f0ffc850ed01533bfeb9a03431fdace15473b2 Mon Sep 17 00:00:00 2001 From: "openapi-bot[bot]" <37845953+openapi-bot[bot]@users.noreply.github.com> Date: Fri, 23 Aug 2019 00:40:27 +0000 Subject: [PATCH] Generated from a9e6716031821eff25f2cbb422960fa56742c0e9 (#109) Merge branch 'master' into akpati/ssh-property-change --- .../azureMachineLearningWorkspacesContext.ts | 2 +- .../src/models/index.ts | 52 ++++++++++++++++++- .../src/models/mappers.ts | 39 +++++++++++++- 3 files changed, 88 insertions(+), 5 deletions(-) diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts index 9a1cb99cc2a5..f23d82b291aa 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts @@ -44,7 +44,7 @@ export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServ super(credentials, options); - this.apiVersion = '2019-05-01'; + this.apiVersion = '2019-06-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/index.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/index.ts index 652dcfba3a34..a24e9ce12181 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/index.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/index.ts @@ -226,6 +226,11 @@ export interface VirtualMachineSize { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly vCPUs?: number; + /** + * Number of gPUs. The number of gPUs supported by the virtual machine size. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly gpus?: number; /** * OS VHD Disk size. The OS VHD disk size, in MB, allowed by the virtual machine size. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -705,6 +710,16 @@ export interface AmlComputeProperties { * 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 + * that the public ssh port is open on all nodes of the cluster. NotSpecified - Indicates that + * the public ssh port is closed on all nodes of the cluster if VNet is defined, else is open all + * public nodes. It can be default only during cluster creation time, after creation it will be + * either enabled or disabled. Possible values include: 'Enabled', 'Disabled', 'NotSpecified'. + * Default value: 'NotSpecified'. + */ + remoteLoginPortPublicAccess?: RemoteLoginPortPublicAccess; /** * Allocation state. Allocation state of the compute. Possible values are: steady - Indicates * that the compute is not resizing. There are no changes to the number of compute nodes in the @@ -1191,15 +1206,32 @@ export interface AmlComputeNodeInformation { */ readonly nodeId?: string; /** - * IP address. Public IP address of the compute node. + * 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 ipAddress?: string; + 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; } /** @@ -1427,6 +1459,14 @@ export type ResourceIdentityType = 'SystemAssigned'; */ export type VmPriority = 'Dedicated' | 'LowPriority'; +/** + * Defines values for RemoteLoginPortPublicAccess. + * Possible values include: 'Enabled', 'Disabled', 'NotSpecified' + * @readonly + * @enum {string} + */ +export type RemoteLoginPortPublicAccess = 'Enabled' | 'Disabled' | 'NotSpecified'; + /** * Defines values for AllocationState. * Possible values include: 'Steady', 'Resizing' @@ -1435,6 +1475,14 @@ export type VmPriority = 'Dedicated' | 'LowPriority'; */ export type AllocationState = 'Steady' | 'Resizing'; +/** + * Defines values for NodeState. + * Possible values include: 'idle', 'running', 'preparing', 'unusable', 'leaving', 'preempted' + * @readonly + * @enum {string} + */ +export type NodeState = 'idle' | 'running' | 'preparing' | 'unusable' | 'leaving' | 'preempted'; + /** * Defines values for ComputeType. * Possible values include: 'AKS', 'AmlCompute', 'DataFactory', 'VirtualMachine', 'HDInsight', diff --git a/sdk/machinelearningservices/arm-machinelearningservices/src/models/mappers.ts b/sdk/machinelearningservices/arm-machinelearningservices/src/models/mappers.ts index 639d21015222..4fb3ddf7f36e 100644 --- a/sdk/machinelearningservices/arm-machinelearningservices/src/models/mappers.ts +++ b/sdk/machinelearningservices/arm-machinelearningservices/src/models/mappers.ts @@ -336,6 +336,13 @@ export const VirtualMachineSize: msRest.CompositeMapper = { name: "Number" } }, + gpus: { + readOnly: true, + serializedName: "gpus", + type: { + name: "Number" + } + }, osVhdSizeMB: { readOnly: true, serializedName: "osVhdSizeMB", @@ -1060,6 +1067,13 @@ export const AmlComputeProperties: msRest.CompositeMapper = { className: "ResourceId" } }, + remoteLoginPortPublicAccess: { + serializedName: "remoteLoginPortPublicAccess", + defaultValue: 'NotSpecified', + type: { + name: "String" + } + }, allocationState: { readOnly: true, serializedName: "allocationState", @@ -1439,9 +1453,16 @@ export const AmlComputeNodeInformation: msRest.CompositeMapper = { name: "String" } }, - ipAddress: { + privateIpAddress: { + readOnly: true, + serializedName: "privateIpAddress", + type: { + name: "String" + } + }, + publicIpAddress: { readOnly: true, - serializedName: "ipAddress", + serializedName: "publicIpAddress", type: { name: "String" } @@ -1452,6 +1473,20 @@ export const AmlComputeNodeInformation: msRest.CompositeMapper = { type: { name: "Number" } + }, + nodeState: { + readOnly: true, + serializedName: "nodeState", + type: { + name: "String" + } + }, + runId: { + readOnly: true, + serializedName: "runId", + type: { + name: "String" + } } } }