[iotdb] branch change_target_config_nodes updated: update it

[qiaojialin]

This is an automated email from the ASF dual-hosted git repository.

qiaojialin pushed a commit to branch change_target_config_nodes
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/change_target_config_nodes by 
this push:
     new 7cc0840bf3 update it
7cc0840bf3 is described below

commit 7cc0840bf327338f7c69c72986526da67a363183
Author: qiaojialin <646274...@qq.com>
AuthorDate: Thu Jun 30 16:07:40 2022 +0800

    update it
---
 .../src/main/java/org/apache/iotdb/it/env/AbstractEnv.java       | 2 +-
 .../main/java/org/apache/iotdb/it/env/AbstractNodeWrapper.java   | 9 +++++++--
 .../src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java | 2 +-
 .../src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java   | 2 +-
 .../main/java/org/apache/iotdb/itbase/env/BaseNodeWrapper.java   | 4 +++-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git 
a/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractEnv.java 
b/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractEnv.java
index 7c4a104b8b..1acda4e36f 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractEnv.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractEnv.java
@@ -283,7 +283,7 @@ public abstract class AbstractEnv implements BaseEnv {
       dataNode = this.dataNodeWrapperList.get(0);
     }
 
-    String endpoint = dataNode.getIp() + ":" + dataNode.getPort();
+    String endpoint = dataNode.getRPCAddress() + ":" + dataNode.getPort();
     Connection writeConnection =
         DriverManager.getConnection(
             Config.IOTDB_URL_PREFIX + endpoint + getParam(version, 
NODE_NETWORK_TIMEOUT_MS),
diff --git 
a/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractNodeWrapper.java
 
b/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractNodeWrapper.java
index 6d02fd2f28..31869a5660 100644
--- 
a/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractNodeWrapper.java
+++ 
b/integration-test/src/main/java/org/apache/iotdb/it/env/AbstractNodeWrapper.java
@@ -250,10 +250,15 @@ public abstract class AbstractNodeWrapper implements 
BaseNodeWrapper {
   }
 
   @Override
-  public final String getIp() {
+  public final String getRPCAddress() {
     return "127.0.0.1";
   }
 
+  @Override
+  public final String getInternalAddress() {
+    return "0.0.0.0";
+  }
+
   @Override
   public final int getPort() {
     return portList[0];
@@ -261,7 +266,7 @@ public abstract class AbstractNodeWrapper implements 
BaseNodeWrapper {
 
   @Override
   public final String getIpAndPortString() {
-    return this.getIp() + ":" + this.getPort();
+    return this.getRPCAddress() + ":" + this.getPort();
   }
 
   protected String workDirFilePath(String dirName, String fileName) {
diff --git 
a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java 
b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
index b581a16d75..2d79a1dac8 100644
--- 
a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
+++ 
b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
@@ -49,7 +49,7 @@ public class ConfigNodeWrapper extends AbstractNodeWrapper {
 
   @Override
   protected void updateConfig(Properties properties) {
-    properties.setProperty(IoTDBConstant.INTERNAL_ADDRESS, super.getIp());
+    properties.setProperty(IoTDBConstant.INTERNAL_ADDRESS, 
super.getInternalAddress());
     properties.setProperty(IoTDBConstant.INTERNAL_PORT, 
String.valueOf(getPort()));
     properties.setProperty(IoTDBConstant.CONSENSUS_PORT, 
String.valueOf(this.consensusPort));
     properties.setProperty(IoTDBConstant.TARGET_CONFIG_NODES, 
this.targetConfigNodes);
diff --git 
a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java 
b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
index 39e8e5377b..48bd767c1a 100644
--- 
a/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
+++ 
b/integration-test/src/main/java/org/apache/iotdb/it/env/DataNodeWrapper.java
@@ -45,7 +45,7 @@ public class DataNodeWrapper extends AbstractNodeWrapper {
 
   @Override
   protected void updateConfig(Properties properties) {
-    properties.setProperty(IoTDBConstant.RPC_ADDRESS, super.getIp());
+    properties.setProperty(IoTDBConstant.RPC_ADDRESS, super.getRPCAddress());
     properties.setProperty(IoTDBConstant.INTERNAL_ADDRESS, "0.0.0.0");
     properties.setProperty(IoTDBConstant.RPC_PORT, String.valueOf(getPort()));
     properties.setProperty("mpp_data_exchange_port", 
String.valueOf(this.mppDataExchangePort));
diff --git 
a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseNodeWrapper.java
 
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseNodeWrapper.java
index c1efb1f351..f0b1dfc85a 100644
--- 
a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseNodeWrapper.java
+++ 
b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseNodeWrapper.java
@@ -34,7 +34,9 @@ public interface BaseNodeWrapper {
 
   void waitingToShutDown();
 
-  String getIp();
+  String getRPCAddress();
+
+  String getInternalAddress();
 
   int getPort();