From 8fa3a46af359198b013f0aeb9c13ad944cbaa776 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 5 Sep 2018 17:10:03 -0700 Subject: [PATCH] [AutoPR containerinstance/resource-manager] Container Instance: Adding September Update (#3493) * Generated from a2a951c22595ca012bc88b4263946ceb52a8cf0c Adding the september swagger * Generated from 5e3cbec47d171de4a66d7303dbc455298817a1e5 Adding new changes to the september swagger --- .../lib/containerInstanceManagementClient.js | 2 +- .../lib/models/containerGroup.js | 16 ++++ .../lib/models/containerGroupDiagnostics.js | 3 + .../models/containerGroupNetworkProfile.js | 52 ++++++++++ .../lib/models/index.d.ts | 28 ++++++ .../lib/models/index.js | 1 + .../lib/models/logAnalytics.js | 24 +++++ .../lib/operations/containerGroups.js | 96 +++++++++++++++++-- .../lib/operations/index.d.ts | 64 +++++++++++-- .../containerinstanceManagement/package.json | 2 +- 10 files changed, 271 insertions(+), 17 deletions(-) create mode 100644 lib/services/containerinstanceManagement/lib/models/containerGroupNetworkProfile.js diff --git a/lib/services/containerinstanceManagement/lib/containerInstanceManagementClient.js b/lib/services/containerinstanceManagement/lib/containerInstanceManagementClient.js index bb2c5b74ae..e9bf3a99e7 100644 --- a/lib/services/containerinstanceManagement/lib/containerInstanceManagementClient.js +++ b/lib/services/containerinstanceManagement/lib/containerInstanceManagementClient.js @@ -50,7 +50,7 @@ class ContainerInstanceManagementClient extends ServiceClient { super(credentials, options); - this.apiVersion = '2018-06-01'; + this.apiVersion = '2018-09-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.generateClientRequestId = true; diff --git a/lib/services/containerinstanceManagement/lib/models/containerGroup.js b/lib/services/containerinstanceManagement/lib/models/containerGroup.js index 2ca1792baf..19eef67055 100644 --- a/lib/services/containerinstanceManagement/lib/models/containerGroup.js +++ b/lib/services/containerinstanceManagement/lib/models/containerGroup.js @@ -55,6 +55,14 @@ class ContainerGroup extends models['Resource'] { * for log analytics * @member {string} [diagnostics.logAnalytics.workspaceKey] The workspace key * for log analytics + * @member {string} [diagnostics.logAnalytics.logType] The log type to be + * used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * @member {object} [diagnostics.logAnalytics.metadata] Metadata for log + * analytics. + * @member {object} [networkProfile] The network profile information for a + * container group. + * @member {string} [networkProfile.id] The identifier for a network profile. */ constructor() { super(); @@ -210,6 +218,14 @@ class ContainerGroup extends models['Resource'] { name: 'Composite', className: 'ContainerGroupDiagnostics' } + }, + networkProfile: { + required: false, + serializedName: 'properties.networkProfile', + type: { + name: 'Composite', + className: 'ContainerGroupNetworkProfile' + } } } } diff --git a/lib/services/containerinstanceManagement/lib/models/containerGroupDiagnostics.js b/lib/services/containerinstanceManagement/lib/models/containerGroupDiagnostics.js index 41f8db8965..e91000a941 100644 --- a/lib/services/containerinstanceManagement/lib/models/containerGroupDiagnostics.js +++ b/lib/services/containerinstanceManagement/lib/models/containerGroupDiagnostics.js @@ -22,6 +22,9 @@ class ContainerGroupDiagnostics { * analytics * @member {string} [logAnalytics.workspaceKey] The workspace key for log * analytics + * @member {string} [logAnalytics.logType] The log type to be used. Possible + * values include: 'ContainerInsights', 'ContainerInstanceLogs' + * @member {object} [logAnalytics.metadata] Metadata for log analytics. */ constructor() { } diff --git a/lib/services/containerinstanceManagement/lib/models/containerGroupNetworkProfile.js b/lib/services/containerinstanceManagement/lib/models/containerGroupNetworkProfile.js new file mode 100644 index 0000000000..0998021e7d --- /dev/null +++ b/lib/services/containerinstanceManagement/lib/models/containerGroupNetworkProfile.js @@ -0,0 +1,52 @@ +/* + * Copyright (c) Microsoft Corporation. All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for + * license information. + * + * Code generated by Microsoft (R) AutoRest Code Generator. + * Changes may cause incorrect behavior and will be lost if the code is + * regenerated. + */ + +'use strict'; + +/** + * Container group network profile information. + * + */ +class ContainerGroupNetworkProfile { + /** + * Create a ContainerGroupNetworkProfile. + * @member {string} id The identifier for a network profile. + */ + constructor() { + } + + /** + * Defines the metadata of ContainerGroupNetworkProfile + * + * @returns {object} metadata of ContainerGroupNetworkProfile + * + */ + mapper() { + return { + required: false, + serializedName: 'ContainerGroupNetworkProfile', + type: { + name: 'Composite', + className: 'ContainerGroupNetworkProfile', + modelProperties: { + id: { + required: true, + serializedName: 'id', + type: { + name: 'String' + } + } + } + } + }; + } +} + +module.exports = ContainerGroupNetworkProfile; diff --git a/lib/services/containerinstanceManagement/lib/models/index.d.ts b/lib/services/containerinstanceManagement/lib/models/index.d.ts index c21553b256..f4cb2befa9 100644 --- a/lib/services/containerinstanceManagement/lib/models/index.d.ts +++ b/lib/services/containerinstanceManagement/lib/models/index.d.ts @@ -508,10 +508,15 @@ export interface ContainerGroupPropertiesInstanceView { * * @member {string} workspaceId The workspace id for log analytics * @member {string} workspaceKey The workspace key for log analytics + * @member {string} [logType] The log type to be used. Possible values include: + * 'ContainerInsights', 'ContainerInstanceLogs' + * @member {object} [metadata] Metadata for log analytics. */ export interface LogAnalytics { workspaceId: string; workspaceKey: string; + logType?: string; + metadata?: { [propertyName: string]: string }; } /** @@ -525,11 +530,26 @@ export interface LogAnalytics { * analytics * @member {string} [logAnalytics.workspaceKey] The workspace key for log * analytics + * @member {string} [logAnalytics.logType] The log type to be used. Possible + * values include: 'ContainerInsights', 'ContainerInstanceLogs' + * @member {object} [logAnalytics.metadata] Metadata for log analytics. */ export interface ContainerGroupDiagnostics { logAnalytics?: LogAnalytics; } +/** + * @class + * Initializes a new instance of the ContainerGroupNetworkProfile class. + * @constructor + * Container group network profile information. + * + * @member {string} id The identifier for a network profile. + */ +export interface ContainerGroupNetworkProfile { + id: string; +} + /** * @class * Initializes a new instance of the Resource class. @@ -590,6 +610,13 @@ export interface Resource extends BaseResource { * log analytics * @member {string} [diagnostics.logAnalytics.workspaceKey] The workspace key * for log analytics + * @member {string} [diagnostics.logAnalytics.logType] The log type to be used. + * Possible values include: 'ContainerInsights', 'ContainerInstanceLogs' + * @member {object} [diagnostics.logAnalytics.metadata] Metadata for log + * analytics. + * @member {object} [networkProfile] The network profile information for a + * container group. + * @member {string} [networkProfile.id] The identifier for a network profile. */ export interface ContainerGroup extends Resource { readonly provisioningState?: string; @@ -601,6 +628,7 @@ export interface ContainerGroup extends Resource { volumes?: Volume[]; readonly instanceView?: ContainerGroupPropertiesInstanceView; diagnostics?: ContainerGroupDiagnostics; + networkProfile?: ContainerGroupNetworkProfile; } /** diff --git a/lib/services/containerinstanceManagement/lib/models/index.js b/lib/services/containerinstanceManagement/lib/models/index.js index 763e039049..efec5e2787 100644 --- a/lib/services/containerinstanceManagement/lib/models/index.js +++ b/lib/services/containerinstanceManagement/lib/models/index.js @@ -40,6 +40,7 @@ exports.IpAddress = require('./ipAddress'); exports.ContainerGroupPropertiesInstanceView = require('./containerGroupPropertiesInstanceView'); exports.LogAnalytics = require('./logAnalytics'); exports.ContainerGroupDiagnostics = require('./containerGroupDiagnostics'); +exports.ContainerGroupNetworkProfile = require('./containerGroupNetworkProfile'); exports.Resource = require('./resource'); exports.ContainerGroup = require('./containerGroup'); exports.OperationDisplay = require('./operationDisplay'); diff --git a/lib/services/containerinstanceManagement/lib/models/logAnalytics.js b/lib/services/containerinstanceManagement/lib/models/logAnalytics.js index ef5fea633a..f3609a5a89 100644 --- a/lib/services/containerinstanceManagement/lib/models/logAnalytics.js +++ b/lib/services/containerinstanceManagement/lib/models/logAnalytics.js @@ -19,6 +19,9 @@ class LogAnalytics { * Create a LogAnalytics. * @member {string} workspaceId The workspace id for log analytics * @member {string} workspaceKey The workspace key for log analytics + * @member {string} [logType] The log type to be used. Possible values + * include: 'ContainerInsights', 'ContainerInstanceLogs' + * @member {object} [metadata] Metadata for log analytics. */ constructor() { } @@ -50,6 +53,27 @@ class LogAnalytics { type: { name: 'String' } + }, + logType: { + required: false, + serializedName: 'logType', + type: { + name: 'String' + } + }, + metadata: { + required: false, + serializedName: 'metadata', + type: { + name: 'Dictionary', + value: { + required: false, + serializedName: 'StringElementType', + type: { + name: 'String' + } + } + } } } } diff --git a/lib/services/containerinstanceManagement/lib/operations/containerGroups.js b/lib/services/containerinstanceManagement/lib/operations/containerGroups.js index 8a260c1e8d..e3733e04e5 100644 --- a/lib/services/containerinstanceManagement/lib/operations/containerGroups.js +++ b/lib/services/containerinstanceManagement/lib/operations/containerGroups.js @@ -506,6 +506,19 @@ function _get(resourceGroupName, containerGroupName, options, callback) { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -904,7 +917,7 @@ function _deleteMethod(resourceGroupName, containerGroupName, options, callback) /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. @@ -969,7 +982,7 @@ function _restart(resourceGroupName, containerGroupName, options, callback) { /** * @summary Stops all containers in a container group. * - * Stops all containers in a contaienr group. Compute resources will be + * Stops all containers in a container group. Compute resources will be * deallocated and billing will stop. * * @param {string} resourceGroupName The name of the resource group. @@ -1152,6 +1165,19 @@ function _stop(resourceGroupName, containerGroupName, options, callback) { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -1335,7 +1361,7 @@ function _beginCreateOrUpdate(resourceGroupName, containerGroupName, containerGr /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. @@ -2087,6 +2113,19 @@ class ContainerGroups { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -2172,6 +2211,19 @@ class ContainerGroups { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -2424,7 +2476,7 @@ class ContainerGroups { /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. @@ -2459,7 +2511,7 @@ class ContainerGroups { /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. @@ -2515,7 +2567,7 @@ class ContainerGroups { /** * @summary Stops all containers in a container group. * - * Stops all containers in a contaienr group. Compute resources will be + * Stops all containers in a container group. Compute resources will be * deallocated and billing will stop. * * @param {string} resourceGroupName The name of the resource group. @@ -2550,7 +2602,7 @@ class ContainerGroups { /** * @summary Stops all containers in a container group. * - * Stops all containers in a contaienr group. Compute resources will be + * Stops all containers in a container group. Compute resources will be * deallocated and billing will stop. * * @param {string} resourceGroupName The name of the resource group. @@ -2659,6 +2711,19 @@ class ContainerGroups { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -2744,6 +2809,19 @@ class ContainerGroups { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -2798,7 +2876,7 @@ class ContainerGroups { /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. @@ -2833,7 +2911,7 @@ class ContainerGroups { /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. diff --git a/lib/services/containerinstanceManagement/lib/operations/index.d.ts b/lib/services/containerinstanceManagement/lib/operations/index.d.ts index 7630cd151e..742e74e77b 100644 --- a/lib/services/containerinstanceManagement/lib/operations/index.d.ts +++ b/lib/services/containerinstanceManagement/lib/operations/index.d.ts @@ -276,6 +276,19 @@ export interface ContainerGroups { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -349,6 +362,19 @@ export interface ContainerGroups { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -532,7 +558,7 @@ export interface ContainerGroups { /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. @@ -555,7 +581,7 @@ export interface ContainerGroups { /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. @@ -596,7 +622,7 @@ export interface ContainerGroups { /** * @summary Stops all containers in a container group. * - * Stops all containers in a contaienr group. Compute resources will be + * Stops all containers in a container group. Compute resources will be * deallocated and billing will stop. * * @param {string} resourceGroupName The name of the resource group. @@ -619,7 +645,7 @@ export interface ContainerGroups { /** * @summary Stops all containers in a container group. * - * Stops all containers in a contaienr group. Compute resources will be + * Stops all containers in a container group. Compute resources will be * deallocated and billing will stop. * * @param {string} resourceGroupName The name of the resource group. @@ -713,6 +739,19 @@ export interface ContainerGroups { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -786,6 +825,19 @@ export interface ContainerGroups { * @param {string} containerGroup.diagnostics.logAnalytics.workspaceKey The * workspace key for log analytics * + * @param {string} [containerGroup.diagnostics.logAnalytics.logType] The log + * type to be used. Possible values include: 'ContainerInsights', + * 'ContainerInstanceLogs' + * + * @param {object} [containerGroup.diagnostics.logAnalytics.metadata] Metadata + * for log analytics. + * + * @param {object} [containerGroup.networkProfile] The network profile + * information for a container group. + * + * @param {string} containerGroup.networkProfile.id The identifier for a + * network profile. + * * @param {string} [containerGroup.location] The resource location. * * @param {object} [containerGroup.tags] The resource tags. @@ -825,7 +877,7 @@ export interface ContainerGroups { /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. @@ -848,7 +900,7 @@ export interface ContainerGroups { /** * @summary Restarts all containers in a container group. * - * Restarts all containers in a contaienr group in place. If container image + * Restarts all containers in a container group in place. If container image * has updates, new image will be downloaded. * * @param {string} resourceGroupName The name of the resource group. diff --git a/lib/services/containerinstanceManagement/package.json b/lib/services/containerinstanceManagement/package.json index 3e910fa86d..85d94e130a 100644 --- a/lib/services/containerinstanceManagement/package.json +++ b/lib/services/containerinstanceManagement/package.json @@ -14,7 +14,7 @@ "license": "MIT", "main": "./lib/containerInstanceManagementClient.js", "types": "./lib/containerInstanceManagementClient.d.ts", - "homepage": "https://github.com/azure/azure-sdk-for-node/tree/master/lib/services/containerinstanceManagement", + "homepage": "https://github.com/azure/azure-sdk-for-node", "repository": { "type": "git", "url": "https://github.com/azure/azure-sdk-for-node.git"