[AutoPR] containerservices/resource-manager

lib/services/containerservicesManagement/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Microsoft
+Copyright (c) 2019 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

lib/services/containerservicesManagement/README.md

@@ -18,17 +18,15 @@ npm install azure-arm-containerservice
 
 ## How to use
 
-### Authentication, client creation and get openShiftManagedClusters as an example.
+### Authentication, client creation and list openShiftManagedClusters as an example.
 
 ```javascript
 const msRestAzure = require("ms-rest-azure");
 const ContainerServiceClient = require("azure-arm-containerservice");
 msRestAzure.interactiveLogin().then((creds) => {
     const subscriptionId = "<Subscription_Id>";
     const client = new ContainerServiceClient(creds, subscriptionId);
-    const resourceGroupName = "testresourceGroupName";
-    const resourceName = "testresourceName";
-    return client.openShiftManagedClusters.get(resourceGroupName, resourceName).then((result) => {
+    return client.openShiftManagedClusters.list().then((result) => {
       console.log("The result is:");
       console.log(result);
     });

lib/services/containerservicesManagement/lib/models/containerService.js

@@ -112,14 +112,14 @@ class ContainerService extends models['Resource'] {
    * If you specify 0, it will apply the default osDisk size according to the
    * vmSize specified.
    * @member {string} [masterProfile.vnetSubnetID] VNet SubnetID specifies the
-   * vnet's subnet identifier.
+   * VNet's subnet identifier.
    * @member {string} [masterProfile.firstConsecutiveStaticIP]
    * FirstConsecutiveStaticIP used to specify the first static ip of masters.
    * @member {string} [masterProfile.storageProfile] Storage profile specifies
    * what kind of storage used. Choose from StorageAccount and ManagedDisks.
    * Leave it empty, we will choose for you based on the orchestrator choice.
    * Possible values include: 'StorageAccount', 'ManagedDisks'
-   * @member {string} [masterProfile.fqdn] FDQN for the master pool.
+   * @member {string} [masterProfile.fqdn] FQDN for the master pool.
    * @member {array} [agentPoolProfiles] Properties of the agent pool.
    * @member {object} [windowsProfile] Profile for Windows VMs in the container
    * service cluster.

lib/services/containerservicesManagement/lib/models/containerServiceAgentPoolProfile.js

@@ -79,15 +79,15 @@ class ContainerServiceAgentPoolProfile {
    * specified.
    * @member {string} [dnsPrefix] DNS prefix to be used to create the FQDN for
    * the agent pool.
-   * @member {string} [fqdn] FDQN for the agent pool.
+   * @member {string} [fqdn] FQDN for the agent pool.
    * @member {array} [ports] Ports number array used to expose on this agent
    * pool. The default opened ports are different based on your choice of
    * orchestrator.
    * @member {string} [storageProfile] Storage profile specifies what kind of
    * storage used. Choose from StorageAccount and ManagedDisks. Leave it empty,
    * we will choose for you based on the orchestrator choice. Possible values
    * include: 'StorageAccount', 'ManagedDisks'
-   * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
+   * @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
    * identifier.
    * @member {string} [osType] OsType to be used to specify os type. Choose
    * from Linux and Windows. Default to Linux. Possible values include:

lib/services/containerservicesManagement/lib/models/containerServiceMasterProfile.js

@@ -77,15 +77,15 @@ class ContainerServiceMasterProfile {
    * the disk size for every machine in this master/agent pool. If you specify
    * 0, it will apply the default osDisk size according to the vmSize
    * specified.
-   * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
+   * @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
    * identifier.
    * @member {string} [firstConsecutiveStaticIP] FirstConsecutiveStaticIP used
    * to specify the first static ip of masters. Default value: '10.240.255.5' .
    * @member {string} [storageProfile] Storage profile specifies what kind of
    * storage used. Choose from StorageAccount and ManagedDisks. Leave it empty,
    * we will choose for you based on the orchestrator choice. Possible values
    * include: 'StorageAccount', 'ManagedDisks'
-   * @member {string} [fqdn] FDQN for the master pool.
+   * @member {string} [fqdn] FQDN for the master pool.
    */
   constructor() {
   }

lib/services/containerservicesManagement/lib/models/credentialResults.js

@@ -17,7 +17,8 @@
 class CredentialResults {
   /**
    * Create a CredentialResults.
-   * @member {array} [kubeconfigs]
+   * @member {array} [kubeconfigs] Base64-encoded Kubernetes configuration
+   * file.
    */
   constructor() {
   }

lib/services/containerservicesManagement/lib/models/index.d.ts

@@ -64,7 +64,7 @@ export interface PurchasePlan {
  * Represents an OpenShift router
  *
  * @member {string} [name] Name of the router profile.
- * @member {string} [publicSubdomain] DNS subdomain for openshift router.
+ * @member {string} [publicSubdomain] DNS subdomain for OpenShift router.
  * @member {string} [fqdn] Auto-allocated FQDN for the OpenShift router.
  */
 export interface OpenShiftRouterProfile {
@@ -98,9 +98,17 @@ export interface NetworkProfile {
  * @member {string} [name] Unique name of the master pool profile in the
  * context of the subscription and resource group.
  * @member {number} count Number of masters (VMs) to host docker containers.
- * The default value is 3. Default value: 3 .
+ * The default value is 3.
  * @member {string} vmSize Size of agent VMs. Possible values include:
- * 'Standard_D2s_v3', 'Standard_D4s_v3'
+ * 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3',
+ * 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2',
+ * 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2',
+ * 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s',
+ * 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+ * 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2',
+ * 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2',
+ * 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s',
+ * 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'
  * @member {string} [subnetCidr] Subnet CIDR for the peering.
  * @member {string} [osType] OsType to be used to specify os type. Choose from
  * Linux and Windows. Default to Linux. Possible values include: 'Linux',
@@ -123,10 +131,16 @@ export interface OpenShiftManagedClusterMasterPoolProfile {
  * @member {string} name Unique name of the pool profile in the context of the
  * subscription and resource group.
  * @member {number} count Number of agents (VMs) to host docker containers.
- * Allowed values must be in the range of 1 to 5 (inclusive). The default value
- * is 2. . Default value: 2 .
  * @member {string} vmSize Size of agent VMs. Possible values include:
- * 'Standard_D2s_v3', 'Standard_D4s_v3'
+ * 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3', 'Standard_D16s_v3',
+ * 'Standard_D32s_v3', 'Standard_D64s_v3', 'Standard_DS4_v2',
+ * 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2',
+ * 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s',
+ * 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+ * 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2',
+ * 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2',
+ * 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s',
+ * 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'
  * @member {string} [subnetCidr] Subnet CIDR for the peering. Default value:
  * '10.0.0.0/24' .
  * @member {string} [osType] OsType to be used to specify os type. Choose from
@@ -216,7 +230,15 @@ export interface OpenShiftManagedClusterAuthProfile {
  * @member {number} [masterPoolProfile.count] Number of masters (VMs) to host
  * docker containers. The default value is 3.
  * @member {string} [masterPoolProfile.vmSize] Size of agent VMs. Possible
- * values include: 'Standard_D2s_v3', 'Standard_D4s_v3'
+ * values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+ * 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+ * 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2', 'Standard_F16s_v2',
+ * 'Standard_F32s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8s',
+ * 'Standard_F16s', 'Standard_E4s_v3', 'Standard_E8s_v3', 'Standard_E16s_v3',
+ * 'Standard_E20s_v3', 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2',
+ * 'Standard_GS3', 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2',
+ * 'Standard_DS13_v2', 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s',
+ * 'Standard_L8s', 'Standard_L16s', 'Standard_L32s'
  * @member {string} [masterPoolProfile.subnetCidr] Subnet CIDR for the peering.
  * @member {string} [masterPoolProfile.osType] OsType to be used to specify os
  * type. Choose from Linux and Windows. Default to Linux. Possible values
@@ -402,15 +424,15 @@ export interface ContainerServiceOrchestratorProfile {
  * @member {number} [osDiskSizeGB] OS Disk Size in GB to be used to specify the
  * disk size for every machine in this master/agent pool. If you specify 0, it
  * will apply the default osDisk size according to the vmSize specified.
- * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
+ * @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
  * identifier.
  * @member {string} [firstConsecutiveStaticIP] FirstConsecutiveStaticIP used to
  * specify the first static ip of masters. Default value: '10.240.255.5' .
  * @member {string} [storageProfile] Storage profile specifies what kind of
  * storage used. Choose from StorageAccount and ManagedDisks. Leave it empty,
  * we will choose for you based on the orchestrator choice. Possible values
  * include: 'StorageAccount', 'ManagedDisks'
- * @member {string} [fqdn] FDQN for the master pool.
+ * @member {string} [fqdn] FQDN for the master pool.
  */
 export interface ContainerServiceMasterProfile {
   count?: number;
@@ -489,15 +511,15 @@ export interface ContainerServiceMasterProfile {
  * will apply the default osDisk size according to the vmSize specified.
  * @member {string} [dnsPrefix] DNS prefix to be used to create the FQDN for
  * the agent pool.
- * @member {string} [fqdn] FDQN for the agent pool.
+ * @member {string} [fqdn] FQDN for the agent pool.
  * @member {array} [ports] Ports number array used to expose on this agent
  * pool. The default opened ports are different based on your choice of
  * orchestrator.
  * @member {string} [storageProfile] Storage profile specifies what kind of
  * storage used. Choose from StorageAccount and ManagedDisks. Leave it empty,
  * we will choose for you based on the orchestrator choice. Possible values
  * include: 'StorageAccount', 'ManagedDisks'
- * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
+ * @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
  * identifier.
  * @member {string} [osType] OsType to be used to specify os type. Choose from
  * Linux and Windows. Default to Linux. Possible values include: 'Linux',
@@ -706,14 +728,14 @@ export interface ContainerServiceDiagnosticsProfile {
  * specify 0, it will apply the default osDisk size according to the vmSize
  * specified.
  * @member {string} [masterProfile.vnetSubnetID] VNet SubnetID specifies the
- * vnet's subnet identifier.
+ * VNet's subnet identifier.
  * @member {string} [masterProfile.firstConsecutiveStaticIP]
  * FirstConsecutiveStaticIP used to specify the first static ip of masters.
  * @member {string} [masterProfile.storageProfile] Storage profile specifies
  * what kind of storage used. Choose from StorageAccount and ManagedDisks.
  * Leave it empty, we will choose for you based on the orchestrator choice.
  * Possible values include: 'StorageAccount', 'ManagedDisks'
- * @member {string} [masterProfile.fqdn] FDQN for the master pool.
+ * @member {string} [masterProfile.fqdn] FQDN for the master pool.
  * @member {array} [agentPoolProfiles] Properties of the agent pool.
  * @member {object} [windowsProfile] Profile for Windows VMs in the container
  * service cluster.
@@ -853,7 +875,7 @@ export interface ManagedClusterServicePrincipalProfile {
  * @member {number} [osDiskSizeGB] OS Disk Size in GB to be used to specify the
  * disk size for every machine in this master/agent pool. If you specify 0, it
  * will apply the default osDisk size according to the vmSize specified.
- * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
+ * @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
  * identifier.
  * @member {number} [maxPods] Maximum number of pods that can run on a node.
  * @member {string} [osType] OsType to be used to specify os type. Choose from
@@ -862,7 +884,7 @@ export interface ManagedClusterServicePrincipalProfile {
  * @member {number} [maxCount] Maximum number of nodes for auto-scaling
  * @member {number} [minCount] Minimum number of nodes for auto-scaling
  * @member {boolean} [enableAutoScaling] Whether to enable auto-scaler
- * @member {string} [type] AgentPoolType represents types of agentpool.
+ * @member {string} [type] AgentPoolType represents types of an agent pool.
  * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'
  */
 export interface ManagedClusterAgentPoolProfile {
@@ -956,7 +978,7 @@ export interface ManagedClusterAADProfile {
  * creating the managed cluster.
  * @member {string} [dnsPrefix] DNS prefix specified when creating the managed
  * cluster.
- * @member {string} [fqdn] FDQN for the master pool.
+ * @member {string} [fqdn] FQDN for the master pool.
  * @member {array} [agentPoolProfiles] Properties of the agent pool.
  * @member {object} [linuxProfile] Profile for Linux VMs in the container
  * service cluster.
@@ -1116,7 +1138,7 @@ export interface CredentialResult {
  * @constructor
  * The list of credential result response.
  *
- * @member {array} [kubeconfigs]
+ * @member {array} [kubeconfigs] Base64-encoded Kubernetes configuration file.
  */
 export interface CredentialResults {
   readonly kubeconfigs?: CredentialResult[];
@@ -1162,6 +1184,19 @@ export interface OrchestratorVersionProfileListResult {
 }
 
 
+/**
+ * @class
+ * Initializes a new instance of the OpenShiftManagedClusterListResult class.
+ * @constructor
+ * The response from the List OpenShift Managed Clusters operation.
+ *
+ * @member {string} [nextLink] The URL to get the next set of OpenShift managed
+ * cluster results.
+ */
+export interface OpenShiftManagedClusterListResult extends Array<OpenShiftManagedCluster> {
+  readonly nextLink?: string;
+}
+
 /**
  * @class
  * Initializes a new instance of the ContainerServiceListResult class.

lib/services/containerservicesManagement/lib/models/index.js

@@ -58,6 +58,7 @@ exports.CredentialResult = require('./credentialResult');
 exports.CredentialResults = require('./credentialResults');
 exports.OrchestratorVersionProfile = require('./orchestratorVersionProfile');
 exports.OrchestratorVersionProfileListResult = require('./orchestratorVersionProfileListResult');
+exports.OpenShiftManagedClusterListResult = require('./openShiftManagedClusterListResult');
 exports.ContainerServiceListResult = require('./containerServiceListResult');
 exports.OperationListResult = require('./operationListResult');
 exports.ManagedClusterListResult = require('./managedClusterListResult');

lib/services/containerservicesManagement/lib/models/managedCluster.js

@@ -26,7 +26,7 @@ class ManagedCluster extends models['Resource'] {
    * creating the managed cluster.
    * @member {string} [dnsPrefix] DNS prefix specified when creating the
    * managed cluster.
-   * @member {string} [fqdn] FDQN for the master pool.
+   * @member {string} [fqdn] FQDN for the master pool.
    * @member {array} [agentPoolProfiles] Properties of the agent pool.
    * @member {object} [linuxProfile] Profile for Linux VMs in the container
    * service cluster.

lib/services/containerservicesManagement/lib/models/managedClusterAgentPoolProfile.js

@@ -77,7 +77,7 @@ class ManagedClusterAgentPoolProfile {
    * the disk size for every machine in this master/agent pool. If you specify
    * 0, it will apply the default osDisk size according to the vmSize
    * specified.
-   * @member {string} [vnetSubnetID] VNet SubnetID specifies the vnet's subnet
+   * @member {string} [vnetSubnetID] VNet SubnetID specifies the VNet's subnet
    * identifier.
    * @member {number} [maxPods] Maximum number of pods that can run on a node.
    * @member {string} [osType] OsType to be used to specify os type. Choose
@@ -86,7 +86,7 @@ class ManagedClusterAgentPoolProfile {
    * @member {number} [maxCount] Maximum number of nodes for auto-scaling
    * @member {number} [minCount] Minimum number of nodes for auto-scaling
    * @member {boolean} [enableAutoScaling] Whether to enable auto-scaler
-   * @member {string} [type] AgentPoolType represents types of agentpool.
+   * @member {string} [type] AgentPoolType represents types of an agent pool.
    * Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'
    */
   constructor() {

lib/services/containerservicesManagement/lib/models/openShiftManagedCluster.js

@@ -47,7 +47,16 @@ class OpenShiftManagedCluster extends models['Resource'] {
    * @member {number} [masterPoolProfile.count] Number of masters (VMs) to host
    * docker containers. The default value is 3.
    * @member {string} [masterPoolProfile.vmSize] Size of agent VMs. Possible
-   * values include: 'Standard_D2s_v3', 'Standard_D4s_v3'
+   * values include: 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+   * 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+   * 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2',
+   * 'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2',
+   * 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3',
+   * 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3',
+   * 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3',
+   * 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2',
+   * 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s',
+   * 'Standard_L16s', 'Standard_L32s'
    * @member {string} [masterPoolProfile.subnetCidr] Subnet CIDR for the
    * peering.
    * @member {string} [masterPoolProfile.osType] OsType to be used to specify

lib/services/containerservicesManagement/lib/models/openShiftManagedClusterAgentPoolProfile.js

@@ -20,10 +20,17 @@ class OpenShiftManagedClusterAgentPoolProfile {
    * @member {string} name Unique name of the pool profile in the context of
    * the subscription and resource group.
    * @member {number} count Number of agents (VMs) to host docker containers.
-   * Allowed values must be in the range of 1 to 5 (inclusive). The default
-   * value is 2. . Default value: 2 .
    * @member {string} vmSize Size of agent VMs. Possible values include:
-   * 'Standard_D2s_v3', 'Standard_D4s_v3'
+   * 'Standard_D2s_v3', 'Standard_D4s_v3', 'Standard_D8s_v3',
+   * 'Standard_D16s_v3', 'Standard_D32s_v3', 'Standard_D64s_v3',
+   * 'Standard_DS4_v2', 'Standard_DS5_v2', 'Standard_F8s_v2',
+   * 'Standard_F16s_v2', 'Standard_F32s_v2', 'Standard_F64s_v2',
+   * 'Standard_F72s_v2', 'Standard_F8s', 'Standard_F16s', 'Standard_E4s_v3',
+   * 'Standard_E8s_v3', 'Standard_E16s_v3', 'Standard_E20s_v3',
+   * 'Standard_E32s_v3', 'Standard_E64s_v3', 'Standard_GS2', 'Standard_GS3',
+   * 'Standard_GS4', 'Standard_GS5', 'Standard_DS12_v2', 'Standard_DS13_v2',
+   * 'Standard_DS14_v2', 'Standard_DS15_v2', 'Standard_L4s', 'Standard_L8s',
+   * 'Standard_L16s', 'Standard_L32s'
    * @member {string} [subnetCidr] Subnet CIDR for the peering. Default value:
    * '10.0.0.0/24' .
    * @member {string} [osType] OsType to be used to specify os type. Choose
@@ -59,11 +66,6 @@ class OpenShiftManagedClusterAgentPoolProfile {
           count: {
             required: true,
             serializedName: 'count',
-            defaultValue: 2,
-            constraints: {
-              InclusiveMaximum: 5,
-              InclusiveMinimum: 1
-            },
             type: {
               name: 'Number'
             }