From c8f0749675960aad6e90a18e8c8445405e414ab9 Mon Sep 17 00:00:00 2001 From: SDK Automation Date: Mon, 2 Nov 2020 04:48:50 +0000 Subject: [PATCH] Generated from f8f9d9560e3772c360a6e883516bb7691156691c --- sdk/containerservice/mgmt-v2020_02_01/pom.xml | 4 +- .../v2020_02_01/AgentPool.java | 82 ++++++++++++------- .../v2020_02_01/ManagedCluster.java | 4 +- ...agedClusterAgentPoolProfileProperties.java | 10 +-- .../ManagedClusterWindowsProfile.java | 27 ++++-- .../implementation/AgentPoolImpl.java | 26 +++--- .../implementation/AgentPoolInner.java | 10 +-- .../implementation/ManagedClusterInner.java | 8 +- 8 files changed, 106 insertions(+), 65 deletions(-) diff --git a/sdk/containerservice/mgmt-v2020_02_01/pom.xml b/sdk/containerservice/mgmt-v2020_02_01/pom.xml index 99c682089b36b..f6e0da9133c1a 100644 --- a/sdk/containerservice/mgmt-v2020_02_01/pom.xml +++ b/sdk/containerservice/mgmt-v2020_02_01/pom.xml @@ -11,8 +11,8 @@ com.microsoft.azure azure-arm-parent - 1.3.0 - ../../parents/azure-arm-parent + 1.1.0 + ../../../pom.management.xml azure-mgmt-containerservice 1.0.0-beta diff --git a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/AgentPool.java b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/AgentPool.java index 22baba781e449..8f4112b282544 100644 --- a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/AgentPool.java +++ b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/AgentPool.java @@ -37,7 +37,7 @@ public interface AgentPool extends HasInner, Indexable, Refresha /** * @return the count value. */ - int count(); + Integer count(); /** * @return the enableAutoScaling value. @@ -142,7 +142,7 @@ public interface AgentPool extends HasInner, Indexable, Refresha /** * The entirety of the AgentPool definition. */ - interface Definition extends DefinitionStages.Blank, DefinitionStages.WithManagedCluster, DefinitionStages.WithCount, DefinitionStages.WithVmSize, DefinitionStages.WithCreate { + interface Definition extends DefinitionStages.Blank, DefinitionStages.WithManagedCluster, DefinitionStages.WithCreate { } /** @@ -165,31 +165,7 @@ interface WithManagedCluster { * @param resourceName The name of the managed cluster resource * @return the next definition stage */ - WithCount withExistingManagedCluster(String resourceGroupName, String resourceName); - } - - /** - * The stage of the agentpool definition allowing to specify Count. - */ - interface WithCount { - /** - * Specifies count. - * @param count Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1 - * @return the next definition stage - */ - WithVmSize withCount(int count); - } - - /** - * The stage of the agentpool definition allowing to specify VmSize. - */ - interface WithVmSize { - /** - * Specifies vmSize. - * @param vmSize Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' - * @return the next definition stage - */ - WithCreate withVmSize(ContainerServiceVMSizeTypes vmSize); + WithCreate withExistingManagedCluster(String resourceGroupName, String resourceName); } /** @@ -216,6 +192,18 @@ interface WithAvailabilityZones { WithCreate withAvailabilityZones(List availabilityZones); } + /** + * The stage of the agentpool definition allowing to specify Count. + */ + interface WithCount { + /** + * Specifies count. + * @param count Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1 + * @return the next definition stage + */ + WithCreate withCount(Integer count); + } + /** * The stage of the agentpool definition allowing to specify EnableAutoScaling. */ @@ -384,6 +372,18 @@ interface WithTags { WithCreate withTags(Map tags); } + /** + * The stage of the agentpool definition allowing to specify VmSize. + */ + interface WithVmSize { + /** + * Specifies vmSize. + * @param vmSize Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + * @return the next definition stage + */ + WithCreate withVmSize(ContainerServiceVMSizeTypes vmSize); + } + /** * The stage of the agentpool definition allowing to specify VnetSubnetID. */ @@ -401,13 +401,13 @@ interface WithVnetSubnetID { * the resource to be created (via {@link WithCreate#create()}), but also allows * for any other optional settings to be specified. */ - interface WithCreate extends Creatable, DefinitionStages.WithAgentPoolType, DefinitionStages.WithAvailabilityZones, DefinitionStages.WithEnableAutoScaling, DefinitionStages.WithEnableNodePublicIP, DefinitionStages.WithMaxCount, DefinitionStages.WithMaxPods, DefinitionStages.WithMinCount, DefinitionStages.WithNodeLabels, DefinitionStages.WithNodeTaints, DefinitionStages.WithOrchestratorVersion, DefinitionStages.WithOsDiskSizeGB, DefinitionStages.WithOsType, DefinitionStages.WithScaleSetEvictionPolicy, DefinitionStages.WithScaleSetPriority, DefinitionStages.WithSpotMaxPrice, DefinitionStages.WithTags, DefinitionStages.WithVnetSubnetID { + interface WithCreate extends Creatable, DefinitionStages.WithAgentPoolType, DefinitionStages.WithAvailabilityZones, DefinitionStages.WithCount, DefinitionStages.WithEnableAutoScaling, DefinitionStages.WithEnableNodePublicIP, DefinitionStages.WithMaxCount, DefinitionStages.WithMaxPods, DefinitionStages.WithMinCount, DefinitionStages.WithNodeLabels, DefinitionStages.WithNodeTaints, DefinitionStages.WithOrchestratorVersion, DefinitionStages.WithOsDiskSizeGB, DefinitionStages.WithOsType, DefinitionStages.WithScaleSetEvictionPolicy, DefinitionStages.WithScaleSetPriority, DefinitionStages.WithSpotMaxPrice, DefinitionStages.WithTags, DefinitionStages.WithVmSize, DefinitionStages.WithVnetSubnetID { } } /** * The template for a AgentPool update operation, containing all the settings that can be modified. */ - interface Update extends Appliable, UpdateStages.WithAgentPoolType, UpdateStages.WithAvailabilityZones, UpdateStages.WithEnableAutoScaling, UpdateStages.WithEnableNodePublicIP, UpdateStages.WithMaxCount, UpdateStages.WithMaxPods, UpdateStages.WithMinCount, UpdateStages.WithNodeLabels, UpdateStages.WithNodeTaints, UpdateStages.WithOrchestratorVersion, UpdateStages.WithOsDiskSizeGB, UpdateStages.WithOsType, UpdateStages.WithScaleSetEvictionPolicy, UpdateStages.WithScaleSetPriority, UpdateStages.WithSpotMaxPrice, UpdateStages.WithTags, UpdateStages.WithVnetSubnetID { + interface Update extends Appliable, UpdateStages.WithAgentPoolType, UpdateStages.WithAvailabilityZones, UpdateStages.WithCount, UpdateStages.WithEnableAutoScaling, UpdateStages.WithEnableNodePublicIP, UpdateStages.WithMaxCount, UpdateStages.WithMaxPods, UpdateStages.WithMinCount, UpdateStages.WithNodeLabels, UpdateStages.WithNodeTaints, UpdateStages.WithOrchestratorVersion, UpdateStages.WithOsDiskSizeGB, UpdateStages.WithOsType, UpdateStages.WithScaleSetEvictionPolicy, UpdateStages.WithScaleSetPriority, UpdateStages.WithSpotMaxPrice, UpdateStages.WithTags, UpdateStages.WithVmSize, UpdateStages.WithVnetSubnetID { } /** @@ -438,6 +438,18 @@ interface WithAvailabilityZones { Update withAvailabilityZones(List availabilityZones); } + /** + * The stage of the agentpool update allowing to specify Count. + */ + interface WithCount { + /** + * Specifies count. + * @param count Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1 + * @return the next update stage + */ + Update withCount(Integer count); + } + /** * The stage of the agentpool update allowing to specify EnableAutoScaling. */ @@ -606,6 +618,18 @@ interface WithTags { Update withTags(Map tags); } + /** + * The stage of the agentpool update allowing to specify VmSize. + */ + interface WithVmSize { + /** + * Specifies vmSize. + * @param vmSize Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + * @return the next update stage + */ + Update withVmSize(ContainerServiceVMSizeTypes vmSize); + } + /** * The stage of the agentpool update allowing to specify VnetSubnetID. */ diff --git a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedCluster.java b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedCluster.java index b30d408abfcb0..fa163b7a702b8 100644 --- a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedCluster.java +++ b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedCluster.java @@ -243,7 +243,7 @@ interface WithDnsPrefix { interface WithEnablePodSecurityPolicy { /** * Specifies enablePodSecurityPolicy. - * @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy + * @param enablePodSecurityPolicy (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy * @return the next definition stage */ WithCreate withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy); @@ -465,7 +465,7 @@ interface WithDnsPrefix { interface WithEnablePodSecurityPolicy { /** * Specifies enablePodSecurityPolicy. - * @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy + * @param enablePodSecurityPolicy (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy * @return the next update stage */ Update withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy); diff --git a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterAgentPoolProfileProperties.java b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterAgentPoolProfileProperties.java index 1fb18f414ab63..785f1e1c6189a 100644 --- a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterAgentPoolProfileProperties.java +++ b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterAgentPoolProfileProperties.java @@ -20,8 +20,8 @@ public class ManagedClusterAgentPoolProfileProperties { * Number of agents (VMs) to host docker containers. Allowed values must be * in the range of 1 to 100 (inclusive). The default value is 1. */ - @JsonProperty(value = "count", required = true) - private int count; + @JsonProperty(value = "count") + private Integer count; /** * Size of agent VMs. Possible values include: 'Standard_A1', @@ -77,7 +77,7 @@ public class ManagedClusterAgentPoolProfileProperties { * 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', * 'Standard_NV6'. */ - @JsonProperty(value = "vmSize", required = true) + @JsonProperty(value = "vmSize") private ContainerServiceVMSizeTypes vmSize; /** @@ -207,7 +207,7 @@ public class ManagedClusterAgentPoolProfileProperties { * * @return the count value */ - public int count() { + public Integer count() { return this.count; } @@ -217,7 +217,7 @@ public int count() { * @param count the count value to set * @return the ManagedClusterAgentPoolProfileProperties object itself. */ - public ManagedClusterAgentPoolProfileProperties withCount(int count) { + public ManagedClusterAgentPoolProfileProperties withCount(Integer count) { this.count = count; return this; } diff --git a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterWindowsProfile.java b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterWindowsProfile.java index 7fe5dec398577..f4fcb059e8a37 100644 --- a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterWindowsProfile.java +++ b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterWindowsProfile.java @@ -15,19 +15,34 @@ */ public class ManagedClusterWindowsProfile { /** - * The administrator username to use for Windows VMs. + * Specifies the name of the administrator account. <br><br> + * **restriction:** Cannot end in "." <br><br> **Disallowed + * values:** "administrator", "admin", "user", "user1", "test", "user2", + * "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", + * "aspnet", "backup", "console", "david", "guest", "john", "owner", + * "root", "server", "sql", "support", "support_388945a0", "sys", "test2", + * "test3", "user4", "user5". <br><br> **Minimum-length:** 1 + * character <br><br> **Max-length:** 20 characters. */ @JsonProperty(value = "adminUsername", required = true) private String adminUsername; /** - * The administrator password to use for Windows VMs. + * Specifies the password of the administrator account. + * <br><br> **Minimum-length:** 8 characters + * <br><br> **Max-length:** 123 characters <br><br> + * **Complexity requirements:** 3 out of 4 conditions below need to be + * fulfilled <br> Has lower characters <br>Has upper characters + * <br> Has a digit <br> Has a special character (Regex match + * [\W_]) <br><br> **Disallowed values:** "abc@123", + * "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", + * "Password!", "Password1", "Password22", "iloveyou!". */ @JsonProperty(value = "adminPassword") private String adminPassword; /** - * Get the administrator username to use for Windows VMs. + * Get specifies the name of the administrator account. <br><br> **restriction:** Cannot end in "." <br><br> **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". <br><br> **Minimum-length:** 1 character <br><br> **Max-length:** 20 characters. * * @return the adminUsername value */ @@ -36,7 +51,7 @@ public String adminUsername() { } /** - * Set the administrator username to use for Windows VMs. + * Set specifies the name of the administrator account. <br><br> **restriction:** Cannot end in "." <br><br> **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". <br><br> **Minimum-length:** 1 character <br><br> **Max-length:** 20 characters. * * @param adminUsername the adminUsername value to set * @return the ManagedClusterWindowsProfile object itself. @@ -47,7 +62,7 @@ public ManagedClusterWindowsProfile withAdminUsername(String adminUsername) { } /** - * Get the administrator password to use for Windows VMs. + * Get specifies the password of the administrator account. <br><br> **Minimum-length:** 8 characters <br><br> **Max-length:** 123 characters <br><br> **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a digit <br> Has a special character (Regex match [\W_]) <br><br> **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!". * * @return the adminPassword value */ @@ -56,7 +71,7 @@ public String adminPassword() { } /** - * Set the administrator password to use for Windows VMs. + * Set specifies the password of the administrator account. <br><br> **Minimum-length:** 8 characters <br><br> **Max-length:** 123 characters <br><br> **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled <br> Has lower characters <br>Has upper characters <br> Has a digit <br> Has a special character (Regex match [\W_]) <br><br> **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!". * * @param adminPassword the adminPassword value to set * @return the ManagedClusterWindowsProfile object itself. diff --git a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolImpl.java b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolImpl.java index c33a5a96af65f..4f245d32e78ea 100644 --- a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolImpl.java +++ b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolImpl.java @@ -87,7 +87,7 @@ public List availabilityZones() { } @Override - public int count() { + public Integer count() { return this.inner().count(); } @@ -198,18 +198,6 @@ public AgentPoolImpl withExistingManagedCluster(String resourceGroupName, String return this; } - @Override - public AgentPoolImpl withCount(int count) { - this.inner().withCount(count); - return this; - } - - @Override - public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) { - this.inner().withVmSize(vmSize); - return this; - } - @Override public AgentPoolImpl withAgentPoolType(AgentPoolType agentPoolType) { this.inner().withAgentPoolType(agentPoolType); @@ -222,6 +210,12 @@ public AgentPoolImpl withAvailabilityZones(List availabilityZones) { return this; } + @Override + public AgentPoolImpl withCount(Integer count) { + this.inner().withCount(count); + return this; + } + @Override public AgentPoolImpl withEnableAutoScaling(Boolean enableAutoScaling) { this.inner().withEnableAutoScaling(enableAutoScaling); @@ -306,6 +300,12 @@ public AgentPoolImpl withTags(Map tags) { return this; } + @Override + public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) { + this.inner().withVmSize(vmSize); + return this; + } + @Override public AgentPoolImpl withVnetSubnetID(String vnetSubnetID) { this.inner().withVnetSubnetID(vnetSubnetID); diff --git a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolInner.java b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolInner.java index 0d53c31462241..afe5aa3b98597 100644 --- a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolInner.java +++ b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolInner.java @@ -28,8 +28,8 @@ public class AgentPoolInner extends SubResource { * Number of agents (VMs) to host docker containers. Allowed values must be * in the range of 1 to 100 (inclusive). The default value is 1. */ - @JsonProperty(value = "properties.count", required = true) - private int count; + @JsonProperty(value = "properties.count") + private Integer count; /** * Size of agent VMs. Possible values include: 'Standard_A1', @@ -85,7 +85,7 @@ public class AgentPoolInner extends SubResource { * 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', * 'Standard_NV6'. */ - @JsonProperty(value = "properties.vmSize", required = true) + @JsonProperty(value = "properties.vmSize") private ContainerServiceVMSizeTypes vmSize; /** @@ -228,7 +228,7 @@ public class AgentPoolInner extends SubResource { * * @return the count value */ - public int count() { + public Integer count() { return this.count; } @@ -238,7 +238,7 @@ public int count() { * @param count the count value to set * @return the AgentPoolInner object itself. */ - public AgentPoolInner withCount(int count) { + public AgentPoolInner withCount(Integer count) { this.count = count; return this; } diff --git a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/ManagedClusterInner.java b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/ManagedClusterInner.java index 3c15853102b1c..141ca91951127 100644 --- a/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/ManagedClusterInner.java +++ b/sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/ManagedClusterInner.java @@ -111,7 +111,9 @@ public class ManagedClusterInner extends Resource { private Boolean enableRBAC; /** - * (PREVIEW) Whether to enable Kubernetes Pod security policy. + * (DEPRECATING) Whether to enable Kubernetes pod security policy + * (preview). This feature is set for removal on October 15th, 2020. Learn + * more at aka.ms/aks/azpodpolicy. */ @JsonProperty(value = "properties.enablePodSecurityPolicy") private Boolean enablePodSecurityPolicy; @@ -376,7 +378,7 @@ public ManagedClusterInner withEnableRBAC(Boolean enableRBAC) { } /** - * Get (PREVIEW) Whether to enable Kubernetes Pod security policy. + * Get (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy. * * @return the enablePodSecurityPolicy value */ @@ -385,7 +387,7 @@ public Boolean enablePodSecurityPolicy() { } /** - * Set (PREVIEW) Whether to enable Kubernetes Pod security policy. + * Set (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy. * * @param enablePodSecurityPolicy the enablePodSecurityPolicy value to set * @return the ManagedClusterInner object itself.