Skip to content

Commit

Permalink
[AutoPR containerservices/resource-manager] [AKS] add new 2018-03-31 …
Browse files Browse the repository at this point in the history 
…API (#194)

* Generated from 069fe698d58709694ea1945b032523b01a5aa4cd

Rename an example file to start with a capital letter

* Generated from e365e10741ba688b8c3b39b67986e2b6e06e4ddc

Rename to ManagedClusterAgentPoolProfile.

Its fields have diverged from ContainerServiceAgentPoolProfile.

* Generated from d61dfda40f6a7498040fee441c1b23cb6a1bc01a

Incorporated review comments
  • Loading branch information
@AutorestCI
AutorestCI authored Jun 1, 2018
1 parent 0f8d62f commit 24b6ba2
Show file tree
Hide file tree
Showing 31 changed files with 1,412 additions and 273 deletions.
42 changes: 20 additions & 22 deletions ...ava/com/microsoft/azure/management/containerservice/ContainerServiceAgentPoolProfile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -138,7 +136,7 @@ public class ContainerServiceAgentPoolProfile {
private OSType osType;

/**
* Get the name value.
* Get unique name of the agent pool profile in the context of the subscription and resource group.
*
* @return the name value
*/
Expand All @@ -147,7 +145,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.
Expand All @@ -158,7 +156,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
*/
Expand All @@ -167,7 +165,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.
Expand All @@ -178,7 +176,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
*/
Expand All @@ -187,7 +185,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.
Expand All @@ -198,7 +196,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
*/
Expand All @@ -207,7 +205,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.
Expand All @@ -218,7 +216,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
*/
Expand All @@ -227,7 +225,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.
Expand All @@ -238,7 +236,7 @@ public ContainerServiceAgentPoolProfile withDnsPrefix(String dnsPrefix) {
}

/**
* Get the fqdn value.
* Get fDQN for the agent pool.
*
* @return the fqdn value
*/
Expand All @@ -247,7 +245,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
*/
Expand All @@ -256,7 +254,7 @@ public List<Integer> 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.
Expand All @@ -267,7 +265,7 @@ public ContainerServiceAgentPoolProfile withPorts(List<Integer> 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
*/
Expand All @@ -276,7 +274,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.
Expand All @@ -287,7 +285,7 @@ public ContainerServiceAgentPoolProfile withStorageProfile(ContainerServiceStora
}

/**
* Get the vnetSubnetID value.
* Get vNet SubnetID specifies the vnet's subnet identifier.
*
* @return the vnetSubnetID value
*/
Expand All @@ -296,7 +294,7 @@ public String vnetSubnetID() {
}

/**
* Set the vnetSubnetID value.
* Set vNet SubnetID specifies the vnet's subnet identifier.
*
* @param vnetSubnetID the vnetSubnetID value to set
* @return the ContainerServiceAgentPoolProfile object itself.
Expand All @@ -307,7 +305,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
*/
Expand All @@ -316,7 +314,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.
Expand Down
4 changes: 2 additions & 2 deletions ...n/java/com/microsoft/azure/management/containerservice/ContainerServiceCustomProfile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions ...a/com/microsoft/azure/management/containerservice/ContainerServiceDiagnosticsProfile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions ...in/java/com/microsoft/azure/management/containerservice/ContainerServiceLinuxProfile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand All @@ -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.
Expand All @@ -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
*/
Expand All @@ -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.
Expand Down
Loading

0 comments on commit 24b6ba2

Please # to comment.