Merge branch 'ecs-Java-2020-04-01-online-695-2024_10_21_20_47_41' into 'integration_2024-10-24_515996570370'

feat: [development task] ecs-695-java (818776)

See merge request iaasng/volcengine-java-sdk!273

Author: BitsAdmin

volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/CreateCommandRequest.java

@@ -20,6 +20,7 @@
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
 import com.volcengine.ecs.model.ParameterDefinitionForCreateCommandInput;
+import com.volcengine.ecs.model.TagForCreateCommandInput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -48,6 +49,12 @@ public class CreateCommandRequest {
   @SerializedName("ParameterDefinitions")
   private List<ParameterDefinitionForCreateCommandInput> parameterDefinitions = null;
 
+  @SerializedName("ProjectName")
+  private String projectName = null;
+
+  @SerializedName("Tags")
+  private List<TagForCreateCommandInput> tags = null;
+
   @SerializedName("Timeout")
   private Integer timeout = null;
 
@@ -161,6 +168,51 @@ public void setParameterDefinitions(List<ParameterDefinitionForCreateCommandInpu
     this.parameterDefinitions = parameterDefinitions;
   }
 
+  public CreateCommandRequest projectName(String projectName) {
+    this.projectName = projectName;
+    return this;
+  }
+
+   /**
+   * Get projectName
+   * @return projectName
+  **/
+  @Schema(description = "")
+  public String getProjectName() {
+    return projectName;
+  }
+
+  public void setProjectName(String projectName) {
+    this.projectName = projectName;
+  }
+
+  public CreateCommandRequest tags(List<TagForCreateCommandInput> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public CreateCommandRequest addTagsItem(TagForCreateCommandInput tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<TagForCreateCommandInput>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+   /**
+   * Get tags
+   * @return tags
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<TagForCreateCommandInput> getTags() {
+    return tags;
+  }
+
+  public void setTags(List<TagForCreateCommandInput> tags) {
+    this.tags = tags;
+  }
+
   public CreateCommandRequest timeout(Integer timeout) {
     this.timeout = timeout;
     return this;
@@ -249,6 +301,8 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.enableParameter, createCommandRequest.enableParameter) &&
         Objects.equals(this.name, createCommandRequest.name) &&
         Objects.equals(this.parameterDefinitions, createCommandRequest.parameterDefinitions) &&
+        Objects.equals(this.projectName, createCommandRequest.projectName) &&
+        Objects.equals(this.tags, createCommandRequest.tags) &&
         Objects.equals(this.timeout, createCommandRequest.timeout) &&
         Objects.equals(this.type, createCommandRequest.type) &&
         Objects.equals(this.username, createCommandRequest.username) &&
@@ -257,7 +311,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(commandContent, description, enableParameter, name, parameterDefinitions, timeout, type, username, workingDir);
+    return Objects.hash(commandContent, description, enableParameter, name, parameterDefinitions, projectName, tags, timeout, type, username, workingDir);
   }
 
 
@@ -271,6 +325,8 @@ public String toString() {
     sb.append("    enableParameter: ").append(toIndentedString(enableParameter)).append("\n");
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
     sb.append("    parameterDefinitions: ").append(toIndentedString(parameterDefinitions)).append("\n");
+    sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
     sb.append("    timeout: ").append(toIndentedString(timeout)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("    username: ").append(toIndentedString(username)).append("\n");

volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/DescribeCommandsRequest.java

@@ -19,8 +19,11 @@
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import com.volcengine.ecs.model.TagFilterForDescribeCommandsInput;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import javax.validation.constraints.*;
 import javax.validation.Valid;
 /**
@@ -45,9 +48,15 @@ public class DescribeCommandsRequest {
   @SerializedName("PageSize")
   private Integer pageSize = null;
 
+  @SerializedName("ProjectName")
+  private String projectName = null;
+
   @SerializedName("Provider")
   private String provider = null;
 
+  @SerializedName("TagFilters")
+  private List<TagFilterForDescribeCommandsInput> tagFilters = null;
+
   @SerializedName("Type")
   private String type = null;
 
@@ -141,6 +150,24 @@ public void setPageSize(Integer pageSize) {
     this.pageSize = pageSize;
   }
 
+  public DescribeCommandsRequest projectName(String projectName) {
+    this.projectName = projectName;
+    return this;
+  }
+
+   /**
+   * Get projectName
+   * @return projectName
+  **/
+  @Schema(description = "")
+  public String getProjectName() {
+    return projectName;
+  }
+
+  public void setProjectName(String projectName) {
+    this.projectName = projectName;
+  }
+
   public DescribeCommandsRequest provider(String provider) {
     this.provider = provider;
     return this;
@@ -159,6 +186,33 @@ public void setProvider(String provider) {
     this.provider = provider;
   }
 
+  public DescribeCommandsRequest tagFilters(List<TagFilterForDescribeCommandsInput> tagFilters) {
+    this.tagFilters = tagFilters;
+    return this;
+  }
+
+  public DescribeCommandsRequest addTagFiltersItem(TagFilterForDescribeCommandsInput tagFiltersItem) {
+    if (this.tagFilters == null) {
+      this.tagFilters = new ArrayList<TagFilterForDescribeCommandsInput>();
+    }
+    this.tagFilters.add(tagFiltersItem);
+    return this;
+  }
+
+   /**
+   * Get tagFilters
+   * @return tagFilters
+  **/
+  @Valid
+  @Schema(description = "")
+  public List<TagFilterForDescribeCommandsInput> getTagFilters() {
+    return tagFilters;
+  }
+
+  public void setTagFilters(List<TagFilterForDescribeCommandsInput> tagFilters) {
+    this.tagFilters = tagFilters;
+  }
+
   public DescribeCommandsRequest type(String type) {
     this.type = type;
     return this;
@@ -192,13 +246,15 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.order, describeCommandsRequest.order) &&
         Objects.equals(this.pageNumber, describeCommandsRequest.pageNumber) &&
         Objects.equals(this.pageSize, describeCommandsRequest.pageSize) &&
+        Objects.equals(this.projectName, describeCommandsRequest.projectName) &&
         Objects.equals(this.provider, describeCommandsRequest.provider) &&
+        Objects.equals(this.tagFilters, describeCommandsRequest.tagFilters) &&
         Objects.equals(this.type, describeCommandsRequest.type);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(commandId, name, order, pageNumber, pageSize, provider, type);
+    return Objects.hash(commandId, name, order, pageNumber, pageSize, projectName, provider, tagFilters, type);
   }
 
 
@@ -212,7 +268,9 @@ public String toString() {
     sb.append("    order: ").append(toIndentedString(order)).append("\n");
     sb.append("    pageNumber: ").append(toIndentedString(pageNumber)).append("\n");
     sb.append("    pageSize: ").append(toIndentedString(pageSize)).append("\n");
+    sb.append("    projectName: ").append(toIndentedString(projectName)).append("\n");
     sb.append("    provider: ").append(toIndentedString(provider)).append("\n");
+    sb.append("    tagFilters: ").append(toIndentedString(tagFilters)).append("\n");
     sb.append("    type: ").append(toIndentedString(type)).append("\n");
     sb.append("}");
     return sb.toString();

volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/DescribeInstanceTypesRequest.java

@@ -32,6 +32,9 @@
 
 
 public class DescribeInstanceTypesRequest {
+  @SerializedName("ImageId")
+  private String imageId = null;
+
   @SerializedName("InstanceTypeIds")
   private List<String> instanceTypeIds = null;
 
@@ -44,6 +47,24 @@ public class DescribeInstanceTypesRequest {
   @SerializedName("NextToken")
   private String nextToken = null;
 
+  public DescribeInstanceTypesRequest imageId(String imageId) {
+    this.imageId = imageId;
+    return this;
+  }
+
+   /**
+   * Get imageId
+   * @return imageId
+  **/
+  @Schema(description = "")
+  public String getImageId() {
+    return imageId;
+  }
+
+  public void setImageId(String imageId) {
+    this.imageId = imageId;
+  }
+
   public DescribeInstanceTypesRequest instanceTypeIds(List<String> instanceTypeIds) {
     this.instanceTypeIds = instanceTypeIds;
     return this;
@@ -142,15 +163,16 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     DescribeInstanceTypesRequest describeInstanceTypesRequest = (DescribeInstanceTypesRequest) o;
-    return Objects.equals(this.instanceTypeIds, describeInstanceTypesRequest.instanceTypeIds) &&
+    return Objects.equals(this.imageId, describeInstanceTypesRequest.imageId) &&
+        Objects.equals(this.instanceTypeIds, describeInstanceTypesRequest.instanceTypeIds) &&
         Objects.equals(this.instanceTypes, describeInstanceTypesRequest.instanceTypes) &&
         Objects.equals(this.maxResults, describeInstanceTypesRequest.maxResults) &&
         Objects.equals(this.nextToken, describeInstanceTypesRequest.nextToken);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(instanceTypeIds, instanceTypes, maxResults, nextToken);
+    return Objects.hash(imageId, instanceTypeIds, instanceTypes, maxResults, nextToken);
   }
 
 
@@ -159,6 +181,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class DescribeInstanceTypesRequest {\n");
 
+    sb.append("    imageId: ").append(toIndentedString(imageId)).append("\n");
     sb.append("    instanceTypeIds: ").append(toIndentedString(instanceTypeIds)).append("\n");
     sb.append("    instanceTypes: ").append(toIndentedString(instanceTypes)).append("\n");
     sb.append("    maxResults: ").append(toIndentedString(maxResults)).append("\n");

volcengine-java-sdk-ecs/src/main/java/com/volcengine/ecs/model/DescribeInstancesRequest.java

@@ -69,6 +69,9 @@ public class DescribeInstancesRequest {
   @SerializedName("InstanceTypes")
   private List<String> instanceTypes = null;
 
+  @SerializedName("Ipv6Addresses")
+  private List<String> ipv6Addresses = null;
+
   @SerializedName("KeyPairName")
   private String keyPairName = null;
 
@@ -371,6 +374,32 @@ public void setInstanceTypes(List<String> instanceTypes) {
     this.instanceTypes = instanceTypes;
   }
 
+  public DescribeInstancesRequest ipv6Addresses(List<String> ipv6Addresses) {
+    this.ipv6Addresses = ipv6Addresses;
+    return this;
+  }
+
+  public DescribeInstancesRequest addIpv6AddressesItem(String ipv6AddressesItem) {
+    if (this.ipv6Addresses == null) {
+      this.ipv6Addresses = new ArrayList<String>();
+    }
+    this.ipv6Addresses.add(ipv6AddressesItem);
+    return this;
+  }
+
+   /**
+   * Get ipv6Addresses
+   * @return ipv6Addresses
+  **/
+  @Schema(description = "")
+  public List<String> getIpv6Addresses() {
+    return ipv6Addresses;
+  }
+
+  public void setIpv6Addresses(List<String> ipv6Addresses) {
+    this.ipv6Addresses = ipv6Addresses;
+  }
+
   public DescribeInstancesRequest keyPairName(String keyPairName) {
     this.keyPairName = keyPairName;
     return this;
@@ -582,6 +611,7 @@ public boolean equals(java.lang.Object o) {
         Objects.equals(this.instanceTypeFamilies, describeInstancesRequest.instanceTypeFamilies) &&
         Objects.equals(this.instanceTypeIds, describeInstancesRequest.instanceTypeIds) &&
         Objects.equals(this.instanceTypes, describeInstancesRequest.instanceTypes) &&
+        Objects.equals(this.ipv6Addresses, describeInstancesRequest.ipv6Addresses) &&
         Objects.equals(this.keyPairName, describeInstancesRequest.keyPairName) &&
         Objects.equals(this.maxResults, describeInstancesRequest.maxResults) &&
         Objects.equals(this.nextToken, describeInstancesRequest.nextToken) &&
@@ -596,7 +626,7 @@ public boolean equals(java.lang.Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(dedicatedHostClusterId, dedicatedHostId, deploymentSetGroupNumbers, deploymentSetIds, eipAddresses, hpcClusterId, instanceChargeType, instanceIds, instanceName, instanceTypeFamilies, instanceTypeIds, instanceTypes, keyPairName, maxResults, nextToken, primaryIpAddress, projectName, scheduledInstanceId, status, tagFilters, vpcId, zoneId);
+    return Objects.hash(dedicatedHostClusterId, dedicatedHostId, deploymentSetGroupNumbers, deploymentSetIds, eipAddresses, hpcClusterId, instanceChargeType, instanceIds, instanceName, instanceTypeFamilies, instanceTypeIds, instanceTypes, ipv6Addresses, keyPairName, maxResults, nextToken, primaryIpAddress, projectName, scheduledInstanceId, status, tagFilters, vpcId, zoneId);
   }
 
 
@@ -617,6 +647,7 @@ public String toString() {
     sb.append("    instanceTypeFamilies: ").append(toIndentedString(instanceTypeFamilies)).append("\n");
     sb.append("    instanceTypeIds: ").append(toIndentedString(instanceTypeIds)).append("\n");
     sb.append("    instanceTypes: ").append(toIndentedString(instanceTypes)).append("\n");
+    sb.append("    ipv6Addresses: ").append(toIndentedString(ipv6Addresses)).append("\n");
     sb.append("    keyPairName: ").append(toIndentedString(keyPairName)).append("\n");
     sb.append("    maxResults: ").append(toIndentedString(maxResults)).append("\n");
     sb.append("    nextToken: ").append(toIndentedString(nextToken)).append("\n");