From af01c4d998d2136e12487c9b944e07939b31ca15 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 25 May 2018 21:33:19 +0000 Subject: [PATCH 1/3] Generated from 069fe698d58709694ea1945b032523b01a5aa4cd Rename an example file to start with a capital letter --- .../ContainerServiceAgentPoolProfile.java | 64 +++++-- .../ContainerServiceCustomProfile.java | 4 +- .../ContainerServiceDiagnosticsProfile.java | 4 +- .../ContainerServiceLinuxProfile.java | 8 +- .../ContainerServiceMasterProfile.java | 30 +-- .../ContainerServiceNetworkProfile.java | 180 ++++++++++++++++++ .../ContainerServiceOrchestratorProfile.java | 8 +- ...ntainerServiceServicePrincipalProfile.java | 12 +- .../ContainerServiceSshConfiguration.java | 4 +- .../ContainerServiceSshPublicKey.java | 4 +- .../ContainerServiceVMDiagnostics.java | 6 +- .../ContainerServiceWindowsProfile.java | 8 +- .../containerservice/KeyVaultSecretRef.java | 12 +- .../ManagedClusterAADProfile.java | 122 ++++++++++++ .../ManagedClusterAddonProfile.java | 70 +++++++ .../ManagedClusterPoolUpgradeProfile.java | 16 +- .../containerservice/NetworkPlugin.java | 41 ++++ .../containerservice/NetworkPolicy.java | 41 ++++ .../containerservice/OrchestratorProfile.java | 8 +- .../OrchestratorVersionProfile.java | 16 +- .../ComputeOperationValueInner.java | 109 +++++++++++ .../ContainerServiceClientImpl.java | 14 ++ .../implementation/ContainerServiceInner.java | 34 ++-- .../ManagedClusterAccessProfileInner.java | 4 +- .../implementation/ManagedClusterInner.java | 178 +++++++++++++---- .../ManagedClusterUpgradeProfileInner.java | 14 +- .../implementation/ManagedClustersInner.java | 117 +----------- .../implementation/OperationsInner.java | 132 +++++++++++++ ...estratorVersionProfileListResultInner.java | 10 +- .../implementation/PageImpl1.java | 75 ++++++++ 30 files changed, 1082 insertions(+), 263 deletions(-) create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceNetworkProfile.java create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAADProfile.java create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAddonProfile.java create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPlugin.java create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPolicy.java create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ComputeOperationValueInner.java create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/OperationsInner.java create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/PageImpl1.java diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java index 98cfdbf4261..47cd983ff44 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java @@ -138,7 +138,13 @@ public class ContainerServiceAgentPoolProfile { private OSType osType; /** - * Get the name value. + * Maximum number of pods that can run on a node. + */ + @JsonProperty(value = "maxPods") + private Integer maxPods; + + /** + * Get unique name of the agent pool profile in the context of the subscription and resource group. * * @return the name value */ @@ -147,7 +153,7 @@ public String name() { } /** - * Set the name value. + * Set unique name of the agent pool profile in the context of the subscription and resource group. * * @param name the name value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -158,7 +164,7 @@ public ContainerServiceAgentPoolProfile withName(String name) { } /** - * Get the count value. + * Get 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 count value */ @@ -167,7 +173,7 @@ public Integer count() { } /** - * Set the count value. + * Set 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. * * @param count the count value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -178,7 +184,7 @@ public ContainerServiceAgentPoolProfile withCount(Integer count) { } /** - * Get the vmSize value. + * Get 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 vmSize value */ @@ -187,7 +193,7 @@ public ContainerServiceVMSizeTypes vmSize() { } /** - * Set the vmSize value. + * Set 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'. * * @param vmSize the vmSize value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -198,7 +204,7 @@ public ContainerServiceAgentPoolProfile withVmSize(ContainerServiceVMSizeTypes v } /** - * Get the osDiskSizeGB value. + * Get 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. * * @return the osDiskSizeGB value */ @@ -207,7 +213,7 @@ public Integer osDiskSizeGB() { } /** - * Set the osDiskSizeGB value. + * Set 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. * * @param osDiskSizeGB the osDiskSizeGB value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -218,7 +224,7 @@ public ContainerServiceAgentPoolProfile withOsDiskSizeGB(Integer osDiskSizeGB) { } /** - * Get the dnsPrefix value. + * Get dNS prefix to be used to create the FQDN for the agent pool. * * @return the dnsPrefix value */ @@ -227,7 +233,7 @@ public String dnsPrefix() { } /** - * Set the dnsPrefix value. + * Set dNS prefix to be used to create the FQDN for the agent pool. * * @param dnsPrefix the dnsPrefix value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -238,7 +244,7 @@ public ContainerServiceAgentPoolProfile withDnsPrefix(String dnsPrefix) { } /** - * Get the fqdn value. + * Get fDQN for the agent pool. * * @return the fqdn value */ @@ -247,7 +253,7 @@ public String fqdn() { } /** - * Get the ports value. + * Get ports number array used to expose on this agent pool. The default opened ports are different based on your choice of orchestrator. * * @return the ports value */ @@ -256,7 +262,7 @@ public List ports() { } /** - * Set the ports value. + * Set ports number array used to expose on this agent pool. The default opened ports are different based on your choice of orchestrator. * * @param ports the ports value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -267,7 +273,7 @@ public ContainerServiceAgentPoolProfile withPorts(List ports) { } /** - * Get the storageProfile value. + * Get 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'. * * @return the storageProfile value */ @@ -276,7 +282,7 @@ public ContainerServiceStorageProfileTypes storageProfile() { } /** - * Set the storageProfile value. + * Set 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'. * * @param storageProfile the storageProfile value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -287,7 +293,7 @@ public ContainerServiceAgentPoolProfile withStorageProfile(ContainerServiceStora } /** - * Get the vnetSubnetID value. + * Get vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. * * @return the vnetSubnetID value */ @@ -296,7 +302,7 @@ public String vnetSubnetID() { } /** - * Set the vnetSubnetID value. + * Set vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. * * @param vnetSubnetID the vnetSubnetID value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -307,7 +313,7 @@ public ContainerServiceAgentPoolProfile withVnetSubnetID(String vnetSubnetID) { } /** - * Get the osType value. + * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'. * * @return the osType value */ @@ -316,7 +322,7 @@ public OSType osType() { } /** - * Set the osType value. + * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'. * * @param osType the osType value to set * @return the ContainerServiceAgentPoolProfile object itself. @@ -326,4 +332,24 @@ public ContainerServiceAgentPoolProfile withOsType(OSType osType) { return this; } + /** + * Get maximum number of pods that can run on a node. + * + * @return the maxPods value + */ + public Integer maxPods() { + return this.maxPods; + } + + /** + * Set maximum number of pods that can run on a node. + * + * @param maxPods the maxPods value to set + * @return the ContainerServiceAgentPoolProfile object itself. + */ + public ContainerServiceAgentPoolProfile withMaxPods(Integer maxPods) { + this.maxPods = maxPods; + return this; + } + } diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceCustomProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceCustomProfile.java index a4583825418..ecf75926c12 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceCustomProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceCustomProfile.java @@ -21,7 +21,7 @@ public class ContainerServiceCustomProfile { private String orchestrator; /** - * Get the orchestrator value. + * Get the name of the custom orchestrator to use. * * @return the orchestrator value */ @@ -30,7 +30,7 @@ public String orchestrator() { } /** - * Set the orchestrator value. + * Set the name of the custom orchestrator to use. * * @param orchestrator the orchestrator value to set * @return the ContainerServiceCustomProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceDiagnosticsProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceDiagnosticsProfile.java index a4353241a62..2cdddcf77a1 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceDiagnosticsProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceDiagnosticsProfile.java @@ -21,7 +21,7 @@ public class ContainerServiceDiagnosticsProfile { private ContainerServiceVMDiagnostics vmDiagnostics; /** - * Get the vmDiagnostics value. + * Get profile for diagnostics on the container service VMs. * * @return the vmDiagnostics value */ @@ -30,7 +30,7 @@ public ContainerServiceVMDiagnostics vmDiagnostics() { } /** - * Set the vmDiagnostics value. + * Set profile for diagnostics on the container service VMs. * * @param vmDiagnostics the vmDiagnostics value to set * @return the ContainerServiceDiagnosticsProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceLinuxProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceLinuxProfile.java index dd7114bb5ff..bd3d45c2341 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceLinuxProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceLinuxProfile.java @@ -27,7 +27,7 @@ public class ContainerServiceLinuxProfile { private ContainerServiceSshConfiguration ssh; /** - * Get the adminUsername value. + * Get the administrator username to use for Linux VMs. * * @return the adminUsername value */ @@ -36,7 +36,7 @@ public String adminUsername() { } /** - * Set the adminUsername value. + * Set the administrator username to use for Linux VMs. * * @param adminUsername the adminUsername value to set * @return the ContainerServiceLinuxProfile object itself. @@ -47,7 +47,7 @@ public ContainerServiceLinuxProfile withAdminUsername(String adminUsername) { } /** - * Get the ssh value. + * Get sSH configuration for Linux-based VMs running on Azure. * * @return the ssh value */ @@ -56,7 +56,7 @@ public ContainerServiceSshConfiguration ssh() { } /** - * Set the ssh value. + * Set sSH configuration for Linux-based VMs running on Azure. * * @param ssh the ssh value to set * @return the ContainerServiceLinuxProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceMasterProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceMasterProfile.java index 049904b89c1..a2acab1bc05 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceMasterProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceMasterProfile.java @@ -122,7 +122,7 @@ public class ContainerServiceMasterProfile { private String fqdn; /** - * Get the count value. + * Get number of masters (VMs) in the container service cluster. Allowed values are 1, 3, and 5. The default value is 1. * * @return the count value */ @@ -131,7 +131,7 @@ public Integer count() { } /** - * Set the count value. + * Set number of masters (VMs) in the container service cluster. Allowed values are 1, 3, and 5. The default value is 1. * * @param count the count value to set * @return the ContainerServiceMasterProfile object itself. @@ -142,7 +142,7 @@ public ContainerServiceMasterProfile withCount(Integer count) { } /** - * Get the dnsPrefix value. + * Get dNS prefix to be used to create the FQDN for the master pool. * * @return the dnsPrefix value */ @@ -151,7 +151,7 @@ public String dnsPrefix() { } /** - * Set the dnsPrefix value. + * Set dNS prefix to be used to create the FQDN for the master pool. * * @param dnsPrefix the dnsPrefix value to set * @return the ContainerServiceMasterProfile object itself. @@ -162,7 +162,7 @@ public ContainerServiceMasterProfile withDnsPrefix(String dnsPrefix) { } /** - * Get the vmSize value. + * Get 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 vmSize value */ @@ -171,7 +171,7 @@ public ContainerServiceVMSizeTypes vmSize() { } /** - * Set the vmSize value. + * Set 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'. * * @param vmSize the vmSize value to set * @return the ContainerServiceMasterProfile object itself. @@ -182,7 +182,7 @@ public ContainerServiceMasterProfile withVmSize(ContainerServiceVMSizeTypes vmSi } /** - * Get the osDiskSizeGB value. + * Get 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. * * @return the osDiskSizeGB value */ @@ -191,7 +191,7 @@ public Integer osDiskSizeGB() { } /** - * Set the osDiskSizeGB value. + * Set 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. * * @param osDiskSizeGB the osDiskSizeGB value to set * @return the ContainerServiceMasterProfile object itself. @@ -202,7 +202,7 @@ public ContainerServiceMasterProfile withOsDiskSizeGB(Integer osDiskSizeGB) { } /** - * Get the vnetSubnetID value. + * Get vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. * * @return the vnetSubnetID value */ @@ -211,7 +211,7 @@ public String vnetSubnetID() { } /** - * Set the vnetSubnetID value. + * Set vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. * * @param vnetSubnetID the vnetSubnetID value to set * @return the ContainerServiceMasterProfile object itself. @@ -222,7 +222,7 @@ public ContainerServiceMasterProfile withVnetSubnetID(String vnetSubnetID) { } /** - * Get the firstConsecutiveStaticIP value. + * Get firstConsecutiveStaticIP used to specify the first static ip of masters. * * @return the firstConsecutiveStaticIP value */ @@ -231,7 +231,7 @@ public String firstConsecutiveStaticIP() { } /** - * Set the firstConsecutiveStaticIP value. + * Set firstConsecutiveStaticIP used to specify the first static ip of masters. * * @param firstConsecutiveStaticIP the firstConsecutiveStaticIP value to set * @return the ContainerServiceMasterProfile object itself. @@ -242,7 +242,7 @@ public ContainerServiceMasterProfile withFirstConsecutiveStaticIP(String firstCo } /** - * Get the storageProfile value. + * Get 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'. * * @return the storageProfile value */ @@ -251,7 +251,7 @@ public ContainerServiceStorageProfileTypes storageProfile() { } /** - * Set the storageProfile value. + * Set 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'. * * @param storageProfile the storageProfile value to set * @return the ContainerServiceMasterProfile object itself. @@ -262,7 +262,7 @@ public ContainerServiceMasterProfile withStorageProfile(ContainerServiceStorageP } /** - * Get the fqdn value. + * Get fDQN for the master pool. * * @return the fqdn value */ diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceNetworkProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceNetworkProfile.java new file mode 100644 index 00000000000..aa57acc8fc7 --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceNetworkProfile.java @@ -0,0 +1,180 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Profile of network configuration. + */ +public class ContainerServiceNetworkProfile { + /** + * Network plugin used for building Kubernetes network. Possible values + * include: 'azure', 'kubenet'. + */ + @JsonProperty(value = "networkPlugin") + private NetworkPlugin networkPlugin; + + /** + * Network policy used for building Kubernetes network. Possible values + * include: 'calico', 'cilium'. + */ + @JsonProperty(value = "networkPolicy") + private NetworkPolicy networkPolicy; + + /** + * A CIDR notation IP range from which to assign pod IPs when kubenet is + * used. + */ + @JsonProperty(value = "podCidr") + private String podCidr; + + /** + * A CIDR notation IP range from which to assign service cluster IPs. It + * must not overlap with any Subnet IP ranges. + */ + @JsonProperty(value = "serviceCidr") + private String serviceCidr; + + /** + * An IP address assigned to the Kubernetes DNS service. It must be within + * the Kubernetes service address range specified in serviceCidr. + */ + @JsonProperty(value = "dnsServiceIP") + private String dnsServiceIP; + + /** + * A CIDR notation IP range assigned to the Docker bridge network. It must + * not overlap with any Subnet IP ranges or the Kubernetes service address + * range. + */ + @JsonProperty(value = "dockerBridgeCidr") + private String dockerBridgeCidr; + + /** + * Get network plugin used for building Kubernetes network. Possible values include: 'azure', 'kubenet'. + * + * @return the networkPlugin value + */ + public NetworkPlugin networkPlugin() { + return this.networkPlugin; + } + + /** + * Set network plugin used for building Kubernetes network. Possible values include: 'azure', 'kubenet'. + * + * @param networkPlugin the networkPlugin value to set + * @return the ContainerServiceNetworkProfile object itself. + */ + public ContainerServiceNetworkProfile withNetworkPlugin(NetworkPlugin networkPlugin) { + this.networkPlugin = networkPlugin; + return this; + } + + /** + * Get network policy used for building Kubernetes network. Possible values include: 'calico', 'cilium'. + * + * @return the networkPolicy value + */ + public NetworkPolicy networkPolicy() { + return this.networkPolicy; + } + + /** + * Set network policy used for building Kubernetes network. Possible values include: 'calico', 'cilium'. + * + * @param networkPolicy the networkPolicy value to set + * @return the ContainerServiceNetworkProfile object itself. + */ + public ContainerServiceNetworkProfile withNetworkPolicy(NetworkPolicy networkPolicy) { + this.networkPolicy = networkPolicy; + return this; + } + + /** + * Get a CIDR notation IP range from which to assign pod IPs when kubenet is used. + * + * @return the podCidr value + */ + public String podCidr() { + return this.podCidr; + } + + /** + * Set a CIDR notation IP range from which to assign pod IPs when kubenet is used. + * + * @param podCidr the podCidr value to set + * @return the ContainerServiceNetworkProfile object itself. + */ + public ContainerServiceNetworkProfile withPodCidr(String podCidr) { + this.podCidr = podCidr; + return this; + } + + /** + * Get a CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges. + * + * @return the serviceCidr value + */ + public String serviceCidr() { + return this.serviceCidr; + } + + /** + * Set a CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges. + * + * @param serviceCidr the serviceCidr value to set + * @return the ContainerServiceNetworkProfile object itself. + */ + public ContainerServiceNetworkProfile withServiceCidr(String serviceCidr) { + this.serviceCidr = serviceCidr; + return this; + } + + /** + * Get an IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr. + * + * @return the dnsServiceIP value + */ + public String dnsServiceIP() { + return this.dnsServiceIP; + } + + /** + * Set an IP address assigned to the Kubernetes DNS service. It must be within the Kubernetes service address range specified in serviceCidr. + * + * @param dnsServiceIP the dnsServiceIP value to set + * @return the ContainerServiceNetworkProfile object itself. + */ + public ContainerServiceNetworkProfile withDnsServiceIP(String dnsServiceIP) { + this.dnsServiceIP = dnsServiceIP; + return this; + } + + /** + * Get a CIDR notation IP range assigned to the Docker bridge network. It must not overlap with any Subnet IP ranges or the Kubernetes service address range. + * + * @return the dockerBridgeCidr value + */ + public String dockerBridgeCidr() { + return this.dockerBridgeCidr; + } + + /** + * Set a CIDR notation IP range assigned to the Docker bridge network. It must not overlap with any Subnet IP ranges or the Kubernetes service address range. + * + * @param dockerBridgeCidr the dockerBridgeCidr value to set + * @return the ContainerServiceNetworkProfile object itself. + */ + public ContainerServiceNetworkProfile withDockerBridgeCidr(String dockerBridgeCidr) { + this.dockerBridgeCidr = dockerBridgeCidr; + return this; + } + +} diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceOrchestratorProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceOrchestratorProfile.java index 5ec83fafb5d..b97a09e1874 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceOrchestratorProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceOrchestratorProfile.java @@ -31,7 +31,7 @@ public class ContainerServiceOrchestratorProfile { private String orchestratorVersion; /** - * Get the orchestratorType value. + * Get the orchestrator to use to manage container service cluster resources. Valid values are Kubernetes, Swarm, DCOS, DockerCE and Custom. Possible values include: 'Kubernetes', 'Swarm', 'DCOS', 'DockerCE', 'Custom'. * * @return the orchestratorType value */ @@ -40,7 +40,7 @@ public ContainerServiceOrchestratorTypes orchestratorType() { } /** - * Set the orchestratorType value. + * Set the orchestrator to use to manage container service cluster resources. Valid values are Kubernetes, Swarm, DCOS, DockerCE and Custom. Possible values include: 'Kubernetes', 'Swarm', 'DCOS', 'DockerCE', 'Custom'. * * @param orchestratorType the orchestratorType value to set * @return the ContainerServiceOrchestratorProfile object itself. @@ -51,7 +51,7 @@ public ContainerServiceOrchestratorProfile withOrchestratorType(ContainerService } /** - * Get the orchestratorVersion value. + * Get the version of the orchestrator to use. You can specify the major.minor.patch part of the actual version.For example, you can specify version as "1.6.11". * * @return the orchestratorVersion value */ @@ -60,7 +60,7 @@ public String orchestratorVersion() { } /** - * Set the orchestratorVersion value. + * Set the version of the orchestrator to use. You can specify the major.minor.patch part of the actual version.For example, you can specify version as "1.6.11". * * @param orchestratorVersion the orchestratorVersion value to set * @return the ContainerServiceOrchestratorProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceServicePrincipalProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceServicePrincipalProfile.java index 7dc0d28fe60..272c7db19e0 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceServicePrincipalProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceServicePrincipalProfile.java @@ -35,7 +35,7 @@ public class ContainerServiceServicePrincipalProfile { private KeyVaultSecretRef keyVaultSecretRef; /** - * Get the clientId value. + * Get the ID for the service principal. * * @return the clientId value */ @@ -44,7 +44,7 @@ public String clientId() { } /** - * Set the clientId value. + * Set the ID for the service principal. * * @param clientId the clientId value to set * @return the ContainerServiceServicePrincipalProfile object itself. @@ -55,7 +55,7 @@ public ContainerServiceServicePrincipalProfile withClientId(String clientId) { } /** - * Get the secret value. + * Get the secret password associated with the service principal in plain text. * * @return the secret value */ @@ -64,7 +64,7 @@ public String secret() { } /** - * Set the secret value. + * Set the secret password associated with the service principal in plain text. * * @param secret the secret value to set * @return the ContainerServiceServicePrincipalProfile object itself. @@ -75,7 +75,7 @@ public ContainerServiceServicePrincipalProfile withSecret(String secret) { } /** - * Get the keyVaultSecretRef value. + * Get reference to a secret stored in Azure Key Vault. * * @return the keyVaultSecretRef value */ @@ -84,7 +84,7 @@ public KeyVaultSecretRef keyVaultSecretRef() { } /** - * Set the keyVaultSecretRef value. + * Set reference to a secret stored in Azure Key Vault. * * @param keyVaultSecretRef the keyVaultSecretRef value to set * @return the ContainerServiceServicePrincipalProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceSshConfiguration.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceSshConfiguration.java index 42e347b41ac..cd6436f99a2 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceSshConfiguration.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceSshConfiguration.java @@ -23,7 +23,7 @@ public class ContainerServiceSshConfiguration { private List publicKeys; /** - * Get the publicKeys value. + * Get the list of SSH public keys used to authenticate with Linux-based VMs. Only expect one key specified. * * @return the publicKeys value */ @@ -32,7 +32,7 @@ public List publicKeys() { } /** - * Set the publicKeys value. + * Set the list of SSH public keys used to authenticate with Linux-based VMs. Only expect one key specified. * * @param publicKeys the publicKeys value to set * @return the ContainerServiceSshConfiguration object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceSshPublicKey.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceSshPublicKey.java index 219f9fd97b1..cc96af28555 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceSshPublicKey.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceSshPublicKey.java @@ -22,7 +22,7 @@ public class ContainerServiceSshPublicKey { private String keyData; /** - * Get the keyData value. + * Get certificate public key used to authenticate with VMs through SSH. The certificate must be in PEM format with or without headers. * * @return the keyData value */ @@ -31,7 +31,7 @@ public String keyData() { } /** - * Set the keyData value. + * Set certificate public key used to authenticate with VMs through SSH. The certificate must be in PEM format with or without headers. * * @param keyData the keyData value to set * @return the ContainerServiceSshPublicKey object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceVMDiagnostics.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceVMDiagnostics.java index 5dcc77b2f25..bc9ef415829 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceVMDiagnostics.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceVMDiagnostics.java @@ -27,7 +27,7 @@ public class ContainerServiceVMDiagnostics { private String storageUri; /** - * Get the enabled value. + * Get whether the VM diagnostic agent is provisioned on the VM. * * @return the enabled value */ @@ -36,7 +36,7 @@ public boolean enabled() { } /** - * Set the enabled value. + * Set whether the VM diagnostic agent is provisioned on the VM. * * @param enabled the enabled value to set * @return the ContainerServiceVMDiagnostics object itself. @@ -47,7 +47,7 @@ public ContainerServiceVMDiagnostics withEnabled(boolean enabled) { } /** - * Get the storageUri value. + * Get the URI of the storage account where diagnostics are stored. * * @return the storageUri value */ diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceWindowsProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceWindowsProfile.java index 5f244a301d5..0995e1435d8 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceWindowsProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceWindowsProfile.java @@ -27,7 +27,7 @@ public class ContainerServiceWindowsProfile { private String adminPassword; /** - * Get the adminUsername value. + * Get the administrator username to use for Windows VMs. * * @return the adminUsername value */ @@ -36,7 +36,7 @@ public String adminUsername() { } /** - * Set the adminUsername value. + * Set the administrator username to use for Windows VMs. * * @param adminUsername the adminUsername value to set * @return the ContainerServiceWindowsProfile object itself. @@ -47,7 +47,7 @@ public ContainerServiceWindowsProfile withAdminUsername(String adminUsername) { } /** - * Get the adminPassword value. + * Get the administrator password to use for Windows VMs. * * @return the adminPassword value */ @@ -56,7 +56,7 @@ public String adminPassword() { } /** - * Set the adminPassword value. + * Set the administrator password to use for Windows VMs. * * @param adminPassword the adminPassword value to set * @return the ContainerServiceWindowsProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/KeyVaultSecretRef.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/KeyVaultSecretRef.java index 824c57aa2b7..c2be8c4b463 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/KeyVaultSecretRef.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/KeyVaultSecretRef.java @@ -33,7 +33,7 @@ public class KeyVaultSecretRef { private String version; /** - * Get the vaultID value. + * Get key vault identifier. * * @return the vaultID value */ @@ -42,7 +42,7 @@ public String vaultID() { } /** - * Set the vaultID value. + * Set key vault identifier. * * @param vaultID the vaultID value to set * @return the KeyVaultSecretRef object itself. @@ -53,7 +53,7 @@ public KeyVaultSecretRef withVaultID(String vaultID) { } /** - * Get the secretName value. + * Get the secret name. * * @return the secretName value */ @@ -62,7 +62,7 @@ public String secretName() { } /** - * Set the secretName value. + * Set the secret name. * * @param secretName the secretName value to set * @return the KeyVaultSecretRef object itself. @@ -73,7 +73,7 @@ public KeyVaultSecretRef withSecretName(String secretName) { } /** - * Get the version value. + * Get the secret version. * * @return the version value */ @@ -82,7 +82,7 @@ public String version() { } /** - * Set the version value. + * Set the secret version. * * @param version the version value to set * @return the KeyVaultSecretRef object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAADProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAADProfile.java new file mode 100644 index 00000000000..96c87135f6a --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAADProfile.java @@ -0,0 +1,122 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice; + +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * AADProfile specifies attributes for Azure Active Directory integration. + */ +public class ManagedClusterAADProfile { + /** + * The client AAD application ID. + */ + @JsonProperty(value = "clientAppID", required = true) + private String clientAppID; + + /** + * The server AAD application ID. + */ + @JsonProperty(value = "serverAppID", required = true) + private String serverAppID; + + /** + * The server AAD application secret. + */ + @JsonProperty(value = "serverAppSecret", required = true) + private String serverAppSecret; + + /** + * The AAD tenant ID to use for authentication. If not specified, will use + * the tenant of the deployment subscription. + */ + @JsonProperty(value = "tenantID") + private String tenantID; + + /** + * Get the client AAD application ID. + * + * @return the clientAppID value + */ + public String clientAppID() { + return this.clientAppID; + } + + /** + * Set the client AAD application ID. + * + * @param clientAppID the clientAppID value to set + * @return the ManagedClusterAADProfile object itself. + */ + public ManagedClusterAADProfile withClientAppID(String clientAppID) { + this.clientAppID = clientAppID; + return this; + } + + /** + * Get the server AAD application ID. + * + * @return the serverAppID value + */ + public String serverAppID() { + return this.serverAppID; + } + + /** + * Set the server AAD application ID. + * + * @param serverAppID the serverAppID value to set + * @return the ManagedClusterAADProfile object itself. + */ + public ManagedClusterAADProfile withServerAppID(String serverAppID) { + this.serverAppID = serverAppID; + return this; + } + + /** + * Get the server AAD application secret. + * + * @return the serverAppSecret value + */ + public String serverAppSecret() { + return this.serverAppSecret; + } + + /** + * Set the server AAD application secret. + * + * @param serverAppSecret the serverAppSecret value to set + * @return the ManagedClusterAADProfile object itself. + */ + public ManagedClusterAADProfile withServerAppSecret(String serverAppSecret) { + this.serverAppSecret = serverAppSecret; + return this; + } + + /** + * Get the AAD tenant ID to use for authentication. If not specified, will use the tenant of the deployment subscription. + * + * @return the tenantID value + */ + public String tenantID() { + return this.tenantID; + } + + /** + * Set the AAD tenant ID to use for authentication. If not specified, will use the tenant of the deployment subscription. + * + * @param tenantID the tenantID value to set + * @return the ManagedClusterAADProfile object itself. + */ + public ManagedClusterAADProfile withTenantID(String tenantID) { + this.tenantID = tenantID; + return this; + } + +} diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAddonProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAddonProfile.java new file mode 100644 index 00000000000..6b2d8a0ebd9 --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAddonProfile.java @@ -0,0 +1,70 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice; + +import java.util.Map; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * A Kubernetes add-on profile for a managed cluster. + */ +public class ManagedClusterAddonProfile { + /** + * Whether the add-on is enabled or not. + */ + @JsonProperty(value = "enabled", required = true) + private boolean enabled; + + /** + * Key-value pairs for configuring an add-on. + */ + @JsonProperty(value = "config") + private Map config; + + /** + * Get whether the add-on is enabled or not. + * + * @return the enabled value + */ + public boolean enabled() { + return this.enabled; + } + + /** + * Set whether the add-on is enabled or not. + * + * @param enabled the enabled value to set + * @return the ManagedClusterAddonProfile object itself. + */ + public ManagedClusterAddonProfile withEnabled(boolean enabled) { + this.enabled = enabled; + return this; + } + + /** + * Get key-value pairs for configuring an add-on. + * + * @return the config value + */ + public Map config() { + return this.config; + } + + /** + * Set key-value pairs for configuring an add-on. + * + * @param config the config value to set + * @return the ManagedClusterAddonProfile object itself. + */ + public ManagedClusterAddonProfile withConfig(Map config) { + this.config = config; + return this; + } + +} diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterPoolUpgradeProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterPoolUpgradeProfile.java index 70a48cb08c7..93a08eb1758 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterPoolUpgradeProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterPoolUpgradeProfile.java @@ -41,7 +41,7 @@ public class ManagedClusterPoolUpgradeProfile { private List upgrades; /** - * Get the kubernetesVersion value. + * Get kubernetes version (major, minor, patch). * * @return the kubernetesVersion value */ @@ -50,7 +50,7 @@ public String kubernetesVersion() { } /** - * Set the kubernetesVersion value. + * Set kubernetes version (major, minor, patch). * * @param kubernetesVersion the kubernetesVersion value to set * @return the ManagedClusterPoolUpgradeProfile object itself. @@ -61,7 +61,7 @@ public ManagedClusterPoolUpgradeProfile withKubernetesVersion(String kubernetesV } /** - * Get the name value. + * Get pool name. * * @return the name value */ @@ -70,7 +70,7 @@ public String name() { } /** - * Set the name value. + * Set pool name. * * @param name the name value to set * @return the ManagedClusterPoolUpgradeProfile object itself. @@ -81,7 +81,7 @@ public ManagedClusterPoolUpgradeProfile withName(String name) { } /** - * Get the osType value. + * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'. * * @return the osType value */ @@ -90,7 +90,7 @@ public OSType osType() { } /** - * Set the osType value. + * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'. * * @param osType the osType value to set * @return the ManagedClusterPoolUpgradeProfile object itself. @@ -101,7 +101,7 @@ public ManagedClusterPoolUpgradeProfile withOsType(OSType osType) { } /** - * Get the upgrades value. + * Get list of orchestrator types and versions available for upgrade. * * @return the upgrades value */ @@ -110,7 +110,7 @@ public List upgrades() { } /** - * Set the upgrades value. + * Set list of orchestrator types and versions available for upgrade. * * @param upgrades the upgrades value to set * @return the ManagedClusterPoolUpgradeProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPlugin.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPlugin.java new file mode 100644 index 00000000000..37acd903bd1 --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPlugin.java @@ -0,0 +1,41 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice; + +import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.microsoft.rest.ExpandableStringEnum; + +/** + * Defines values for NetworkPlugin. + */ +public final class NetworkPlugin extends ExpandableStringEnum { + /** Static value azure for NetworkPlugin. */ + public static final NetworkPlugin AZURE = fromString("azure"); + + /** Static value kubenet for NetworkPlugin. */ + public static final NetworkPlugin KUBENET = fromString("kubenet"); + + /** + * Creates or finds a NetworkPlugin from its string representation. + * @param name a name to look for + * @return the corresponding NetworkPlugin + */ + @JsonCreator + public static NetworkPlugin fromString(String name) { + return fromString(name, NetworkPlugin.class); + } + + /** + * @return known NetworkPlugin values + */ + public static Collection values() { + return values(NetworkPlugin.class); + } +} diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPolicy.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPolicy.java new file mode 100644 index 00000000000..d6cc5c34a0f --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPolicy.java @@ -0,0 +1,41 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice; + +import java.util.Collection; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.microsoft.rest.ExpandableStringEnum; + +/** + * Defines values for NetworkPolicy. + */ +public final class NetworkPolicy extends ExpandableStringEnum { + /** Static value calico for NetworkPolicy. */ + public static final NetworkPolicy CALICO = fromString("calico"); + + /** Static value cilium for NetworkPolicy. */ + public static final NetworkPolicy CILIUM = fromString("cilium"); + + /** + * Creates or finds a NetworkPolicy from its string representation. + * @param name a name to look for + * @return the corresponding NetworkPolicy + */ + @JsonCreator + public static NetworkPolicy fromString(String name) { + return fromString(name, NetworkPolicy.class); + } + + /** + * @return known NetworkPolicy values + */ + public static Collection values() { + return values(NetworkPolicy.class); + } +} diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/OrchestratorProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/OrchestratorProfile.java index 2dd9ca63347..6b782a3cbbc 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/OrchestratorProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/OrchestratorProfile.java @@ -27,7 +27,7 @@ public class OrchestratorProfile { private String orchestratorVersion; /** - * Get the orchestratorType value. + * Get orchestrator type. * * @return the orchestratorType value */ @@ -36,7 +36,7 @@ public String orchestratorType() { } /** - * Set the orchestratorType value. + * Set orchestrator type. * * @param orchestratorType the orchestratorType value to set * @return the OrchestratorProfile object itself. @@ -47,7 +47,7 @@ public OrchestratorProfile withOrchestratorType(String orchestratorType) { } /** - * Get the orchestratorVersion value. + * Get orchestrator version (major, minor, patch). * * @return the orchestratorVersion value */ @@ -56,7 +56,7 @@ public String orchestratorVersion() { } /** - * Set the orchestratorVersion value. + * Set orchestrator version (major, minor, patch). * * @param orchestratorVersion the orchestratorVersion value to set * @return the OrchestratorProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/OrchestratorVersionProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/OrchestratorVersionProfile.java index 8c4faa45ad6..feba9463779 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/OrchestratorVersionProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/OrchestratorVersionProfile.java @@ -40,7 +40,7 @@ public class OrchestratorVersionProfile { private List upgrades; /** - * Get the orchestratorType value. + * Get orchestrator type. * * @return the orchestratorType value */ @@ -49,7 +49,7 @@ public String orchestratorType() { } /** - * Set the orchestratorType value. + * Set orchestrator type. * * @param orchestratorType the orchestratorType value to set * @return the OrchestratorVersionProfile object itself. @@ -60,7 +60,7 @@ public OrchestratorVersionProfile withOrchestratorType(String orchestratorType) } /** - * Get the orchestratorVersion value. + * Get orchestrator version (major, minor, patch). * * @return the orchestratorVersion value */ @@ -69,7 +69,7 @@ public String orchestratorVersion() { } /** - * Set the orchestratorVersion value. + * Set orchestrator version (major, minor, patch). * * @param orchestratorVersion the orchestratorVersion value to set * @return the OrchestratorVersionProfile object itself. @@ -80,7 +80,7 @@ public OrchestratorVersionProfile withOrchestratorVersion(String orchestratorVer } /** - * Get the defaultProperty value. + * Get installed by default if version is not specified. * * @return the defaultProperty value */ @@ -89,7 +89,7 @@ public boolean defaultProperty() { } /** - * Set the defaultProperty value. + * Set installed by default if version is not specified. * * @param defaultProperty the defaultProperty value to set * @return the OrchestratorVersionProfile object itself. @@ -100,7 +100,7 @@ public OrchestratorVersionProfile withDefaultProperty(boolean defaultProperty) { } /** - * Get the upgrades value. + * Get the list of available upgrade versions. * * @return the upgrades value */ @@ -109,7 +109,7 @@ public List upgrades() { } /** - * Set the upgrades value. + * Set the list of available upgrade versions. * * @param upgrades the upgrades value to set * @return the OrchestratorVersionProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ComputeOperationValueInner.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ComputeOperationValueInner.java new file mode 100644 index 00000000000..adef8207fed --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ComputeOperationValueInner.java @@ -0,0 +1,109 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice.implementation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.rest.serializer.JsonFlatten; + +/** + * Describes the properties of a Compute Operation value. + */ +@JsonFlatten +public class ComputeOperationValueInner { + /** + * The origin of the compute operation. + */ + @JsonProperty(value = "origin", access = JsonProperty.Access.WRITE_ONLY) + private String origin; + + /** + * The name of the compute operation. + */ + @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY) + private String name; + + /** + * The display name of the compute operation. + */ + @JsonProperty(value = "display.operation", access = JsonProperty.Access.WRITE_ONLY) + private String operation; + + /** + * The display name of the resource the operation applies to. + */ + @JsonProperty(value = "display.resource", access = JsonProperty.Access.WRITE_ONLY) + private String resource; + + /** + * The description of the operation. + */ + @JsonProperty(value = "display.description", access = JsonProperty.Access.WRITE_ONLY) + private String description; + + /** + * The resource provider for the operation. + */ + @JsonProperty(value = "display.provider", access = JsonProperty.Access.WRITE_ONLY) + private String provider; + + /** + * Get the origin of the compute operation. + * + * @return the origin value + */ + public String origin() { + return this.origin; + } + + /** + * Get the name of the compute operation. + * + * @return the name value + */ + public String name() { + return this.name; + } + + /** + * Get the display name of the compute operation. + * + * @return the operation value + */ + public String operation() { + return this.operation; + } + + /** + * Get the display name of the resource the operation applies to. + * + * @return the resource value + */ + public String resource() { + return this.resource; + } + + /** + * Get the description of the operation. + * + * @return the description value + */ + public String description() { + return this.description; + } + + /** + * Get the resource provider for the operation. + * + * @return the provider value + */ + public String provider() { + return this.provider; + } + +} diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ContainerServiceClientImpl.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ContainerServiceClientImpl.java index dc451384bcf..2d8b91bec5c 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ContainerServiceClientImpl.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ContainerServiceClientImpl.java @@ -133,6 +133,19 @@ public ContainerServicesInner containerServices() { return this.containerServices; } + /** + * The OperationsInner object to access its operations. + */ + private OperationsInner operations; + + /** + * Gets the OperationsInner object to access its operations. + * @return the OperationsInner object. + */ + public OperationsInner operations() { + return this.operations; + } + /** * The ManagedClustersInner object to access its operations. */ @@ -181,6 +194,7 @@ protected void initialize() { this.longRunningOperationRetryTimeout = 30; this.generateClientRequestId = true; this.containerServices = new ContainerServicesInner(restClient().retrofit(), this); + this.operations = new OperationsInner(restClient().retrofit(), this); this.managedClusters = new ManagedClustersInner(restClient().retrofit(), this); this.azureClient = new AzureClient(this); } diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ContainerServiceInner.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ContainerServiceInner.java index 9f7bcdf6ac2..797347c7cb2 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ContainerServiceInner.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ContainerServiceInner.java @@ -84,7 +84,7 @@ public class ContainerServiceInner extends Resource { private ContainerServiceDiagnosticsProfile diagnosticsProfile; /** - * Get the provisioningState value. + * Get the current deployment or provisioning state, which only appears in the response. * * @return the provisioningState value */ @@ -93,7 +93,7 @@ public String provisioningState() { } /** - * Get the orchestratorProfile value. + * Get profile for the container service orchestrator. * * @return the orchestratorProfile value */ @@ -102,7 +102,7 @@ public ContainerServiceOrchestratorProfile orchestratorProfile() { } /** - * Set the orchestratorProfile value. + * Set profile for the container service orchestrator. * * @param orchestratorProfile the orchestratorProfile value to set * @return the ContainerServiceInner object itself. @@ -113,7 +113,7 @@ public ContainerServiceInner withOrchestratorProfile(ContainerServiceOrchestrato } /** - * Get the customProfile value. + * Get properties to configure a custom container service cluster. * * @return the customProfile value */ @@ -122,7 +122,7 @@ public ContainerServiceCustomProfile customProfile() { } /** - * Set the customProfile value. + * Set properties to configure a custom container service cluster. * * @param customProfile the customProfile value to set * @return the ContainerServiceInner object itself. @@ -133,7 +133,7 @@ public ContainerServiceInner withCustomProfile(ContainerServiceCustomProfile cus } /** - * Get the servicePrincipalProfile value. + * Get information about a service principal identity for the cluster to use for manipulating Azure APIs. Exact one of secret or keyVaultSecretRef need to be specified. * * @return the servicePrincipalProfile value */ @@ -142,7 +142,7 @@ public ContainerServiceServicePrincipalProfile servicePrincipalProfile() { } /** - * Set the servicePrincipalProfile value. + * Set information about a service principal identity for the cluster to use for manipulating Azure APIs. Exact one of secret or keyVaultSecretRef need to be specified. * * @param servicePrincipalProfile the servicePrincipalProfile value to set * @return the ContainerServiceInner object itself. @@ -153,7 +153,7 @@ public ContainerServiceInner withServicePrincipalProfile(ContainerServiceService } /** - * Get the masterProfile value. + * Get profile for the container service master. * * @return the masterProfile value */ @@ -162,7 +162,7 @@ public ContainerServiceMasterProfile masterProfile() { } /** - * Set the masterProfile value. + * Set profile for the container service master. * * @param masterProfile the masterProfile value to set * @return the ContainerServiceInner object itself. @@ -173,7 +173,7 @@ public ContainerServiceInner withMasterProfile(ContainerServiceMasterProfile mas } /** - * Get the agentPoolProfiles value. + * Get properties of the agent pool. * * @return the agentPoolProfiles value */ @@ -182,7 +182,7 @@ public List agentPoolProfiles() { } /** - * Set the agentPoolProfiles value. + * Set properties of the agent pool. * * @param agentPoolProfiles the agentPoolProfiles value to set * @return the ContainerServiceInner object itself. @@ -193,7 +193,7 @@ public ContainerServiceInner withAgentPoolProfiles(List addonProfiles; + + /** + * Whether to enable Kubernetes Role-Based Access Control. + */ + @JsonProperty(value = "properties.enableRBAC") + private Boolean enableRBAC; + + /** + * Profile of network configuration. + */ + @JsonProperty(value = "properties.networkProfile") + private ContainerServiceNetworkProfile networkProfile; + + /** + * Profile of Azure Active Directory configuration. + */ + @JsonProperty(value = "properties.aadProfile") + private ManagedClusterAADProfile aadProfile; + + /** + * Get the current deployment or provisioning state, which only appears in the response. * * @return the provisioningState value */ @@ -76,56 +104,56 @@ public String provisioningState() { } /** - * Get the dnsPrefix value. + * Get version of Kubernetes specified when creating the managed cluster. * - * @return the dnsPrefix value + * @return the kubernetesVersion value */ - public String dnsPrefix() { - return this.dnsPrefix; + public String kubernetesVersion() { + return this.kubernetesVersion; } /** - * Set the dnsPrefix value. + * Set version of Kubernetes specified when creating the managed cluster. * - * @param dnsPrefix the dnsPrefix value to set + * @param kubernetesVersion the kubernetesVersion value to set * @return the ManagedClusterInner object itself. */ - public ManagedClusterInner withDnsPrefix(String dnsPrefix) { - this.dnsPrefix = dnsPrefix; + public ManagedClusterInner withKubernetesVersion(String kubernetesVersion) { + this.kubernetesVersion = kubernetesVersion; return this; } /** - * Get the fqdn value. + * Get dNS prefix specified when creating the managed cluster. * - * @return the fqdn value + * @return the dnsPrefix value */ - public String fqdn() { - return this.fqdn; + public String dnsPrefix() { + return this.dnsPrefix; } /** - * Get the kubernetesVersion value. + * Set dNS prefix specified when creating the managed cluster. * - * @return the kubernetesVersion value + * @param dnsPrefix the dnsPrefix value to set + * @return the ManagedClusterInner object itself. */ - public String kubernetesVersion() { - return this.kubernetesVersion; + public ManagedClusterInner withDnsPrefix(String dnsPrefix) { + this.dnsPrefix = dnsPrefix; + return this; } /** - * Set the kubernetesVersion value. + * Get fDQN for the master pool. * - * @param kubernetesVersion the kubernetesVersion value to set - * @return the ManagedClusterInner object itself. + * @return the fqdn value */ - public ManagedClusterInner withKubernetesVersion(String kubernetesVersion) { - this.kubernetesVersion = kubernetesVersion; - return this; + public String fqdn() { + return this.fqdn; } /** - * Get the agentPoolProfiles value. + * Get properties of the agent pool. * * @return the agentPoolProfiles value */ @@ -134,7 +162,7 @@ public List agentPoolProfiles() { } /** - * Set the agentPoolProfiles value. + * Set properties of the agent pool. * * @param agentPoolProfiles the agentPoolProfiles value to set * @return the ManagedClusterInner object itself. @@ -145,7 +173,7 @@ public ManagedClusterInner withAgentPoolProfiles(List addonProfiles() { + return this.addonProfiles; + } + + /** + * Set profile of managed cluster add-on. + * + * @param addonProfiles the addonProfiles value to set + * @return the ManagedClusterInner object itself. + */ + public ManagedClusterInner withAddonProfiles(Map addonProfiles) { + this.addonProfiles = addonProfiles; + return this; + } + + /** + * Get whether to enable Kubernetes Role-Based Access Control. + * + * @return the enableRBAC value + */ + public Boolean enableRBAC() { + return this.enableRBAC; + } + + /** + * Set whether to enable Kubernetes Role-Based Access Control. + * + * @param enableRBAC the enableRBAC value to set + * @return the ManagedClusterInner object itself. + */ + public ManagedClusterInner withEnableRBAC(Boolean enableRBAC) { + this.enableRBAC = enableRBAC; + return this; + } + + /** + * Get profile of network configuration. + * + * @return the networkProfile value + */ + public ContainerServiceNetworkProfile networkProfile() { + return this.networkProfile; + } + + /** + * Set profile of network configuration. + * + * @param networkProfile the networkProfile value to set + * @return the ManagedClusterInner object itself. + */ + public ManagedClusterInner withNetworkProfile(ContainerServiceNetworkProfile networkProfile) { + this.networkProfile = networkProfile; + return this; + } + + /** + * Get profile of Azure Active Directory configuration. + * + * @return the aadProfile value + */ + public ManagedClusterAADProfile aadProfile() { + return this.aadProfile; + } + + /** + * Set profile of Azure Active Directory configuration. + * + * @param aadProfile the aadProfile value to set + * @return the ManagedClusterInner object itself. + */ + public ManagedClusterInner withAadProfile(ManagedClusterAADProfile aadProfile) { + this.aadProfile = aadProfile; + return this; + } + } diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClusterUpgradeProfileInner.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClusterUpgradeProfileInner.java index 17b36775610..303b8595a75 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClusterUpgradeProfileInner.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClusterUpgradeProfileInner.java @@ -49,7 +49,7 @@ public class ManagedClusterUpgradeProfileInner { private List agentPoolProfiles; /** - * Get the id value. + * Get id of upgrade profile. * * @return the id value */ @@ -58,7 +58,7 @@ public String id() { } /** - * Get the name value. + * Get name of upgrade profile. * * @return the name value */ @@ -67,7 +67,7 @@ public String name() { } /** - * Get the type value. + * Get type of upgrade profile. * * @return the type value */ @@ -76,7 +76,7 @@ public String type() { } /** - * Get the controlPlaneProfile value. + * Get the list of available upgrade versions for the control plane. * * @return the controlPlaneProfile value */ @@ -85,7 +85,7 @@ public ManagedClusterPoolUpgradeProfile controlPlaneProfile() { } /** - * Set the controlPlaneProfile value. + * Set the list of available upgrade versions for the control plane. * * @param controlPlaneProfile the controlPlaneProfile value to set * @return the ManagedClusterUpgradeProfileInner object itself. @@ -96,7 +96,7 @@ public ManagedClusterUpgradeProfileInner withControlPlaneProfile(ManagedClusterP } /** - * Get the agentPoolProfiles value. + * Get the list of available upgrade versions for agent pools. * * @return the agentPoolProfiles value */ @@ -105,7 +105,7 @@ public List agentPoolProfiles() { } /** - * Set the agentPoolProfiles value. + * Set the list of available upgrade versions for agent pools. * * @param agentPoolProfiles the agentPoolProfiles value to set * @return the ManagedClusterUpgradeProfileInner object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClustersInner.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClustersInner.java index 4b1c5673649..ba78ef4474b 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClustersInner.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClustersInner.java @@ -81,10 +81,6 @@ interface ManagedClustersService { @POST("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}/listCredential") Observable> getAccessProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("roleName") String roleName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.ManagedClusters getAccessProfiles" }) - @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}") - Observable> getAccessProfiles(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("roleName") String roleName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); - @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.ManagedClusters getByResourceGroup" }) @GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}") Observable> getByResourceGroup(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); @@ -203,7 +199,7 @@ public Observable>> listSinglePageAsyn if (this.client.subscriptionId() == null) { throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); } - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; return service.list(this.client.subscriptionId(), apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override @@ -321,7 +317,7 @@ public Observable>> listByResourceGrou if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; return service.listByResourceGroup(this.client.subscriptionId(), resourceGroupName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>>() { @Override @@ -409,7 +405,7 @@ public Observable> getUpgrade if (resourceName == null) { throw new IllegalArgumentException("Parameter resourceName is required and cannot be null."); } - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; return service.getUpgradeProfile(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override @@ -504,7 +500,7 @@ public Observable> getAccessPr if (roleName == null) { throw new IllegalArgumentException("Parameter roleName is required and cannot be null."); } - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; return service.getAccessProfile(this.client.subscriptionId(), resourceGroupName, resourceName, roleName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override @@ -526,101 +522,6 @@ private ServiceResponse getAccessProfileDelega .build(response); } - /** - * Gets access profile of a managed cluster. - * Use ManagedClusters_GetAccessProfile instead. - * - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the managed cluster resource. - * @param roleName The name of the role for managed cluster accessProfile resource. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @throws CloudException thrown if the request is rejected by server - * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent - * @return the ManagedClusterAccessProfileInner object if successful. - */ - public ManagedClusterAccessProfileInner getAccessProfiles(String resourceGroupName, String resourceName, String roleName) { - return getAccessProfilesWithServiceResponseAsync(resourceGroupName, resourceName, roleName).toBlocking().single().body(); - } - - /** - * Gets access profile of a managed cluster. - * Use ManagedClusters_GetAccessProfile instead. - * - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the managed cluster resource. - * @param roleName The name of the role for managed cluster accessProfile resource. - * @param serviceCallback the async ServiceCallback to handle successful and failed responses. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the {@link ServiceFuture} object - */ - public ServiceFuture getAccessProfilesAsync(String resourceGroupName, String resourceName, String roleName, final ServiceCallback serviceCallback) { - return ServiceFuture.fromResponse(getAccessProfilesWithServiceResponseAsync(resourceGroupName, resourceName, roleName), serviceCallback); - } - - /** - * Gets access profile of a managed cluster. - * Use ManagedClusters_GetAccessProfile instead. - * - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the managed cluster resource. - * @param roleName The name of the role for managed cluster accessProfile resource. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the ManagedClusterAccessProfileInner object - */ - public Observable getAccessProfilesAsync(String resourceGroupName, String resourceName, String roleName) { - return getAccessProfilesWithServiceResponseAsync(resourceGroupName, resourceName, roleName).map(new Func1, ManagedClusterAccessProfileInner>() { - @Override - public ManagedClusterAccessProfileInner call(ServiceResponse response) { - return response.body(); - } - }); - } - - /** - * Gets access profile of a managed cluster. - * Use ManagedClusters_GetAccessProfile instead. - * - * @param resourceGroupName The name of the resource group. - * @param resourceName The name of the managed cluster resource. - * @param roleName The name of the role for managed cluster accessProfile resource. - * @throws IllegalArgumentException thrown if parameters fail the validation - * @return the observable to the ManagedClusterAccessProfileInner object - */ - public Observable> getAccessProfilesWithServiceResponseAsync(String resourceGroupName, String resourceName, String roleName) { - if (this.client.subscriptionId() == null) { - throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null."); - } - if (resourceGroupName == null) { - throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); - } - if (resourceName == null) { - throw new IllegalArgumentException("Parameter resourceName is required and cannot be null."); - } - if (roleName == null) { - throw new IllegalArgumentException("Parameter roleName is required and cannot be null."); - } - final String apiVersion = "2017-08-31"; - return service.getAccessProfiles(this.client.subscriptionId(), resourceGroupName, resourceName, roleName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) - .flatMap(new Func1, Observable>>() { - @Override - public Observable> call(Response response) { - try { - ServiceResponse clientResponse = getAccessProfilesDelegate(response); - return Observable.just(clientResponse); - } catch (Throwable t) { - return Observable.error(t); - } - } - }); - } - - private ServiceResponse getAccessProfilesDelegate(Response response) throws CloudException, IOException, IllegalArgumentException { - return this.client.restClient().responseBuilderFactory().newInstance(this.client.serializerAdapter()) - .register(200, new TypeToken() { }.getType()) - .registerError(CloudException.class) - .build(response); - } - /** * Gets a managed cluster. * Gets the details of the managed cluster with a specified resource group and name. @@ -687,7 +588,7 @@ public Observable> getByResourceGroupWithSe if (resourceName == null) { throw new IllegalArgumentException("Parameter resourceName is required and cannot be null."); } - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; return service.getByResourceGroup(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override @@ -783,7 +684,7 @@ public Observable> createOrUpdateWithServic throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); } Validator.validate(parameters); - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; Observable> observable = service.createOrUpdate(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent()); return client.getAzureClient().getPutOrPatchResultAsync(observable, new TypeToken() { }.getType()); } @@ -862,7 +763,7 @@ public Observable> beginCreateOrUpdateWithS throw new IllegalArgumentException("Parameter parameters is required and cannot be null."); } Validator.validate(parameters); - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; return service.beginCreateOrUpdate(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, parameters, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override @@ -950,7 +851,7 @@ public Observable> deleteWithServiceResponseAsync(String r if (resourceName == null) { throw new IllegalArgumentException("Parameter resourceName is required and cannot be null."); } - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; Observable> observable = service.delete(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()); return client.getAzureClient().getPostOrDeleteResultAsync(observable, new TypeToken() { }.getType()); } @@ -1020,7 +921,7 @@ public Observable> beginDeleteWithServiceResponseAsync(Str if (resourceName == null) { throw new IllegalArgumentException("Parameter resourceName is required and cannot be null."); } - final String apiVersion = "2017-08-31"; + final String apiVersion = "2018-03-31"; return service.beginDelete(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent()) .flatMap(new Func1, Observable>>() { @Override diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/OperationsInner.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/OperationsInner.java new file mode 100644 index 00000000000..d0093621232 --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/OperationsInner.java @@ -0,0 +1,132 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice.implementation; + +import retrofit2.Retrofit; +import com.google.common.reflect.TypeToken; +import com.microsoft.azure.CloudException; +import com.microsoft.rest.ServiceCallback; +import com.microsoft.rest.ServiceFuture; +import com.microsoft.rest.ServiceResponse; +import java.io.IOException; +import java.util.List; +import okhttp3.ResponseBody; +import retrofit2.http.GET; +import retrofit2.http.Header; +import retrofit2.http.Headers; +import retrofit2.http.Query; +import retrofit2.Response; +import rx.functions.Func1; +import rx.Observable; + +/** + * An instance of this class provides access to all the operations defined + * in Operations. + */ +public class OperationsInner { + /** The Retrofit service to perform REST calls. */ + private OperationsService service; + /** The service client containing this operation class. */ + private ContainerServiceClientImpl client; + + /** + * Initializes an instance of OperationsInner. + * + * @param retrofit the Retrofit instance built from a Retrofit Builder. + * @param client the instance of the service client containing this operation class. + */ + public OperationsInner(Retrofit retrofit, ContainerServiceClientImpl client) { + this.service = retrofit.create(OperationsService.class); + this.client = client; + } + + /** + * The interface defining all the services for Operations to be + * used by Retrofit to perform actually REST calls. + */ + interface OperationsService { + @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.Operations list" }) + @GET("providers/Microsoft.ContainerService/operations") + Observable> list(@Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent); + + } + + /** + * Gets a list of compute operations. + * + * @throws IllegalArgumentException thrown if parameters fail the validation + * @throws CloudException thrown if the request is rejected by server + * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent + * @return the List<ComputeOperationValueInner> object if successful. + */ + public List list() { + return listWithServiceResponseAsync().toBlocking().single().body(); + } + + /** + * Gets a list of compute operations. + * + * @param serviceCallback the async ServiceCallback to handle successful and failed responses. + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the {@link ServiceFuture} object + */ + public ServiceFuture> listAsync(final ServiceCallback> serviceCallback) { + return ServiceFuture.fromResponse(listWithServiceResponseAsync(), serviceCallback); + } + + /** + * Gets a list of compute operations. + * + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the List<ComputeOperationValueInner> object + */ + public Observable> listAsync() { + return listWithServiceResponseAsync().map(new Func1>, List>() { + @Override + public List call(ServiceResponse> response) { + return response.body(); + } + }); + } + + /** + * Gets a list of compute operations. + * + * @throws IllegalArgumentException thrown if parameters fail the validation + * @return the observable to the List<ComputeOperationValueInner> object + */ + public Observable>> listWithServiceResponseAsync() { + final String apiVersion = "2018-03-31"; + return service.list(apiVersion, this.client.acceptLanguage(), this.client.userAgent()) + .flatMap(new Func1, Observable>>>() { + @Override + public Observable>> call(Response response) { + try { + ServiceResponse> result = listDelegate(response); + List items = null; + if (result.body() != null) { + items = result.body().items(); + } + ServiceResponse> clientResponse = new ServiceResponse>(items, result.response()); + return Observable.just(clientResponse); + } catch (Throwable t) { + return Observable.error(t); + } + } + }); + } + + private ServiceResponse> listDelegate(Response response) throws CloudException, IOException { + return this.client.restClient().responseBuilderFactory()., CloudException>newInstance(this.client.serializerAdapter()) + .register(200, new TypeToken>() { }.getType()) + .registerError(CloudException.class) + .build(response); + } + +} diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/OrchestratorVersionProfileListResultInner.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/OrchestratorVersionProfileListResultInner.java index c116e51e8ea..445a69582b7 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/OrchestratorVersionProfileListResultInner.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/OrchestratorVersionProfileListResultInner.java @@ -43,7 +43,7 @@ public class OrchestratorVersionProfileListResultInner { private List orchestrators; /** - * Get the id value. + * Get id of the orchestrator version profile list result. * * @return the id value */ @@ -52,7 +52,7 @@ public String id() { } /** - * Get the name value. + * Get name of the orchestrator version profile list result. * * @return the name value */ @@ -61,7 +61,7 @@ public String name() { } /** - * Get the type value. + * Get type of the orchestrator version profile list result. * * @return the type value */ @@ -70,7 +70,7 @@ public String type() { } /** - * Get the orchestrators value. + * Get list of orchestrator version profiles. * * @return the orchestrators value */ @@ -79,7 +79,7 @@ public List orchestrators() { } /** - * Set the orchestrators value. + * Set list of orchestrator version profiles. * * @param orchestrators the orchestrators value to set * @return the OrchestratorVersionProfileListResultInner object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/PageImpl1.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/PageImpl1.java new file mode 100644 index 00000000000..5afa104330d --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/PageImpl1.java @@ -0,0 +1,75 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice.implementation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.microsoft.azure.Page; +import java.util.List; + +/** + * An instance of this class defines a page of Azure resources and a link to + * get the next page of resources, if any. + * + * @param type of Azure resource + */ +public class PageImpl1 implements Page { + /** + * The link to the next page. + */ + @JsonProperty("") + private String nextPageLink; + + /** + * The list of items. + */ + @JsonProperty("value") + private List items; + + /** + * Gets the link to the next page. + * + * @return the link to the next page. + */ + @Override + public String nextPageLink() { + return this.nextPageLink; + } + + /** + * Gets the list of items. + * + * @return the list of items in {@link List}. + */ + @Override + public List items() { + return items; + } + + /** + * Sets the link to the next page. + * + * @param nextPageLink the link to the next page. + * @return this Page object itself. + */ + public PageImpl1 setNextPageLink(String nextPageLink) { + this.nextPageLink = nextPageLink; + return this; + } + + /** + * Sets the list of items. + * + * @param items the list of items in {@link List}. + * @return this Page object itself. + */ + public PageImpl1 setItems(List items) { + this.items = items; + return this; + } +} From 16a31cea256c0eb45ebcd1509a64206ff4849592 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 25 May 2018 22:31:30 +0000 Subject: [PATCH 2/3] Generated from e365e10741ba688b8c3b39b67986e2b6e06e4ddc Rename to ManagedClusterAgentPoolProfile. Its fields have diverged from ContainerServiceAgentPoolProfile. --- .../ContainerServiceAgentPoolProfile.java | 26 -- .../ManagedClusterAgentPoolProfile.java | 355 ++++++++++++++++++ .../implementation/ManagedClusterInner.java | 8 +- 3 files changed, 359 insertions(+), 30 deletions(-) create mode 100644 azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAgentPoolProfile.java diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java index 47cd983ff44..5c1ac533544 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java @@ -137,12 +137,6 @@ public class ContainerServiceAgentPoolProfile { @JsonProperty(value = "osType") private OSType osType; - /** - * Maximum number of pods that can run on a node. - */ - @JsonProperty(value = "maxPods") - private Integer maxPods; - /** * Get unique name of the agent pool profile in the context of the subscription and resource group. * @@ -332,24 +326,4 @@ public ContainerServiceAgentPoolProfile withOsType(OSType osType) { return this; } - /** - * Get maximum number of pods that can run on a node. - * - * @return the maxPods value - */ - public Integer maxPods() { - return this.maxPods; - } - - /** - * Set maximum number of pods that can run on a node. - * - * @param maxPods the maxPods value to set - * @return the ContainerServiceAgentPoolProfile object itself. - */ - public ContainerServiceAgentPoolProfile withMaxPods(Integer maxPods) { - this.maxPods = maxPods; - return this; - } - } diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAgentPoolProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAgentPoolProfile.java new file mode 100644 index 00000000000..5f9d8c02e76 --- /dev/null +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAgentPoolProfile.java @@ -0,0 +1,355 @@ +/** + * 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. + */ + +package com.microsoft.azure.management.containerservice; + +import java.util.List; +import com.fasterxml.jackson.annotation.JsonProperty; + +/** + * Profile for the container service agent pool. + */ +public class ManagedClusterAgentPoolProfile { + /** + * Unique name of the agent pool profile in the context of the subscription + * and resource group. + */ + @JsonProperty(value = "name", required = true) + private String name; + + /** + * 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") + private Integer count; + + /** + * 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'. + */ + @JsonProperty(value = "vmSize", required = true) + private ContainerServiceVMSizeTypes vmSize; + + /** + * 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. + */ + @JsonProperty(value = "osDiskSizeGB") + private Integer osDiskSizeGB; + + /** + * DNS prefix to be used to create the FQDN for the agent pool. + */ + @JsonProperty(value = "dnsPrefix") + private String dnsPrefix; + + /** + * FDQN for the agent pool. + */ + @JsonProperty(value = "fqdn", access = JsonProperty.Access.WRITE_ONLY) + private String fqdn; + + /** + * Ports number array used to expose on this agent pool. The default opened + * ports are different based on your choice of orchestrator. + */ + @JsonProperty(value = "ports") + private List ports; + + /** + * 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'. + */ + @JsonProperty(value = "storageProfile") + private ContainerServiceStorageProfileTypes storageProfile; + + /** + * VNet SubnetID specifies the vnet's subnet identifier. If you specify + * either master VNet Subnet, or agent VNet Subnet, you need to specify + * both. And they have to be in the same VNet. + */ + @JsonProperty(value = "vnetSubnetID") + private String vnetSubnetID; + + /** + * Maximum number of pods that can run on a node. + */ + @JsonProperty(value = "maxPods") + private Integer maxPods; + + /** + * OsType to be used to specify os type. Choose from Linux and Windows. + * Default to Linux. Possible values include: 'Linux', 'Windows'. + */ + @JsonProperty(value = "osType") + private OSType osType; + + /** + * Get unique name of the agent pool profile in the context of the subscription and resource group. + * + * @return the name value + */ + public String name() { + return this.name; + } + + /** + * Set unique name of the agent pool profile in the context of the subscription and resource group. + * + * @param name the name value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withName(String name) { + this.name = name; + return this; + } + + /** + * Get 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 count value + */ + public Integer count() { + return this.count; + } + + /** + * Set 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. + * + * @param count the count value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withCount(Integer count) { + this.count = count; + return this; + } + + /** + * Get 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 vmSize value + */ + public ContainerServiceVMSizeTypes vmSize() { + return this.vmSize; + } + + /** + * Set 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'. + * + * @param vmSize the vmSize value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withVmSize(ContainerServiceVMSizeTypes vmSize) { + this.vmSize = vmSize; + return this; + } + + /** + * Get 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. + * + * @return the osDiskSizeGB value + */ + public Integer osDiskSizeGB() { + return this.osDiskSizeGB; + } + + /** + * Set 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. + * + * @param osDiskSizeGB the osDiskSizeGB value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withOsDiskSizeGB(Integer osDiskSizeGB) { + this.osDiskSizeGB = osDiskSizeGB; + return this; + } + + /** + * Get dNS prefix to be used to create the FQDN for the agent pool. + * + * @return the dnsPrefix value + */ + public String dnsPrefix() { + return this.dnsPrefix; + } + + /** + * Set dNS prefix to be used to create the FQDN for the agent pool. + * + * @param dnsPrefix the dnsPrefix value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withDnsPrefix(String dnsPrefix) { + this.dnsPrefix = dnsPrefix; + return this; + } + + /** + * Get fDQN for the agent pool. + * + * @return the fqdn value + */ + public String fqdn() { + return this.fqdn; + } + + /** + * Get ports number array used to expose on this agent pool. The default opened ports are different based on your choice of orchestrator. + * + * @return the ports value + */ + public List ports() { + return this.ports; + } + + /** + * Set ports number array used to expose on this agent pool. The default opened ports are different based on your choice of orchestrator. + * + * @param ports the ports value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withPorts(List ports) { + this.ports = ports; + return this; + } + + /** + * Get 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'. + * + * @return the storageProfile value + */ + public ContainerServiceStorageProfileTypes storageProfile() { + return this.storageProfile; + } + + /** + * Set 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'. + * + * @param storageProfile the storageProfile value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withStorageProfile(ContainerServiceStorageProfileTypes storageProfile) { + this.storageProfile = storageProfile; + return this; + } + + /** + * Get vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + * + * @return the vnetSubnetID value + */ + public String vnetSubnetID() { + return this.vnetSubnetID; + } + + /** + * Set vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + * + * @param vnetSubnetID the vnetSubnetID value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withVnetSubnetID(String vnetSubnetID) { + this.vnetSubnetID = vnetSubnetID; + return this; + } + + /** + * Get maximum number of pods that can run on a node. + * + * @return the maxPods value + */ + public Integer maxPods() { + return this.maxPods; + } + + /** + * Set maximum number of pods that can run on a node. + * + * @param maxPods the maxPods value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withMaxPods(Integer maxPods) { + this.maxPods = maxPods; + return this; + } + + /** + * Get osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'. + * + * @return the osType value + */ + public OSType osType() { + return this.osType; + } + + /** + * Set osType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', 'Windows'. + * + * @param osType the osType value to set + * @return the ManagedClusterAgentPoolProfile object itself. + */ + public ManagedClusterAgentPoolProfile withOsType(OSType osType) { + this.osType = osType; + return this; + } + +} diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClusterInner.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClusterInner.java index 16c9ddfcbd1..7899931b924 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClusterInner.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/implementation/ManagedClusterInner.java @@ -9,7 +9,7 @@ package com.microsoft.azure.management.containerservice.implementation; import java.util.List; -import com.microsoft.azure.management.containerservice.ContainerServiceAgentPoolProfile; +import com.microsoft.azure.management.containerservice.ManagedClusterAgentPoolProfile; import com.microsoft.azure.management.containerservice.ContainerServiceLinuxProfile; import com.microsoft.azure.management.containerservice.ContainerServiceServicePrincipalProfile; import java.util.Map; @@ -54,7 +54,7 @@ public class ManagedClusterInner extends Resource { * Properties of the agent pool. */ @JsonProperty(value = "properties.agentPoolProfiles") - private List agentPoolProfiles; + private List agentPoolProfiles; /** * Profile for Linux VMs in the container service cluster. @@ -157,7 +157,7 @@ public String fqdn() { * * @return the agentPoolProfiles value */ - public List agentPoolProfiles() { + public List agentPoolProfiles() { return this.agentPoolProfiles; } @@ -167,7 +167,7 @@ public List agentPoolProfiles() { * @param agentPoolProfiles the agentPoolProfiles value to set * @return the ManagedClusterInner object itself. */ - public ManagedClusterInner withAgentPoolProfiles(List agentPoolProfiles) { + public ManagedClusterInner withAgentPoolProfiles(List agentPoolProfiles) { this.agentPoolProfiles = agentPoolProfiles; return this; } From 8269432c0d6b8a32ec1067fa934f5892a1585f72 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 30 May 2018 21:45:40 +0000 Subject: [PATCH 3/3] Generated from d61dfda40f6a7498040fee441c1b23cb6a1bc01a Incorporated review comments --- .../ContainerServiceAgentPoolProfile.java | 8 +++----- .../containerservice/ContainerServiceMasterProfile.java | 8 +++----- .../containerservice/ContainerServiceNetworkProfile.java | 6 +++--- .../containerservice/ManagedClusterAgentPoolProfile.java | 8 +++----- .../azure/management/containerservice/NetworkPolicy.java | 3 --- 5 files changed, 12 insertions(+), 21 deletions(-) diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java index 5c1ac533544..a24fa21e9e0 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java @@ -123,9 +123,7 @@ public class ContainerServiceAgentPoolProfile { private ContainerServiceStorageProfileTypes storageProfile; /** - * VNet SubnetID specifies the vnet's subnet identifier. If you specify - * either master VNet Subnet, or agent VNet Subnet, you need to specify - * both. And they have to be in the same VNet. + * VNet SubnetID specifies the vnet's subnet identifier. */ @JsonProperty(value = "vnetSubnetID") private String vnetSubnetID; @@ -287,7 +285,7 @@ public ContainerServiceAgentPoolProfile withStorageProfile(ContainerServiceStora } /** - * Get vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + * Get vNet SubnetID specifies the vnet's subnet identifier. * * @return the vnetSubnetID value */ @@ -296,7 +294,7 @@ public String vnetSubnetID() { } /** - * Set vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + * Set vNet SubnetID specifies the vnet's subnet identifier. * * @param vnetSubnetID the vnetSubnetID value to set * @return the ContainerServiceAgentPoolProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceMasterProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceMasterProfile.java index a2acab1bc05..8a6ee6adbec 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceMasterProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceMasterProfile.java @@ -93,9 +93,7 @@ public class ContainerServiceMasterProfile { private Integer osDiskSizeGB; /** - * VNet SubnetID specifies the vnet's subnet identifier. If you specify - * either master VNet Subnet, or agent VNet Subnet, you need to specify - * both. And they have to be in the same VNet. + * VNet SubnetID specifies the vnet's subnet identifier. */ @JsonProperty(value = "vnetSubnetID") private String vnetSubnetID; @@ -202,7 +200,7 @@ public ContainerServiceMasterProfile withOsDiskSizeGB(Integer osDiskSizeGB) { } /** - * Get vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + * Get vNet SubnetID specifies the vnet's subnet identifier. * * @return the vnetSubnetID value */ @@ -211,7 +209,7 @@ public String vnetSubnetID() { } /** - * Set vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + * Set vNet SubnetID specifies the vnet's subnet identifier. * * @param vnetSubnetID the vnetSubnetID value to set * @return the ContainerServiceMasterProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceNetworkProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceNetworkProfile.java index aa57acc8fc7..f31d071dccb 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceNetworkProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ContainerServiceNetworkProfile.java @@ -23,7 +23,7 @@ public class ContainerServiceNetworkProfile { /** * Network policy used for building Kubernetes network. Possible values - * include: 'calico', 'cilium'. + * include: 'calico'. */ @JsonProperty(value = "networkPolicy") private NetworkPolicy networkPolicy; @@ -78,7 +78,7 @@ public ContainerServiceNetworkProfile withNetworkPlugin(NetworkPlugin networkPlu } /** - * Get network policy used for building Kubernetes network. Possible values include: 'calico', 'cilium'. + * Get network policy used for building Kubernetes network. Possible values include: 'calico'. * * @return the networkPolicy value */ @@ -87,7 +87,7 @@ public NetworkPolicy networkPolicy() { } /** - * Set network policy used for building Kubernetes network. Possible values include: 'calico', 'cilium'. + * Set network policy used for building Kubernetes network. Possible values include: 'calico'. * * @param networkPolicy the networkPolicy value to set * @return the ContainerServiceNetworkProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAgentPoolProfile.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAgentPoolProfile.java index 5f9d8c02e76..34ad137392e 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAgentPoolProfile.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/ManagedClusterAgentPoolProfile.java @@ -123,9 +123,7 @@ public class ManagedClusterAgentPoolProfile { private ContainerServiceStorageProfileTypes storageProfile; /** - * VNet SubnetID specifies the vnet's subnet identifier. If you specify - * either master VNet Subnet, or agent VNet Subnet, you need to specify - * both. And they have to be in the same VNet. + * VNet SubnetID specifies the vnet's subnet identifier. */ @JsonProperty(value = "vnetSubnetID") private String vnetSubnetID; @@ -293,7 +291,7 @@ public ManagedClusterAgentPoolProfile withStorageProfile(ContainerServiceStorage } /** - * Get vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + * Get vNet SubnetID specifies the vnet's subnet identifier. * * @return the vnetSubnetID value */ @@ -302,7 +300,7 @@ public String vnetSubnetID() { } /** - * Set vNet SubnetID specifies the vnet's subnet identifier. If you specify either master VNet Subnet, or agent VNet Subnet, you need to specify both. And they have to be in the same VNet. + * Set vNet SubnetID specifies the vnet's subnet identifier. * * @param vnetSubnetID the vnetSubnetID value to set * @return the ManagedClusterAgentPoolProfile object itself. diff --git a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPolicy.java b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPolicy.java index d6cc5c34a0f..2750b084cb7 100644 --- a/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPolicy.java +++ b/azure-mgmt-containerservice/src/main/java/com/microsoft/azure/management/containerservice/NetworkPolicy.java @@ -19,9 +19,6 @@ public final class NetworkPolicy extends ExpandableStringEnum { /** Static value calico for NetworkPolicy. */ public static final NetworkPolicy CALICO = fromString("calico"); - /** Static value cilium for NetworkPolicy. */ - public static final NetworkPolicy CILIUM = fromString("cilium"); - /** * Creates or finds a NetworkPolicy from its string representation. * @param name a name to look for