Skip to content

Commit 06422ab

Browse files
author
SDK Automation
committed
Generated from eb835f618f791a74a3a2b85b7fcf3425229aed58
1 parent c41fa34 commit 06422ab

File tree

10 files changed

+98
-80
lines changed

10 files changed

+98
-80
lines changed

sdk/containerservice/mgmt-v2019_06_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_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/AgentPool.java

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

sdk/containerservice/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_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) {

sdk/containerservice/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/AgentPoolsInner.java

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ interface AgentPoolsService {
9090
Observable<Response<ResponseBody>> getUpgradeProfile(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
9191

9292
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools getAvailableAgentPoolVersions" })
93-
@GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/agentPools/{agentPoolName}/availableAgentPoolVersions")
94-
Observable<Response<ResponseBody>> getAvailableAgentPoolVersions(@Path("subscriptionId") String subscriptionId, @Path("resourceGroupName") String resourceGroupName, @Path("resourceName") String resourceName, @Path("agentPoolName") String agentPoolName, @Query("api-version") String apiVersion, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
93+
@GET("subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/availableAgentPoolVersions")
94+
Observable<Response<ResponseBody>> getAvailableAgentPoolVersions(@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);
9595

9696
@Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.containerservice.v2019_06_01.AgentPools listNext" })
9797
@GET
@@ -783,14 +783,13 @@ private ServiceResponse<AgentPoolUpgradeProfileInner> getUpgradeProfileDelegate(
783783
*
784784
* @param resourceGroupName The name of the resource group.
785785
* @param resourceName The name of the managed cluster resource.
786-
* @param agentPoolName The name of the agent pool.
787786
* @throws IllegalArgumentException thrown if parameters fail the validation
788787
* @throws CloudException thrown if the request is rejected by server
789788
* @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
790789
* @return the AgentPoolAvailableVersionsInner object if successful.
791790
*/
792-
public AgentPoolAvailableVersionsInner getAvailableAgentPoolVersions(String resourceGroupName, String resourceName, String agentPoolName) {
793-
return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).toBlocking().single().body();
791+
public AgentPoolAvailableVersionsInner getAvailableAgentPoolVersions(String resourceGroupName, String resourceName) {
792+
return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName).toBlocking().single().body();
794793
}
795794

796795
/**
@@ -799,13 +798,12 @@ public AgentPoolAvailableVersionsInner getAvailableAgentPoolVersions(String reso
799798
*
800799
* @param resourceGroupName The name of the resource group.
801800
* @param resourceName The name of the managed cluster resource.
802-
* @param agentPoolName The name of the agent pool.
803801
* @param serviceCallback the async ServiceCallback to handle successful and failed responses.
804802
* @throws IllegalArgumentException thrown if parameters fail the validation
805803
* @return the {@link ServiceFuture} object
806804
*/
807-
public ServiceFuture<AgentPoolAvailableVersionsInner> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName, final ServiceCallback<AgentPoolAvailableVersionsInner> serviceCallback) {
808-
return ServiceFuture.fromResponse(getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName), serviceCallback);
805+
public ServiceFuture<AgentPoolAvailableVersionsInner> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, final ServiceCallback<AgentPoolAvailableVersionsInner> serviceCallback) {
806+
return ServiceFuture.fromResponse(getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName), serviceCallback);
809807
}
810808

811809
/**
@@ -814,12 +812,11 @@ public ServiceFuture<AgentPoolAvailableVersionsInner> getAvailableAgentPoolVersi
814812
*
815813
* @param resourceGroupName The name of the resource group.
816814
* @param resourceName The name of the managed cluster resource.
817-
* @param agentPoolName The name of the agent pool.
818815
* @throws IllegalArgumentException thrown if parameters fail the validation
819816
* @return the observable to the AgentPoolAvailableVersionsInner object
820817
*/
821-
public Observable<AgentPoolAvailableVersionsInner> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName) {
822-
return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName, agentPoolName).map(new Func1<ServiceResponse<AgentPoolAvailableVersionsInner>, AgentPoolAvailableVersionsInner>() {
818+
public Observable<AgentPoolAvailableVersionsInner> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName) {
819+
return getAvailableAgentPoolVersionsWithServiceResponseAsync(resourceGroupName, resourceName).map(new Func1<ServiceResponse<AgentPoolAvailableVersionsInner>, AgentPoolAvailableVersionsInner>() {
823820
@Override
824821
public AgentPoolAvailableVersionsInner call(ServiceResponse<AgentPoolAvailableVersionsInner> response) {
825822
return response.body();
@@ -833,11 +830,10 @@ public AgentPoolAvailableVersionsInner call(ServiceResponse<AgentPoolAvailableVe
833830
*
834831
* @param resourceGroupName The name of the resource group.
835832
* @param resourceName The name of the managed cluster resource.
836-
* @param agentPoolName The name of the agent pool.
837833
* @throws IllegalArgumentException thrown if parameters fail the validation
838834
* @return the observable to the AgentPoolAvailableVersionsInner object
839835
*/
840-
public Observable<ServiceResponse<AgentPoolAvailableVersionsInner>> getAvailableAgentPoolVersionsWithServiceResponseAsync(String resourceGroupName, String resourceName, String agentPoolName) {
836+
public Observable<ServiceResponse<AgentPoolAvailableVersionsInner>> getAvailableAgentPoolVersionsWithServiceResponseAsync(String resourceGroupName, String resourceName) {
841837
if (this.client.subscriptionId() == null) {
842838
throw new IllegalArgumentException("Parameter this.client.subscriptionId() is required and cannot be null.");
843839
}
@@ -847,11 +843,8 @@ public Observable<ServiceResponse<AgentPoolAvailableVersionsInner>> getAvailable
847843
if (resourceName == null) {
848844
throw new IllegalArgumentException("Parameter resourceName is required and cannot be null.");
849845
}
850-
if (agentPoolName == null) {
851-
throw new IllegalArgumentException("Parameter agentPoolName is required and cannot be null.");
852-
}
853846
final String apiVersion = "2019-06-01";
854-
return service.getAvailableAgentPoolVersions(this.client.subscriptionId(), resourceGroupName, resourceName, agentPoolName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
847+
return service.getAvailableAgentPoolVersions(this.client.subscriptionId(), resourceGroupName, resourceName, apiVersion, this.client.acceptLanguage(), this.client.userAgent())
855848
.flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<AgentPoolAvailableVersionsInner>>>() {
856849
@Override
857850
public Observable<ServiceResponse<AgentPoolAvailableVersionsInner>> call(Response<ResponseBody> response) {

sdk/containerservice/mgmt-v2019_06_01/src/main/java/com/microsoft/azure/management/containerservice/v2019_06_01/implementation/ManagedClusterInner.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,9 @@ public class ManagedClusterInner extends Resource {
102102
private Boolean enableRBAC;
103103

104104
/**
105-
* (PREVIEW) Whether to enable Kubernetes Pod security policy.
105+
* (DEPRECATING) Whether to enable Kubernetes pod security policy
106+
* (preview). This feature is set for removal on October 15th, 2020. Learn
107+
* more at aka.ms/aks/azpodpolicy.
106108
*/
107109
@JsonProperty(value = "properties.enablePodSecurityPolicy")
108110
private Boolean enablePodSecurityPolicy;
@@ -339,7 +341,7 @@ public ManagedClusterInner withEnableRBAC(Boolean enableRBAC) {
339341
}
340342

341343
/**
342-
* Get (PREVIEW) Whether to enable Kubernetes Pod security policy.
344+
* Get (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy.
343345
*
344346
* @return the enablePodSecurityPolicy value
345347
*/
@@ -348,7 +350,7 @@ public Boolean enablePodSecurityPolicy() {
348350
}
349351

350352
/**
351-
* Set (PREVIEW) Whether to enable Kubernetes Pod security policy.
353+
* Set (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy.
352354
*
353355
* @param enablePodSecurityPolicy the enablePodSecurityPolicy value to set
354356
* @return the ManagedClusterInner object itself.

0 commit comments

Comments
 (0)