Skip to content

Commit 799d3e9

Browse files
author
SDKAuto
committed
CodeGen from PR 11669 in Azure/azure-rest-api-specs
Merge 8ca705121a02efc689365b127ac92189673771cc into 48e7415267518cc2b92f6e6002466f676bdef1a5
1 parent 65f70ec commit 799d3e9

File tree

14 files changed

+302
-86
lines changed

14 files changed

+302
-86
lines changed

sdk/containerservice/mgmt-v2019_08_01/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<parent>
1212
<groupId>com.microsoft.azure</groupId>
1313
<artifactId>azure-arm-parent</artifactId>
14-
<version>1.2.0</version>
15-
<relativePath>../../parents/azure-arm-parent</relativePath>
14+
<version>1.1.0</version>
15+
<relativePath>../../../pom.management.xml</relativePath>
1616
</parent>
1717
<artifactId>azure-mgmt-containerservice</artifactId>
1818
<version>1.0.0-beta</version>

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/AgentPool.java

Lines changed: 53 additions & 29 deletions
Large diffs are not rendered by default.

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/AgentPools.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ public interface AgentPools extends SupportsCreating<AgentPool.DefinitionStages.
7171
*
7272
* @param resourceGroupName The name of the resource group.
7373
* @param resourceName The name of the managed cluster resource.
74-
* @param agentPoolName The name of the agent pool.
7574
* @throws IllegalArgumentException thrown if parameters fail the validation
7675
* @return the observable for the request
7776
*/
78-
Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName);
77+
Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName);
7978

