upgrade ACI 2021-03 (#1381)

api-specs.json

@@ -88,7 +88,7 @@
     "dir": "azure-mgmt-containerinstance",
     "source": "specification/containerinstance/resource-manager/readme.md",
     "package": "com.microsoft.azure.management.containerinstance",
-    "args": "--payload-flattening-threshold=1 --tag=package-2018-10"
+    "args": "--payload-flattening-threshold=1 --tag=package-2021-03 --remove-inner=Container,Operation,CachedImages,Capabilities"
   },
   "containerregistry": {
     "dir": "azure-mgmt-containerregistry",

azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/CachedImages.java

@@ -14,12 +14,6 @@
  * The cached image and OS type.
  */
 public class CachedImages {
-    /**
-     * The resource Id of the cached image.
-     */
-    @JsonProperty(value = "id")
-    private String id;
-
     /**
      * The OS type of the cached image.
      */
@@ -32,26 +26,6 @@ public class CachedImages {
     @JsonProperty(value = "image", required = true)
     private String image;
 
-    /**
-     * Get the resource Id of the cached image.
-     *
-     * @return the id value
-     */
-    public String id() {
-        return this.id;
-    }
-
-    /**
-     * Set the resource Id of the cached image.
-     *
-     * @param id the id value to set
-     * @return the CachedImages object itself.
-     */
-    public CachedImages withId(String id) {
-        this.id = id;
-        return this;
-    }
-
     /**
      * Get the OS type of the cached image.
      *

azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/Container.java

@@ -2,12 +2,13 @@
  * 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.containerinstance;
 
 import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 

azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/ContainerGroupSku.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.containerinstance;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for ContainerGroupSku.
+ */
+public final class ContainerGroupSku extends ExpandableStringEnum<ContainerGroupSku> {
+    /** Static value Standard for ContainerGroupSku. */
+    public static final ContainerGroupSku STANDARD = fromString("Standard");
+
+    /** Static value Dedicated for ContainerGroupSku. */
+    public static final ContainerGroupSku DEDICATED = fromString("Dedicated");
+
+    /**
+     * Creates or finds a ContainerGroupSku from its string representation.
+     * @param name a name to look for
+     * @return the corresponding ContainerGroupSku
+     */
+    @JsonCreator
+    public static ContainerGroupSku fromString(String name) {
+        return fromString(name, ContainerGroupSku.class);
+    }
+
+    /**
+     * @return known ContainerGroupSku values
+     */
+    public static Collection<ContainerGroupSku> values() {
+        return values(ContainerGroupSku.class);
+    }
+}

azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/ContainerGroups.java

@@ -3,8 +3,10 @@
  * Licensed under the MIT License. See License.txt in the project root for
  * license information.
  */
+
 package com.microsoft.azure.management.containerinstance;
 
+import com.microsoft.azure.PagedList;
 import com.microsoft.azure.management.apigeneration.Beta;
 import com.microsoft.azure.management.apigeneration.Fluent;
 import com.microsoft.azure.management.containerinstance.implementation.ContainerGroupsInner;
@@ -23,9 +25,6 @@
 import rx.Completable;
 import rx.Observable;
 
-import java.util.List;
-import java.util.Set;
-
 /**
  * Entry point to the container instance management API.
  */
@@ -100,15 +99,15 @@ public interface ContainerGroups extends
      * @return all operations for Azure Container Instance service
      */
     @Beta(Beta.SinceVersion.V1_5_0)
-    Set<Operation> listOperations();
+    PagedList<Operation> listOperations();
 
     /**
      * Lists all operations for Azure Container Instance service.
      *
      * @return a representation of the future computation of this call
      */
     @Beta(Beta.SinceVersion.V1_23_0)
-    Observable<Set<Operation>> listOperationsAsync();
+    Observable<Operation> listOperationsAsync();
 
     /**
      * Lists cached images for a subscription in a region.
@@ -117,7 +116,7 @@ public interface ContainerGroups extends
      * @return all cached images from the specified location
      */
     @Beta(Beta.SinceVersion.V1_23_0)
-    List<CachedImages> listCachedImages(String location);
+    PagedList<CachedImages> listCachedImages(String location);
 
     /**
      * Lists cached images for a subscription in a region.
@@ -135,7 +134,7 @@ public interface ContainerGroups extends
      * @return a list of all of the capabilities of the given location
      */
     @Beta(Beta.SinceVersion.V1_23_0)
-    List<Capabilities> listCapabilities(String location);
+    PagedList<Capabilities> listCapabilities(String location);
 
     /**
      * Lists the capabilities of a location.

azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/ContainerHttpGet.java

@@ -30,7 +30,13 @@ public class ContainerHttpGet {
      * The scheme. Possible values include: 'http', 'https'.
      */
     @JsonProperty(value = "scheme")
-    private String scheme;
+    private Scheme scheme;
+
+    /**
+     * The HTTP headers.
+     */
+    @JsonProperty(value = "httpHeaders")
+    private HttpHeaders httpHeaders;
 
     /**
      * Get the path to probe.
@@ -77,7 +83,7 @@ public ContainerHttpGet withPort(int port) {
      *
      * @return the scheme value
      */
-    public String scheme() {
+    public Scheme scheme() {
         return this.scheme;
     }
 
@@ -87,9 +93,29 @@ public String scheme() {
      * @param scheme the scheme value to set
      * @return the ContainerHttpGet object itself.
      */
-    public ContainerHttpGet withScheme(String scheme) {
+    public ContainerHttpGet withScheme(Scheme scheme) {
         this.scheme = scheme;
         return this;
     }
 
+    /**
+     * Get the HTTP headers.
+     *
+     * @return the httpHeaders value
+     */
+    public HttpHeaders httpHeaders() {
+        return this.httpHeaders;
+    }
+
+    /**
+     * Set the HTTP headers.
+     *
+     * @param httpHeaders the httpHeaders value to set
+     * @return the ContainerHttpGet object itself.
+     */
+    public ContainerHttpGet withHttpHeaders(HttpHeaders httpHeaders) {
+        this.httpHeaders = httpHeaders;
+        return this;
+    }
+
 }

azure-mgmt-containerinstance/src/main/java/com/microsoft/azure/management/containerinstance/ContainerState.java

@@ -18,32 +18,32 @@ public class ContainerState {
     /**
      * The state of the container instance.
      */
-    @JsonProperty(value = "state")
+    @JsonProperty(value = "state", access = JsonProperty.Access.WRITE_ONLY)
     private String state;
 
     /**
      * The date-time when the container instance state started.
      */
-    @JsonProperty(value = "startTime")
+    @JsonProperty(value = "startTime", access = JsonProperty.Access.WRITE_ONLY)
     private DateTime startTime;
 
     /**
      * The container instance exit codes correspond to those from the `docker
      * run` command.
      */
-    @JsonProperty(value = "exitCode")
+    @JsonProperty(value = "exitCode", access = JsonProperty.Access.WRITE_ONLY)
     private Integer exitCode;
 
     /**
      * The date-time when the container instance state finished.
      */
-    @JsonProperty(value = "finishTime")
+    @JsonProperty(value = "finishTime", access = JsonProperty.Access.WRITE_ONLY)
     private DateTime finishTime;
 
     /**
      * The human-readable status of the container instance state.
      */
-    @JsonProperty(value = "detailStatus")
+    @JsonProperty(value = "detailStatus", access = JsonProperty.Access.WRITE_ONLY)
     private String detailStatus;
 
     /**
@@ -55,17 +55,6 @@ public String state() {
         return this.state;
     }
 
-    /**
-     * Set the state of the container instance.
-     *
-     * @param state the state value to set
-     * @return the ContainerState object itself.
-     */
-    public ContainerState withState(String state) {
-        this.state = state;
-        return this;
-    }
-
     /**
      * Get the date-time when the container instance state started.
      *
@@ -75,17 +64,6 @@ public DateTime startTime() {
         return this.startTime;
     }
 
-    /**
-     * Set the date-time when the container instance state started.
-     *
-     * @param startTime the startTime value to set
-     * @return the ContainerState object itself.
-     */
-    public ContainerState withStartTime(DateTime startTime) {
-        this.startTime = startTime;
-        return this;
-    }
-
     /**
      * Get the container instance exit codes correspond to those from the `docker run` command.
      *
@@ -95,17 +73,6 @@ public Integer exitCode() {
         return this.exitCode;
     }
 
-    /**
-     * Set the container instance exit codes correspond to those from the `docker run` command.
-     *
-     * @param exitCode the exitCode value to set
-     * @return the ContainerState object itself.
-     */
-    public ContainerState withExitCode(Integer exitCode) {
-        this.exitCode = exitCode;
-        return this;
-    }
-
     /**
      * Get the date-time when the container instance state finished.
      *
@@ -115,17 +82,6 @@ public DateTime finishTime() {
         return this.finishTime;
     }
 
-    /**
-     * Set the date-time when the container instance state finished.
-     *
-     * @param finishTime the finishTime value to set
-     * @return the ContainerState object itself.
-     */
-    public ContainerState withFinishTime(DateTime finishTime) {
-        this.finishTime = finishTime;
-        return this;
-    }
-
     /**
      * Get the human-readable status of the container instance state.
      *
@@ -135,15 +91,4 @@ public String detailStatus() {
         return this.detailStatus;
     }
 
-    /**
-     * Set the human-readable status of the container instance state.
-     *
-     * @param detailStatus the detailStatus value to set
-     * @return the ContainerState object itself.
-     */
-    public ContainerState withDetailStatus(String detailStatus) {
-        this.detailStatus = detailStatus;
-        return this;
-    }
-
 }