Skip to content

Commit 050d69c

Browse files
author
BitsAdmin
committed
Merge 'vefaas-Java-2024-06-06-online-1972-2025_12_24_14_27_45' into 'integration_2025-12-25_1097408644354'
feat: [development task] vefaas-1972-Java (1971858) See merge request: !813
2 parents eb7fa30 + f80a1a6 commit 050d69c

File tree

7 files changed

+648
-4
lines changed

7 files changed

+648
-4
lines changed

volcengine-java-sdk-vefaas/src/main/java/com/volcengine/vefaas/model/CreateSandboxRequest.java

Lines changed: 73 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.vefaas.model.EnvForCreateSandboxInput;
2323
import com.volcengine.vefaas.model.InstanceImageInfoForCreateSandboxInput;
24+
import com.volcengine.vefaas.model.InstanceNasMountConfigForCreateSandboxInput;
2425
import com.volcengine.vefaas.model.InstanceTosMountConfigForCreateSandboxInput;
2526
import io.swagger.v3.oas.annotations.media.Schema;
2627
import java.io.IOException;
@@ -37,6 +38,9 @@
3738

3839

3940
public class CreateSandboxRequest {
41+
@SerializedName("Async")
42+
private Boolean async = null;
43+
4044
@SerializedName("CpuMilli")
4145
private Integer cpuMilli = null;
4246

@@ -49,6 +53,9 @@ public class CreateSandboxRequest {
4953
@SerializedName("InstanceImageInfo")
5054
private InstanceImageInfoForCreateSandboxInput instanceImageInfo = null;
5155

56+
@SerializedName("InstanceNasMountConfig")
57+
private InstanceNasMountConfigForCreateSandboxInput instanceNasMountConfig = null;
58+
5259
@SerializedName("InstanceTosMountConfig")
5360
private InstanceTosMountConfigForCreateSandboxInput instanceTosMountConfig = null;
5461

@@ -64,12 +71,33 @@ public class CreateSandboxRequest {
6471
@SerializedName("RequestTimeout")
6572
private Integer requestTimeout = null;
6673

74+
@SerializedName("SessionId")
75+
private String sessionId = null;
76+
6777
@SerializedName("Timeout")
6878
private Integer timeout = null;
6979

7080
@SerializedName("TimeoutUnit")
7181
private String timeoutUnit = null;
7282

83+
public CreateSandboxRequest async(Boolean async) {
84+
this.async = async;
85+
return this;
86+
}
87+
88+
/**
89+
* Get async
90+
* @return async
91+
**/
92+
@Schema(description = "")
93+
public Boolean isAsync() {
94+
return async;
95+
}
96+
97+
public void setAsync(Boolean async) {
98+
this.async = async;
99+
}
100+
73101
public CreateSandboxRequest cpuMilli(Integer cpuMilli) {
74102
this.cpuMilli = cpuMilli;
75103
return this;
@@ -153,6 +181,25 @@ public void setInstanceImageInfo(InstanceImageInfoForCreateSandboxInput instance
153181
this.instanceImageInfo = instanceImageInfo;
154182
}
155183

184+
public CreateSandboxRequest instanceNasMountConfig(InstanceNasMountConfigForCreateSandboxInput instanceNasMountConfig) {
185+
this.instanceNasMountConfig = instanceNasMountConfig;
186+
return this;
187+
}
188+
189+
/**
190+
* Get instanceNasMountConfig
191+
* @return instanceNasMountConfig
192+
**/
193+
@Valid
194+
@Schema(description = "")
195+
public InstanceNasMountConfigForCreateSandboxInput getInstanceNasMountConfig() {
196+
return instanceNasMountConfig;
197+
}
198+
199+
public void setInstanceNasMountConfig(InstanceNasMountConfigForCreateSandboxInput instanceNasMountConfig) {
200+
this.instanceNasMountConfig = instanceNasMountConfig;
201+
}
202+
156203
public CreateSandboxRequest instanceTosMountConfig(InstanceTosMountConfigForCreateSandboxInput instanceTosMountConfig) {
157204
this.instanceTosMountConfig = instanceTosMountConfig;
158205
return this;
@@ -252,6 +299,24 @@ public void setRequestTimeout(Integer requestTimeout) {
252299
this.requestTimeout = requestTimeout;
253300
}
254301

302+
public CreateSandboxRequest sessionId(String sessionId) {
303+
this.sessionId = sessionId;
304+
return this;
305+
}
306+
307+
/**
308+
* Get sessionId
309+
* @return sessionId
310+
**/
311+
@Schema(description = "")
312+
public String getSessionId() {
313+
return sessionId;
314+
}
315+
316+
public void setSessionId(String sessionId) {
317+
this.sessionId = sessionId;
318+
}
319+
255320
public CreateSandboxRequest timeout(Integer timeout) {
256321
this.timeout = timeout;
257322
return this;
@@ -298,22 +363,25 @@ public boolean equals(java.lang.Object o) {
298363
return false;
299364
}
300365
CreateSandboxRequest createSandboxRequest = (CreateSandboxRequest) o;
301-
return Objects.equals(this.cpuMilli, createSandboxRequest.cpuMilli) &&
366+
return Objects.equals(this.async, createSandboxRequest.async) &&
367+
Objects.equals(this.cpuMilli, createSandboxRequest.cpuMilli) &&
302368
Objects.equals(this.envs, createSandboxRequest.envs) &&
303369
Objects.equals(this.functionId, createSandboxRequest.functionId) &&
304370
Objects.equals(this.instanceImageInfo, createSandboxRequest.instanceImageInfo) &&
371+
Objects.equals(this.instanceNasMountConfig, createSandboxRequest.instanceNasMountConfig) &&
305372
Objects.equals(this.instanceTosMountConfig, createSandboxRequest.instanceTosMountConfig) &&
306373
Objects.equals(this.maxConcurrency, createSandboxRequest.maxConcurrency) &&
307374
Objects.equals(this.memoryMB, createSandboxRequest.memoryMB) &&
308375
Objects.equals(this.metadata, createSandboxRequest.metadata) &&
309376
Objects.equals(this.requestTimeout, createSandboxRequest.requestTimeout) &&
377+
Objects.equals(this.sessionId, createSandboxRequest.sessionId) &&
310378
Objects.equals(this.timeout, createSandboxRequest.timeout) &&
311379
Objects.equals(this.timeoutUnit, createSandboxRequest.timeoutUnit);
312380
}
313381

314382
@Override
315383
public int hashCode() {
316-
return Objects.hash(cpuMilli, envs, functionId, instanceImageInfo, instanceTosMountConfig, maxConcurrency, memoryMB, metadata, requestTimeout, timeout, timeoutUnit);
384+
return Objects.hash(async, cpuMilli, envs, functionId, instanceImageInfo, instanceNasMountConfig, instanceTosMountConfig, maxConcurrency, memoryMB, metadata, requestTimeout, sessionId, timeout, timeoutUnit);
317385
}
318386

319387

@@ -322,15 +390,18 @@ public String toString() {
322390
StringBuilder sb = new StringBuilder();
323391
sb.append("class CreateSandboxRequest {\n");
324392

393+
sb.append(" async: ").append(toIndentedString(async)).append("\n");
325394
sb.append(" cpuMilli: ").append(toIndentedString(cpuMilli)).append("\n");
326395
sb.append(" envs: ").append(toIndentedString(envs)).append("\n");
327396
sb.append(" functionId: ").append(toIndentedString(functionId)).append("\n");
328397
sb.append(" instanceImageInfo: ").append(toIndentedString(instanceImageInfo)).append("\n");
398+
sb.append(" instanceNasMountConfig: ").append(toIndentedString(instanceNasMountConfig)).append("\n");
329399
sb.append(" instanceTosMountConfig: ").append(toIndentedString(instanceTosMountConfig)).append("\n");
330400
sb.append(" maxConcurrency: ").append(toIndentedString(maxConcurrency)).append("\n");
331401
sb.append(" memoryMB: ").append(toIndentedString(memoryMB)).append("\n");
332402
sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n");
333403
sb.append(" requestTimeout: ").append(toIndentedString(requestTimeout)).append("\n");
404+
sb.append(" sessionId: ").append(toIndentedString(sessionId)).append("\n");
334405
sb.append(" timeout: ").append(toIndentedString(timeout)).append("\n");
335406
sb.append(" timeoutUnit: ").append(toIndentedString(timeoutUnit)).append("\n");
336407
sb.append("}");

volcengine-java-sdk-vefaas/src/main/java/com/volcengine/vefaas/model/DescribeSandboxResponse.java

Lines changed: 59 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,15 @@
2121
import com.google.gson.stream.JsonWriter;
2222
import com.volcengine.vefaas.model.EnvForDescribeSandboxOutput;
2323
import com.volcengine.vefaas.model.ImageInfoForDescribeSandboxOutput;
24+
import com.volcengine.vefaas.model.InstanceNasMountConfigForDescribeSandboxOutput;
2425
import com.volcengine.vefaas.model.InstanceTosMountConfigForDescribeSandboxOutput;
2526
import com.volcengine.vefaas.model.MetadataListForDescribeSandboxOutput;
2627
import io.swagger.v3.oas.annotations.media.Schema;
2728
import java.io.IOException;
2829
import java.util.ArrayList;
30+
import java.util.HashMap;
2931
import java.util.List;
32+
import java.util.Map;
3033
import javax.validation.constraints.*;
3134
import javax.validation.Valid;
3235
/**
@@ -66,6 +69,9 @@ public class DescribeSandboxResponse extends com.volcengine.model.AbstractRespon
6669
@SerializedName("ImageInfo")
6770
private ImageInfoForDescribeSandboxOutput imageInfo = null;
6871

72+
@SerializedName("InstanceNasMountConfig")
73+
private InstanceNasMountConfigForDescribeSandboxOutput instanceNasMountConfig = null;
74+
6975
@SerializedName("InstanceTosMountConfig")
7076
private InstanceTosMountConfigForDescribeSandboxOutput instanceTosMountConfig = null;
7177

@@ -78,6 +84,9 @@ public class DescribeSandboxResponse extends com.volcengine.model.AbstractRespon
7884
@SerializedName("MemoryMB")
7985
private Integer memoryMB = null;
8086

87+
@SerializedName("Metadata")
88+
private Map<String, String> metadata = null;
89+
8190
@SerializedName("MetadataList")
8291
private List<MetadataListForDescribeSandboxOutput> metadataList = null;
8392

@@ -283,6 +292,25 @@ public void setImageInfo(ImageInfoForDescribeSandboxOutput imageInfo) {
283292
this.imageInfo = imageInfo;
284293
}
285294

295+
public DescribeSandboxResponse instanceNasMountConfig(InstanceNasMountConfigForDescribeSandboxOutput instanceNasMountConfig) {
296+
this.instanceNasMountConfig = instanceNasMountConfig;
297+
return this;
298+
}
299+
300+
/**
301+
* Get instanceNasMountConfig
302+
* @return instanceNasMountConfig
303+
**/
304+
@Valid
305+
@Schema(description = "")
306+
public InstanceNasMountConfigForDescribeSandboxOutput getInstanceNasMountConfig() {
307+
return instanceNasMountConfig;
308+
}
309+
310+
public void setInstanceNasMountConfig(InstanceNasMountConfigForDescribeSandboxOutput instanceNasMountConfig) {
311+
this.instanceNasMountConfig = instanceNasMountConfig;
312+
}
313+
286314
public DescribeSandboxResponse instanceTosMountConfig(InstanceTosMountConfigForDescribeSandboxOutput instanceTosMountConfig) {
287315
this.instanceTosMountConfig = instanceTosMountConfig;
288316
return this;
@@ -356,6 +384,32 @@ public void setMemoryMB(Integer memoryMB) {
356384
this.memoryMB = memoryMB;
357385
}
358386

387+
public DescribeSandboxResponse metadata(Map<String, String> metadata) {
388+
this.metadata = metadata;
389+
return this;
390+
}
391+
392+
public DescribeSandboxResponse putMetadataItem(String key, String metadataItem) {
393+
if (this.metadata == null) {
394+
this.metadata = new HashMap<String, String>();
395+
}
396+
this.metadata.put(key, metadataItem);
397+
return this;
398+
}
399+
400+
/**
401+
* Get metadata
402+
* @return metadata
403+
**/
404+
@Schema(description = "")
405+
public Map<String, String> getMetadata() {
406+
return metadata;
407+
}
408+
409+
public void setMetadata(Map<String, String> metadata) {
410+
this.metadata = metadata;
411+
}
412+
359413
public DescribeSandboxResponse metadataList(List<MetadataListForDescribeSandboxOutput> metadataList) {
360414
this.metadataList = metadataList;
361415
return this;
@@ -475,10 +529,12 @@ public boolean equals(java.lang.Object o) {
475529
Objects.equals(this.functionId, describeSandboxResponse.functionId) &&
476530
Objects.equals(this.id, describeSandboxResponse.id) &&
477531
Objects.equals(this.imageInfo, describeSandboxResponse.imageInfo) &&
532+
Objects.equals(this.instanceNasMountConfig, describeSandboxResponse.instanceNasMountConfig) &&
478533
Objects.equals(this.instanceTosMountConfig, describeSandboxResponse.instanceTosMountConfig) &&
479534
Objects.equals(this.instanceType, describeSandboxResponse.instanceType) &&
480535
Objects.equals(this.maxConcurrency, describeSandboxResponse.maxConcurrency) &&
481536
Objects.equals(this.memoryMB, describeSandboxResponse.memoryMB) &&
537+
Objects.equals(this.metadata, describeSandboxResponse.metadata) &&
482538
Objects.equals(this.metadataList, describeSandboxResponse.metadataList) &&
483539
Objects.equals(this.pending, describeSandboxResponse.pending) &&
484540
Objects.equals(this.requestTimeout, describeSandboxResponse.requestTimeout) &&
@@ -488,7 +544,7 @@ public boolean equals(java.lang.Object o) {
488544

489545
@Override
490546
public int hashCode() {
491-
return Objects.hash(availabilityZone, cpuMilli, createdAt, envs, errorCode, errorMessage, expireAt, functionId, id, imageInfo, instanceTosMountConfig, instanceType, maxConcurrency, memoryMB, metadataList, pending, requestTimeout, revisionNumber, status);
547+
return Objects.hash(availabilityZone, cpuMilli, createdAt, envs, errorCode, errorMessage, expireAt, functionId, id, imageInfo, instanceNasMountConfig, instanceTosMountConfig, instanceType, maxConcurrency, memoryMB, metadata, metadataList, pending, requestTimeout, revisionNumber, status);
492548
}
493549

494550

@@ -507,10 +563,12 @@ public String toString() {
507563
sb.append(" functionId: ").append(toIndentedString(functionId)).append("\n");
508564
sb.append(" id: ").append(toIndentedString(id)).append("\n");
509565
sb.append(" imageInfo: ").append(toIndentedString(imageInfo)).append("\n");
566+
sb.append(" instanceNasMountConfig: ").append(toIndentedString(instanceNasMountConfig)).append("\n");
510567
sb.append(" instanceTosMountConfig: ").append(toIndentedString(instanceTosMountConfig)).append("\n");
511568
sb.append(" instanceType: ").append(toIndentedString(instanceType)).append("\n");
512569
sb.append(" maxConcurrency: ").append(toIndentedString(maxConcurrency)).append("\n");
513570
sb.append(" memoryMB: ").append(toIndentedString(memoryMB)).append("\n");
571+
sb.append(" metadata: ").append(toIndentedString(metadata)).append("\n");
514572
sb.append(" metadataList: ").append(toIndentedString(metadataList)).append("\n");
515573
sb.append(" pending: ").append(toIndentedString(pending)).append("\n");
516574
sb.append(" requestTimeout: ").append(toIndentedString(requestTimeout)).append("\n");

0 commit comments

Comments
 (0)