8079
}

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/ManagedCluster.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ interface WithDnsPrefix {
199199
interface WithEnablePodSecurityPolicy {
200200
/**
201201
* Specifies enablePodSecurityPolicy.
202-
* @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy
202+
* @param enablePodSecurityPolicy (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy
203203
* @return the next definition stage
204204
*/
205205
WithCreate withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy);
@@ -385,7 +385,7 @@ interface WithDnsPrefix {
385385
interface WithEnablePodSecurityPolicy {
386386
/**
387387
* Specifies enablePodSecurityPolicy.
388-
* @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy
388+
* @param enablePodSecurityPolicy (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy
389389
* @return the next update stage
390390
*/
391391
Update withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy);

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/ManagedClusterAgentPoolProfileProperties.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ public class ManagedClusterAgentPoolProfileProperties {
1919
* Number of agents (VMs) to host docker containers. Allowed values must be
2020
* in the range of 1 to 100 (inclusive). The default value is 1.
2121
*/
22-
@JsonProperty(value = "count", required = true)
23-
private int count;
22+
@JsonProperty(value = "count")
23+
private Integer count;
2424

2525
/**
2626
* Size of agent VMs. Possible values include: 'Standard_A1',
@@ -76,7 +76,7 @@ public class ManagedClusterAgentPoolProfileProperties {
7676
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
7777
* 'Standard_NV6'.
7878
*/
79-
@JsonProperty(value = "vmSize", required = true)
79+
@JsonProperty(value = "vmSize")
8080
private ContainerServiceVMSizeTypes vmSize;
8181

8282
/**
@@ -184,7 +184,7 @@ public class ManagedClusterAgentPoolProfileProperties {
184184
*
185185
* @return the count value
186186
*/
187-
public int count() {
187+
public Integer count() {
188188
return this.count;
189189
}
190190

@@ -194,7 +194,7 @@ public int count() {
194194
* @param count the count value to set
195195
* @return the ManagedClusterAgentPoolProfileProperties object itself.
196196
*/
197-
public ManagedClusterAgentPoolProfileProperties withCount(int count) {
197+
public ManagedClusterAgentPoolProfileProperties withCount(Integer count) {
198198
this.count = count;
199199
return this;
200200
}

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/ManagedClusterWindowsProfile.java

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,34 @@
1515
*/
1616
public class ManagedClusterWindowsProfile {
1717
/**
18-
* The administrator username to use for Windows VMs.
18+
* Specifies the name of the administrator account. &lt;br&gt;&lt;br&gt;
19+
* **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed
20+
* values:** "administrator", "admin", "user", "user1", "test", "user2",
21+
* "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2",
22+
* "aspnet", "backup", "console", "david", "guest", "john", "owner",
23+
* "root", "server", "sql", "support", "support_388945a0", "sys", "test2",
24+
* "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1
25+
* character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
1926
*/
2027
@JsonProperty(value = "adminUsername", required = true)
2128
private String adminUsername;
2229

2330
/**
24-
* The administrator password to use for Windows VMs.
31+
* Specifies the password of the administrator account.
32+
* &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters
33+
* &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt;
34+
* **Complexity requirements:** 3 out of 4 conditions below need to be
35+
* fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters
36+
* &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match
37+
* [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123",
38+
* "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1",
39+
* "Password!", "Password1", "Password22", "iloveyou!".
2540
*/
2641
@JsonProperty(value = "adminPassword")
2742
private String adminPassword;
2843

2944
/**
30-
* Get the administrator username to use for Windows VMs.
45+
* Get specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1 character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
3146
*
3247
* @return the adminUsername value
3348
*/
@@ -36,7 +51,7 @@ public String adminUsername() {
3651
}
3752

3853
/**
39-
* Set the administrator username to use for Windows VMs.
54+
* Set specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1 character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
4055
*
4156
* @param adminUsername the adminUsername value to set
4257
* @return the ManagedClusterWindowsProfile object itself.
@@ -47,7 +62,7 @@ public ManagedClusterWindowsProfile withAdminUsername(String adminUsername) {
4762
}
4863

4964
/**
50-
* Get the administrator password to use for Windows VMs.
65+
* Get specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!".
5166
*
5267
* @return the adminPassword value
5368
*/
@@ -56,7 +71,7 @@ public String adminPassword() {
5671
}
5772

5873
/**
59-
* Set the administrator password to use for Windows VMs.
74+
* Set specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!".
6075
*
6176
* @param adminPassword the adminPassword value to set
6277
* @return the ManagedClusterWindowsProfile object itself.

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/ManagedClusters.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,17 @@ public interface ManagedClusters extends SupportsCreating<ManagedCluster.Definit
6969
*/
7070
Completable resetAADProfileAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters);
7171

72+
/**
73+
* Rotate certificates of a managed cluster.
74+
* Rotate certificates of a managed cluster.
75+
*
76+
* @param resourceGroupName The name of the resource group.
77+
* @param resourceName The name of the managed cluster resource.
78+
* @throws IllegalArgumentException thrown if parameters fail the validation
79+
* @return the observable for the request
80+
*/
81+
Completable rotateClusterCertificatesAsync(String resourceGroupName, String resourceName);
82+
7283
/**
7384
* Gets upgrade profile for a managed cluster.
7485
* Gets the details of the upgrade profile for a managed cluster with a specified resource group and name.

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/implementation/AgentPoolImpl.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public List<String> availabilityZones() {
8686
}
8787

8888
@Override
89-
public int count() {
89+
public Integer count() {
9090
return this.inner().count();
9191
}
9292

@@ -182,18 +182,6 @@ public AgentPoolImpl withExistingManagedCluster(String resourceGroupName, String
182182
return this;
183183
}
184184

185-
@Override
186-
public AgentPoolImpl withCount(int count) {
187-
this.inner().withCount(count);
188-
return this;
189-
}
190-
191-
@Override
192-
public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) {
193-
this.inner().withVmSize(vmSize);
194-
return this;
195-
}
196-
197185
@Override
198186
public AgentPoolImpl withAgentPoolType(AgentPoolType agentPoolType) {
199187
this.inner().withAgentPoolType(agentPoolType);
@@ -206,6 +194,12 @@ public AgentPoolImpl withAvailabilityZones(List<String> availabilityZones) {
206194
return this;
207195
}
208196

197+
@Override
198+
public AgentPoolImpl withCount(Integer count) {
199+
this.inner().withCount(count);
200+
return this;
201+
}
202+
209203
@Override
210204
public AgentPoolImpl withEnableAutoScaling(Boolean enableAutoScaling) {
211205
this.inner().withEnableAutoScaling(enableAutoScaling);
@@ -272,6 +266,12 @@ public AgentPoolImpl withScaleSetPriority(ScaleSetPriority scaleSetPriority) {
272266
return this;
273267
}
274268

269+
@Override
270+
public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) {
271+
this.inner().withVmSize(vmSize);
272+
return this;
273+
}
274+
275275
@Override
276276
public AgentPoolImpl withVnetSubnetID(String vnetSubnetID) {
277277
this.inner().withVnetSubnetID(vnetSubnetID);

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/implementation/AgentPoolInner.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ public class AgentPoolInner extends SubResource {
2727
* Number of agents (VMs) to host docker containers. Allowed values must be
2828
* in the range of 1 to 100 (inclusive). The default value is 1.
2929
*/
30-
@JsonProperty(value = "properties.count", required = true)
31-
private int count;
30+
@JsonProperty(value = "properties.count")
31+
private Integer count;
3232

3333
/**
3434
* Size of agent VMs. Possible values include: 'Standard_A1',
@@ -84,7 +84,7 @@ public class AgentPoolInner extends SubResource {
8484
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
8585
* 'Standard_NV6'.
8686
*/
87-
@JsonProperty(value = "properties.vmSize", required = true)
87+
@JsonProperty(value = "properties.vmSize")
8888
private ContainerServiceVMSizeTypes vmSize;
8989

9090
/**
@@ -205,7 +205,7 @@ public class AgentPoolInner extends SubResource {
205205
*
206206
* @return the count value
207207
*/
208-
public int count() {
208+
public Integer count() {
209209
return this.count;
210210
}
211211

@@ -215,7 +215,7 @@ public int count() {
215215
* @param count the count value to set
216216
* @return the AgentPoolInner object itself.
217217
*/
218-
public AgentPoolInner withCount(int count) {
218+
public AgentPoolInner withCount(Integer count) {
219219
this.count = count;
220220
return this;
221221
}

sdk/containerservice/mgmt-v2019_08_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_08_01/implementation/AgentPoolsImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ public AgentPoolUpgradeProfile call(AgentPoolUpgradeProfileInner inner) {
9797
}
9898

9999
@Override
100-
public Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName) {
100+
public Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName) {
101101
AgentPoolsInner client = this.inner();
102-
return client.getAvailableAgentPoolVersionsAsync(resourceGroupName, resourceName, agentPoolName)
102+
return client.getAvailableAgentPoolVersionsAsync(resourceGroupName, resourceName)
103103
.map(new Func1<AgentPoolAvailableVersionsInner, AgentPoolAvailableVersions>() {
104104
@Override
105105
public AgentPoolAvailableVersions call(AgentPoolAvailableVersionsInner inner) {

0 commit comments

Comments
 (0)