Skip to content

Commit

Permalink
Update EBS default encrypted APIs from private to public.
Browse files Browse the repository at this point in the history
  • Loading branch information
sdk-team committed Sep 14, 2024
1 parent 0c6c1cf commit 33cbaf2
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 99 deletions.
4 changes: 4 additions & 0 deletions aliyun-java-sdk-ecs/ChangeLog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2024-09-14 Version: 5.11.9
- Update EBS default encrypted APIs from private to public.
- Support describe and modify source dest check property of ENI.

2024-09-10 Version: 5.11.8
- Update EBS default encrypted APIs from private to public.

Expand Down
2 changes: 1 addition & 1 deletion aliyun-java-sdk-ecs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.aliyun</groupId>
<artifactId>aliyun-java-sdk-ecs</artifactId>
<packaging>jar</packaging>
<version>5.11.8</version>
<version>5.11.9</version>
<name>aliyun-java-sdk-ecs</name>
<url>http://www.aliyun.com</url>
<description>Aliyun Open API SDK for Java
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@ public class DescribeNetworkInterfaceAttributeResponse extends AcsResponse {

private String tcpOptionAddressEnabled;

private Boolean sourceDestCheck;

private List<PrivateIpSet> privateIpSets;

private List<Ipv6Set> ipv6Sets;
Expand All @@ -81,10 +83,6 @@ public class DescribeNetworkInterfaceAttributeResponse extends AcsResponse {

private List<String> securityGroupIds;

private ConnectionTrackingConfiguration connectionTrackingConfiguration;

private NetworkInterfaceTrafficConfig networkInterfaceTrafficConfig;

private AssociatedPublicIp associatedPublicIp;

private Attachment attachment;
Expand All @@ -93,6 +91,10 @@ public class DescribeNetworkInterfaceAttributeResponse extends AcsResponse {

private SlaveInterfaceSpecification slaveInterfaceSpecification;

private NetworkInterfaceTrafficConfig networkInterfaceTrafficConfig;

private ConnectionTrackingConfiguration connectionTrackingConfiguration;

private EnhancedNetwork enhancedNetwork;

public String getCreationTime() {
Expand Down Expand Up @@ -271,6 +273,14 @@ public void setTcpOptionAddressEnabled(String tcpOptionAddressEnabled) {
this.tcpOptionAddressEnabled = tcpOptionAddressEnabled;
}

public Boolean getSourceDestCheck() {
return this.sourceDestCheck;
}

public void setSourceDestCheck(Boolean sourceDestCheck) {
this.sourceDestCheck = sourceDestCheck;
}

public List<PrivateIpSet> getPrivateIpSets() {
return this.privateIpSets;
}
Expand Down Expand Up @@ -319,22 +329,6 @@ public void setSecurityGroupIds(List<String> securityGroupIds) {
this.securityGroupIds = securityGroupIds;
}

public ConnectionTrackingConfiguration getConnectionTrackingConfiguration() {
return this.connectionTrackingConfiguration;
}

public void setConnectionTrackingConfiguration(ConnectionTrackingConfiguration connectionTrackingConfiguration) {
this.connectionTrackingConfiguration = connectionTrackingConfiguration;
}

public NetworkInterfaceTrafficConfig getNetworkInterfaceTrafficConfig() {
return this.networkInterfaceTrafficConfig;
}

public void setNetworkInterfaceTrafficConfig(NetworkInterfaceTrafficConfig networkInterfaceTrafficConfig) {
this.networkInterfaceTrafficConfig = networkInterfaceTrafficConfig;
}

public AssociatedPublicIp getAssociatedPublicIp() {
return this.associatedPublicIp;
}
Expand Down Expand Up @@ -367,6 +361,22 @@ public void setSlaveInterfaceSpecification(SlaveInterfaceSpecification slaveInte
this.slaveInterfaceSpecification = slaveInterfaceSpecification;
}

public NetworkInterfaceTrafficConfig getNetworkInterfaceTrafficConfig() {
return this.networkInterfaceTrafficConfig;
}

public void setNetworkInterfaceTrafficConfig(NetworkInterfaceTrafficConfig networkInterfaceTrafficConfig) {
this.networkInterfaceTrafficConfig = networkInterfaceTrafficConfig;
}

public ConnectionTrackingConfiguration getConnectionTrackingConfiguration() {
return this.connectionTrackingConfiguration;
}

public void setConnectionTrackingConfiguration(ConnectionTrackingConfiguration connectionTrackingConfiguration) {
this.connectionTrackingConfiguration = connectionTrackingConfiguration;
}

public EnhancedNetwork getEnhancedNetwork() {
return this.enhancedNetwork;
}
Expand Down Expand Up @@ -493,72 +503,6 @@ public void setTagKey(String tagKey) {
}
}

public static class ConnectionTrackingConfiguration {

private Integer tcpClosedAndTimeWaitTimeout;

private Integer tcpEstablishedTimeout;

private Integer udpTimeout;

public Integer getTcpClosedAndTimeWaitTimeout() {
return this.tcpClosedAndTimeWaitTimeout;
}

public void setTcpClosedAndTimeWaitTimeout(Integer tcpClosedAndTimeWaitTimeout) {
this.tcpClosedAndTimeWaitTimeout = tcpClosedAndTimeWaitTimeout;
}

public Integer getTcpEstablishedTimeout() {
return this.tcpEstablishedTimeout;
}

public void setTcpEstablishedTimeout(Integer tcpEstablishedTimeout) {
this.tcpEstablishedTimeout = tcpEstablishedTimeout;
}

public Integer getUdpTimeout() {
return this.udpTimeout;
}

public void setUdpTimeout(Integer udpTimeout) {
this.udpTimeout = udpTimeout;
}
}

public static class NetworkInterfaceTrafficConfig {

private String networkInterfaceTrafficMode;

private Integer queueNumber;

private Integer queuePairNumber;

public String getNetworkInterfaceTrafficMode() {
return this.networkInterfaceTrafficMode;
}

public void setNetworkInterfaceTrafficMode(String networkInterfaceTrafficMode) {
this.networkInterfaceTrafficMode = networkInterfaceTrafficMode;
}

public Integer getQueueNumber() {
return this.queueNumber;
}

public void setQueueNumber(Integer queueNumber) {
this.queueNumber = queueNumber;
}

public Integer getQueuePairNumber() {
return this.queuePairNumber;
}

public void setQueuePairNumber(Integer queuePairNumber) {
this.queuePairNumber = queuePairNumber;
}
}

public static class AssociatedPublicIp {

private String publicIpAddress;
Expand Down Expand Up @@ -724,6 +668,72 @@ public void setBondNetworkInterfaceId(String bondNetworkInterfaceId) {
}
}

public static class NetworkInterfaceTrafficConfig {

private String networkInterfaceTrafficMode;

private Integer queueNumber;

private Integer queuePairNumber;

public String getNetworkInterfaceTrafficMode() {
return this.networkInterfaceTrafficMode;
}

public void setNetworkInterfaceTrafficMode(String networkInterfaceTrafficMode) {
this.networkInterfaceTrafficMode = networkInterfaceTrafficMode;
}

public Integer getQueueNumber() {
return this.queueNumber;
}

public void setQueueNumber(Integer queueNumber) {
this.queueNumber = queueNumber;
}

public Integer getQueuePairNumber() {
return this.queuePairNumber;
}

public void setQueuePairNumber(Integer queuePairNumber) {
this.queuePairNumber = queuePairNumber;
}
}

public static class ConnectionTrackingConfiguration {

private Integer tcpEstablishedTimeout;

private Integer tcpClosedAndTimeWaitTimeout;

private Integer udpTimeout;

public Integer getTcpEstablishedTimeout() {
return this.tcpEstablishedTimeout;
}

public void setTcpEstablishedTimeout(Integer tcpEstablishedTimeout) {
this.tcpEstablishedTimeout = tcpEstablishedTimeout;
}

public Integer getTcpClosedAndTimeWaitTimeout() {
return this.tcpClosedAndTimeWaitTimeout;
}

public void setTcpClosedAndTimeWaitTimeout(Integer tcpClosedAndTimeWaitTimeout) {
this.tcpClosedAndTimeWaitTimeout = tcpClosedAndTimeWaitTimeout;
}

public Integer getUdpTimeout() {
return this.udpTimeout;
}

public void setUdpTimeout(Integer udpTimeout) {
this.udpTimeout = udpTimeout;
}
}

public static class EnhancedNetwork {

private Boolean enableSriov;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,8 @@ public static class NetworkInterfaceSet {

private Boolean deleteOnRelease;

private Boolean sourceDestCheck;

private List<PrivateIpSet> privateIpSets;

private List<Ipv6Set> ipv6Sets;
Expand Down Expand Up @@ -303,6 +305,14 @@ public void setDeleteOnRelease(Boolean deleteOnRelease) {
this.deleteOnRelease = deleteOnRelease;
}

public Boolean getSourceDestCheck() {
return this.sourceDestCheck;
}

public void setSourceDestCheck(Boolean sourceDestCheck) {
this.sourceDestCheck = sourceDestCheck;
}

public List<PrivateIpSet> getPrivateIpSets() {
return this.privateIpSets;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public class ModifyNetworkInterfaceAttributeRequest extends RpcAcsRequest<Modify

private EnhancedNetwork enhancedNetwork;

private Boolean sourceDestCheck;

private String networkInterfaceName;

private Integer txQueueSize;
Expand Down Expand Up @@ -138,6 +140,17 @@ public void setEnhancedNetwork(EnhancedNetwork enhancedNetwork) {
}
}

public Boolean getSourceDestCheck() {
return this.sourceDestCheck;
}

public void setSourceDestCheck(Boolean sourceDestCheck) {
this.sourceDestCheck = sourceDestCheck;
if(sourceDestCheck != null){
putQueryParameter("SourceDestCheck", sourceDestCheck.toString());
}
}

public String getNetworkInterfaceName() {
return this.networkInterfaceName;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,25 +61,14 @@ public static DescribeNetworkInterfaceAttributeResponse unmarshall(DescribeNetwo
describeNetworkInterfaceAttributeResponse.setQueueNumber(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.QueueNumber"));
describeNetworkInterfaceAttributeResponse.setDeleteOnRelease(_ctx.booleanValue("DescribeNetworkInterfaceAttributeResponse.DeleteOnRelease"));
describeNetworkInterfaceAttributeResponse.setTcpOptionAddressEnabled(_ctx.stringValue("DescribeNetworkInterfaceAttributeResponse.TcpOptionAddressEnabled"));
describeNetworkInterfaceAttributeResponse.setSourceDestCheck(_ctx.booleanValue("DescribeNetworkInterfaceAttributeResponse.SourceDestCheck"));

List<String> securityGroupIds = new ArrayList<String>();
for (int i = 0; i < _ctx.lengthValue("DescribeNetworkInterfaceAttributeResponse.SecurityGroupIds.Length"); i++) {
securityGroupIds.add(_ctx.stringValue("DescribeNetworkInterfaceAttributeResponse.SecurityGroupIds["+ i +"]"));
}
describeNetworkInterfaceAttributeResponse.setSecurityGroupIds(securityGroupIds);

ConnectionTrackingConfiguration connectionTrackingConfiguration = new ConnectionTrackingConfiguration();
connectionTrackingConfiguration.setTcpClosedAndTimeWaitTimeout(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.ConnectionTrackingConfiguration.TcpClosedAndTimeWaitTimeout"));
connectionTrackingConfiguration.setTcpEstablishedTimeout(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.ConnectionTrackingConfiguration.TcpEstablishedTimeout"));
connectionTrackingConfiguration.setUdpTimeout(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.ConnectionTrackingConfiguration.UdpTimeout"));
describeNetworkInterfaceAttributeResponse.setConnectionTrackingConfiguration(connectionTrackingConfiguration);

NetworkInterfaceTrafficConfig networkInterfaceTrafficConfig = new NetworkInterfaceTrafficConfig();
networkInterfaceTrafficConfig.setNetworkInterfaceTrafficMode(_ctx.stringValue("DescribeNetworkInterfaceAttributeResponse.NetworkInterfaceTrafficConfig.NetworkInterfaceTrafficMode"));
networkInterfaceTrafficConfig.setQueueNumber(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.NetworkInterfaceTrafficConfig.QueueNumber"));
networkInterfaceTrafficConfig.setQueuePairNumber(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.NetworkInterfaceTrafficConfig.QueuePairNumber"));
describeNetworkInterfaceAttributeResponse.setNetworkInterfaceTrafficConfig(networkInterfaceTrafficConfig);

AssociatedPublicIp associatedPublicIp = new AssociatedPublicIp();
associatedPublicIp.setPublicIpAddress(_ctx.stringValue("DescribeNetworkInterfaceAttributeResponse.AssociatedPublicIp.PublicIpAddress"));
associatedPublicIp.setAllocationId(_ctx.stringValue("DescribeNetworkInterfaceAttributeResponse.AssociatedPublicIp.AllocationId"));
Expand Down Expand Up @@ -119,6 +108,18 @@ public static DescribeNetworkInterfaceAttributeResponse unmarshall(DescribeNetwo
slaveInterfaceSpecification.setBondNetworkInterfaceId(_ctx.stringValue("DescribeNetworkInterfaceAttributeResponse.SlaveInterfaceSpecification.BondNetworkInterfaceId"));
describeNetworkInterfaceAttributeResponse.setSlaveInterfaceSpecification(slaveInterfaceSpecification);

NetworkInterfaceTrafficConfig networkInterfaceTrafficConfig = new NetworkInterfaceTrafficConfig();
networkInterfaceTrafficConfig.setNetworkInterfaceTrafficMode(_ctx.stringValue("DescribeNetworkInterfaceAttributeResponse.NetworkInterfaceTrafficConfig.NetworkInterfaceTrafficMode"));
networkInterfaceTrafficConfig.setQueueNumber(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.NetworkInterfaceTrafficConfig.QueueNumber"));
networkInterfaceTrafficConfig.setQueuePairNumber(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.NetworkInterfaceTrafficConfig.QueuePairNumber"));
describeNetworkInterfaceAttributeResponse.setNetworkInterfaceTrafficConfig(networkInterfaceTrafficConfig);

ConnectionTrackingConfiguration connectionTrackingConfiguration = new ConnectionTrackingConfiguration();
connectionTrackingConfiguration.setTcpEstablishedTimeout(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.ConnectionTrackingConfiguration.TcpEstablishedTimeout"));
connectionTrackingConfiguration.setTcpClosedAndTimeWaitTimeout(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.ConnectionTrackingConfiguration.TcpClosedAndTimeWaitTimeout"));
connectionTrackingConfiguration.setUdpTimeout(_ctx.integerValue("DescribeNetworkInterfaceAttributeResponse.ConnectionTrackingConfiguration.UdpTimeout"));
describeNetworkInterfaceAttributeResponse.setConnectionTrackingConfiguration(connectionTrackingConfiguration);

EnhancedNetwork enhancedNetwork = new EnhancedNetwork();
enhancedNetwork.setEnableSriov(_ctx.booleanValue("DescribeNetworkInterfaceAttributeResponse.EnhancedNetwork.EnableSriov"));
describeNetworkInterfaceAttributeResponse.setEnhancedNetwork(enhancedNetwork);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public static DescribeNetworkInterfacesResponse unmarshall(DescribeNetworkInterf
networkInterfaceSet.setPrivateIpAddress(_ctx.stringValue("DescribeNetworkInterfacesResponse.NetworkInterfaceSets["+ i +"].PrivateIpAddress"));
networkInterfaceSet.setQueueNumber(_ctx.integerValue("DescribeNetworkInterfacesResponse.NetworkInterfaceSets["+ i +"].QueueNumber"));
networkInterfaceSet.setDeleteOnRelease(_ctx.booleanValue("DescribeNetworkInterfacesResponse.NetworkInterfaceSets["+ i +"].DeleteOnRelease"));
networkInterfaceSet.setSourceDestCheck(_ctx.booleanValue("DescribeNetworkInterfacesResponse.NetworkInterfaceSets["+ i +"].SourceDestCheck"));

List<String> securityGroupIds = new ArrayList<String>();
for (int j = 0; j < _ctx.lengthValue("DescribeNetworkInterfacesResponse.NetworkInterfaceSets["+ i +"].SecurityGroupIds.Length"); j++) {
Expand Down

0 comments on commit 33cbaf2

Please sign in to comment.