diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index c6762e78bc..79188203da 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -304,10 +304,11 @@ int32_t tscToSQLCmd(SSqlObj* pSql, struct SSqlInfo* pInfo) {
       }
 
       SSQLToken* pIpAddr = &pInfo->pDCLInfo->a[0];
-      if (!validateIpAddress(pIpAddr->z, pIpAddr->n)) {
-        return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
-      }
+      // if (!validateIpAddress(pIpAddr->z, pIpAddr->n)) {
+      //   return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+      // }
 
+      pIpAddr->n = strdequote(pIpAddr->z);
       break;
     }
 
diff --git a/src/client/src/tscServer.c b/src/client/src/tscServer.c
index 9044031d64..9b44bea82d 100644
--- a/src/client/src/tscServer.c
+++ b/src/client/src/tscServer.c
@@ -79,7 +79,7 @@ void tscSetMgmtIpListFromEdge() {
   if (tscMgmtIpSet.numOfIps != 1) {
     tscMgmtIpSet.numOfIps = 1;
     tscMgmtIpSet.inUse = 0;
-    taosGetFqdnPortFromEp(tsMaster, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]); 
+    taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]); 
     tscTrace("edge mgmt IP list:");
     tscPrintMgmtIp();
   }
diff --git a/src/client/src/tscSql.c b/src/client/src/tscSql.c
index fbdddca8f3..1934c05014 100644
--- a/src/client/src/tscSql.c
+++ b/src/client/src/tscSql.c
@@ -80,8 +80,8 @@ STscObj *taosConnectImpl(const char *ip, const char *user, const char *pass, con
     strcpy(tscMgmtIpSet.fqdn[0], ip);
     tscMgmtIpSet.port[0] = port? port: tsMnodeShellPort;
   } else {
-    if (tsMaster[0] != 0) {
-      taosGetFqdnPortFromEp(tsMaster, tscMgmtIpSet.fqdn[tscMgmtIpSet.numOfIps], &tscMgmtIpSet.port[tscMgmtIpSet.numOfIps]);
+    if (tsFirst[0] != 0) {
+      taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[tscMgmtIpSet.numOfIps], &tscMgmtIpSet.port[tscMgmtIpSet.numOfIps]);
       tscMgmtIpSet.numOfIps++;
     }
 
diff --git a/src/client/src/tscSystem.c b/src/client/src/tscSystem.c
index 897c63f011..c0ad91cd59 100644
--- a/src/client/src/tscSystem.c
+++ b/src/client/src/tscSystem.c
@@ -136,9 +136,9 @@ void taos_init_imp() {
 
   tscMgmtIpSet.inUse = 0;
   tscMgmtIpSet.numOfIps = 1;
-  taosGetFqdnPortFromEp(tsMaster, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]);
+  taosGetFqdnPortFromEp(tsFirst, tscMgmtIpSet.fqdn[0], &tscMgmtIpSet.port[0]);
 
-  if (tsSecond[0] && strcmp(tsSecond, tsMaster) != 0) {
+  if (tsSecond[0] && strcmp(tsSecond, tsFirst) != 0) {
     tscMgmtIpSet.numOfIps = 2;
     taosGetFqdnPortFromEp(tsSecond, tscMgmtIpSet.fqdn[1], &tscMgmtIpSet.port[1]);
   }
diff --git a/src/common/inc/tglobal.h b/src/common/inc/tglobal.h
index de07ae35e5..7642475f70 100644
--- a/src/common/inc/tglobal.h
+++ b/src/common/inc/tglobal.h
@@ -51,7 +51,7 @@ extern int32_t tsVersion;
 extern int32_t tscEmbedded;
 extern int64_t tsMsPerDay[2];
 
-extern char  tsMaster[];
+extern char  tsFirst[];
 extern char  tsSecond[];
 extern char  tsLocalEp[];
 extern uint16_t tsServerPort;
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index d97efeb500..eb81070f6d 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -61,7 +61,7 @@ int32_t tscEmbedded = 0;
  */
 int64_t tsMsPerDay[] = {86400000L, 86400000000L};
 
-char  tsMaster[TSDB_FQDN_LEN] = {0};
+char  tsFirst[TSDB_FQDN_LEN] = {0};
 char  tsSecond[TSDB_FQDN_LEN] = {0};
 char  tsArbitrator[TSDB_FQDN_LEN] = {0};
 char  tsLocalEp[TSDB_FQDN_LEN] = {0};  // Local End Point, hostname:port
@@ -272,9 +272,9 @@ static void doInitGlobalConfig() {
   SGlobalCfg cfg = {0};
   
   // ip address
-  cfg.option = "master";
-  cfg.ptr = tsMaster;
-  cfg.valType = TAOS_CFG_VTYPE_IPSTR;
+  cfg.option = "first";
+  cfg.ptr = tsFirst;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
@@ -284,7 +284,7 @@ static void doInitGlobalConfig() {
 
   cfg.option = "second";
   cfg.ptr = tsSecond;
-  cfg.valType = TAOS_CFG_VTYPE_IPSTR;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
@@ -346,7 +346,7 @@ static void doInitGlobalConfig() {
 
   cfg.option = "arbitrator";
   cfg.ptr = tsArbitrator;
-  cfg.valType = TAOS_CFG_VTYPE_IPSTR;
+  cfg.valType = TAOS_CFG_VTYPE_STRING;
   cfg.cfgType = TSDB_CFG_CTYPE_B_CONFIG | TSDB_CFG_CTYPE_B_CLIENT;
   cfg.minValue = 0;
   cfg.maxValue = 0;
@@ -1204,9 +1204,10 @@ void taosInitGlobalCfg() {
 bool taosCheckGlobalCfg() {
   taosGetFqdn(tsLocalEp);
   sprintf(tsLocalEp + strlen(tsLocalEp), ":%d", tsServerPort);
+  uPrint("localEp is %s", tsLocalEp);
 
-  if (tsMaster[0] == 0) {
-    strcpy(tsMaster, tsLocalEp);
+  if (tsFirst[0] == 0) {
+    strcpy(tsFirst, tsLocalEp);
   }
 
   if (tsSecond[0] == 0) {
diff --git a/src/dnode/src/dnodeMClient.c b/src/dnode/src/dnodeMClient.c
index fc25d9f3c5..3aa863799b 100644
--- a/src/dnode/src/dnodeMClient.c
+++ b/src/dnode/src/dnodeMClient.c
@@ -83,12 +83,12 @@ int32_t dnodeInitMClient() {
     memset(&tsMnodeIpSet, 0, sizeof(SRpcIpSet));
     memset(&tsMnodeInfos, 0, sizeof(SDMMnodeInfos));
     tsMnodeIpSet.numOfIps = 1;
-    taosGetFqdnPortFromEp(tsMaster, tsMnodeIpSet.fqdn[0], &tsMnodeIpSet.port[0]);
+    taosGetFqdnPortFromEp(tsFirst, tsMnodeIpSet.fqdn[0], &tsMnodeIpSet.port[0]);
     tsMnodeIpSet.port[0] += TSDB_PORT_MNODEDNODE;
-    if (strcmp(tsSecond, tsMaster) != 0) {
+    if (strcmp(tsSecond, tsFirst) != 0) {
       tsMnodeIpSet.numOfIps = 2;
       taosGetFqdnPortFromEp(tsSecond, tsMnodeIpSet.fqdn[1], &tsMnodeIpSet.port[1]);
-      tsMnodeIpSet.port[0] += TSDB_PORT_MNODEDNODE;
+      tsMnodeIpSet.port[1] += TSDB_PORT_MNODEDNODE;
     }
   } else {
     tsMnodeIpSet.inUse = tsMnodeInfos.inUse;
diff --git a/src/dnode/src/dnodeMain.c b/src/dnode/src/dnodeMain.c
index 43b16ae6ea..6aa42f05c7 100644
--- a/src/dnode/src/dnodeMain.c
+++ b/src/dnode/src/dnodeMain.c
@@ -15,6 +15,7 @@
 
 #define _DEFAULT_SOURCE
 #include "os.h"
+#include "taos.h"
 #include "tglobal.h"
 #include "trpc.h"
 #include "tutil.h"
@@ -190,6 +191,7 @@ static void dnodeCleanUpSystem() {
     dnodeCleanupWrite();
     dnodeCleanupRead();
     dnodeCleanUpModules();
+    taos_cleanup();
     dnodeCleanupStorage();
     taosCloseLog();
   }
@@ -236,5 +238,5 @@ static int32_t dnodeInitStorage() {
 static void dnodeCleanupStorage() {}
 
 bool  dnodeIsFirstDeploy() {
-  return strcmp(tsMaster, tsLocalEp) == 0;
+  return strcmp(tsFirst, tsLocalEp) == 0;
 }
diff --git a/src/inc/taosdef.h b/src/inc/taosdef.h
index a0113dab3b..57c54efba4 100644
--- a/src/inc/taosdef.h
+++ b/src/inc/taosdef.h
@@ -194,7 +194,7 @@ void tsDataSwap(void *pLeft, void *pRight, int32_t type, int32_t size);
 #define TSDB_LOCALE_LEN           64
 #define TSDB_TIMEZONE_LEN         64
 
-#define TSDB_FQDN_LEN             64
+#define TSDB_FQDN_LEN             72
 #define TSDB_IPv4ADDR_LEN      	  16
 #define TSDB_FILENAME_LEN         128
 #define TSDB_METER_VNODE_BITS     20
diff --git a/src/inc/tsdb.h b/src/inc/tsdb.h
index 38ded5cf10..a59a278d52 100644
--- a/src/inc/tsdb.h
+++ b/src/inc/tsdb.h
@@ -104,9 +104,10 @@ void tsdbClearTableCfg(STableCfg *config);
 int32_t tsdbGetTableTagVal(TsdbRepoT *repo, STableId id, int32_t col, int16_t *type, int16_t *bytes, char **val);
 int32_t tsdbTableGetName(TsdbRepoT *repo, STableId id, char** name);
 
-int tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg);
-int tsdbDropTable(TsdbRepoT *pRepo, STableId tableId);
-int tsdbAlterTable(TsdbRepoT *repo, STableCfg *pCfg);
+int   tsdbCreateTable(TsdbRepoT *repo, STableCfg *pCfg);
+int   tsdbDropTable(TsdbRepoT *pRepo, STableId tableId);
+int   tsdbAlterTable(TsdbRepoT *repo, STableCfg *pCfg);
+TSKEY tsdbGetTableLastKey(TsdbRepoT *repo, int64_t uid);
 
 // the TSDB repository info
 typedef struct STsdbRepoInfo {
diff --git a/src/mnode/inc/mgmtSdb.h b/src/mnode/inc/mgmtSdb.h
index c09d215adb..2b96eb4005 100644
--- a/src/mnode/inc/mgmtSdb.h
+++ b/src/mnode/inc/mgmtSdb.h
@@ -72,6 +72,7 @@ void    sdbCleanUp();
 void *  sdbOpenTable(SSdbTableDesc *desc);
 void    sdbCloseTable(void *handle);
 bool    sdbIsMaster();
+bool    sdbIsServing();
 void    sdbUpdateMnodeRoles();
 
 int32_t sdbInsertRow(SSdbOper *pOper);
diff --git a/src/mnode/src/mgmtDServer.c b/src/mnode/src/mgmtDServer.c
index 9fd928e7da..726554e490 100644
--- a/src/mnode/src/mgmtDServer.c
+++ b/src/mnode/src/mgmtDServer.c
@@ -107,6 +107,7 @@ static void mgmtProcessMsgFromDnode(SRpcMsg *rpcMsg) {
     
     SRpcIpSet ipSet = {0};
     dnodeGetMnodeDnodeIpSet(&ipSet);
+    
     mTrace("conn from dnode ip:%s user:%s redirect msg, inUse:%d", taosIpStr(connInfo.clientIp), connInfo.user, ipSet.inUse);
     for (int32_t i = 0; i < ipSet.numOfIps; ++i) {
       mTrace("index:%d %s:%d", i, ipSet.fqdn[i], ipSet.port[i]);
diff --git a/src/mnode/src/mgmtDnode.c b/src/mnode/src/mgmtDnode.c
index 44838d35ef..97360e49ea 100644
--- a/src/mnode/src/mgmtDnode.c
+++ b/src/mnode/src/mgmtDnode.c
@@ -324,7 +324,7 @@ void mgmtProcessDnodeStatusMsg(SRpcMsg *rpcMsg) {
   if (pStatus->dnodeId == 0) {
     mTrace("dnode:%d %s, first access", pDnode->dnodeId, pDnode->dnodeEp);
   } else {
-    mTrace("dnode:%d, status received, access times %d", pDnode->dnodeId, pDnode->lastAccess);
+    //mTrace("dnode:%d, status received, access times %d", pDnode->dnodeId, pDnode->lastAccess);
   }
  
   int32_t openVnodes = htons(pStatus->openVnodes);
diff --git a/src/mnode/src/mgmtMain.c b/src/mnode/src/mgmtMain.c
index 437563a007..dd57a650c8 100644
--- a/src/mnode/src/mgmtMain.c
+++ b/src/mnode/src/mgmtMain.c
@@ -130,7 +130,7 @@ int32_t mgmtInitSystem() {
 
   struct stat dirstat;
   bool fileExist  = (stat(tsMnodeDir, &dirstat) == 0);
-  bool asMaster = (strcmp(tsMaster, tsLocalEp) == 0);
+  bool asMaster = (strcmp(tsFirst, tsLocalEp) == 0);
 
   if (asMaster || fileExist) {
     if (mgmtStartSystem() != 0) {
diff --git a/src/mnode/src/mgmtSdb.c b/src/mnode/src/mgmtSdb.c
index ef6ada1c06..804522d19a 100644
--- a/src/mnode/src/mgmtSdb.c
+++ b/src/mnode/src/mgmtSdb.c
@@ -40,7 +40,7 @@ typedef enum {
 typedef enum {
   SDB_STATUS_OFFLINE,
   SDB_STATUS_SERVING,
-  SDB_ACTION_CLOSING
+  SDB_STATUS_CLOSING
 } ESdbStatus;
 
 typedef struct _SSdbTable {
@@ -107,6 +107,10 @@ bool sdbIsMaster() {
   return tsSdbObj.role == TAOS_SYNC_ROLE_MASTER; 
 }
 
+bool sdbIsServing() {
+  return tsSdbObj.status == SDB_STATUS_SERVING; 
+}
+
 static char *sdbGetActionStr(int32_t action) {
   switch (action) {
     case SDB_ACTION_INSERT:
@@ -314,6 +318,7 @@ int32_t sdbInit() {
 void sdbCleanUp() {
   if (tsSdbObj.status != SDB_STATUS_SERVING) return;
 
+  tsSdbObj.status = SDB_STATUS_CLOSING;
   syncStop(tsSdbObj.sync);
   free(tsSdbObj.sync);
   walClose(tsSdbObj.wal);
diff --git a/src/query/src/sql.c b/src/query/src/sql.c
index d52e58395a..08a8d41c69 100644
--- a/src/query/src/sql.c
+++ b/src/query/src/sql.c
@@ -27,7 +27,6 @@
 
 #include <assert.h>
 #include <stdbool.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "qsqlparser.h"
@@ -203,61 +202,62 @@ typedef union {
 **  yy_default[]       Default action for each state.
 **
 *********** Begin parsing tables **********************************************/
-#define YY_ACTTAB_COUNT (529)
+#define YY_ACTTAB_COUNT (531)
 static const YYACTIONTYPE yy_action[] = {
- /*     0 */   752,  440,  132,  150,  244,   10,  616,  246,  132,  441,
- /*    10 */   132,  155,  821,   41,   43,   20,   35,   36,  820,  154,
- /*    20 */   821,   29,  741,  440,  200,   39,   37,   40,   38,  131,
- /*    30 */   499,  441,   96,   34,   33,  100,  151,   32,   31,   30,
- /*    40 */    41,   43,  741,   35,   36,  152,  136,  163,   29,  727,
- /*    50 */   749,  200,   39,   37,   40,   38,  185,  100,  225,  224,
- /*    60 */    34,   33,  162,  730,   32,   31,   30,  400,  401,  402,
+ /*     0 */   752,  440,  133,  151,  244,   10,  616,  246,  133,  441,
+ /*    10 */   133,  156,  821,   41,   43,   20,   35,   36,  820,  155,
+ /*    20 */   821,   29,  741,  440,  201,   39,   37,   40,   38,  132,
+ /*    30 */   499,  441,   97,   34,   33,  101,  152,   32,   31,   30,
+ /*    40 */    41,   43,  741,   35,   36,  153,  137,  164,   29,  727,
+ /*    50 */   749,  201,   39,   37,   40,   38,  186,  101,  225,  224,
+ /*    60 */    34,   33,  163,  730,   32,   31,   30,  400,  401,  402,
  /*    70 */   403,  404,  405,  406,  407,  408,  409,  410,  411,  245,
- /*    80 */   730,   41,   43,  188,   35,   36,  215,  236,  197,   29,
- /*    90 */    58,   20,  200,   39,   37,   40,   38,   32,   31,   30,
- /*   100 */    56,   34,   33,   75,  730,   32,   31,   30,   43,  236,
- /*   110 */    35,   36,  776,  817,  195,   29,   20,   20,  200,   39,
- /*   120 */    37,   40,   38,  164,  570,  727,  227,   34,   33,  440,
- /*   130 */   167,   32,   31,   30,  238,   35,   36,  441,    7,  816,
- /*   140 */    29,   61,  110,  200,   39,   37,   40,   38,  223,  228,
+ /*    80 */   730,   41,   43,  189,   35,   36,  216,  236,  198,   29,
+ /*    90 */    58,   20,  201,   39,   37,   40,   38,   32,   31,   30,
+ /*   100 */    56,   34,   33,   76,  730,   32,   31,   30,   43,  236,
+ /*   110 */    35,   36,  776,  817,  196,   29,   20,   20,  201,   39,
+ /*   120 */    37,   40,   38,  165,  570,  727,  227,   34,   33,  440,
+ /*   130 */   168,   32,   31,   30,  238,   35,   36,  441,    7,  816,
+ /*   140 */    29,   61,  111,  201,   39,   37,   40,   38,  223,  228,
  /*   150 */   727,  727,   34,   33,   50,  728,   32,   31,   30,   15,
- /*   160 */   214,  237,  213,  212,  211,  210,  209,  208,  207,  206,
+ /*   160 */   215,  237,  214,  213,  212,  211,  210,  209,  208,  207,
  /*   170 */   712,   51,  701,  702,  703,  704,  705,  706,  707,  708,
- /*   180 */   709,  710,  711,  159,  583,   11,  815,  574,  100,  577,
- /*   190 */   100,  580,  168,  159,  583,  222,  221,  574,   16,  577,
- /*   200 */    20,  580,   34,   33,  145,   26,   32,   31,   30,  238,
- /*   210 */    86,   85,  139,  174,  657,  156,  157,  123,  144,  199,
- /*   220 */   182,  715,  179,  714,  148,  156,  157,  159,  583,  531,
- /*   230 */    60,  574,  149,  577,  726,  580,  237,   16,   39,   37,
+ /*   180 */   709,  710,  711,  160,  583,   11,  815,  574,  101,  577,
+ /*   190 */   101,  580,  169,  160,  583,  222,  221,  574,   16,  577,
+ /*   200 */    20,  580,   34,   33,  146,   26,   32,   31,   30,  238,
+ /*   210 */    87,   86,  140,  175,  657,  157,  158,  124,  145,  200,
+ /*   220 */   183,  715,  180,  714,  149,  157,  158,  160,  583,  531,
+ /*   230 */    60,  574,  150,  577,  726,  580,  237,   16,   39,   37,
  /*   240 */    40,   38,   27,  775,   26,   59,   34,   33,  551,  552,
- /*   250 */    32,   31,   30,  137,  113,  114,  219,   64,   67,  156,
- /*   260 */   157,   95,  515,  666,  184,  512,  123,  513,   26,  514,
- /*   270 */   523,  147,  127,  125,  240,   88,   87,  187,   42,  158,
- /*   280 */    73,   77,  239,   84,   76,  572,  528,  729,   42,  582,
- /*   290 */    79,   17,  658,  165,  166,  123,  243,  242,   92,  582,
+ /*   250 */    32,   31,   30,  138,  114,  115,   68,   64,   67,  157,
+ /*   260 */   158,   96,  515,  666,  185,  512,  124,  513,   26,  514,
+ /*   270 */   523,  148,  128,  126,  240,   89,   88,  188,   42,  159,
+ /*   280 */    74,   78,  239,   85,   77,  572,  528,  729,   42,  582,
+ /*   290 */    80,   17,  658,  166,  167,  124,  243,  242,   93,  582,
  /*   300 */    47,  542,  543,  600,  581,   45,   13,   12,  584,  576,
- /*   310 */   138,  579,   12,  575,  581,  578,    2,   72,   71,   48,
- /*   320 */   505,  573,   42,  743,   45,  504,  204,    9,    8,   21,
- /*   330 */    21,  140,  519,  582,  520,  517,  141,  518,   83,   82,
- /*   340 */   142,  143,  134,  130,  135,  830,  133,  786,  581,  785,
- /*   350 */   160,  782,  781,  161,  751,  721,  768,  226,   97,  767,
- /*   360 */   111,  112,  516,  668,  205,  109,  128,   24,  218,  220,
- /*   370 */   829,   69,   26,  828,  826,  115,  186,  686,   25,   22,
- /*   380 */    90,  129,  655,   78,  653,   80,  651,  650,  169,  538,
- /*   390 */   124,  648,  189,  647,  646,  644,  636,  193,   52,  740,
- /*   400 */   126,  642,  640,  638,   49,  755,  756,  101,  769,   44,
- /*   410 */   198,  196,  194,   28,  192,  190,  217,   74,  229,  230,
- /*   420 */   202,  232,  231,  614,  233,  234,   53,  235,  241,  170,
- /*   430 */   146,   62,  171,   65,  173,  172,  613,  176,  175,  178,
- /*   440 */   649,  177,  612,   89,   91,  117,  687,  118,  116,  119,
- /*   450 */   120,  643,  104,  102,  122,  725,  106,  103,  105,  121,
- /*   460 */   107,    1,  108,   23,  180,  181,  605,  183,  187,  525,
- /*   470 */    55,  539,  153,   98,   57,  191,   18,   63,    4,  544,
- /*   480 */    99,    5,  585,    3,   19,   14,  201,    6,  203,  480,
- /*   490 */   479,  478,  477,  476,  475,  474,  473,  471,   45,  444,
- /*   500 */    66,  446,   21,  501,  216,   68,  500,  498,   54,  465,
- /*   510 */    46,  463,  455,   70,  461,  457,  459,  453,  451,  472,
- /*   520 */   470,   81,  426,  442,   93,  415,   94,  413,  618,
+ /*   310 */   139,  579,   12,  575,  581,  578,    2,   73,   72,   48,
+ /*   320 */   505,  573,   42,  743,   45,  504,  205,    9,    8,   21,
+ /*   330 */    21,  141,  519,  582,  520,  517,  142,  518,   84,   83,
+ /*   340 */   143,  144,  135,  131,  136,  830,  134,  786,  581,  785,
+ /*   350 */   161,  782,  781,  162,  751,  721,  768,  226,   98,  767,
+ /*   360 */   112,  113,  516,  668,  206,  110,  129,   24,  219,  665,
+ /*   370 */   220,  829,   26,   70,  828,  826,  187,  116,  686,   25,
+ /*   380 */    91,   22,  130,  655,   79,  653,   81,  651,  650,  538,
+ /*   390 */   170,  125,  190,  648,  647,  646,  644,  194,   52,  740,
+ /*   400 */   636,  127,  642,  640,  638,   49,  755,  102,  756,   44,
+ /*   410 */   769,  199,  197,  195,  193,  191,   28,  218,   75,  229,
+ /*   420 */   230,  231,  232,  233,  234,  235,  203,   53,  241,  614,
+ /*   430 */   171,  172,  147,   62,   65,  174,  613,  177,  173,  179,
+ /*   440 */   612,  176,  649,  178,  181,  643,  123,  687,  117,  119,
+ /*   450 */   118,  120,  121,   90,  103,  725,  108,  104,  105,  122,
+ /*   460 */   106,  107,  109,   92,    1,   23,  182,  188,  605,  184,
+ /*   470 */   525,   55,  539,   57,   99,  154,  192,   18,   63,    4,
+ /*   480 */   544,  100,  480,  585,    3,   19,    5,   14,  202,    6,
+ /*   490 */   204,  479,  478,  477,  476,  475,  474,  473,  471,   45,
+ /*   500 */   217,  444,   66,   21,  501,  500,   46,  498,   54,  465,
+ /*   510 */   463,  455,  461,  457,   69,  459,   71,  453,  451,  472,
+ /*   520 */   470,   82,  426,  442,   94,  415,  413,  618,  617,  617,
+ /*   530 */    95,
 };
 static const YYCODETYPE yy_lookahead[] = {
  /*     0 */   207,    1,  256,  206,  207,  256,  204,  205,  256,    9,
@@ -300,20 +300,20 @@ static const YYCODETYPE yy_lookahead[] = {
  /*   370 */   207,  207,  103,  207,  207,  207,  240,  207,  207,  207,
  /*   380 */    59,  207,  207,  207,  207,  207,  207,  207,  207,  107,
  /*   390 */   207,  207,  259,  207,  207,  207,  207,  259,  117,  253,
- /*   400 */   207,  207,  207,  207,  119,  208,  208,  252,  208,  116,
- /*   410 */   111,  115,  110,  121,  109,  108,   75,   84,   83,   49,
- /*   420 */   208,   82,   80,    5,   53,   81,  208,   79,   75,  132,
- /*   430 */   208,  212,    5,  212,   58,  132,    5,    5,  132,   58,
- /*   440 */   208,  132,    5,  209,  209,  220,  222,  216,  221,  219,
- /*   450 */   217,  208,  249,  251,  215,  240,  247,  250,  248,  218,
- /*   460 */   246,  213,  245,  210,  132,   58,   86,  124,  104,   97,
- /*   470 */   105,   97,    1,   96,  101,   96,  101,   72,  112,   97,
- /*   480 */    96,  112,   97,   96,  101,   96,   98,   96,   98,    9,
- /*   490 */     5,    5,    5,    5,    1,    5,    5,    5,  101,   76,
- /*   500 */    72,   58,  101,    5,   15,  127,    5,   97,   96,    5,
- /*   510 */    16,    5,    5,  127,    5,    5,    5,    5,    5,    5,
- /*   520 */     5,   58,   58,   76,   21,   59,   21,   58,    0,  267,
- /*   530 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
+ /*   400 */   207,  207,  207,  207,  207,  119,  208,  252,  208,  116,
+ /*   410 */   208,  111,  115,  110,  109,  108,  121,   75,   84,   83,
+ /*   420 */    49,   80,   82,   53,   81,   79,  208,  208,   75,    5,
+ /*   430 */   132,    5,  208,  212,  212,   58,    5,    5,  132,   58,
+ /*   440 */     5,  132,  208,  132,  132,  208,  215,  222,  221,  216,
+ /*   450 */   220,  219,  217,  209,  251,  240,  246,  250,  249,  218,
+ /*   460 */   248,  247,  245,  209,  213,  210,   58,  104,   86,  124,
+ /*   470 */    97,  105,   97,  101,   96,    1,   96,  101,   72,  112,
+ /*   480 */    97,   96,    9,   97,   96,  101,  112,   96,   98,   96,
+ /*   490 */    98,    5,    5,    5,    5,    1,    5,    5,    5,  101,
+ /*   500 */    15,   76,   72,  101,    5,    5,   16,   97,   96,    5,
+ /*   510 */     5,    5,    5,    5,  127,    5,  127,    5,    5,    5,
+ /*   520 */     5,   58,   58,   76,   21,   59,   58,    0,  267,  267,
+ /*   530 */    21,  267,  267,  267,  267,  267,  267,  267,  267,  267,
  /*   540 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
  /*   550 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
  /*   560 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
@@ -333,41 +333,41 @@ static const YYCODETYPE yy_lookahead[] = {
  /*   700 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
  /*   710 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
  /*   720 */   267,  267,  267,  267,  267,  267,  267,  267,  267,  267,
- /*   730 */   267,  267,
+ /*   730 */   267,  267,  267,  267,
 };
 #define YY_SHIFT_COUNT    (246)
 #define YY_SHIFT_MIN      (0)
-#define YY_SHIFT_MAX      (528)
+#define YY_SHIFT_MAX      (527)
 static const unsigned short int yy_shift_ofst[] = {
  /*     0 */   141,   74,  182,  226,  128,  128,  128,  128,  128,  128,
  /*    10 */     0,   22,  226,  260,  260,  260,  102,  128,  128,  128,
- /*    20 */   128,  128,   31,  149,    9,    9,  529,  192,  226,  226,
+ /*    20 */   128,  128,   31,  149,    9,    9,  531,  192,  226,  226,
  /*    30 */   226,  226,  226,  226,  226,  226,  226,  226,  226,  226,
  /*    40 */   226,  226,  226,  226,  226,  260,  260,   25,   25,   25,
  /*    50 */    25,   25,   25,   42,   25,  165,  128,  128,  135,  135,
  /*    60 */   185,  128,  128,  128,  128,  128,  128,  128,  128,  128,
  /*    70 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
  /*    80 */   128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
- /*    90 */   128,  128,  128,  128,  128,  269,  321,  321,  282,  282,
- /*   100 */   321,  281,  285,  293,  299,  296,  302,  305,  307,  292,
- /*   110 */   269,  321,  321,  341,  341,  321,  333,  335,  370,  342,
- /*   120 */   339,  371,  344,  348,  321,  353,  321,  353,  529,  529,
- /*   130 */    27,   68,   68,   68,   94,  119,  213,  213,  213,  216,
- /*   140 */   169,  169,  169,  169,  190,  208,   67,   89,   60,   60,
- /*   150 */   236,  173,  204,  205,  206,  211,  304,  308,  284,  220,
- /*   160 */   199,   53,  223,  228,  229,  327,  330,  191,  201,  266,
- /*   170 */   418,  297,  427,  303,  376,  431,  306,  432,  309,  381,
- /*   180 */   437,  332,  407,  380,  343,  364,  372,  365,  373,  374,
- /*   190 */   377,  471,  379,  382,  384,  375,  366,  383,  369,  385,
- /*   200 */   387,  389,  388,  391,  390,  405,  480,  485,  486,  487,
- /*   210 */   488,  493,  490,  491,  492,  397,  423,  489,  428,  443,
- /*   220 */   494,  378,  386,  401,  498,  501,  410,  412,  401,  504,
- /*   230 */   506,  507,  509,  510,  511,  512,  513,  514,  515,  463,
- /*   240 */   464,  447,  503,  505,  466,  469,  528,
+ /*    90 */   128,  128,  128,  128,  128,  128,  269,  321,  321,  282,
+ /*   100 */   282,  321,  281,  286,  293,  300,  297,  303,  305,  307,
+ /*   110 */   295,  269,  321,  321,  342,  342,  321,  334,  336,  371,
+ /*   120 */   341,  340,  370,  343,  346,  321,  353,  321,  353,  531,
+ /*   130 */   531,   27,   68,   68,   68,   94,  119,  213,  213,  213,
+ /*   140 */   216,  169,  169,  169,  169,  190,  208,   67,   89,   60,
+ /*   150 */    60,  236,  173,  204,  205,  206,  211,  304,  308,  284,
+ /*   160 */   220,  199,   53,  223,  228,  229,  327,  330,  191,  201,
+ /*   170 */   266,  424,  298,  426,  306,  377,  431,  309,  432,  311,
+ /*   180 */   381,  435,  312,  408,  382,  345,  363,  373,  366,  372,
+ /*   190 */   375,  378,  474,  380,  383,  385,  376,  367,  384,  374,
+ /*   200 */   386,  388,  391,  390,  393,  392,  406,  473,  486,  487,
+ /*   210 */   488,  489,  494,  491,  492,  493,  398,  425,  485,  430,
+ /*   220 */   490,  387,  389,  402,  499,  500,  410,  412,  402,  504,
+ /*   230 */   505,  506,  507,  508,  510,  512,  513,  514,  515,  463,
+ /*   240 */   464,  447,  503,  509,  466,  468,  527,
 };
-#define YY_REDUCE_COUNT (129)
+#define YY_REDUCE_COUNT (130)
 #define YY_REDUCE_MIN   (-254)
-#define YY_REDUCE_MAX   (253)
+#define YY_REDUCE_MAX   (255)
 static const short yy_reduce_ofst[] = {
  /*     0 */  -198,  -53, -254, -246, -150, -172, -192, -116,  -91,  -90,
  /*    10 */  -207, -203, -248, -179, -162, -138, -218, -175,  -19,  -17,
@@ -378,10 +378,11 @@ static const short yy_reduce_ofst[] = {
  /*    60 */   121,  153,  154,  156,  157,  159,  160,  161,  162,  163,
  /*    70 */   164,  166,  167,  168,  170,  171,  172,  174,  175,  176,
  /*    80 */   177,  178,  179,  180,  181,  183,  184,  186,  187,  188,
- /*    90 */   189,  193,  194,  195,  196,  136,  197,  198,  133,  138,
- /*   100 */   200,  146,  155,  202,  207,  203,  210,  209,  214,  217,
- /*   110 */   215,  212,  218,  219,  221,  222,  224,  227,  225,  231,
- /*   120 */   230,  233,  241,  239,  232,  234,  243,  235,  248,  253,
+ /*    90 */   189,  193,  194,  195,  196,  197,  136,  198,  200,  133,
+ /*   100 */   138,  202,  146,  155,  203,  207,  209,  212,  214,  210,
+ /*   110 */   217,  215,  218,  219,  221,  222,  224,  225,  227,  230,
+ /*   120 */   233,  232,  235,  241,  231,  234,  244,  237,  254,  251,
+ /*   130 */   255,
 };
 static const YYACTIONTYPE yy_default[] = {
  /*     0 */   615,  667,  823,  823,  615,  615,  615,  615,  615,  615,
@@ -391,21 +392,21 @@ static const YYACTIONTYPE yy_default[] = {
  /*    40 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
  /*    50 */   615,  615,  615,  615,  615,  615,  615,  615,  772,  772,
  /*    60 */   746,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*    70 */   615,  615,  615,  615,  615,  615,  615,  615,  654,  615,
- /*    80 */   652,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*    90 */   615,  615,  641,  615,  615,  615,  635,  635,  615,  615,
- /*   100 */   635,  779,  783,  777,  765,  773,  764,  760,  759,  787,
- /*   110 */   615,  635,  635,  664,  664,  635,  685,  683,  681,  673,
- /*   120 */   679,  675,  677,  671,  635,  662,  635,  662,  700,  713,
- /*   130 */   615,  788,  822,  778,  806,  805,  818,  812,  811,  615,
- /*   140 */   810,  809,  808,  807,  615,  615,  615,  615,  814,  813,
- /*   150 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  790,
- /*   160 */   784,  780,  615,  615,  615,  615,  615,  615,  615,  615,
+ /*    70 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  654,
+ /*    80 */   615,  652,  615,  615,  615,  615,  615,  615,  615,  615,
+ /*    90 */   615,  615,  615,  641,  615,  615,  615,  635,  635,  615,
+ /*   100 */   615,  635,  779,  783,  777,  765,  773,  764,  760,  759,
+ /*   110 */   787,  615,  635,  635,  664,  664,  635,  685,  683,  681,
+ /*   120 */   673,  679,  675,  677,  671,  635,  662,  635,  662,  700,
+ /*   130 */   713,  615,  788,  822,  778,  806,  805,  818,  812,  811,
+ /*   140 */   615,  810,  809,  808,  807,  615,  615,  615,  615,  814,
+ /*   150 */   813,  615,  615,  615,  615,  615,  615,  615,  615,  615,
+ /*   160 */   790,  784,  780,  615,  615,  615,  615,  615,  615,  615,
  /*   170 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
- /*   180 */   615,  615,  615,  615,  615,  745,  615,  615,  754,  615,
- /*   190 */   615,  615,  615,  615,  615,  774,  615,  766,  615,  615,
- /*   200 */   615,  615,  615,  615,  722,  615,  615,  615,  615,  615,
- /*   210 */   615,  615,  615,  615,  615,  688,  615,  615,  615,  615,
+ /*   180 */   615,  615,  615,  615,  615,  615,  745,  615,  615,  754,
+ /*   190 */   615,  615,  615,  615,  615,  615,  774,  615,  766,  615,
+ /*   200 */   615,  615,  615,  615,  615,  722,  615,  615,  615,  615,
+ /*   210 */   615,  615,  615,  615,  615,  615,  688,  615,  615,  615,
  /*   220 */   615,  615,  615,  827,  615,  615,  615,  716,  825,  615,
  /*   230 */   615,  615,  615,  615,  615,  615,  615,  615,  615,  615,
  /*   240 */   615,  615,  639,  637,  615,  631,  615,
@@ -1038,7 +1039,7 @@ static const char *const yyRuleName[] = {
  /*  44 */ "ifexists ::=",
  /*  45 */ "ifnotexists ::= IF NOT EXISTS",
  /*  46 */ "ifnotexists ::=",
- /*  47 */ "cmd ::= CREATE DNODE IPTOKEN",
+ /*  47 */ "cmd ::= CREATE DNODE ids",
  /*  48 */ "cmd ::= CREATE ACCOUNT ids PASS ids acct_optr",
  /*  49 */ "cmd ::= CREATE DATABASE ifnotexists ids db_optr",
  /*  50 */ "cmd ::= CREATE USER ids PASS ids",
@@ -1711,7 +1712,7 @@ static const struct {
   {  209,    0 }, /* (44) ifexists ::= */
   {  212,   -3 }, /* (45) ifnotexists ::= IF NOT EXISTS */
   {  212,    0 }, /* (46) ifnotexists ::= */
-  {  205,   -3 }, /* (47) cmd ::= CREATE DNODE IPTOKEN */
+  {  205,   -3 }, /* (47) cmd ::= CREATE DNODE ids */
   {  205,   -6 }, /* (48) cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
   {  205,   -5 }, /* (49) cmd ::= CREATE DATABASE ifnotexists ids db_optr */
   {  205,   -5 }, /* (50) cmd ::= CREATE USER ids PASS ids */
@@ -2122,7 +2123,7 @@ static void yy_reduce(
       case 45: /* ifnotexists ::= IF NOT EXISTS */
 {yymsp[-2].minor.yy0.n = 1;}
         break;
-      case 47: /* cmd ::= CREATE DNODE IPTOKEN */
+      case 47: /* cmd ::= CREATE DNODE ids */
 { setDCLSQLElems(pInfo, TSDB_SQL_CREATE_DNODE, 1, &yymsp[0].minor.yy0);}
         break;
       case 48: /* cmd ::= CREATE ACCOUNT ids PASS ids acct_optr */
diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index dd90a120ca..22fb5036e2 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -368,6 +368,15 @@ int tsdbAlterTable(TsdbRepoT *pRepo, STableCfg *pCfg) {
   return 0;
 }
 
+TSKEY tsdbGetTableLastKey(TsdbRepoT *repo, int64_t uid) {
+  STsdbRepo *pRepo = (STsdbRepo *)repo;
+
+  STable *pTable = tsdbGetTableByUid(pRepo->tsdbMeta, uid);
+  if (pTable == NULL) return -1;
+
+  return TSDB_GET_TABLE_LAST_KEY(pTable);
+}
+
 int tsdbDropTable(TsdbRepoT *repo, STableId tableId) {
   if (repo == NULL) return -1;
   STsdbRepo *pRepo = (STsdbRepo *)repo;
diff --git a/src/util/src/hash.c b/src/util/src/hash.c
index 4d39a7299d..5abbf34c89 100644
--- a/src/util/src/hash.c
+++ b/src/util/src/hash.c
@@ -522,6 +522,7 @@ static SHashNode *getNextHashNode(SHashMutableIterator *pIter) {
   assert(pIter != NULL);
   pIter->entryIndex++;
 
+  pIter->entryIndex++;
   while (pIter->entryIndex < pIter->pHashObj->capacity) {
     SHashEntry *pEntry = pIter->pHashObj->hashList[pIter->entryIndex];
     if (pEntry->next == NULL) {
diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c
index 85bebfaca8..c665ef9679 100644
--- a/src/util/src/tsocket.c
+++ b/src/util/src/tsocket.c
@@ -25,8 +25,13 @@ int taosGetFqdn(char *fqdn) {
 
   struct hostent* h;
   h = gethostbyname(hostname);
-  strcpy(fqdn, h->h_name);
-  return 0;
+  if (h != NULL) {
+    strcpy(fqdn, h->h_name);
+    return 0;
+  } else {
+    uError("failed to get host name");
+    return -1;
+  }
 }
 
 uint32_t taosGetIpFromFqdn(const char *fqdn) {
diff --git a/tests/script/general/agg/fill.sim b/tests/script/general/agg/fill.sim
index 4056b9ef20..de579238b8 100644
--- a/tests/script/general/agg/fill.sim
+++ b/tests/script/general/agg/fill.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/agg/stream.sim b/tests/script/general/agg/stream.sim
index a024ad9b80..2217c39430 100644
--- a/tests/script/general/agg/stream.sim
+++ b/tests/script/general/agg/stream.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 
 print ========== step1
diff --git a/tests/script/general/alter/cached_schema_after_alter.sim b/tests/script/general/alter/cached_schema_after_alter.sim
index f9bac689fb..52507b1992 100644
--- a/tests/script/general/alter/cached_schema_after_alter.sim
+++ b/tests/script/general/alter/cached_schema_after_alter.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/alter/count.sim b/tests/script/general/alter/count.sim
index be76aaa1c1..1b77f997ac 100644
--- a/tests/script/general/alter/count.sim
+++ b/tests/script/general/alter/count.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
diff --git a/tests/script/general/alter/import.sim b/tests/script/general/alter/import.sim
index 0cf70c8549..7348cc919e 100644
--- a/tests/script/general/alter/import.sim
+++ b/tests/script/general/alter/import.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
diff --git a/tests/script/general/alter/insert1.sim b/tests/script/general/alter/insert1.sim
index c58dce0203..0daa9c6432 100644
--- a/tests/script/general/alter/insert1.sim
+++ b/tests/script/general/alter/insert1.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/alter/insert2.sim b/tests/script/general/alter/insert2.sim
index d749ddefb5..34f935a04b 100644
--- a/tests/script/general/alter/insert2.sim
+++ b/tests/script/general/alter/insert2.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/alter/metrics.sim b/tests/script/general/alter/metrics.sim
index a58d25c5be..defe8d0fc1 100644
--- a/tests/script/general/alter/metrics.sim
+++ b/tests/script/general/alter/metrics.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/alter/table.sim b/tests/script/general/alter/table.sim
index 6a0e62a0bf..34630f4805 100644
--- a/tests/script/general/alter/table.sim
+++ b/tests/script/general/alter/table.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/cache/cache_balance.sim b/tests/script/general/cache/cache_balance.sim
index 1bc7d83e73..b71e810234 100644
--- a/tests/script/general/cache/cache_balance.sim
+++ b/tests/script/general/cache/cache_balance.sim
@@ -1,8 +1,8 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 
 system sh/cfg.sh -n dnode1 -c commitLog           -v 0
 system sh/cfg.sh -n dnode2 -c commitLog           -v 0
diff --git a/tests/script/general/cache/new_metrics.sim b/tests/script/general/cache/new_metrics.sim
index 6af54766b8..18335b6095 100644
--- a/tests/script/general/cache/new_metrics.sim
+++ b/tests/script/general/cache/new_metrics.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
diff --git a/tests/script/general/cache/new_stream.sim b/tests/script/general/cache/new_stream.sim
index 38559cb936..23904a0210 100644
--- a/tests/script/general/cache/new_stream.sim
+++ b/tests/script/general/cache/new_stream.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
diff --git a/tests/script/general/cache/restart_metrics.sim b/tests/script/general/cache/restart_metrics.sim
index f4a607bf55..67d02722e2 100644
--- a/tests/script/general/cache/restart_metrics.sim
+++ b/tests/script/general/cache/restart_metrics.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
@@ -47,7 +47,7 @@ endi
 
 print =============== step2
 system sh/exec.sh -n dnode1 -s stop
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
diff --git a/tests/script/general/cache/restart_stream.sim b/tests/script/general/cache/restart_stream.sim
index 2f45f18737..b119dcf856 100644
--- a/tests/script/general/cache/restart_stream.sim
+++ b/tests/script/general/cache/restart_stream.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1
@@ -97,7 +97,7 @@ endi
 
 print =============== step4
 system sh/exec.sh -n dnode1 -s stop
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 1
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 1
diff --git a/tests/script/general/cache/restart_table.sim b/tests/script/general/cache/restart_table.sim
index d7c02116fd..c973293fdc 100644
--- a/tests/script/general/cache/restart_table.sim
+++ b/tests/script/general/cache/restart_table.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
@@ -35,7 +35,7 @@ endi
 
 print =============== step2
 system sh/exec.sh -n dnode1 -s stop
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 10
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 10
diff --git a/tests/script/general/column/commit.sim b/tests/script/general/column/commit.sim
index 3bc5d4e06a..3a46cc73e8 100644
--- a/tests/script/general/column/commit.sim
+++ b/tests/script/general/column/commit.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/column/metrics.sim b/tests/script/general/column/metrics.sim
index 94f5e6bb8a..119ab0108c 100644
--- a/tests/script/general/column/metrics.sim
+++ b/tests/script/general/column/metrics.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/column/stream.sim b/tests/script/general/column/stream.sim
index 5ea04db04b..6972e34197 100644
--- a/tests/script/general/column/stream.sim
+++ b/tests/script/general/column/stream.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 
 print ========== step1
diff --git a/tests/script/general/column/table.sim b/tests/script/general/column/table.sim
index 85e11f43f4..e4f3bea466 100644
--- a/tests/script/general/column/table.sim
+++ b/tests/script/general/column/table.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/compress/commitlog.sim b/tests/script/general/compress/commitlog.sim
index 2323991044..fdadfdac73 100644
--- a/tests/script/general/compress/commitlog.sim
+++ b/tests/script/general/compress/commitlog.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 1
 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
diff --git a/tests/script/general/compress/compress.sim b/tests/script/general/compress/compress.sim
index 93e807e2db..2d222ecbbe 100644
--- a/tests/script/general/compress/compress.sim
+++ b/tests/script/general/compress/compress.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
diff --git a/tests/script/general/compress/compress2.sim b/tests/script/general/compress/compress2.sim
index e0053648e2..096875176e 100644
--- a/tests/script/general/compress/compress2.sim
+++ b/tests/script/general/compress/compress2.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 2
diff --git a/tests/script/general/compress/uncompress.sim b/tests/script/general/compress/uncompress.sim
index 13b19300ac..a26627d5e3 100644
--- a/tests/script/general/compress/uncompress.sim
+++ b/tests/script/general/compress/uncompress.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c cacheBlockSize -v 1024
 system sh/cfg.sh -n dnode1 -c compression -v 1
diff --git a/tests/script/general/compute/avg.sim b/tests/script/general/compute/avg.sim
index 9afdce8b14..ccc996dccb 100644
--- a/tests/script/general/compute/avg.sim
+++ b/tests/script/general/compute/avg.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/bottom.sim b/tests/script/general/compute/bottom.sim
index 889191f468..988ce74a03 100644
--- a/tests/script/general/compute/bottom.sim
+++ b/tests/script/general/compute/bottom.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/count.sim b/tests/script/general/compute/count.sim
index ead4a34a63..e2c352ffd4 100644
--- a/tests/script/general/compute/count.sim
+++ b/tests/script/general/compute/count.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/diff.sim b/tests/script/general/compute/diff.sim
index 7581f6b4bd..bc5799db18 100644
--- a/tests/script/general/compute/diff.sim
+++ b/tests/script/general/compute/diff.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/diff2.sim b/tests/script/general/compute/diff2.sim
index 2c831fc5a3..ecd0666198 100644
--- a/tests/script/general/compute/diff2.sim
+++ b/tests/script/general/compute/diff2.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/first.sim b/tests/script/general/compute/first.sim
index 9d98b61c1c..947fcf5444 100644
--- a/tests/script/general/compute/first.sim
+++ b/tests/script/general/compute/first.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/interval.sim b/tests/script/general/compute/interval.sim
index 36df589be9..d4052a47a1 100644
--- a/tests/script/general/compute/interval.sim
+++ b/tests/script/general/compute/interval.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/last.sim b/tests/script/general/compute/last.sim
index ef851e973e..ffd4368949 100644
--- a/tests/script/general/compute/last.sim
+++ b/tests/script/general/compute/last.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/leastsquare.sim b/tests/script/general/compute/leastsquare.sim
index 1f9d7fa4a9..ccd6be0109 100644
--- a/tests/script/general/compute/leastsquare.sim
+++ b/tests/script/general/compute/leastsquare.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/max.sim b/tests/script/general/compute/max.sim
index f8692c467f..d7f80bfef0 100644
--- a/tests/script/general/compute/max.sim
+++ b/tests/script/general/compute/max.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/min.sim b/tests/script/general/compute/min.sim
index 5a3f4351d0..3c123ca967 100644
--- a/tests/script/general/compute/min.sim
+++ b/tests/script/general/compute/min.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/compute/null.sim b/tests/script/general/compute/null.sim
index 813d212636..784f9ba094 100644
--- a/tests/script/general/compute/null.sim
+++ b/tests/script/general/compute/null.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/percentile.sim b/tests/script/general/compute/percentile.sim
index 2b30d4689c..8a4086dd24 100644
--- a/tests/script/general/compute/percentile.sim
+++ b/tests/script/general/compute/percentile.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/stddev.sim b/tests/script/general/compute/stddev.sim
index b39caea7a2..53a1b9bc01 100644
--- a/tests/script/general/compute/stddev.sim
+++ b/tests/script/general/compute/stddev.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/sum.sim b/tests/script/general/compute/sum.sim
index e298eabf44..4e4e75bfe4 100644
--- a/tests/script/general/compute/sum.sim
+++ b/tests/script/general/compute/sum.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/compute/top.sim b/tests/script/general/compute/top.sim
index d36f599b71..54d7699f27 100644
--- a/tests/script/general/compute/top.sim
+++ b/tests/script/general/compute/top.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/db/backup/keep.sim b/tests/script/general/db/backup/keep.sim
index c00665743c..671d77de8c 100644
--- a/tests/script/general/db/backup/keep.sim
+++ b/tests/script/general/db/backup/keep.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/general/db/basic.sim b/tests/script/general/db/basic.sim
index a3bd1ae505..9d56e1c5fb 100644
--- a/tests/script/general/db/basic.sim
+++ b/tests/script/general/db/basic.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c tables -v 1000
diff --git a/tests/script/general/db/basic1.sim b/tests/script/general/db/basic1.sim
index 094c1a6930..1fa6678ef8 100644
--- a/tests/script/general/db/basic1.sim
+++ b/tests/script/general/db/basic1.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/db/basic2.sim b/tests/script/general/db/basic2.sim
index a1e4533707..945481d9bf 100644
--- a/tests/script/general/db/basic2.sim
+++ b/tests/script/general/db/basic2.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/db/basic3.sim b/tests/script/general/db/basic3.sim
index 60ff4b74c7..00e3e9d106 100644
--- a/tests/script/general/db/basic3.sim
+++ b/tests/script/general/db/basic3.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/db/basic4.sim b/tests/script/general/db/basic4.sim
index deac9d47b4..9f8d463a7d 100644
--- a/tests/script/general/db/basic4.sim
+++ b/tests/script/general/db/basic4.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/db/basic5.sim b/tests/script/general/db/basic5.sim
index 55a42899ec..09ace39bf4 100644
--- a/tests/script/general/db/basic5.sim
+++ b/tests/script/general/db/basic5.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/db/delete_reuse1.sim b/tests/script/general/db/delete_reuse1.sim
index 55ed7a1f5c..6e21aabb3c 100644
--- a/tests/script/general/db/delete_reuse1.sim
+++ b/tests/script/general/db/delete_reuse1.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/general/db/delete_reuse2.sim b/tests/script/general/db/delete_reuse2.sim
index 3014bd4d20..95aa3f9526 100644
--- a/tests/script/general/db/delete_reuse2.sim
+++ b/tests/script/general/db/delete_reuse2.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/general/db/delete_reusevnode.sim b/tests/script/general/db/delete_reusevnode.sim
index b8a268d5bb..2204e7434f 100644
--- a/tests/script/general/db/delete_reusevnode.sim
+++ b/tests/script/general/db/delete_reusevnode.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
@@ -45,8 +45,8 @@ endi
 
 
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
diff --git a/tests/script/general/db/delete_reusevnode2.sim b/tests/script/general/db/delete_reusevnode2.sim
index f261b3d1e2..dcf74a287d 100644
--- a/tests/script/general/db/delete_reusevnode2.sim
+++ b/tests/script/general/db/delete_reusevnode2.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 10
diff --git a/tests/script/general/db/delete_writing1.sim b/tests/script/general/db/delete_writing1.sim
index e06371266f..a4be57782e 100644
--- a/tests/script/general/db/delete_writing1.sim
+++ b/tests/script/general/db/delete_writing1.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/general/db/delete_writing2.sim b/tests/script/general/db/delete_writing2.sim
index 751cc26b2f..75603dcdd8 100644
--- a/tests/script/general/db/delete_writing2.sim
+++ b/tests/script/general/db/delete_writing2.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 
diff --git a/tests/script/general/db/len.sim b/tests/script/general/db/len.sim
index 5e4a891dc2..1cee902c1a 100644
--- a/tests/script/general/db/len.sim
+++ b/tests/script/general/db/len.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
diff --git a/tests/script/general/db/repeat.sim b/tests/script/general/db/repeat.sim
index e008d95377..7afa42f0c4 100644
--- a/tests/script/general/db/repeat.sim
+++ b/tests/script/general/db/repeat.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c tables -v 4
diff --git a/tests/script/general/db/tables.sim b/tests/script/general/db/tables.sim
index aed8621116..afa11d6542 100644
--- a/tests/script/general/db/tables.sim
+++ b/tests/script/general/db/tables.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2000
diff --git a/tests/script/general/field/2.sim b/tests/script/general/field/2.sim
index c2d9d78085..d5a002932e 100644
--- a/tests/script/general/field/2.sim
+++ b/tests/script/general/field/2.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/3.sim b/tests/script/general/field/3.sim
index 13f4c14f7b..ed4df854ad 100644
--- a/tests/script/general/field/3.sim
+++ b/tests/script/general/field/3.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/4.sim b/tests/script/general/field/4.sim
index aa8fb822a4..465df43f04 100644
--- a/tests/script/general/field/4.sim
+++ b/tests/script/general/field/4.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/5.sim b/tests/script/general/field/5.sim
index 9fa08cb799..e1e3d9a54a 100644
--- a/tests/script/general/field/5.sim
+++ b/tests/script/general/field/5.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/6.sim b/tests/script/general/field/6.sim
index b2ced5b9df..72e4b5bf4c 100644
--- a/tests/script/general/field/6.sim
+++ b/tests/script/general/field/6.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/bigint.sim b/tests/script/general/field/bigint.sim
index 2093f55de5..2adde6cd3d 100644
--- a/tests/script/general/field/bigint.sim
+++ b/tests/script/general/field/bigint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/binary.sim b/tests/script/general/field/binary.sim
index a49af37806..1e1a3682b1 100644
--- a/tests/script/general/field/binary.sim
+++ b/tests/script/general/field/binary.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/bool.sim b/tests/script/general/field/bool.sim
index aa70dbd23e..41770a399d 100644
--- a/tests/script/general/field/bool.sim
+++ b/tests/script/general/field/bool.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/double.sim b/tests/script/general/field/double.sim
index daca74fcde..bf3aa923fd 100644
--- a/tests/script/general/field/double.sim
+++ b/tests/script/general/field/double.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/float.sim b/tests/script/general/field/float.sim
index 8bdebd6714..8e8c3740a8 100644
--- a/tests/script/general/field/float.sim
+++ b/tests/script/general/field/float.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/int.sim b/tests/script/general/field/int.sim
index a3d4c901eb..a4778279a1 100644
--- a/tests/script/general/field/int.sim
+++ b/tests/script/general/field/int.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/single.sim b/tests/script/general/field/single.sim
index ad844da95d..17492123ed 100644
--- a/tests/script/general/field/single.sim
+++ b/tests/script/general/field/single.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/smallint.sim b/tests/script/general/field/smallint.sim
index 432d766ac2..7b6ea2ce79 100644
--- a/tests/script/general/field/smallint.sim
+++ b/tests/script/general/field/smallint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/field/tinyint.sim b/tests/script/general/field/tinyint.sim
index 9b143e061f..fe6e14f04a 100644
--- a/tests/script/general/field/tinyint.sim
+++ b/tests/script/general/field/tinyint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/http/grafana.sim b/tests/script/general/http/grafana.sim
index 818114f9d7..4f83accf2d 100644
--- a/tests/script/general/http/grafana.sim
+++ b/tests/script/general/http/grafana.sim
@@ -2,8 +2,8 @@ system sh/stop_dnodes.sh
 
 sleep 5000
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
diff --git a/tests/script/general/http/grafana_bug.sim b/tests/script/general/http/grafana_bug.sim
index 6f0e687fda..ac6de5cb31 100644
--- a/tests/script/general/http/grafana_bug.sim
+++ b/tests/script/general/http/grafana_bug.sim
@@ -2,8 +2,8 @@ system sh/stop_dnodes.sh
 
 sleep 2000
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
diff --git a/tests/script/general/http/prepare.sim b/tests/script/general/http/prepare.sim
index dcbaa7ef81..11834e1223 100644
--- a/tests/script/general/http/prepare.sim
+++ b/tests/script/general/http/prepare.sim
@@ -2,8 +2,8 @@ system sh/stop_dnodes.sh
 
 sleep 5000
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/http/restful.sim b/tests/script/general/http/restful.sim
index 50f0223804..7cc48bcb7a 100644
--- a/tests/script/general/http/restful.sim
+++ b/tests/script/general/http/restful.sim
@@ -2,8 +2,8 @@ system sh/stop_dnodes.sh
 
 sleep 5000
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/http/restful_full.sim b/tests/script/general/http/restful_full.sim
index b42f440068..27f2a06253 100644
--- a/tests/script/general/http/restful_full.sim
+++ b/tests/script/general/http/restful_full.sim
@@ -2,8 +2,8 @@ system sh/stop_dnodes.sh
 
 #sleep 5000
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/http/restful_insert.sim b/tests/script/general/http/restful_insert.sim
index e131e3e53e..5a032b0dbe 100644
--- a/tests/script/general/http/restful_insert.sim
+++ b/tests/script/general/http/restful_insert.sim
@@ -2,8 +2,8 @@ system sh/stop_dnodes.sh
 
 sleep 5000
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/http/restful_limit.sim b/tests/script/general/http/restful_limit.sim
index 75d83b61b3..190d63f4db 100644
--- a/tests/script/general/http/restful_limit.sim
+++ b/tests/script/general/http/restful_limit.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/http/telegraf.sim b/tests/script/general/http/telegraf.sim
index b782a9b9bf..16bea1ac4b 100644
--- a/tests/script/general/http/telegraf.sim
+++ b/tests/script/general/http/telegraf.sim
@@ -2,8 +2,8 @@ system sh/stop_dnodes.sh
 
 sleep 5000
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c httpEnableRecordSql -v 1
 system sh/cfg.sh -n dnode1 -c telegrafUseFieldNum -v 0
diff --git a/tests/script/general/import/basic.sim b/tests/script/general/import/basic.sim
index 018d9ea7f7..5037014728 100644
--- a/tests/script/general/import/basic.sim
+++ b/tests/script/general/import/basic.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0
 system sh/cfg.sh -n dnode3 -c commitlog -v 0
 system sh/cfg.sh -n dnode4 -c commitlog -v 0
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
-
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/import/commit.sim b/tests/script/general/import/commit.sim
index 974d9e394f..2197c1d39d 100644
--- a/tests/script/general/import/commit.sim
+++ b/tests/script/general/import/commit.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0
 system sh/cfg.sh -n dnode3 -c commitlog -v 0
 system sh/cfg.sh -n dnode4 -c commitlog -v 0
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
-
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/import/large.sim b/tests/script/general/import/large.sim
index 9fa8f66299..77a47a1049 100644
--- a/tests/script/general/import/large.sim
+++ b/tests/script/general/import/large.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0
 system sh/cfg.sh -n dnode3 -c commitlog -v 0
 system sh/cfg.sh -n dnode4 -c commitlog -v 0
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
-
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/import/replica1.sim b/tests/script/general/import/replica1.sim
index 62fb5e78d4..193082097c 100644
--- a/tests/script/general/import/replica1.sim
+++ b/tests/script/general/import/replica1.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0
 system sh/cfg.sh -n dnode3 -c commitlog -v 0
 system sh/cfg.sh -n dnode4 -c commitlog -v 0
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
-
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/insert/basic.sim b/tests/script/general/insert/basic.sim
index 3b18c7e23a..9136f1e66f 100644
--- a/tests/script/general/insert/basic.sim
+++ b/tests/script/general/insert/basic.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/insert/insert_drop.sim b/tests/script/general/insert/insert_drop.sim
index ef183bb2f0..89aad81229 100644
--- a/tests/script/general/insert/insert_drop.sim
+++ b/tests/script/general/insert/insert_drop.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 1
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/insert/query_block1_file.sim b/tests/script/general/insert/query_block1_file.sim
index dff250ba8b..d13fb9841d 100644
--- a/tests/script/general/insert/query_block1_file.sim
+++ b/tests/script/general/insert/query_block1_file.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/insert/query_block1_memory.sim b/tests/script/general/insert/query_block1_memory.sim
index b94eb4ecd1..c20613e192 100644
--- a/tests/script/general/insert/query_block1_memory.sim
+++ b/tests/script/general/insert/query_block1_memory.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/insert/query_block2_file.sim b/tests/script/general/insert/query_block2_file.sim
index 3ce1e51e02..18a3f407bb 100644
--- a/tests/script/general/insert/query_block2_file.sim
+++ b/tests/script/general/insert/query_block2_file.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/insert/query_block2_memory.sim b/tests/script/general/insert/query_block2_memory.sim
index 6546d89507..409e84269d 100644
--- a/tests/script/general/insert/query_block2_memory.sim
+++ b/tests/script/general/insert/query_block2_memory.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/insert/query_file_memory.sim b/tests/script/general/insert/query_file_memory.sim
index d968f1b1f8..b6e1bf4e55 100644
--- a/tests/script/general/insert/query_file_memory.sim
+++ b/tests/script/general/insert/query_file_memory.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/insert/query_multi_file.sim b/tests/script/general/insert/query_multi_file.sim
index 802efe2ac1..901b6409fc 100644
--- a/tests/script/general/insert/query_multi_file.sim
+++ b/tests/script/general/insert/query_multi_file.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/insert/tcp.sim b/tests/script/general/insert/tcp.sim
index ecb6dc43d5..c2782ac1e1 100644
--- a/tests/script/general/insert/tcp.sim
+++ b/tests/script/general/insert/tcp.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/metrics/disk.sim b/tests/script/general/metrics/disk.sim
index a960fd96fa..421b5f7c6a 100644
--- a/tests/script/general/metrics/disk.sim
+++ b/tests/script/general/metrics/disk.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
diff --git a/tests/script/general/metrics/metrics.sim b/tests/script/general/metrics/metrics.sim
index 0aabadd0e4..f0864034de 100644
--- a/tests/script/general/metrics/metrics.sim
+++ b/tests/script/general/metrics/metrics.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
diff --git a/tests/script/general/metrics/values.sim b/tests/script/general/metrics/values.sim
index e91a9fee39..aa5aecd6ac 100644
--- a/tests/script/general/metrics/values.sim
+++ b/tests/script/general/metrics/values.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
diff --git a/tests/script/general/metrics/vnode3.sim b/tests/script/general/metrics/vnode3.sim
index 3a5c58363e..a2642ac7e8 100644
--- a/tests/script/general/metrics/vnode3.sim
+++ b/tests/script/general/metrics/vnode3.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
diff --git a/tests/script/general/parser/alter.sim b/tests/script/general/parser/alter.sim
index 87e4089d35..07b7f71fa4 100644
--- a/tests/script/general/parser/alter.sim
+++ b/tests/script/general/parser/alter.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3
diff --git a/tests/script/general/parser/alter1.sim b/tests/script/general/parser/alter1.sim
index 695003c702..058977f784 100644
--- a/tests/script/general/parser/alter1.sim
+++ b/tests/script/general/parser/alter1.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/alter_stable.sim b/tests/script/general/parser/alter_stable.sim
index 6ef9b812e7..c0614ec00a 100644
--- a/tests/script/general/parser/alter_stable.sim
+++ b/tests/script/general/parser/alter_stable.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3
diff --git a/tests/script/general/parser/auto_create_tb.sim b/tests/script/general/parser/auto_create_tb.sim
index ed3131d2ac..f9db56d15c 100644
--- a/tests/script/general/parser/auto_create_tb.sim
+++ b/tests/script/general/parser/auto_create_tb.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/parser/auto_create_tb_drop_tb.sim b/tests/script/general/parser/auto_create_tb_drop_tb.sim
index 3489aba9fd..bb27c3e440 100644
--- a/tests/script/general/parser/auto_create_tb_drop_tb.sim
+++ b/tests/script/general/parser/auto_create_tb_drop_tb.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 1
 system sh/cfg.sh -n dnode1 -c commitTime -v 30
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/parser/binary_escapeCharacter.sim b/tests/script/general/parser/binary_escapeCharacter.sim
index 6ab86c5ba3..7342a96f4f 100644
--- a/tests/script/general/parser/binary_escapeCharacter.sim
+++ b/tests/script/general/parser/binary_escapeCharacter.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3
diff --git a/tests/script/general/parser/bug.sim b/tests/script/general/parser/bug.sim
index cac74671f3..7e7d7e536e 100644
--- a/tests/script/general/parser/bug.sim
+++ b/tests/script/general/parser/bug.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog       -v 0
 
 system sh/cfg.sh -n dnode1 -c dDebugFlag       -v 135
diff --git a/tests/script/general/parser/col_arithmetic_operation.sim b/tests/script/general/parser/col_arithmetic_operation.sim
index 5b478d7fc2..b4ffeadc23 100644
--- a/tests/script/general/parser/col_arithmetic_operation.sim
+++ b/tests/script/general/parser/col_arithmetic_operation.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/columnValue.sim b/tests/script/general/parser/columnValue.sim
index 854bb219e5..ead480cad8 100644
--- a/tests/script/general/parser/columnValue.sim
+++ b/tests/script/general/parser/columnValue.sim
@@ -1,7 +1,7 @@
 ####
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3
diff --git a/tests/script/general/parser/commit.sim b/tests/script/general/parser/commit.sim
index 61faad1864..eab9497b0b 100644
--- a/tests/script/general/parser/commit.sim
+++ b/tests/script/general/parser/commit.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/create_db.sim b/tests/script/general/parser/create_db.sim
index 9bfeef7355..b272ef1ddb 100644
--- a/tests/script/general/parser/create_db.sim
+++ b/tests/script/general/parser/create_db.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/parser/create_mt.sim b/tests/script/general/parser/create_mt.sim
index 486a1e3fc8..83dd09eb8f 100644
--- a/tests/script/general/parser/create_mt.sim
+++ b/tests/script/general/parser/create_mt.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/parser/create_tb.sim b/tests/script/general/parser/create_tb.sim
index 489780130a..5e3007824a 100644
--- a/tests/script/general/parser/create_tb.sim
+++ b/tests/script/general/parser/create_tb.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/parser/dbtbnameValidate.sim b/tests/script/general/parser/dbtbnameValidate.sim
index 0ec5f3c9aa..c4a789da79 100644
--- a/tests/script/general/parser/dbtbnameValidate.sim
+++ b/tests/script/general/parser/dbtbnameValidate.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 1000
diff --git a/tests/script/general/parser/fill.sim b/tests/script/general/parser/fill.sim
index 89e35e1a38..33286ecfcb 100644
--- a/tests/script/general/parser/fill.sim
+++ b/tests/script/general/parser/fill.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/fill_stb.sim b/tests/script/general/parser/fill_stb.sim
index 0740ab64fa..8fecaeb4c4 100644
--- a/tests/script/general/parser/fill_stb.sim
+++ b/tests/script/general/parser/fill_stb.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/first_last.sim b/tests/script/general/parser/first_last.sim
index dd125c60f9..b5133ed9a1 100644
--- a/tests/script/general/parser/first_last.sim
+++ b/tests/script/general/parser/first_last.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/groupby.sim b/tests/script/general/parser/groupby.sim
index ca83fb19b2..4d367999b2 100644
--- a/tests/script/general/parser/groupby.sim
+++ b/tests/script/general/parser/groupby.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 1000
diff --git a/tests/script/general/parser/import.sim b/tests/script/general/parser/import.sim
index d3b96cbf89..465f077fec 100644
--- a/tests/script/general/parser/import.sim
+++ b/tests/script/general/parser/import.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/import_commit1.sim b/tests/script/general/parser/import_commit1.sim
index a9935aa54e..a1bc057aef 100644
--- a/tests/script/general/parser/import_commit1.sim
+++ b/tests/script/general/parser/import_commit1.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 1
 system sh/cfg.sh -n dnode1 -c commitTime -v 30
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/parser/import_commit2.sim b/tests/script/general/parser/import_commit2.sim
index d5edb89f8e..c02905a2d5 100644
--- a/tests/script/general/parser/import_commit2.sim
+++ b/tests/script/general/parser/import_commit2.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 1
 system sh/cfg.sh -n dnode1 -c commitTime -v 30
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/parser/import_commit3.sim b/tests/script/general/parser/import_commit3.sim
index be915b5406..c37ecd9a17 100644
--- a/tests/script/general/parser/import_commit3.sim
+++ b/tests/script/general/parser/import_commit3.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 1
 system sh/cfg.sh -n dnode1 -c commitTime -v 30
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/parser/import_file.sim b/tests/script/general/parser/import_file.sim
index 2566e956b3..f0fef295c4 100644
--- a/tests/script/general/parser/import_file.sim
+++ b/tests/script/general/parser/import_file.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 2000
diff --git a/tests/script/general/parser/insert_multiTbl.sim b/tests/script/general/parser/insert_multiTbl.sim
index 4e4b8b3e13..503ab7e1da 100644
--- a/tests/script/general/parser/insert_multiTbl.sim
+++ b/tests/script/general/parser/insert_multiTbl.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 2000
diff --git a/tests/script/general/parser/insert_tb.sim b/tests/script/general/parser/insert_tb.sim
index f7e2980707..c69228d662 100644
--- a/tests/script/general/parser/insert_tb.sim
+++ b/tests/script/general/parser/insert_tb.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/parser/interp.sim b/tests/script/general/parser/interp.sim
index 2d3bc2ac87..78369ec84c 100644
--- a/tests/script/general/parser/interp.sim
+++ b/tests/script/general/parser/interp.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/join.sim b/tests/script/general/parser/join.sim
index b9b35e0cd3..b90579d8d8 100644
--- a/tests/script/general/parser/join.sim
+++ b/tests/script/general/parser/join.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c debugFlag -v 135
 system sh/cfg.sh -n dnode1 -c rpcDebugFlag -v 135
diff --git a/tests/script/general/parser/join_multivnode.sim b/tests/script/general/parser/join_multivnode.sim
index 46f38f9ce0..983b7fad45 100644
--- a/tests/script/general/parser/join_multivnode.sim
+++ b/tests/script/general/parser/join_multivnode.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sql connect
diff --git a/tests/script/general/parser/lastrow.sim b/tests/script/general/parser/lastrow.sim
index c76c71b62e..50317c7abc 100644
--- a/tests/script/general/parser/lastrow.sim
+++ b/tests/script/general/parser/lastrow.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/limit.sim b/tests/script/general/parser/limit.sim
index 4ca348dbd6..16b2a2878c 100644
--- a/tests/script/general/parser/limit.sim
+++ b/tests/script/general/parser/limit.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/limit1.sim b/tests/script/general/parser/limit1.sim
index bdb5b90983..9856365f8e 100644
--- a/tests/script/general/parser/limit1.sim
+++ b/tests/script/general/parser/limit1.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/limit1_tblocks100.sim b/tests/script/general/parser/limit1_tblocks100.sim
index 6e108226a5..b89b7892d4 100644
--- a/tests/script/general/parser/limit1_tblocks100.sim
+++ b/tests/script/general/parser/limit1_tblocks100.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/limit2.sim b/tests/script/general/parser/limit2.sim
index 4374ac9be2..71f1c6f2e8 100644
--- a/tests/script/general/parser/limit2.sim
+++ b/tests/script/general/parser/limit2.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/parser/limit2_tblocks100.sim b/tests/script/general/parser/limit2_tblocks100.sim
index 061d7225b1..a91103270d 100644
--- a/tests/script/general/parser/limit2_tblocks100.sim
+++ b/tests/script/general/parser/limit2_tblocks100.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c rowsInFileBlock -v 255
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/parser/mixed_blocks.sim b/tests/script/general/parser/mixed_blocks.sim
index 03c3a77a89..29f6d2a742 100644
--- a/tests/script/general/parser/mixed_blocks.sim
+++ b/tests/script/general/parser/mixed_blocks.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/parser/nchar.sim b/tests/script/general/parser/nchar.sim
index b6c3a3c9bb..51853825c1 100644
--- a/tests/script/general/parser/nchar.sim
+++ b/tests/script/general/parser/nchar.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/parser/null_char.sim b/tests/script/general/parser/null_char.sim
index eeb94708d9..225c7b6cb7 100644
--- a/tests/script/general/parser/null_char.sim
+++ b/tests/script/general/parser/null_char.sim
@@ -1,7 +1,7 @@
 #### TBASE-679
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 3
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 3
diff --git a/tests/script/general/parser/projection_limit_offset.sim b/tests/script/general/parser/projection_limit_offset.sim
index 2f18e3cf34..21c2151b77 100644
--- a/tests/script/general/parser/projection_limit_offset.sim
+++ b/tests/script/general/parser/projection_limit_offset.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/selectResNum.sim b/tests/script/general/parser/selectResNum.sim
index 3065c7eca0..dd06d26521 100644
--- a/tests/script/general/parser/selectResNum.sim
+++ b/tests/script/general/parser/selectResNum.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/select_across_vnodes.sim b/tests/script/general/parser/select_across_vnodes.sim
index 875036082d..67c727ef28 100644
--- a/tests/script/general/parser/select_across_vnodes.sim
+++ b/tests/script/general/parser/select_across_vnodes.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 5
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
diff --git a/tests/script/general/parser/select_from_cache_disk.sim b/tests/script/general/parser/select_from_cache_disk.sim
index a60571b7d1..9450d41720 100644
--- a/tests/script/general/parser/select_from_cache_disk.sim
+++ b/tests/script/general/parser/select_from_cache_disk.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
diff --git a/tests/script/general/parser/select_with_tags.sim b/tests/script/general/parser/select_with_tags.sim
index 8558323eba..92e30bc914 100644
--- a/tests/script/general/parser/select_with_tags.sim
+++ b/tests/script/general/parser/select_with_tags.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 1000
diff --git a/tests/script/general/parser/set_tag_vals.sim b/tests/script/general/parser/set_tag_vals.sim
index 8076643247..62fef45846 100644
--- a/tests/script/general/parser/set_tag_vals.sim
+++ b/tests/script/general/parser/set_tag_vals.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/single_row_in_tb.sim b/tests/script/general/parser/single_row_in_tb.sim
index bf94c71347..1a159d97fd 100644
--- a/tests/script/general/parser/single_row_in_tb.sim
+++ b/tests/script/general/parser/single_row_in_tb.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/slimit.sim b/tests/script/general/parser/slimit.sim
index ae83d92e22..61abf1eb2a 100644
--- a/tests/script/general/parser/slimit.sim
+++ b/tests/script/general/parser/slimit.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
diff --git a/tests/script/general/parser/slimit1.sim b/tests/script/general/parser/slimit1.sim
index 40be5c1b91..d034d5bf17 100644
--- a/tests/script/general/parser/slimit1.sim
+++ b/tests/script/general/parser/slimit1.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
diff --git a/tests/script/general/parser/slimit_alter_tags.sim b/tests/script/general/parser/slimit_alter_tags.sim
index 6091fa89b4..6579549287 100644
--- a/tests/script/general/parser/slimit_alter_tags.sim
+++ b/tests/script/general/parser/slimit_alter_tags.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 10
diff --git a/tests/script/general/parser/stream.sim b/tests/script/general/parser/stream.sim
index 33a7d2ac6e..b3334d970e 100644
--- a/tests/script/general/parser/stream.sim
+++ b/tests/script/general/parser/stream.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c meterMetaKeepTimer -v 5
 system sh/cfg.sh -n dnode1 -c metricMetaKeepTimer -v 5
diff --git a/tests/script/general/parser/stream_on_sys.sim b/tests/script/general/parser/stream_on_sys.sim
index d0f6cbace3..aa3595eaf6 100644
--- a/tests/script/general/parser/stream_on_sys.sim
+++ b/tests/script/general/parser/stream_on_sys.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c monitor       -v 1
 system sh/cfg.sh -n dnode1 -c monitorInterval     -v 1
diff --git a/tests/script/general/parser/tags_dynamically_specifiy.sim b/tests/script/general/parser/tags_dynamically_specifiy.sim
index b34ea90413..ca8d335742 100644
--- a/tests/script/general/parser/tags_dynamically_specifiy.sim
+++ b/tests/script/general/parser/tags_dynamically_specifiy.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/tags_filter.sim b/tests/script/general/parser/tags_filter.sim
index 29b295b6cd..bc6c6c52f0 100644
--- a/tests/script/general/parser/tags_filter.sim
+++ b/tests/script/general/parser/tags_filter.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/tbnameIn.sim b/tests/script/general/parser/tbnameIn.sim
index d3b16ea202..38551dd59e 100644
--- a/tests/script/general/parser/tbnameIn.sim
+++ b/tests/script/general/parser/tbnameIn.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/parser/timestamp.sim b/tests/script/general/parser/timestamp.sim
index edc03fc4f0..8d407dd5cc 100644
--- a/tests/script/general/parser/timestamp.sim
+++ b/tests/script/general/parser/timestamp.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/parser/where.sim b/tests/script/general/parser/where.sim
index 397ce53477..05237c392b 100644
--- a/tests/script/general/parser/where.sim
+++ b/tests/script/general/parser/where.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/show/dnodes.sim b/tests/script/general/show/dnodes.sim
index df78194365..0951c1a6c9 100644
--- a/tests/script/general/show/dnodes.sim
+++ b/tests/script/general/show/dnodes.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/stream/metrics_1.sim b/tests/script/general/stream/metrics_1.sim
index e61572d9f4..2e8d02bf21 100644
--- a/tests/script/general/stream/metrics_1.sim
+++ b/tests/script/general/stream/metrics_1.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/stream/metrics_del.sim b/tests/script/general/stream/metrics_del.sim
index 9077d48f45..7ca74dc102 100644
--- a/tests/script/general/stream/metrics_del.sim
+++ b/tests/script/general/stream/metrics_del.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
diff --git a/tests/script/general/stream/metrics_n.sim b/tests/script/general/stream/metrics_n.sim
index c3b20f8616..31f9fc64ff 100644
--- a/tests/script/general/stream/metrics_n.sim
+++ b/tests/script/general/stream/metrics_n.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/stream/metrics_replica1_vnoden.sim b/tests/script/general/stream/metrics_replica1_vnoden.sim
index 5129dc2f02..76ffd99d89 100644
--- a/tests/script/general/stream/metrics_replica1_vnoden.sim
+++ b/tests/script/general/stream/metrics_replica1_vnoden.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
diff --git a/tests/script/general/stream/stream_1.sim b/tests/script/general/stream/stream_1.sim
index 0178ef2ac3..bb2d4a05a5 100644
--- a/tests/script/general/stream/stream_1.sim
+++ b/tests/script/general/stream/stream_1.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/stream/stream_2.sim b/tests/script/general/stream/stream_2.sim
index a2af8f8548..d0fa60ff90 100644
--- a/tests/script/general/stream/stream_2.sim
+++ b/tests/script/general/stream/stream_2.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/stream/stream_3.sim b/tests/script/general/stream/stream_3.sim
index 6758d74aba..3e7d574cd4 100644
--- a/tests/script/general/stream/stream_3.sim
+++ b/tests/script/general/stream/stream_3.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
@@ -107,7 +107,7 @@ endi
 print =============== step7
 
 system sh/exec.sh -n dnode1 -s stop
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
diff --git a/tests/script/general/stream/stream_restart.sim b/tests/script/general/stream/stream_restart.sim
index 6d9324b69c..f37fbf471d 100644
--- a/tests/script/general/stream/stream_restart.sim
+++ b/tests/script/general/stream/stream_restart.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/stream/table_1.sim b/tests/script/general/stream/table_1.sim
index 08aa4912e3..be45a98f49 100644
--- a/tests/script/general/stream/table_1.sim
+++ b/tests/script/general/stream/table_1.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/stream/table_del.sim b/tests/script/general/stream/table_del.sim
index 509c72e4c8..a2db5b250d 100644
--- a/tests/script/general/stream/table_del.sim
+++ b/tests/script/general/stream/table_del.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfBlocksPerMeter -v 4
 system sh/cfg.sh -n dnode1 -c pointsPerCompBlock -v 100
diff --git a/tests/script/general/stream/table_n.sim b/tests/script/general/stream/table_n.sim
index 3eeadd0aff..49e8e723da 100644
--- a/tests/script/general/stream/table_n.sim
+++ b/tests/script/general/stream/table_n.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/stream/table_replica1_vnoden.sim b/tests/script/general/stream/table_replica1_vnoden.sim
index f9db9fd9f4..1ed649a3fb 100644
--- a/tests/script/general/stream/table_replica1_vnoden.sim
+++ b/tests/script/general/stream/table_replica1_vnoden.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 4
diff --git a/tests/script/general/table/autocreate.sim b/tests/script/general/table/autocreate.sim
index 9aa28b2cec..eac153e3c2 100644
--- a/tests/script/general/table/autocreate.sim
+++ b/tests/script/general/table/autocreate.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/table/basic1.sim b/tests/script/general/table/basic1.sim
index a8dfb0f21a..0e425c95f9 100644
--- a/tests/script/general/table/basic1.sim
+++ b/tests/script/general/table/basic1.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/table/basic2.sim b/tests/script/general/table/basic2.sim
index 1f6d889429..40688403a8 100644
--- a/tests/script/general/table/basic2.sim
+++ b/tests/script/general/table/basic2.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/table/basic3.sim b/tests/script/general/table/basic3.sim
index 6558617384..18c3f9b625 100644
--- a/tests/script/general/table/basic3.sim
+++ b/tests/script/general/table/basic3.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/table/bigint.sim b/tests/script/general/table/bigint.sim
index 667ce523cb..4145968fbd 100644
--- a/tests/script/general/table/bigint.sim
+++ b/tests/script/general/table/bigint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/binary.sim b/tests/script/general/table/binary.sim
index bc91c48c19..b0c5166d20 100644
--- a/tests/script/general/table/binary.sim
+++ b/tests/script/general/table/binary.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/bool.sim b/tests/script/general/table/bool.sim
index 1393315b4f..b55147b67e 100644
--- a/tests/script/general/table/bool.sim
+++ b/tests/script/general/table/bool.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/column2.sim b/tests/script/general/table/column2.sim
index 3d32ae454e..4c27ae68ad 100644
--- a/tests/script/general/table/column2.sim
+++ b/tests/script/general/table/column2.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/column_name.sim b/tests/script/general/table/column_name.sim
index c49e58336d..41a4179a41 100644
--- a/tests/script/general/table/column_name.sim
+++ b/tests/script/general/table/column_name.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/column_num.sim b/tests/script/general/table/column_num.sim
index 5e124a1943..bf82b9fc05 100644
--- a/tests/script/general/table/column_num.sim
+++ b/tests/script/general/table/column_num.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/column_value.sim b/tests/script/general/table/column_value.sim
index bb811b7ab8..2a1636e5ca 100644
--- a/tests/script/general/table/column_value.sim
+++ b/tests/script/general/table/column_value.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/date.sim b/tests/script/general/table/date.sim
index 52242b6388..f702a55750 100644
--- a/tests/script/general/table/date.sim
+++ b/tests/script/general/table/date.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/db.table.sim b/tests/script/general/table/db.table.sim
index 242f778a15..653a73310f 100644
--- a/tests/script/general/table/db.table.sim
+++ b/tests/script/general/table/db.table.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/delete_reuse1.sim b/tests/script/general/table/delete_reuse1.sim
index 1f47088c6f..1f42637088 100644
--- a/tests/script/general/table/delete_reuse1.sim
+++ b/tests/script/general/table/delete_reuse1.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/general/table/delete_reuse2.sim b/tests/script/general/table/delete_reuse2.sim
index acd69bc488..238eac975d 100644
--- a/tests/script/general/table/delete_reuse2.sim
+++ b/tests/script/general/table/delete_reuse2.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/general/table/delete_writing.sim b/tests/script/general/table/delete_writing.sim
index 769207b83c..b697c7f841 100644
--- a/tests/script/general/table/delete_writing.sim
+++ b/tests/script/general/table/delete_writing.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/general/table/describe.sim b/tests/script/general/table/describe.sim
index 1905a0b032..fd9a8eda18 100644
--- a/tests/script/general/table/describe.sim
+++ b/tests/script/general/table/describe.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/double.sim b/tests/script/general/table/double.sim
index 2b34f5a191..36013be51d 100644
--- a/tests/script/general/table/double.sim
+++ b/tests/script/general/table/double.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/float.sim b/tests/script/general/table/float.sim
index 95666f677b..195a2268b7 100644
--- a/tests/script/general/table/float.sim
+++ b/tests/script/general/table/float.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/int.sim b/tests/script/general/table/int.sim
index 70a2ac767d..0f8223896c 100644
--- a/tests/script/general/table/int.sim
+++ b/tests/script/general/table/int.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/limit.sim b/tests/script/general/table/limit.sim
index 904a49a2fd..e01a209b61 100644
--- a/tests/script/general/table/limit.sim
+++ b/tests/script/general/table/limit.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode1 -c sessionsPerVnode -v 129
diff --git a/tests/script/general/table/smallint.sim b/tests/script/general/table/smallint.sim
index 0547fbb1b6..6a0fbd7fb5 100644
--- a/tests/script/general/table/smallint.sim
+++ b/tests/script/general/table/smallint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/table.sim b/tests/script/general/table/table.sim
index 2c8467b9a3..468e60f1ba 100644
--- a/tests/script/general/table/table.sim
+++ b/tests/script/general/table/table.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/table_len.sim b/tests/script/general/table/table_len.sim
index 37c06c515c..e1ed254fe1 100644
--- a/tests/script/general/table/table_len.sim
+++ b/tests/script/general/table/table_len.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/tinyint.sim b/tests/script/general/table/tinyint.sim
index 4e50b6dba2..d22331c2a3 100644
--- a/tests/script/general/table/tinyint.sim
+++ b/tests/script/general/table/tinyint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/table/vgroup.sim b/tests/script/general/table/vgroup.sim
index d5198534bc..cd5c44fb60 100644
--- a/tests/script/general/table/vgroup.sim
+++ b/tests/script/general/table/vgroup.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/general/tag/3.sim b/tests/script/general/tag/3.sim
index b972bdf975..1cc2fa8cf7 100644
--- a/tests/script/general/tag/3.sim
+++ b/tests/script/general/tag/3.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/4.sim b/tests/script/general/tag/4.sim
index d75f5478c1..02bb910888 100644
--- a/tests/script/general/tag/4.sim
+++ b/tests/script/general/tag/4.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/5.sim b/tests/script/general/tag/5.sim
index bf8cb9358a..3231f738a7 100644
--- a/tests/script/general/tag/5.sim
+++ b/tests/script/general/tag/5.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/6.sim b/tests/script/general/tag/6.sim
index 3705ffc110..9c106a189c 100644
--- a/tests/script/general/tag/6.sim
+++ b/tests/script/general/tag/6.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/add.sim b/tests/script/general/tag/add.sim
index b36bc0c6c3..6c9456d57a 100644
--- a/tests/script/general/tag/add.sim
+++ b/tests/script/general/tag/add.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/bigint.sim b/tests/script/general/tag/bigint.sim
index 5519f6759e..3522d91b93 100644
--- a/tests/script/general/tag/bigint.sim
+++ b/tests/script/general/tag/bigint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/binary.sim b/tests/script/general/tag/binary.sim
index f5e779bfee..45aedf6db8 100644
--- a/tests/script/general/tag/binary.sim
+++ b/tests/script/general/tag/binary.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/binary_binary.sim b/tests/script/general/tag/binary_binary.sim
index f2622bd034..fdb10d5877 100644
--- a/tests/script/general/tag/binary_binary.sim
+++ b/tests/script/general/tag/binary_binary.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/bool.sim b/tests/script/general/tag/bool.sim
index fb69a0ac67..da3da99b19 100644
--- a/tests/script/general/tag/bool.sim
+++ b/tests/script/general/tag/bool.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/bool_binary.sim b/tests/script/general/tag/bool_binary.sim
index 55542d7de7..ddd5b3df94 100644
--- a/tests/script/general/tag/bool_binary.sim
+++ b/tests/script/general/tag/bool_binary.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/bool_int.sim b/tests/script/general/tag/bool_int.sim
index 261bbfb3d8..6f1a637965 100644
--- a/tests/script/general/tag/bool_int.sim
+++ b/tests/script/general/tag/bool_int.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/change.sim b/tests/script/general/tag/change.sim
index b77e5765d2..f0f4efb9c6 100644
--- a/tests/script/general/tag/change.sim
+++ b/tests/script/general/tag/change.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/column.sim b/tests/script/general/tag/column.sim
index a7f1b1c8c2..4313f48e5f 100644
--- a/tests/script/general/tag/column.sim
+++ b/tests/script/general/tag/column.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/commit.sim b/tests/script/general/tag/commit.sim
index 84bb72271b..94ea85781a 100644
--- a/tests/script/general/tag/commit.sim
+++ b/tests/script/general/tag/commit.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/create.sim b/tests/script/general/tag/create.sim
index 9742b1c8da..852eadfbcc 100644
--- a/tests/script/general/tag/create.sim
+++ b/tests/script/general/tag/create.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/delete.sim b/tests/script/general/tag/delete.sim
index 2a0e3ea58c..ae424ef58c 100644
--- a/tests/script/general/tag/delete.sim
+++ b/tests/script/general/tag/delete.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/double.sim b/tests/script/general/tag/double.sim
index 8c5831b74c..d811325b10 100644
--- a/tests/script/general/tag/double.sim
+++ b/tests/script/general/tag/double.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/filter.sim b/tests/script/general/tag/filter.sim
index 6d8f9ff893..b10e8a0372 100644
--- a/tests/script/general/tag/filter.sim
+++ b/tests/script/general/tag/filter.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 
 sleep 3000
diff --git a/tests/script/general/tag/float.sim b/tests/script/general/tag/float.sim
index 49fcf8029b..537211fe1b 100644
--- a/tests/script/general/tag/float.sim
+++ b/tests/script/general/tag/float.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/int.sim b/tests/script/general/tag/int.sim
index d663dd6eb0..ea635d9db6 100644
--- a/tests/script/general/tag/int.sim
+++ b/tests/script/general/tag/int.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/int_binary.sim b/tests/script/general/tag/int_binary.sim
index 29220eb92f..166285f799 100644
--- a/tests/script/general/tag/int_binary.sim
+++ b/tests/script/general/tag/int_binary.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/int_float.sim b/tests/script/general/tag/int_float.sim
index 4cb85b7e3d..4745ae704f 100644
--- a/tests/script/general/tag/int_float.sim
+++ b/tests/script/general/tag/int_float.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/set.sim b/tests/script/general/tag/set.sim
index 0c6ddd17d0..fd9fdd2807 100644
--- a/tests/script/general/tag/set.sim
+++ b/tests/script/general/tag/set.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/smallint.sim b/tests/script/general/tag/smallint.sim
index f38f6e2340..701e605e38 100644
--- a/tests/script/general/tag/smallint.sim
+++ b/tests/script/general/tag/smallint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/tag/tinyint.sim b/tests/script/general/tag/tinyint.sim
index f88cf0f61d..b65be72036 100644
--- a/tests/script/general/tag/tinyint.sim
+++ b/tests/script/general/tag/tinyint.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/user/basic1.sim b/tests/script/general/user/basic1.sim
index 4bc7deae83..1cff77d317 100644
--- a/tests/script/general/user/basic1.sim
+++ b/tests/script/general/user/basic1.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/general/user/monitor.sim b/tests/script/general/user/monitor.sim
index d53ade2e4b..987cb84357 100644
--- a/tests/script/general/user/monitor.sim
+++ b/tests/script/general/user/monitor.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 
 print ========== step1
 system sh/cfg.sh -n dnode1 -c clog    -v 0
diff --git a/tests/script/general/user/pass_alter.sim b/tests/script/general/user/pass_alter.sim
index d815ca824f..f7eee1359b 100644
--- a/tests/script/general/user/pass_alter.sim
+++ b/tests/script/general/user/pass_alter.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/general/user/pass_len.sim b/tests/script/general/user/pass_len.sim
index 5520ce6f17..583c2e73d3 100644
--- a/tests/script/general/user/pass_len.sim
+++ b/tests/script/general/user/pass_len.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/user/user_create.sim b/tests/script/general/user/user_create.sim
index e63246cbd6..8f0d32e7cc 100644
--- a/tests/script/general/user/user_create.sim
+++ b/tests/script/general/user/user_create.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec.sh -n dnode1 -s start
 sql connect
diff --git a/tests/script/general/user/user_len.sim b/tests/script/general/user/user_len.sim
index 71198c61cb..4d2658cec9 100644
--- a/tests/script/general/user/user_len.sim
+++ b/tests/script/general/user/user_len.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/metrics_field.sim b/tests/script/general/vector/metrics_field.sim
index 187ad51ca2..a883c81e18 100644
--- a/tests/script/general/vector/metrics_field.sim
+++ b/tests/script/general/vector/metrics_field.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/metrics_mix.sim b/tests/script/general/vector/metrics_mix.sim
index 3baf3732f1..26ff0af063 100644
--- a/tests/script/general/vector/metrics_mix.sim
+++ b/tests/script/general/vector/metrics_mix.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/metrics_query.sim b/tests/script/general/vector/metrics_query.sim
index 3690c9f29c..d797fa6467 100644
--- a/tests/script/general/vector/metrics_query.sim
+++ b/tests/script/general/vector/metrics_query.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/metrics_tag.sim b/tests/script/general/vector/metrics_tag.sim
index f4a4eea53f..29923d3d42 100644
--- a/tests/script/general/vector/metrics_tag.sim
+++ b/tests/script/general/vector/metrics_tag.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/metrics_time.sim b/tests/script/general/vector/metrics_time.sim
index b2fa6e98b0..9400b2a76a 100644
--- a/tests/script/general/vector/metrics_time.sim
+++ b/tests/script/general/vector/metrics_time.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/multi.sim b/tests/script/general/vector/multi.sim
index c9c7a95c71..dfdc015edf 100644
--- a/tests/script/general/vector/multi.sim
+++ b/tests/script/general/vector/multi.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/single.sim b/tests/script/general/vector/single.sim
index e87de13745..cd892bfd87 100644
--- a/tests/script/general/vector/single.sim
+++ b/tests/script/general/vector/single.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/table_field.sim b/tests/script/general/vector/table_field.sim
index 0308ff78c3..2894b04c6d 100644
--- a/tests/script/general/vector/table_field.sim
+++ b/tests/script/general/vector/table_field.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/table_mix.sim b/tests/script/general/vector/table_mix.sim
index 0c88406022..9cd4085912 100644
--- a/tests/script/general/vector/table_mix.sim
+++ b/tests/script/general/vector/table_mix.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/table_query.sim b/tests/script/general/vector/table_query.sim
index 5a94f30585..1e1784e726 100644
--- a/tests/script/general/vector/table_query.sim
+++ b/tests/script/general/vector/table_query.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/general/vector/table_time.sim b/tests/script/general/vector/table_time.sim
index 6a661ba969..f0b0d525e6 100644
--- a/tests/script/general/vector/table_time.sim
+++ b/tests/script/general/vector/table_time.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/sh/deploy.sh b/tests/script/sh/deploy.sh
index 63c65d0345..6439b0ff6c 100755
--- a/tests/script/sh/deploy.sh
+++ b/tests/script/sh/deploy.sh
@@ -2,28 +2,23 @@
 
 echo "Executing deploy.sh"
 
-if [ $# != 6 ]; then 
+if [ $# != 4 ]; then 
   echo "argument list need input : "
   echo "  -n nodeName"
-  echo "  -i nodeIp"
-  echo "  -m masterIp"
+  echo "  -i nodePort"
   exit 1
 fi
 
 NODE_NAME=
-NODE_IP=
-MSATER_IP=
-while getopts "n:i:m:" arg 
+NODE=
+while getopts "n:i:" arg 
 do
   case $arg in
     n)
       NODE_NAME=$OPTARG
       ;;
     i)
-      NODE_IP=$OPTARG
-      ;;
-    m)
-      MASTER_IP=$OPTARG
+      NODE=$OPTARG
       ;;
     ?)
       echo "unkonw argument"
@@ -48,14 +43,6 @@ CFG_DIR=$NODE_DIR/cfg
 LOG_DIR=$NODE_DIR/log
 DATA_DIR=$NODE_DIR/data
 
-#echo ============ deploy $NODE_NAME
-#echo === masterIp : $MASTER_IP
-#echo === nodeIp : $NODE_IP
-#echo === nodePath : $EXE_DIR
-#echo === cfgPath : $CFG_DIR
-#echo === logPath : $LOG_DIR
-#echo === dataPath : $DATA_DIR
-
 rm -rf $NODE_DIR
 
 mkdir -p $SIM_DIR
@@ -83,13 +70,32 @@ if [ -f "$TAOS_FLAG" ] ; then
   sudo rm -rf $LOG_DIR
 fi
 
-echo " "                                  >> $TAOS_CFG   
-echo "masterIp            $MASTER_IP"     >> $TAOS_CFG
+HOSTNAME=`hostname`
+
+if [ $NODE -eq 1 ]; then
+  NODE=7100
+elif [ $NODE -eq 2 ]; then
+  NODE=7200
+elif [ $NODE -eq 3 ]; then
+  NODE=7300
+elif [ $NODE -eq 4 ]; then
+  NODE=7400
+elif [ $NODE -eq 5 ]; then
+  NODE=7500
+elif [ $NODE -eq 6 ]; then
+  NODE=7600  
+elif [ $NODE -eq 7 ]; then
+  NODE=7700  
+elif [ $NODE -eq 8 ]; then
+  NODE=7800    
+fi
+
+echo " "                                    >> $TAOS_CFG   
+echo "first               ${HOSTNAME}:7100" >> $TAOS_CFG
+echo "second              ${HOSTNAME}:7200" >> $TAOS_CFG
+echo "serverPort          ${NODE}"          >> $TAOS_CFG
 echo "dataDir             $DATA_DIR"      >> $TAOS_CFG
 echo "logDir              $LOG_DIR"       >> $TAOS_CFG
-echo "publicIp            $NODE_IP"       >> $TAOS_CFG
-echo "internalIp          $NODE_IP"       >> $TAOS_CFG
-echo "privateIp           $NODE_IP"       >> $TAOS_CFG
 echo "dDebugFlag          199"            >> $TAOS_CFG
 echo "mDebugFlag          199"            >> $TAOS_CFG
 echo "sdbDebugFlag        199"            >> $TAOS_CFG
diff --git a/tests/script/test.sh b/tests/script/test.sh
index b9660458b0..2c9a5c4de9 100755
--- a/tests/script/test.sh
+++ b/tests/script/test.sh
@@ -7,12 +7,14 @@
 ##################################################
 
 set +e
+#set -x
 
 FILE_NAME=
 RELEASE=0
 ASYNC=0
 VALGRIND=0
-while getopts "f:av" arg
+UNIQUE=0
+while getopts "f:avu" arg
 do
   case $arg in
     f)
@@ -24,6 +26,9 @@ do
     v)
       VALGRIND=1
       ;;
+    u)
+      UNIQUE=1
+      ;;
     ?)
       echo "unknow argument"
       ;;
@@ -31,11 +36,6 @@ do
 done
 
 cd .
-sh/ip.sh -i 1 -s up > /dev/null 2>&1 & 
-sh/ip.sh -i 2 -s up > /dev/null 2>&1 & 
-sh/ip.sh -i 3 -s up > /dev/null 2>&1 & 
-sh/ip.sh -i 4 -s up > /dev/null 2>&1 & 
-sh/ip.sh -i 5 -s up > /dev/null 2>&1 & 
 
 # Get responsible directories
 CODE_DIR=`dirname $0`
@@ -51,6 +51,12 @@ else
   PROGRAM="$BUILD_DIR/bin/tsim -a"
 fi
 
+if [ $UNIQUE -eq 0 ]; then
+  PROGRAM=$BUILD_DIR/bin/tsim
+else
+  PROGRAM="$TOP_DIR/../debug/build/bin/tsim"
+fi 
+
 PRG_DIR=$SIM_DIR/tsim
 CFG_DIR=$PRG_DIR/cfg
 LOG_DIR=$PRG_DIR/log
@@ -74,13 +80,15 @@ TAOS_CFG=$PRG_DIR/cfg/taos.cfg
 touch -f $TAOS_CFG
 TAOS_FLAG=$PRG_DIR/flag
 
-echo " "                                    >> $TAOS_CFG
-echo "scriptDir        ${CODE_DIR}/../script">> $TAOS_CFG
-echo "masterIp         192.168.0.1"          >> $TAOS_CFG
-echo "secondIp         192.168.0.2"          >> $TAOS_CFG
-echo "localIp          127.0.0.1"            >> $TAOS_CFG
+HOSTNAME=`hostname`
+
+echo " "                                     >> $TAOS_CFG
+echo "first            ${HOSTNAME}:7100"     >> $TAOS_CFG
+echo "second           ${HOSTNAME}:7200"     >> $TAOS_CFG
+echo "serverPort       7100"                 >> $TAOS_CFG
 echo "dataDir          $DATA_DIR"            >> $TAOS_CFG
 echo "logDir           $LOG_DIR"             >> $TAOS_CFG
+echo "scriptDir        ${CODE_DIR}/../script">> $TAOS_CFG
 echo "numOfLogLines    100000000"            >> $TAOS_CFG
 echo "dDebugFlag       135"                  >> $TAOS_CFG
 echo "mDebugFlag       135"                  >> $TAOS_CFG
@@ -89,12 +97,12 @@ echo "rpcDebugFlag     135"                  >> $TAOS_CFG
 echo "tmrDebugFlag     131"                  >> $TAOS_CFG
 echo "cDebugFlag       135"                  >> $TAOS_CFG
 echo "httpDebugFlag    135"                  >> $TAOS_CFG
-echo "monitorDebugFlag 135"                 >> $TAOS_CFG
+echo "monitorDebugFlag 135"                  >> $TAOS_CFG
 echo "udebugFlag       135"                  >> $TAOS_CFG
 echo "clog             0"                    >> $TAOS_CFG
 echo "asyncLog         0"                    >> $TAOS_CFG
 echo "locale           en_US.UTF-8"          >> $TAOS_CFG
-echo " "                                    >> $TAOS_CFG
+echo " "                                     >> $TAOS_CFG
 
 ulimit -n 600000
 ulimit -c unlimited
diff --git a/tests/script/tmp/dnode1.sim b/tests/script/tmp/dnode1.sim
index 7b6e3723cb..67d0dd4c12 100644
--- a/tests/script/tmp/dnode1.sim
+++ b/tests/script/tmp/dnode1.sim
@@ -1,4 +1,4 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec.sh -n dnode1 -s start
 sql connect
\ No newline at end of file
diff --git a/tests/script/tmp/mnodes.sim b/tests/script/tmp/mnodes.sim
index 32e72f16ff..38d99bd214 100644
--- a/tests/script/tmp/mnodes.sim
+++ b/tests/script/tmp/mnodes.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
diff --git a/tests/script/tmp/prepare.sim b/tests/script/tmp/prepare.sim
index 7890864360..eda0452459 100644
--- a/tests/script/tmp/prepare.sim
+++ b/tests/script/tmp/prepare.sim
@@ -1,13 +1,9 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 2
 system sh/cfg.sh -n dnode2 -c commitLog -v 2
diff --git a/tests/script/unique/account/account_create.sim b/tests/script/unique/account/account_create.sim
index ca7e91e892..b6eb239052 100644
--- a/tests/script/unique/account/account_create.sim
+++ b/tests/script/unique/account/account_create.sim
@@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
diff --git a/tests/script/unique/account/account_delete.sim b/tests/script/unique/account/account_delete.sim
index f4bc8d0a2f..6d1c148698 100644
--- a/tests/script/unique/account/account_delete.sim
+++ b/tests/script/unique/account/account_delete.sim
@@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
@@ -53,7 +51,8 @@ if $rows != 0 then
   return -1
 endi
 sql show dnodes
-if $data03 != 2 then
+print $data00 $data01 $data02 $data03
+if $data02 != 2 then
   return -1
 endi
 sql drop account oroot
@@ -68,7 +67,7 @@ show4:
 	endi
 
 sql show dnodes
-if $data03 != 0 then
+if $data02 != 0 then
   goto show4
 endi
 
diff --git a/tests/script/unique/account/account_len.sim b/tests/script/unique/account/account_len.sim
index 80d1a56a09..06fb37bb5a 100644
--- a/tests/script/unique/account/account_len.sim
+++ b/tests/script/unique/account/account_len.sim
@@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
diff --git a/tests/script/unique/account/authority.sim b/tests/script/unique/account/authority.sim
index 352e9797e3..e1966e378c 100644
--- a/tests/script/unique/account/authority.sim
+++ b/tests/script/unique/account/authority.sim
@@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/exec_up.sh -n dnode1 -s start
diff --git a/tests/script/unique/account/basic.sim b/tests/script/unique/account/basic.sim
index 6f64975ac2..b2d8904cc6 100644
--- a/tests/script/unique/account/basic.sim
+++ b/tests/script/unique/account/basic.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/unique/account/paras.sim b/tests/script/unique/account/paras.sim
index 14ee2f6c85..d1d573d334 100644
--- a/tests/script/unique/account/paras.sim
+++ b/tests/script/unique/account/paras.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/unique/account/pass_alter.sim b/tests/script/unique/account/pass_alter.sim
index d327d3d4e2..2c15d55544 100644
--- a/tests/script/unique/account/pass_alter.sim
+++ b/tests/script/unique/account/pass_alter.sim
@@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
diff --git a/tests/script/unique/account/pass_len.sim b/tests/script/unique/account/pass_len.sim
index 426c18adf7..acf4f50c69 100644
--- a/tests/script/unique/account/pass_len.sim
+++ b/tests/script/unique/account/pass_len.sim
@@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
diff --git a/tests/script/unique/account/testSuite.sim b/tests/script/unique/account/testSuite.sim
index dedaf029f7..9d4141cfe0 100644
--- a/tests/script/unique/account/testSuite.sim
+++ b/tests/script/unique/account/testSuite.sim
@@ -1,12 +1,11 @@
 run unique/account/account_create.sim
-run unique/account/account_len.sim
 run unique/account/account_delete.sim
-run unique/account/pass_alter.sim
-run unique/account/pass_len.sim
-run unique/account/user_create.sim
-run unique/account/user_len.sim
+run unique/account/account_len.sim
 run unique/account/authority.sim
 run unique/account/basic.sim
 run unique/account/paras.sim
+run unique/account/pass_alter.sim
+run unique/account/pass_len.sim
 run unique/account/usage.sim
-run unique/account/monitor.sim
+run unique/account/user_create.sim
+run unique/account/user_len.sim
diff --git a/tests/script/unique/account/usage.sim b/tests/script/unique/account/usage.sim
index 5b334374c9..af904815a0 100644
--- a/tests/script/unique/account/usage.sim
+++ b/tests/script/unique/account/usage.sim
@@ -1,5 +1,5 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
diff --git a/tests/script/unique/account/user_create.sim b/tests/script/unique/account/user_create.sim
index 97a48cf8f6..b22cefcf21 100644
--- a/tests/script/unique/account/user_create.sim
+++ b/tests/script/unique/account/user_create.sim
@@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
diff --git a/tests/script/unique/account/user_len.sim b/tests/script/unique/account/user_len.sim
index 260a0c78b5..0e25f554e0 100644
--- a/tests/script/unique/account/user_len.sim
+++ b/tests/script/unique/account/user_len.sim
@@ -1,7 +1,5 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog -v 0
 system sh/exec_up.sh -n dnode1 -s start
 
diff --git a/tests/script/unique/big/balance.sim b/tests/script/unique/big/balance.sim
index 10d13b4460..32a1396f90 100644
--- a/tests/script/unique/big/balance.sim
+++ b/tests/script/unique/big/balance.sim
@@ -1,27 +1,27 @@
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
+
+
+
+
+
 
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c tables -v 1000
 
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c tables -v 1000
 
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c tables -v 1000
 
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c tables -v 1000
 
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
+system sh/deploy.sh -n dnode5 -i 5
 system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode5 -c tables -v 1000
 
@@ -104,8 +104,8 @@ show1:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.2 freeVnodes $data3_192.168.0.2
+print dnode1 freeVnodes $data3_192.168.0.1
+print dnode2 freeVnodes $data3_192.168.0.2
 if $data3_192.168.0.1 != 2 then
 	goto show1
 endi
@@ -160,9 +160,9 @@ show3:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.2 freeVnodes $data3_192.168.0.2
-print 192.168.0.3 freeVnodes $data3_192.168.0.3
+print dnode1 freeVnodes $data3_192.168.0.1
+print dnode2 freeVnodes $data3_192.168.0.2
+print dnode3 freeVnodes $data3_192.168.0.3
 if $data3_192.168.0.1 != 2 then
 	goto show3
 endi
@@ -217,8 +217,8 @@ show4:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.3 freeVnodes $data3_192.168.0.3
+print dnode1 freeVnodes $data3_192.168.0.1
+print dnode3 freeVnodes $data3_192.168.0.3
 if $data3_192.168.0.1 != 0 then
 	goto show4
 endi
@@ -272,8 +272,8 @@ show5:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.4 freeVnodes $data3_192.168.0.4
+print dnode1 freeVnodes $data3_192.168.0.1
+print dnode4 freeVnodes $data3_192.168.0.4
 if $data3_192.168.0.1 != 0 then
 	goto show5
 endi
diff --git a/tests/script/unique/big/maxvnodes.sim b/tests/script/unique/big/maxvnodes.sim
index c3802da1f8..7d87dc4744 100644
--- a/tests/script/unique/big/maxvnodes.sim
+++ b/tests/script/unique/big/maxvnodes.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c clog           -v 0
 system sh/cfg.sh -n dnode1 -c tables         -v 100
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes    -v 256
@@ -37,8 +37,8 @@ if $data00 != 25600 then
   return -1
 endi  
 
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c clog           -v 0
 system sh/cfg.sh -n dnode2 -c tables         -v 100
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes    -v 256
@@ -60,8 +60,8 @@ show3:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.2 freeVnodes $data3_192.168.0.2
+print dnode1 freeVnodes $data3_192.168.0.1
+print dnode2 freeVnodes $data3_192.168.0.2
 if $data3_192.168.0.1 != 126 then
 	goto show3
 endi
diff --git a/tests/script/unique/big/tcp.sim b/tests/script/unique/big/tcp.sim
index 5e1b26aade..9e98ddd349 100644
--- a/tests/script/unique/big/tcp.sim
+++ b/tests/script/unique/big/tcp.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c tables    -v 30000
 
diff --git a/tests/script/unique/cluster/backup/balance4.sim b/tests/script/unique/cluster/backup/balance4.sim
index fbfd6eb36c..a1fe5713f3 100644
--- a/tests/script/unique/cluster/backup/balance4.sim
+++ b/tests/script/unique/cluster/backup/balance4.sim
@@ -1,24 +1,24 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-system sh/ip.sh -i 7 -s up
-system sh/ip.sh -i 8 -s up
+
+
+
+
+
+
+
+
 
 sleep 1000
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7
-system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
@@ -161,15 +161,15 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show1
@@ -202,15 +202,15 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 
 if $dnode5Vnodes != 2 then
@@ -231,15 +231,15 @@ show3:
 	endi
 sql show dnodes -x show3
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show3
@@ -274,15 +274,15 @@ show4:
 	endi
 sql show dnodes -x show4
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode2Vnodes != 2 then
   goto show4
@@ -302,15 +302,15 @@ show5:
 	endi
 sql show dnodes -x show5
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show5
@@ -345,15 +345,15 @@ show6:
 	endi
 sql show dnodes -x show6
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode3Vnodes != 2 then
   goto show6
@@ -373,15 +373,15 @@ show7:
 	endi
 sql show dnodes -x show7
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show7
@@ -416,15 +416,15 @@ show8:
 	endi
 sql show dnodes -x show8
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode4Vnodes != 2 then
   goto show8
@@ -444,15 +444,15 @@ show9:
 	endi
 sql show dnodes -x show9
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show9
@@ -487,15 +487,15 @@ show10:
 	endi
 sql show dnodes -x show10
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode5Vnodes != 2 then
   goto show10
@@ -520,15 +520,15 @@ show11:
 	endi
 sql show dnodes -x show11
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != null then
   goto show11
@@ -561,15 +561,15 @@ show12:
 	endi
 sql show dnodes -x show12
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show12
@@ -621,15 +621,15 @@ show13:
 	endi
 sql show dnodes -x show13
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 0 then
   goto show13
diff --git a/tests/script/unique/cluster/backup/balance5.sim b/tests/script/unique/cluster/backup/balance5.sim
index 15bc83ab5d..83486bb813 100644
--- a/tests/script/unique/cluster/backup/balance5.sim
+++ b/tests/script/unique/cluster/backup/balance5.sim
@@ -1,24 +1,24 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-system sh/ip.sh -i 7 -s up
-system sh/ip.sh -i 8 -s up
+
+
+
+
+
+
+
+
 
 sleep 1000
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7
-system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
@@ -144,15 +144,15 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show1
@@ -202,17 +202,17 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Status = $data4_192.168.0.1
-print 192.168.0.1 $dnode1Status
+print dnode1 $dnode1Status
 $dnode2Status = $data4_192.168.0.2
-print 192.168.0.2 $dnode2Status
+print dnode2 $dnode2Status
 $dnode3Status = $data4_192.168.0.3
-print 192.168.0.3 $dnode3Status
+print dnode3 $dnode3Status
 $dnode4Status = $data4_192.168.0.4
-print 192.168.0.4 $dnode4Status
+print dnode4 $dnode4Status
 $dnode5Status = $data4_192.168.0.5
-print 192.168.0.5 $dnode5Status
+print dnode5 $dnode5Status
 $dnode6Status = $data4_192.168.0.6
-print 192.168.0.6 $dnode6Status
+print dnode6 $dnode6Status
 
 if $dnode1Status != online then
   goto show2
@@ -251,17 +251,17 @@ show3:
 	endi
 sql show dnodes -x show3
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 $dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
+print dnode6 $dnode6Vnodes
 
 if $dnode1Vnodes != null then
   goto show3
diff --git a/tests/script/unique/cluster/backup/balancex.sim b/tests/script/unique/cluster/backup/balancex.sim
index 8f1cd191d6..7d4f5f7660 100644
--- a/tests/script/unique/cluster/backup/balancex.sim
+++ b/tests/script/unique/cluster/backup/balancex.sim
@@ -1,22 +1,22 @@
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-system sh/ip.sh -i 7 -s up
-system sh/ip.sh -i 8 -s up
+
+
+
+
+
+
+
+
 
 sleep 1000
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7
-system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
@@ -143,13 +143,13 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show1
@@ -196,17 +196,17 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 $dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
+print dnode6 $dnode6Vnodes
 
 if $dnode5Vnodes != 2 then
   goto show2
@@ -230,17 +230,17 @@ show3:
 	endi
 sql show dnodes -x show3
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 $dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
+print dnode6 $dnode6Vnodes
 
 if $dnode1Vnodes != null then
   goto show3
diff --git a/tests/script/unique/cluster/balance1.sim b/tests/script/unique/cluster/balance1.sim
index 95cfcbd979..6d4e67de0e 100644
--- a/tests/script/unique/cluster/balance1.sim
+++ b/tests/script/unique/cluster/balance1.sim
@@ -1,19 +1,8 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
@@ -61,9 +50,9 @@ sql insert into c_b1_t2 values(1520000024021, 21)
 
 sql show dnodes
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   return -1
@@ -88,9 +77,9 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 3 then
   goto show2
@@ -104,10 +93,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step3
 print ========= add db3
@@ -134,9 +123,9 @@ show4:
 	endi
 sql show dnodes -x show4
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show4
@@ -150,17 +139,16 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step5
 print ========= add dnode2
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 sleep 3000
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c clog -v 1
@@ -179,9 +167,9 @@ show5:
 	endi
 sql show dnodes -x show5
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show5
@@ -195,10 +183,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step6
 print ========= drop dnode1
@@ -219,9 +207,9 @@ show6:
 	endi
 sql show dnodes -x show6
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != null then
   goto show6
@@ -235,16 +223,16 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step7
 print ========= add dnode1
 sql create dnode 192.168.0.1
 sleep 3000
-system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c clog -v 1
@@ -262,9 +250,9 @@ show7:
 	endi
 sql show dnodes -x show7
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 3 then
   goto show7
@@ -278,10 +266,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step8
 print ========= drop dnode2
@@ -301,9 +289,9 @@ show8:
 	endi
 sql show dnodes -x show8
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show8
@@ -317,10 +305,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != master then
   return -1
@@ -329,8 +317,7 @@ endi
 print ============================== step9
 print ========= add dnode2
 sql create dnode 192.168.0.2
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c clog -v 1
@@ -348,9 +335,9 @@ show9:
 	endi
 sql show dnodes -x show9
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show9
@@ -364,10 +351,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step10
 print ========= add db4
@@ -389,9 +376,9 @@ show10:
 	endi
 sql show dnodes -x show10
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
    goto show10
@@ -409,8 +396,8 @@ sql insert into c_b1_t2 values(1520000025026, 26)
 sql show mnodes
 $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
 
 if $dnode1Role != master then
   return -1
@@ -431,9 +418,9 @@ show11:
 	endi
 sql show dnodes -x show11
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 0 then
    goto show11
@@ -447,10 +434,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 
@@ -466,8 +453,7 @@ error3:
 print ============================== step13
 print ========= add dnode2
 sql create dnode 192.168.0.2
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c clog -v 1
@@ -481,10 +467,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 sql use c_b1_d5;
 sql create table c_b1_t5 (t timestamp, i int)
@@ -505,9 +491,9 @@ sql insert into c_b1_t6 values(1520000024061, 61)
 
 sql show dnodes
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 #if $dnode1Vnodes != 1 then
 #  return -1
@@ -524,10 +510,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 sleep 2000
 sql create dnode 192.168.0.3
@@ -543,11 +529,11 @@ show14:
 	endi
 sql show dnodes -x show14
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show14
@@ -563,9 +549,9 @@ sql show mnodes
 $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 print ============================== step15
 print ========= create db7 db8
@@ -593,10 +579,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ========== add dnode4
 sleep 2000
@@ -616,13 +602,13 @@ show15:
 	endi
 sql show dnodes -x show15
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show15
@@ -662,11 +648,11 @@ show16:
 	endi
 sql show dnodes -x show16
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show16
diff --git a/tests/script/unique/cluster/balance1_bug.sim b/tests/script/unique/cluster/balance1_bug.sim
index 85b38d6c7e..1796d8d2f2 100644
--- a/tests/script/unique/cluster/balance1_bug.sim
+++ b/tests/script/unique/cluster/balance1_bug.sim
@@ -1,19 +1,8 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
@@ -61,9 +50,9 @@ sql insert into c_b1_t2 values(now+5s, 21)
 
 sql show dnodes
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   return -1
@@ -88,9 +77,9 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 3 then
   goto show2
@@ -104,10 +93,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step3
 print ========= add db3
@@ -134,9 +123,9 @@ show4:
 	endi
 sql show dnodes -x show4
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show4
@@ -150,10 +139,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step5
 print ========= add dnode2
@@ -172,9 +161,9 @@ show5:
 	endi
 sql show dnodes -x show5
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show5
@@ -188,10 +177,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step6
 print ========= drop dnode1
@@ -212,9 +201,9 @@ show6:
 	endi
 sql show dnodes -x show6
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != null then
   goto show6
@@ -228,10 +217,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step7
 print ========= add dnode1
@@ -249,9 +238,9 @@ show7:
 	endi
 sql show dnodes -x show7
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 3 then
   goto show7
@@ -265,10 +254,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step8
 print ========= drop dnode2
@@ -288,9 +277,9 @@ show8:
 	endi
 sql show dnodes -x show8
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show8
@@ -304,10 +293,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != master then
   return -1
@@ -328,9 +317,9 @@ show9:
 	endi
 sql show dnodes -x show9
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show9
@@ -344,10 +333,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step10
 print ========= add db4
@@ -369,9 +358,9 @@ show10:
 	endi
 sql show dnodes -x show10
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
    goto show10
@@ -389,8 +378,8 @@ sql insert into c_b1_t2 values(now+1s, 25)
 sql show mnodes
 $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
 
 if $dnode1Role != master then
   return -1
@@ -411,9 +400,9 @@ show11:
 	endi
 sql show dnodes -x show11
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 0 then
    goto show11
@@ -427,10 +416,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 system sh/exec.sh -n dnode2 -s stop -x SIGINT
 
@@ -454,10 +443,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 sql use c_b1_d5;
 $x = 0
@@ -492,9 +481,9 @@ sql insert into c_b1_t6 values(now+5s, 61)
 
 sql show dnodes
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 #if $dnode1Vnodes != 1 then
 #  return -1
@@ -511,10 +500,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 sleep 2000
 sql create dnode 192.168.0.3
@@ -530,11 +519,11 @@ show14:
 	endi
 sql show dnodes -x show14
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show14
@@ -550,9 +539,9 @@ sql show mnodes
 $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 print ============================== step15
 print ========= create db7 db8
@@ -580,10 +569,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ========== add dnode4
 sleep 2000
@@ -603,13 +592,13 @@ show15:
 	endi
 sql show dnodes -x show15
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show15
@@ -649,11 +638,11 @@ show16:
 	endi
 sql show dnodes -x show16
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show16
diff --git a/tests/script/unique/cluster/balance1_single.sim b/tests/script/unique/cluster/balance1_single.sim
index 497352544d..030d6551e0 100644
--- a/tests/script/unique/cluster/balance1_single.sim
+++ b/tests/script/unique/cluster/balance1_single.sim
@@ -1,22 +1,9 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode5 -c secondIp -v 192.168.0.2
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -59,9 +46,9 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode2Vnodes
+print dnode1 $dnode2Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode3Vnodes
+print dnode2 $dnode3Vnodes
 
 if $dnode1Vnodes != 4 then
   goto show1
@@ -92,9 +79,9 @@ sql insert into c_b1_t2 values(now+5s, 21)
 
 sql show dnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 2 then
   return -1
@@ -119,9 +106,9 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 3 then
   goto show2
@@ -135,10 +122,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step3
 print ========= add db3
@@ -166,9 +153,9 @@ show4:
 	endi
 sql show dnodes -x show4
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 1 then
   goto show4
@@ -182,10 +169,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step5
 print ========= add dnode3
@@ -204,9 +191,9 @@ show5:
 	endi
 sql show dnodes -x show5
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 2 then
   goto show5
@@ -234,9 +221,9 @@ show6:
 	endi
 sql show dnodes -x show6
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != null then
   goto show6
@@ -262,9 +249,9 @@ show7:
 	endi
 sql show dnodes -x show7
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 3 then
   goto show7
@@ -291,9 +278,9 @@ show8:
 	endi
 sql show dnodes -x show8
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 1 then
   goto show8
@@ -317,9 +304,9 @@ show9:
 	endi
 sql show dnodes -x show9
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 2 then
   goto show9
@@ -348,9 +335,9 @@ show10:
 	endi
 sql show dnodes -x show10
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 2 then
    goto show10
@@ -379,9 +366,9 @@ show11:
 	endi
 sql show dnodes -x show11
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode2Vnodes != 0 then
    goto show11
@@ -436,9 +423,9 @@ sql insert into c_b1_t6 values(now+5s, 61)
 
 sql show dnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 #if $dnode2Vnodes != 1 then
 #  return -1
@@ -462,11 +449,11 @@ show14:
 	endi
 sql show dnodes -x show14
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode2Vnodes != 2 then
   goto show14
@@ -517,13 +504,13 @@ show15:
 	endi
 sql show dnodes -x show15
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 $dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
+print dnode5 $dnode5Vnodes
 
 if $dnode2Vnodes != 2 then
   goto show15
@@ -563,11 +550,11 @@ show16:
 	endi
 sql show dnodes -x show16
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode2Vnodes != 1 then
   goto show16
diff --git a/tests/script/unique/cluster/balance2.sim b/tests/script/unique/cluster/balance2.sim
index 65dbfba361..9a0a88b609 100644
--- a/tests/script/unique/cluster/balance2.sim
+++ b/tests/script/unique/cluster/balance2.sim
@@ -1,27 +1,12 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-system sh/ip.sh -i 7 -s up
-system sh/ip.sh -i 8 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7
-system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8
-
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
@@ -107,11 +92,11 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show1
@@ -137,11 +122,11 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show2
@@ -158,10 +143,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 system sh/exec.sh -n dnode2 -s stop  -x SIGINT
 
@@ -170,7 +155,7 @@ print ========= start dnode2
 sql create dnode 192.168.0.2
 
 sleep 3000
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c clog -v 1
@@ -189,11 +174,11 @@ show3:
 	endi
 sql show dnodes -x show3
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show3
@@ -210,10 +195,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step4
 print ========= drop dnode3
@@ -229,11 +214,11 @@ show4:
 	endi
 sql show dnodes -x show4
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show4
@@ -250,10 +235,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 system sh/exec.sh -n dnode3 -s stop  -x SIGINT
 
@@ -262,7 +247,7 @@ print ========= start dnode3
 sql create dnode 192.168.0.3
 
 sleep 3000
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c clog -v 1
@@ -281,11 +266,11 @@ show5:
 	endi
 sql show dnodes -x show5
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show5
@@ -302,10 +287,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step6
 print ========= drop dnode1
@@ -326,11 +311,11 @@ show6:
 	endi
 sql show dnodes -x show6
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != null then
   goto show6
@@ -347,10 +332,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step7
 print ========= start dnode1
@@ -361,13 +346,13 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 sleep 3000
-system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c clog -v 1
@@ -385,10 +370,10 @@ show7:
 	$dnode2Role = $data3_192.168.0.2
 	$dnode3Role = $data3_192.168.0.3
 	$dnode4Role = $data3_192.168.0.4
-	print 192.168.0.1 ==> $dnode1Role
-	print 192.168.0.2 ==> $dnode2Role
-	print 192.168.0.3 ==> $dnode3Role
-	print 192.168.0.4 ==> $dnode4Role
+	print dnode1 ==> $dnode1Role
+	print dnode2 ==> $dnode2Role
+	print dnode3 ==> $dnode3Role
+	print dnode4 ==> $dnode4Role
 
 	$x = $x + 1
 	sleep 2000
@@ -397,11 +382,11 @@ show7:
 	endi
 sql show dnodes -x show7
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show7
@@ -434,10 +419,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 $x = 0
 show8: 
@@ -448,13 +433,13 @@ show8:
 	endi
 sql show dnodes -x show8
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show8
@@ -480,10 +465,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 $x = 0
 show9: 
@@ -494,13 +479,13 @@ show9:
 	endi
 sql show dnodes -x show9
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != null then
   goto show9
@@ -524,17 +509,15 @@ sql create dnode 192.168.0.1
 sql create dnode 192.168.0.4
 
 sleep 3000
-system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
+system sh/deploy.sh -n dnode1 -i 1
+ssystem sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c clog -v 1
 system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 0
 sleep 3000
 
 sleep 3000
-system sh/deploy.sh -n dnode4 -m 192.168.0.2 -i 192.168.0.4
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c clog -v 1
@@ -552,10 +535,10 @@ show10:
 	$dnode2Role = $data3_192.168.0.2
 	$dnode3Role = $data3_192.168.0.3
 	$dnode4Role = $data3_192.168.0.4
-	print 192.168.0.1 ==> $dnode1Role
-	print 192.168.0.2 ==> $dnode2Role
-	print 192.168.0.3 ==> $dnode3Role
-	print 192.168.0.4 ==> $dnode4Role
+	print dnode1 ==> $dnode1Role
+	print dnode2 ==> $dnode2Role
+	print dnode3 ==> $dnode3Role
+	print dnode4 ==> $dnode4Role
 	
 	$x = $x + 1
 	sleep 2000
@@ -564,13 +547,13 @@ show10:
 	endi
 sql show dnodes -x show10
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show10
@@ -592,10 +575,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 sql create database c_b2_d5 replica 2 tables 4
 sql use c_b2_d5;
@@ -624,13 +607,13 @@ show11:
 	endi
 sql show dnodes -x show11
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show11
@@ -650,10 +633,10 @@ $dnode1Role = $data3_192.168.0.1
 $dnode2Role = $data3_192.168.0.2
 $dnode3Role = $data3_192.168.0.3
 $dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 print ============================== step12
 print ========= check data
diff --git a/tests/script/unique/cluster/balance3.sim b/tests/script/unique/cluster/balance3.sim
index 83499a4d66..6e5d910a11 100644
--- a/tests/script/unique/cluster/balance3.sim
+++ b/tests/script/unique/cluster/balance3.sim
@@ -1,22 +1,22 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-system sh/ip.sh -i 7 -s up
-system sh/ip.sh -i 8 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7
-system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8
+
+
+
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
+system sh/deploy.sh -n dnode7 -i 7
+system sh/deploy.sh -n dnode8 -i 8
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
@@ -102,13 +102,13 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show1
@@ -138,13 +138,13 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode4Vnodes != 2 then
   goto show2
@@ -164,13 +164,13 @@ show3:
 	endi
 sql show dnodes -x show3
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show3
@@ -190,7 +190,7 @@ system sh/exec.sh -n dnode2 -s stop  -x SIGINT
 print ============================== step4
 print ========= start dnode2
 sleep 3000
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c clog -v 1
@@ -209,13 +209,13 @@ show4:
 	endi
 sql show dnodes -x show4
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode2Vnodes != 2 then
   goto show4
@@ -235,13 +235,13 @@ show5:
 	endi
 sql show dnodes -x show5
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show5
@@ -262,7 +262,7 @@ system sh/exec.sh -n dnode3 -s stop  -x SIGINT
 print ============================== step6
 print ========= start dnode3
 sleep 3000
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode3 -c clog -v 1
@@ -281,13 +281,13 @@ show6:
 	endi
 sql show dnodes -x show6
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode3Vnodes != 2 then
   goto show6
@@ -307,13 +307,13 @@ show7:
 	endi
 sql show dnodes -x show7
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show7
@@ -333,7 +333,7 @@ system sh/exec.sh -n dnode4 -s stop  -x SIGINT
 print ============================== step8
 print ========= start dnode4
 sleep 3000
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode4 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode4 -c clog -v 1
@@ -352,13 +352,13 @@ show8:
 	endi
 sql show dnodes -x show8
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode4Vnodes != 2 then
   goto show8
@@ -383,13 +383,13 @@ show9:
 	endi
 sql show dnodes -x show9
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != null then
   goto show9
@@ -407,7 +407,7 @@ endi
 print ============================== step10
 print ========= start dnode1
 sleep 3000
-system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c clog -v 1
@@ -426,13 +426,13 @@ show10:
 	endi
 sql show dnodes -x show10
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 2 then
  goto show10
@@ -467,13 +467,13 @@ show11:
 	endi
 sql show dnodes -x show11
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != 1 then
   goto show11
@@ -502,13 +502,13 @@ show12:
 	endi
 sql show dnodes -x show12
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 $dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
+print dnode4 $dnode4Vnodes
 
 if $dnode1Vnodes != null then
   goto show12
diff --git a/tests/script/unique/column/replica3.sim b/tests/script/unique/column/replica3.sim
index 2ec7879615..97c89f89f3 100644
--- a/tests/script/unique/column/replica3.sim
+++ b/tests/script/unique/column/replica3.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/db/commit.sim b/tests/script/unique/db/commit.sim
index a9aa674a27..ec84122b47 100644
--- a/tests/script/unique/db/commit.sim
+++ b/tests/script/unique/db/commit.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 2
 system sh/cfg.sh -n dnode2 -c commitLog -v 2
diff --git a/tests/script/unique/db/delete.sim b/tests/script/unique/db/delete.sim
index ce1c3fef12..d22ca2623d 100644
--- a/tests/script/unique/db/delete.sim
+++ b/tests/script/unique/db/delete.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/db/delete_part.sim b/tests/script/unique/db/delete_part.sim
index 4e2808dbaa..e599cc6c4a 100644
--- a/tests/script/unique/db/delete_part.sim
+++ b/tests/script/unique/db/delete_part.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/db/replica_add12.sim b/tests/script/unique/db/replica_add12.sim
index 29f9fdbea8..b9ce0595c7 100644
--- a/tests/script/unique/db/replica_add12.sim
+++ b/tests/script/unique/db/replica_add12.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/db/replica_add13.sim b/tests/script/unique/db/replica_add13.sim
index a4854adc53..0c44d9d839 100644
--- a/tests/script/unique/db/replica_add13.sim
+++ b/tests/script/unique/db/replica_add13.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/db/replica_add23.sim b/tests/script/unique/db/replica_add23.sim
index 0aebcce988..e1cc5767c5 100644
--- a/tests/script/unique/db/replica_add23.sim
+++ b/tests/script/unique/db/replica_add23.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/db/replica_part.sim b/tests/script/unique/db/replica_part.sim
index 144c3f674f..d8075434dc 100644
--- a/tests/script/unique/db/replica_part.sim
+++ b/tests/script/unique/db/replica_part.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/db/replica_reduce21.sim b/tests/script/unique/db/replica_reduce21.sim
index 9f15cf3453..09d295125a 100644
--- a/tests/script/unique/db/replica_reduce21.sim
+++ b/tests/script/unique/db/replica_reduce21.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/db/replica_reduce31.sim b/tests/script/unique/db/replica_reduce31.sim
index c34dccbd62..214b064afb 100644
--- a/tests/script/unique/db/replica_reduce31.sim
+++ b/tests/script/unique/db/replica_reduce31.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/db/replica_reduce32.sim b/tests/script/unique/db/replica_reduce32.sim
index a9cda824b8..c1d4893a3e 100644
--- a/tests/script/unique/db/replica_reduce32.sim
+++ b/tests/script/unique/db/replica_reduce32.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c clog -v 2
 system sh/cfg.sh -n dnode2 -c clog -v 2
diff --git a/tests/script/unique/dnode/backup/balance4.sim b/tests/script/unique/dnode/backup/balance4.sim
deleted file mode 100644
index 914f254ef2..0000000000
--- a/tests/script/unique/dnode/backup/balance4.sim
+++ /dev/null
@@ -1,435 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-system sh/ip.sh -i 7 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7
-
-system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode6 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode7 -c numOfMPeers -v 1
-
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4
-
-system sh/cfg.sh -n dnode1 -c statusInterval -v 1
-system sh/cfg.sh -n dnode2 -c statusInterval -v 1
-system sh/cfg.sh -n dnode3 -c statusInterval -v 1
-system sh/cfg.sh -n dnode4 -c statusInterval -v 1
-system sh/cfg.sh -n dnode5 -c statusInterval -v 1
-system sh/cfg.sh -n dnode6 -c statusInterval -v 1
-system sh/cfg.sh -n dnode7 -c statusInterval -v 1
-
-system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode5 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode7 -c balanceMonitorInterval -v 1
-
-system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode5 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode6 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode7 -c balanceStartInterval -v 10
-
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
-system sh/cfg.sh -n dnode5 -c commitLog -v 0
-system sh/cfg.sh -n dnode6 -c commitLog -v 0
-system sh/cfg.sh -n dnode7 -c commitLog -v 0
-
-system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 4
-
-print ============================ step1
-print ========= start dnode1-5
-system sh/exec.sh -n dnode1 -s start
-sleep 4001
-$x = 0
-connectTbase: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then 
-	  return -1
-	endi
-sql connect -x connectTbase
-
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
-sql create dnode 192.168.0.5
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-system sh/exec.sh -n dnode4 -s start
-system sh/exec.sh -n dnode5 -s start
-sleep 4001
-$x = 0
-created1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then 
-	  return -1
-	endi
-sql create database d_b4_d1 replica 4 -x created1
-sql use d_b4_d1
-
-create1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then 
-	  return -1
-	endi
-sql create table d_b4_d1 (t timestamp, i int) -x create1
-sql insert into d_b4_d1 values(now+1s, 15)
-sql insert into d_b4_d1 values(now+2s, 14)
-sql insert into d_b4_d1 values(now+2s, 13)
-sql insert into d_b4_d1 values(now+3s, 12)
-sql insert into d_b4_d1 values(now+4s, 11)
-
-sql create database d_b4_d2 replica 4
-sql use d_b4_d2
-
-create2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then 
-	  return -1
-	endi
-sql create table d_b4_d2 (t timestamp, i int) -x create2
-sql insert into d_b4_d2 values(now+1s, 25)
-sql insert into d_b4_d2 values(now+2s, 24)
-sql insert into d_b4_d2 values(now+3s, 23)
-sql insert into d_b4_d2 values(now+4s, 22)
-sql insert into d_b4_d2 values(now+5s, 21)
-
-$x = 0
-show1: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show1
-endi
-if $dnode2Vnodes != 2 then
-  goto show1
-endi
-if $dnode3Vnodes != 2 then
-  goto show1
-endi
-if $dnode4Vnodes != 2 then
-  goto show1
-endi
-if $dnode5Vnodes != 2 then
-  goto show1
-endi
-
-print ============================ step2
-print ========= drop dnode2
-sql drop dnode 192.168.0.2
-sleep 7000
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show2
-endi
-if $dnode3Vnodes != 2 then
-  goto show2
-endi
-if $dnode4Vnodes != 2 then
-  goto show2
-endi
-if $dnode5Vnodes != 2 then
-  goto show2
-endi
-
-system sh/exec.sh -n dnode2 -s stop
-
-print ============================ step3
-print ========= start dnode6
-sql create dnode 192.168.0.6
-system sh/exec.sh -n dnode6 -s start
-sleep 4000
-$x = 0
-show3: 
-	$x = $x + 1
-	sleep 6000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show3
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-$dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show3
-endi
-if $dnode3Vnodes != 2 then
-  goto show3
-endi
-if $dnode4Vnodes != 2 then
-  goto show3
-endi
-if $dnode5Vnodes != 2 then
-  goto show3
-endi
-if $dnode6Vnodes != 2 then
-  goto show3
-endi
-
-print ============================ step4
-print ========= add db3
-sql create database d_b4_d3 replica 4
-sql use d_b4_d3
-
-create3: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql create table d_b4_d3 (t timestamp, i int) -x create3
-sql insert into d_b4_d3 values(now+1s, 35)
-sql insert into d_b4_d3 values(now+2s, 34)
-sql insert into d_b4_d3 values(now+3s, 33)
-sql insert into d_b4_d3 values(now+4s, 32)
-sql insert into d_b4_d3 values(now+5s, 31)
-
-$x = 0
-show4: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show4
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-$dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show4
-endi
-if $dnode3Vnodes != 1 then
-  goto show4
-endi
-if $dnode4Vnodes != 1 then
-  goto show4
-endi
-if $dnode5Vnodes != 1 then
-  goto show4
-endi
-if $dnode6Vnodes != 1 then
-  goto show4
-endi
-
-print ============================ step5
-print ========= start dnode7
-sql create dnode 192.168.0.7
-system sh/exec.sh -n dnode7 -s start
-sleep 7000
-$x = 0
-show5: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show5
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode7Vnodes = $data3_192.168.0.7
-print 192.168.0.7 $dnode7Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show5
-endi
-if $dnode7Vnodes != 2 then
-  goto show5
-endi
-
-print ============================ step6
-print ========= drop dnode3
-sql drop dnode 192.168.0.3
-sleep 7000
-$x = 0
-show6: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show6
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-$dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
-$dnode7Vnodes = $data3_192.168.0.7
-print 192.168.0.7 $dnode7Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show6
-endi
-if $dnode4Vnodes != 1 then
-  goto show6
-endi
-if $dnode5Vnodes != 1 then
-  goto show6
-endi
-if $dnode6Vnodes != 1 then
-  goto show6
-endi
-if $dnode7Vnodes != 1 then
-  goto show6
-endi
-
-system sh/exec.sh -n dnode3 -s stop
-
-return
-print ============================ step7
-print ========= check data
-
-sql use d_b4_d1
-sql select * from d_b4_d1
-print $data01 $data11 $data21 $data31 $data41 
-if $data01 != 11 then
-  return -1
-endi
-if $data11 != 12 then
-  return -1
-endi
-if $data21 != 13 then
-  return -1
-endi
-if $data31 != 14 then
-  return -1
-endi
-if $data41 != 15 then
-  return -1
-endi
-
-sql use d_b4_d2
-sql select * from d_b4_d2
-print $data01 $data11 $data21 $data31 $data41 
-if $data01 != 21 then
-  return -1
-endi
-if $data11 != 22 then
-  return -1
-endi
-if $data21 != 23 then
-  return -1
-endi
-if $data31 != 24 then
-  return -1
-endi
-if $data41 != 25 then
-  return -1
-endi
-
-sql use d_b4_d3
-sql select * from d_b4_d3
-print $data01 $data11 $data21 $data31 $data41  
-if $data01 != 31 then
-  return -1
-endi
-if $data11 != 32 then
-  return -1
-endi
-if $data21 != 33 then
-  return -1
-endi
-if $data31 != 34 then
-  return -1
-endi
-if $data41 != 35 then
-  return -1
-endi
-
-
-print ============================================ over
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-system sh/exec.sh -n dnode4 -s stop
-system sh/exec.sh -n dnode5 -s stop
-system sh/exec.sh -n dnode6 -s stop
-system sh/exec.sh -n dnode7 -s stop
diff --git a/tests/script/unique/dnode/backup/balance5.sim b/tests/script/unique/dnode/backup/balance5.sim
deleted file mode 100644
index ac6157ca93..0000000000
--- a/tests/script/unique/dnode/backup/balance5.sim
+++ /dev/null
@@ -1,469 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-system sh/ip.sh -i 7 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7
-system sh/deploy.sh -n dnode8 -m 192.168.0.1 -i 192.168.0.8
-
-system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode3 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode4 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode5 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode6 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode7 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode8 -c numOfMPeers -v 1
-
-system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode3 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode4 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode5 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode6 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode7 -c numOfTotalVnodes -v 4
-system sh/cfg.sh -n dnode8 -c numOfTotalVnodes -v 4
-
-system sh/cfg.sh -n dnode1 -c statusInterval -v 1
-system sh/cfg.sh -n dnode2 -c statusInterval -v 1
-system sh/cfg.sh -n dnode3 -c statusInterval -v 1
-system sh/cfg.sh -n dnode4 -c statusInterval -v 1
-system sh/cfg.sh -n dnode5 -c statusInterval -v 1
-system sh/cfg.sh -n dnode6 -c statusInterval -v 1
-system sh/cfg.sh -n dnode7 -c statusInterval -v 1
-system sh/cfg.sh -n dnode8 -c statusInterval -v 1
-
-system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode5 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode6 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode7 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode8 -c balanceMonitorInterval -v 1
-
-system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode5 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode6 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode7 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode8 -c balanceStartInterval -v 10
-
-system sh/cfg.sh -n dnode1 -c commitLog -v 0
-system sh/cfg.sh -n dnode2 -c commitLog -v 0
-system sh/cfg.sh -n dnode3 -c commitLog -v 0
-system sh/cfg.sh -n dnode4 -c commitLog -v 0
-system sh/cfg.sh -n dnode5 -c commitLog -v 0
-system sh/cfg.sh -n dnode6 -c commitLog -v 0
-system sh/cfg.sh -n dnode7 -c commitLog -v 0
-system sh/cfg.sh -n dnode8 -c commitLog -v 0
-
-system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode5 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode6 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode7 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode8 -c mgmtEqualVnodeNum -v 4
-
-print ============================ step1
-print ========= start dnode1-5
-system sh/exec.sh -n dnode1 -s start
-
-$x = 0
-connectTbase: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then 
-	  return -1
-	endi
-sql connect -x connectTbase
-sleep 4001
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-sql create dnode 192.168.0.4
-sql create dnode 192.168.0.5
-sql create dnode 192.168.0.6
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-system sh/exec.sh -n dnode4 -s start
-system sh/exec.sh -n dnode5 -s start
-system sh/exec.sh -n dnode6 -s start
-sleep 4001
-$x = 0
-created1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then 
-	  return -1
-	endi
-sql create database d_b5_d1 replica 5 -x created1
-sql use d_b5_d1
-
-create1: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then 
-	  return -1
-	endi
-sql create table d_b5_t1 (t timestamp, i int) -x create1
-sql insert into d_b5_t1 values(now+1s, 15)
-sql insert into d_b5_t1 values(now+2s, 14)
-sql insert into d_b5_t1 values(now+2s, 13)
-sql insert into d_b5_t1 values(now+3s, 12)
-sql insert into d_b5_t1 values(now+4s, 11)
-
-sql create database d_b5_d2 replica 5
-sql use d_b5_d2
-create2: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 10 then 
-	  return -1
-	endi
-sql create table d_b5_t2 (t timestamp, i int) -x create2
-sql insert into d_b5_t2 values(now+1s, 25)
-sql insert into d_b5_t2 values(now+2s, 24)
-sql insert into d_b5_t2 values(now+3s, 23)
-sql insert into d_b5_t2 values(now+4s, 22)
-sql insert into d_b5_t2 values(now+5s, 21)
-
-$x = 0
-show1: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show1
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-$dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show1
-endi
-if $dnode2Vnodes != 2 then
-  goto show1
-endi
-if $dnode3Vnodes != 2 then
-  goto show1
-endi
-if $dnode4Vnodes != 2 then
-  goto show1
-endi
-if $dnode5Vnodes != 2 then
-  goto show1
-endi
-if $dnode6Vnodes != 2 then
-  goto show1
-endi
-
-print ============================ step2
-print ========= drop dnode2
-sql drop dnode 192.168.0.2
-sleep 7000
-$x = 0
-show2: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show2
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-$dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
-
-if $dnode1Vnodes != 2 then
-  goto show2
-endi
-if $dnode3Vnodes != 2 then
-  goto show2
-endi
-if $dnode4Vnodes != 2 then
-  goto show2
-endi
-if $dnode5Vnodes != 2 then
-  goto show2
-endi
-if $dnode6Vnodes != 2 then
-  goto show2
-endi
-
-system sh/exec.sh -n dnode2 -s stop
-
-print ============================ step3
-print ========= start dnode7
-sql create dnode 192.168.0.7
-system sh/exec.sh -n dnode7 -s start
-sleep 5000
-$x = 0
-show3: 
-	$x = $x + 1
-	sleep 5000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show3
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-$dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
-$dnode7Vnodes = $data3_192.168.0.7
-print 192.168.0.7 $dnode7Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show3
-endi
-if $dnode3Vnodes != 2 then
-  goto show3
-endi
-if $dnode4Vnodes != 2 then
-  goto show3
-endi
-if $dnode5Vnodes != 2 then
-  goto show3
-endi
-if $dnode6Vnodes != 2 then
-  goto show3
-endi
-if $dnode7Vnodes != 2 then
-  goto show3
-endi
-
-print ============================ step4
-print ========= add db3
-sql create database d_b5_d3 replica 5
-sql use d_b5_d3
-create3: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql create table d_b5_t3 (t timestamp, i int) -x create3
-sql insert into d_b5_t3 values(now+1s, 35)
-sql insert into d_b5_t3 values(now+2s, 34)
-sql insert into d_b5_t3 values(now+3s, 33)
-sql insert into d_b5_t3 values(now+4s, 32)
-sql insert into d_b5_t3 values(now+5s, 31)
-
-$x = 0
-show4: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show4
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-$dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
-$dnode7Vnodes = $data3_192.168.0.7
-print 192.168.0.7 $dnode7Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show4
-endi
-if $dnode3Vnodes != 1 then
-  goto show4
-endi
-if $dnode4Vnodes != 1 then
-  goto show4
-endi
-if $dnode5Vnodes != 1 then
-  goto show4
-endi
-if $dnode6Vnodes != 1 then
-  goto show4
-endi
-if $dnode7Vnodes != 1 then
-  goto show4
-endi
-
-print ============================ step5
-print ========= start dnode8
-sql create dnode 192.168.0.8
-system sh/exec.sh -n dnode8 -s start
-sleep 7000
-$x = 0
-show5: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show5
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode8Vnodes = $data3_192.168.0.8
-print 192.168.0.8 $dnode8Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show5
-endi
-if $dnode8Vnodes != 2 then
-  goto show5
-endi
-
-print ============================ step6
-print ========= drop dnode3
-sql drop dnode 192.168.0.3
-sleep 7000
-$x = 0
-show6: 
-	$x = $x + 1
-	sleep 2000
-	if $x == 10 then 
-	  return -1
-	endi
-sql show dnodes -x show6
-$dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode4Vnodes = $data3_192.168.0.4
-print 192.168.0.4 $dnode4Vnodes
-$dnode5Vnodes = $data3_192.168.0.5
-print 192.168.0.5 $dnode5Vnodes
-$dnode6Vnodes = $data3_192.168.0.6
-print 192.168.0.6 $dnode6Vnodes
-$dnode7Vnodes = $data3_192.168.0.7
-print 192.168.0.7 $dnode7Vnodes
-$dnode8Vnodes = $data3_192.168.0.8
-print 192.168.0.8 $dnode8Vnodes
-
-if $dnode1Vnodes != 4 then
-  goto show6
-endi
-if $dnode4Vnodes != 1 then
-  goto show6
-endi
-if $dnode5Vnodes != 1 then
-  goto show6
-endi
-if $dnode6Vnodes != 1 then
-  goto show6
-endi
-if $dnode7Vnodes != 1 then
-  goto show6
-endi
-if $dnode8Vnodes != 1 then
-  goto show6
-endi
-
-system sh/exec.sh -n dnode3 -s stop
-
-return
-print ============================ step7
-print ========= check data
-
-sql use d_b5_d1
-sql select * from d_b5_t1
-print $data01 $data11 $data21 $data31 $data41 
-if $data01 != 11 then
-  return -1
-endi
-if $data11 != 12 then
-  return -1
-endi
-if $data21 != 13 then
-  return -1
-endi
-if $data31 != 14 then
-  return -1
-endi
-if $data41 != 15 then
-  return -1
-endi
-
-sql use d_b5_d2
-sql select * from d_b5_t2
-print $data01 $data11 $data21 $data31 $data41 
-if $data01 != 21 then
-  return -1
-endi
-if $data11 != 22 then
-  return -1
-endi
-if $data21 != 23 then
-  return -1
-endi
-if $data31 != 24 then
-  return -1
-endi
-if $data41 != 25 then
-  return -1
-endi
-
-sql use d_b5_d3
-sql select * from d_b5_t3
-print $data01 $data11 $data21 $data31 $data41  
-if $data01 != 31 then
-  return -1
-endi
-if $data11 != 32 then
-  return -1
-endi
-if $data21 != 33 then
-  return -1
-endi
-if $data31 != 34 then
-  return -1
-endi
-if $data41 != 35 then
-  return -1
-endi
-
-
-print ============================================ over
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-system sh/exec.sh -n dnode4 -s stop
-system sh/exec.sh -n dnode5 -s stop
-system sh/exec.sh -n dnode6 -s stop
-system sh/exec.sh -n dnode7 -s stop
-system sh/exec.sh -n dnode8 -s stop
diff --git a/tests/script/unique/dnode/backup/unremove.sim b/tests/script/unique/dnode/backup/unremove.sim
deleted file mode 100644
index 75aaeb949b..0000000000
--- a/tests/script/unique/dnode/backup/unremove.sim
+++ /dev/null
@@ -1,149 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-
-system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode3 -c balanceMonitorInterval -v 1
-system sh/cfg.sh -n dnode4 -c balanceMonitorInterval -v 1
-
-system sh/cfg.sh -n dnode1 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode3 -c balanceStartInterval -v 10
-system sh/cfg.sh -n dnode4 -c balanceStartInterval -v 10
-
-system sh/cfg.sh -n dnode1 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode3 -c mgmtEqualVnodeNum -v 4
-system sh/cfg.sh -n dnode4 -c mgmtEqualVnodeNum -v 4
-
-system sh/cfg.sh -n dnode1 -c commitLog -v 1
-system sh/cfg.sh -n dnode2 -c commitLog -v 1
-system sh/cfg.sh -n dnode3 -c commitLog -v 1
-system sh/cfg.sh -n dnode4 -c commitLog -v 1
-
-print ========== step1
-system sh/exec.sh -n dnode1 -s start
-sql connect
-sql create dnode 192.168.0.2
-sql create dnode 192.168.0.3
-system sh/exec.sh -n dnode2 -s start
-system sh/exec.sh -n dnode3 -s start
-sleep 3000
- 
-sql create database d1 replica 3 
-sql create table d1.t1 (t timestamp, i int)
-sql insert into d1.t1 values(now+1s, 15)
-sql insert into d1.t1 values(now+2s, 14)
-sql insert into d1.t1 values(now+2s, 13)
-sql insert into d1.t1 values(now+3s, 12)
-sql insert into d1.t1 values(now+4s, 11)
-
-print ========== step2
-sql drop dnode 192.168.0.2
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 3000
-
-sql alter dnode 192.168.0.2 unremove
-system sh/exec.sh -n dnode2 -s start
-
-sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.2 freeVnodes $data3_192.168.0.2
-print 192.168.0.3 freeVnodes $data3_192.168.0.3
-if $data3_192.168.0.1 != 3 then
-  return -1
-endi
-if $data3_192.168.0.2 != 3 then
-  return 
-endi
-if $data3_192.168.0.3 != 3 then
-  return -1
-endi
-
-print ========== step3
-sql drop dnode 192.168.0.2
-system sh/exec.sh -n dnode2 -s stop -x SIGINT
-sleep 3000
-
-sql alter dnode 192.168.0.2 unremove
-system sh/exec.sh -n dnode2 -s start
-
-sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.2 freeVnodes $data3_192.168.0.2
-print 192.168.0.3 freeVnodes $data3_192.168.0.3
-if $data3_192.168.0.1 != 3 then
-  return -1
-endi
-if $data3_192.168.0.2 != 3 then
-  return -1
-endi
-if $data3_192.168.0.3 != 3 then
-  return -1
-endi
-
-print ========== step4
-sql create dnode 192.168.0.4
-sql drop dnode 192.168.0.2
-
-sleep 5000
-sql show dnodes
-$dnode1Vnodes = $data2_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
-$dnode2Vnodes = $data2_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
-$dnode3Vnodes = $data2_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
-
-sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.2 freeVnodes $data3_192.168.0.2
-print 192.168.0.3 freeVnodes $data3_192.168.0.3
-if $data3_192.168.0.1 != 3 then
-  return -1
-endi
-if $data3_192.168.0.2 != 3 then
-  return -1
-endi
-if $data3_192.168.0.3 != 3 then
-  return -1
-endi
-
-print ========== step5
-system sh/exec.sh -n dnode4 -s start
-sleep 3000
-
-$x = 0
-show5: 
-	$x = $x + 1
-	sleep 5000
-	if $x == 20 then 
-	  return -1
-	endi
-	
-sql show dnodes
-print 192.168.0.1 freeVnodes $data3_192.168.0.1
-print 192.168.0.2 freeVnodes $data3_192.168.0.2
-print 192.168.0.3 freeVnodes $data3_192.168.0.3
-print 192.168.0.4 freeVnodes $data3_192.168.0.4
-if $data3_192.168.0.1 != 3 then
-  goto show5
-endi
-if $data3_192.168.0.2 != null then
-  goto show5
-endi
-if $data3_192.168.0.3 != 3 then
-  goto show5
-endi
-if $data3_192.168.0.4 != 3 then
-  goto show5
-endi
diff --git a/tests/script/unique/dnode/balance1.sim b/tests/script/unique/dnode/balance1.sim
index 493f712c57..eff6b1e51d 100644
--- a/tests/script/unique/dnode/balance1.sim
+++ b/tests/script/unique/dnode/balance1.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -49,7 +49,7 @@ sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
+print dnode1 openVnodes $data3_1
 if $data3_1 != 1 then
 	return -1
 endi
@@ -68,8 +68,8 @@ show2:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 0 then
 	goto show2
 endi
@@ -87,8 +87,8 @@ sql insert into d2.t2 values(now+4s, 22)
 sql insert into d2.t2 values(now+5s, 21)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 0 then
 	return -1
 endi
@@ -108,8 +108,8 @@ show4:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 2 then
     goto show4
 endi
@@ -135,9 +135,9 @@ show5:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_1 != 0 then
   goto show5
 endi
@@ -158,9 +158,9 @@ sql insert into d3.t3 values(now+4s, 32)
 sql insert into d3.t3 values(now+5s, 31)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 
 if $data3_1 != 0 then
 	return -1
@@ -185,10 +185,10 @@ show7:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
 if $data3_1 != 0 then
   goto show7
 endi
@@ -212,10 +212,10 @@ sql insert into d4.t4 values(now+4s, 42)
 sql insert into d4.t4 values(now+5s, 41)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
 
 if $data3_1 != 0 then
 	return -1
@@ -242,10 +242,10 @@ show9:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
 
 if $data3_1 != 0 then
   goto show9
diff --git a/tests/script/unique/dnode/balance2.sim b/tests/script/unique/dnode/balance2.sim
index 5e887d54f5..d38952ea4f 100644
--- a/tests/script/unique/dnode/balance2.sim
+++ b/tests/script/unique/dnode/balance2.sim
@@ -1,16 +1,16 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -63,9 +63,9 @@ sql insert into d2.t2 values(now+4s, 22)
 sql insert into d2.t2 values(now+5s, 21)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_1 != 4 then
 	return -1
 endi
@@ -88,9 +88,9 @@ show2:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_1 != 2 then
 	goto show2
 endi
@@ -116,10 +116,10 @@ show3:
 	endi
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
 if $data3_1 != 4 then
 	goto show3
 endi
@@ -143,10 +143,10 @@ sql insert into d3.t3 values(now+4s, 32)
 sql insert into d3.t3 values(now+5s, 31)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
 if $data3_1 != 4 then
 	return -1
 endi
@@ -173,11 +173,11 @@ show5:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
-print 192.168.0.5 openVnodes $data3_5
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
+print dnode5 openVnodes $data3_5
 if $data3_1 != 4 then
 	goto show5
 endi
@@ -206,11 +206,11 @@ show6:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
-print 192.168.0.5 openVnodes $data3_5
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
+print dnode5 openVnodes $data3_5
 if $data3_1 != 4 then
 	goto show6
 endi
diff --git a/tests/script/unique/dnode/balance3.sim b/tests/script/unique/dnode/balance3.sim
index 7baa6444ee..b379b50119 100644
--- a/tests/script/unique/dnode/balance3.sim
+++ b/tests/script/unique/dnode/balance3.sim
@@ -1,18 +1,18 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
+
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -71,10 +71,10 @@ sql insert into d2.t2 values(now+4s, 22)
 sql insert into d2.t2 values(now+5s, 21)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
 
 if $data3_1 != 4 then
 	return -1
@@ -101,10 +101,10 @@ show2:
 	endi
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
 
 if $data3_1 != 2 then
 	goto show2
@@ -134,11 +134,11 @@ show3:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
-print 192.168.0.5 openVnodes $data3_5
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
+print dnode5 openVnodes $data3_5
 
 if $data3_1 != 4 then
 	goto show3
@@ -174,11 +174,11 @@ show4:
 	endi
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
-print 192.168.0.5 openVnodes $data3_5
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
+print dnode5 openVnodes $data3_5
 
 if $data3_1 != 4 then
 	goto show4
@@ -209,11 +209,11 @@ show5:
 	endi
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
-print 192.168.0.5 openVnodes $data3_5
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
+print dnode5 openVnodes $data3_5
 
 if $data3_1 != 4 then
 	goto show5
@@ -236,11 +236,11 @@ show6:
 	endi
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
-print 192.168.0.5 openVnodes $data3_5
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
+print dnode5 openVnodes $data3_5
 
 if $data3_1 != 4 then
 	goto show6
diff --git a/tests/script/unique/dnode/balancex.sim b/tests/script/unique/dnode/balancex.sim
index 9153224a22..78046d3638 100644
--- a/tests/script/unique/dnode/balancex.sim
+++ b/tests/script/unique/dnode/balancex.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22)
 sql insert into d2.t2 values(now+5s, 21)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
+print dnode1 openVnodes $data3_1
 if $data3_1 != 2 then
 	return -1
 endi
@@ -70,8 +70,8 @@ show2:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 4 then
 	goto show2
 endi
@@ -96,8 +96,8 @@ show3:
 	  return -1
 	endi
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 3 then
 	goto show3
 endi
@@ -117,9 +117,9 @@ show4:
 	  return -1
 	endi
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_1 != 4 then
 	goto show4
 endi
@@ -141,9 +141,9 @@ show5:
 	  return -1
 	endi
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_1 != 3 then
 	goto show5
 endi
diff --git a/tests/script/unique/dnode/basic1.sim b/tests/script/unique/dnode/basic1.sim
index cfd84bbc16..1d1f16c760 100644
--- a/tests/script/unique/dnode/basic1.sim
+++ b/tests/script/unique/dnode/basic1.sim
@@ -1,6 +1,6 @@
 system sh/stop_dnodes.sh
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/exec_up.sh -n dnode1 -s start
 system sh/exec_up.sh -n dnode2 -s start
 sql connect
diff --git a/tests/script/unique/dnode/monitor_bug.sim b/tests/script/unique/dnode/monitor_bug.sim
index c95ddac43c..a2e650ed71 100644
--- a/tests/script/unique/dnode/monitor_bug.sim
+++ b/tests/script/unique/dnode/monitor_bug.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -27,7 +27,7 @@ sql connect
 sleep 5000
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
+print dnode1 openVnodes $data3_1
 if $data3_1 != 3 then
 	return -1
 endi
@@ -45,8 +45,8 @@ show2:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 4 then
 	goto show2
 endi
diff --git a/tests/script/unique/dnode/offline1.sim b/tests/script/unique/dnode/offline1.sim
index d61971a439..71053f378a 100644
--- a/tests/script/unique/dnode/offline1.sim
+++ b/tests/script/unique/dnode/offline1.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
diff --git a/tests/script/unique/dnode/offline2.sim b/tests/script/unique/dnode/offline2.sim
index 9a0bfd18b7..9f265d398a 100644
--- a/tests/script/unique/dnode/offline2.sim
+++ b/tests/script/unique/dnode/offline2.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
diff --git a/tests/script/unique/dnode/remove1.sim b/tests/script/unique/dnode/remove1.sim
index 76429cdd22..5b18c981b4 100644
--- a/tests/script/unique/dnode/remove1.sim
+++ b/tests/script/unique/dnode/remove1.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22)
 sql insert into d2.t2 values(now+5s, 21)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
+print dnode1 openVnodes $data3_1
 if $data3_1 != 2 then
 	return -1
 endi
@@ -79,8 +79,8 @@ show2:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 3 then
 	goto show2
 endi
@@ -101,8 +101,8 @@ show3:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2 $data5_192.168.0.2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2 $data5_192.168.0.2
 
 print ========== step4
 sql create dnode 192.168.0.3
@@ -117,9 +117,9 @@ show4:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_2 != null then
 	goto show4
 endi
@@ -138,10 +138,10 @@ show5:
 	  return -1
 	endi
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
-print 192.168.0.4 openVnodes $data3_4
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
+print dnode4 openVnodes $data3_4
 if $data3_1 != 4 then
 	goto show5
 endi
diff --git a/tests/script/unique/dnode/remove2.sim b/tests/script/unique/dnode/remove2.sim
index 9b808920a6..338322fb6e 100644
--- a/tests/script/unique/dnode/remove2.sim
+++ b/tests/script/unique/dnode/remove2.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -52,7 +52,7 @@ sql insert into d2.t2 values(now+4s, 22)
 sql insert into d2.t2 values(now+5s, 21)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
+print dnode1 openVnodes $data3_1
 if $data3_1 != 2 then
 	return -1
 endi
@@ -79,8 +79,8 @@ show2:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 3 then
 	goto show2
 endi
@@ -102,8 +102,8 @@ show3:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2 $data5_192.168.0.2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2 $data5_192.168.0.2
 
 print ========== step4
 sql create dnode 192.168.0.3
@@ -118,9 +118,9 @@ show4:
 	endi
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_2 != null then
 	goto show4
 endi
diff --git a/tests/script/unique/dnode/vnode_clean.sim b/tests/script/unique/dnode/vnode_clean.sim
index 2ce9645108..d670a6b3b7 100644
--- a/tests/script/unique/dnode/vnode_clean.sim
+++ b/tests/script/unique/dnode/vnode_clean.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
@@ -43,7 +43,7 @@ sql insert into d1.t1 values(now+4s, 12)
 sql insert into d1.t1 values(now+5s, 11)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
+print dnode1 openVnodes $data3_1
 if $data3_1 != 3 then
 	return -1
 endi
@@ -60,8 +60,8 @@ show2:
 	  return -1
 	endi
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 4 then
 	goto show2
 endi
@@ -81,8 +81,8 @@ sql insert into d2.t2 values(now+5s, 21)
 
 $x = 0
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 4 then
 	return -1
 endi
@@ -101,8 +101,8 @@ show4:
 	  return -1
 	endi
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 2 then
     goto show4
 endi
@@ -118,9 +118,8 @@ system sh/exec_up.sh -n dnode2 -s stop -x SIGINT
 print ========== step5
 sleep 2000
 sql create dnode 192.168.0.2
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
 system sh/cfg.sh -n dnode2 -c balanceMonitorInterval -v 1
 system sh/cfg.sh -n dnode2 -c balanceStartInterval -v 10
 system sh/cfg.sh -n dnode2 -c mgmtEqualVnodeNum -v 4
@@ -135,8 +134,8 @@ show5:
 	  return -1
 	endi
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 4 then
     goto show5
 endi
@@ -154,8 +153,8 @@ sql insert into d3.t3 values(now+4s, 32)
 sql insert into d3.t3 values(now+5s, 31)
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
 if $data3_1 != 4 then
 	return -1
 endi
@@ -176,9 +175,9 @@ show7:
 	endi
 	
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_1 != 4 then
   goto show7
 endi
@@ -206,9 +205,9 @@ show8:
 	  return -1
 	endi
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_1 != 4 then
   goto show8
 endi
@@ -231,9 +230,9 @@ show9:
 	endi
 
 sql show dnodes
-print 192.168.0.1 openVnodes $data3_1
-print 192.168.0.2 openVnodes $data3_2
-print 192.168.0.3 openVnodes $data3_3
+print dnode1 openVnodes $data3_1
+print dnode2 openVnodes $data3_2
+print dnode3 openVnodes $data3_3
 if $data3_1 != 4 then
   goto show9
 endi
diff --git a/tests/script/unique/http/admin.sim b/tests/script/unique/http/admin.sim
index b09acd614d..e1237617a8 100644
--- a/tests/script/unique/http/admin.sim
+++ b/tests/script/unique/http/admin.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 #system sh/cfg.sh -n dnode1 -c adminRowLimit -v 10
 system sh/cfg.sh -n dnode1 -c httpDebugFlag -v 135
diff --git a/tests/script/unique/http/opentsdb.sim b/tests/script/unique/http/opentsdb.sim
index 985f1827db..36fba4c24e 100644
--- a/tests/script/unique/http/opentsdb.sim
+++ b/tests/script/unique/http/opentsdb.sim
@@ -1,7 +1,7 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
+
+system sh/deploy.sh -n dnode1 -i 1
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
 
diff --git a/tests/script/unique/import/replica2.sim b/tests/script/unique/import/replica2.sim
index ec806d71a0..ec9bf8d3f5 100644
--- a/tests/script/unique/import/replica2.sim
+++ b/tests/script/unique/import/replica2.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0
 system sh/cfg.sh -n dnode3 -c commitlog -v 0
 system sh/cfg.sh -n dnode4 -c commitlog -v 0
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
-
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 sleep 3000
diff --git a/tests/script/unique/import/replica3.sim b/tests/script/unique/import/replica3.sim
index 4dfa26a6b2..99e46a8506 100644
--- a/tests/script/unique/import/replica3.sim
+++ b/tests/script/unique/import/replica3.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 1
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 1
@@ -30,11 +30,6 @@ system sh/cfg.sh -n dnode2 -c commitlog -v 0
 system sh/cfg.sh -n dnode3 -c commitlog -v 0
 system sh/cfg.sh -n dnode4 -c commitlog -v 0
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode4 -c secondIp -v 192.168.0.2
-
 print ========= start dnode1
 system sh/exec.sh -n dnode1 -s start
 sleep 5000
diff --git a/tests/script/unique/metrics/balance_replica1.sim b/tests/script/unique/metrics/balance_replica1.sim
index 35c20986cb..eaa6a14e41 100644
--- a/tests/script/unique/metrics/balance_replica1.sim
+++ b/tests/script/unique/metrics/balance_replica1.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c statusInterval -v 1
@@ -71,9 +71,9 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 0 then
   goto show1
@@ -95,9 +95,9 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show2
diff --git a/tests/script/unique/metrics/dnode2.sim b/tests/script/unique/metrics/dnode2.sim
index 68000fb046..449f49b7d7 100644
--- a/tests/script/unique/metrics/dnode2.sim
+++ b/tests/script/unique/metrics/dnode2.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
diff --git a/tests/script/unique/metrics/dnode2_stop.sim b/tests/script/unique/metrics/dnode2_stop.sim
index 2570e0789f..90af978e6d 100644
--- a/tests/script/unique/metrics/dnode2_stop.sim
+++ b/tests/script/unique/metrics/dnode2_stop.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
diff --git a/tests/script/unique/metrics/dnode3.sim b/tests/script/unique/metrics/dnode3.sim
index 1e7dcffc24..44f6687d42 100644
--- a/tests/script/unique/metrics/dnode3.sim
+++ b/tests/script/unique/metrics/dnode3.sim
@@ -1,11 +1,11 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
@@ -82,11 +82,11 @@ endi
 
 sql show dnodes
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 $dnode3Vnodes = $data3_192.168.0.3
-print 192.168.0.3 $dnode3Vnodes
+print dnode3 $dnode3Vnodes
 
 if $dnode1Vnodes != 3 then
   return -1
diff --git a/tests/script/unique/metrics/replica2_dnode4.sim b/tests/script/unique/metrics/replica2_dnode4.sim
index 8f2f4a9c0c..a1ffb65b0f 100644
--- a/tests/script/unique/metrics/replica2_dnode4.sim
+++ b/tests/script/unique/metrics/replica2_dnode4.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/metrics/replica2_vnode3.sim b/tests/script/unique/metrics/replica2_vnode3.sim
index ab808b8603..aed98aceff 100644
--- a/tests/script/unique/metrics/replica2_vnode3.sim
+++ b/tests/script/unique/metrics/replica2_vnode3.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
diff --git a/tests/script/unique/metrics/replica3_dnode6.sim b/tests/script/unique/metrics/replica3_dnode6.sim
index 799633b8f0..974bc793ad 100644
--- a/tests/script/unique/metrics/replica3_dnode6.sim
+++ b/tests/script/unique/metrics/replica3_dnode6.sim
@@ -1,18 +1,18 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
+
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
+system sh/deploy.sh -n dnode6 -i 6
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/unique/metrics/replica3_vnode3.sim b/tests/script/unique/metrics/replica3_vnode3.sim
index aee839e80f..379b7357c7 100644
--- a/tests/script/unique/metrics/replica3_vnode3.sim
+++ b/tests/script/unique/metrics/replica3_vnode3.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/mnode/backup/mgmt44.sim b/tests/script/unique/mnode/backup/mgmt44.sim
deleted file mode 100644
index 6eb70c7fb2..0000000000
--- a/tests/script/unique/mnode/backup/mgmt44.sim
+++ /dev/null
@@ -1,240 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-
-system sh/cfg.sh -n dnode1 -c numOfMPeers -v 4
-system sh/cfg.sh -n dnode2 -c numOfMPeers -v 4
-system sh/cfg.sh -n dnode3 -c numOfMPeers -v 4
-system sh/cfg.sh -n dnode4 -c numOfMPeers -v 4
-
-print ============================ step1
-print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
-
-$x = 0
-connectTbase: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql connect -x connectTbase
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-
-print ============================ step2
-print ========= start dnode2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-
-print ============================ step3
-print ========= start dnode3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-
-print ============================ step4
-print ========= start dnode4
-system sh/exec.sh -n dnode4 -s start
-sql create dnode 192.168.0.4
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-
-print ============================ step5
-print ========= drop dnode2
-sql drop dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode2 -s start
-
-print ============================ step6
-print ========= create dnode2
-sql create dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-
-print ============================ step7
-print ========= stop dnode1
-system sh/exec.sh -n dnode1 -s stop
-sleep 10000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-
-if $dnode1Role != undecided then
-  return -1
-endi
-
-print ============================ step8
-print ========= drop dnode1
-sql drop dnode 192.168.0.1
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-
-if $dnode1Role != null then
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-system sh/exec.sh -n dnode4 -s stop
\ No newline at end of file
diff --git a/tests/script/unique/mnode/backup/mgmt45.sim b/tests/script/unique/mnode/backup/mgmt45.sim
deleted file mode 100644
index 53b02847e6..0000000000
--- a/tests/script/unique/mnode/backup/mgmt45.sim
+++ /dev/null
@@ -1,336 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-
-system sh/cfg.sh -n dnode1 -c numOfMPeers -v 4
-system sh/cfg.sh -n dnode2 -c numOfMPeers -v 4
-system sh/cfg.sh -n dnode3 -c numOfMPeers -v 4
-system sh/cfg.sh -n dnode4 -c numOfMPeers -v 4
-system sh/cfg.sh -n dnode5 -c numOfMPeers -v 4
-
-print ============================ step1
-print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
-
-$x = 0
-connectTbase: 
-	$x = $x + 1
-	sleep 1000
-	if $x == 20 then 
-	  return -1
-	endi
-sql connect -x connectTbase
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step2
-print ========= start dnode2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step3
-print ========= start dnode3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step4
-print ========= start dnode4
-system sh/exec.sh -n dnode4 -s start
-sql create dnode 192.168.0.4
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step5
-print ========= start dnode5
-system sh/exec.sh -n dnode5 -s start
-sql create dnode 192.168.0.5
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step6
-print ========= drop dnode2
-sql drop dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode2 -s start
-
-print ============================ step7
-print ========= create dnode2
-sql create dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-print ============================ step8
-print ========= stop dnode1
-system sh/exec.sh -n dnode1 -s stop
-sleep 14000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != undecided then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != master then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-print ============================ step9
-print ========= stop dnode1
-sql drop dnode 192.168.0.1
-sleep 8000
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != null then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != master then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-system sh/exec.sh -n dnode4 -s stop
-system sh/exec.sh -n dnode5 -s stop
\ No newline at end of file
diff --git a/tests/script/unique/mnode/backup/mgmt55.sim b/tests/script/unique/mnode/backup/mgmt55.sim
deleted file mode 100644
index 0e2b9fa2ef..0000000000
--- a/tests/script/unique/mnode/backup/mgmt55.sim
+++ /dev/null
@@ -1,328 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-
-system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5
-
-print ============================ step1
-print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
-sleep 4000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step2
-print ========= start dnode2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step3
-print ========= start dnode3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step4
-print ========= start dnode4
-system sh/exec.sh -n dnode4 -s start
-sql create dnode 192.168.0.4
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step5
-print ========= start dnode5
-system sh/exec.sh -n dnode5 -s start
-sql create dnode 192.168.0.5
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-print ============================ step6
-print ========= drop dnode2
-sql drop dnode 192.168.0.2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode2 -s start
-
-print ============================ step7
-print ========= create dnode2
-sql create dnode 192.168.0.2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-print ============================ step8
-print ========= stop dnode1
-system sh/exec.sh -n dnode1 -s stop
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != undecided then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != master then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-print ============================ step9
-print ========= stop dnode1
-sql drop dnode 192.168.0.1
-sleep 8000
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != null then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != master then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-system sh/exec.sh -n dnode4 -s stop
-system sh/exec.sh -n dnode5 -s stop
\ No newline at end of file
diff --git a/tests/script/unique/mnode/backup/mgmt56.sim b/tests/script/unique/mnode/backup/mgmt56.sim
deleted file mode 100644
index 3171ed855d..0000000000
--- a/tests/script/unique/mnode/backup/mgmt56.sim
+++ /dev/null
@@ -1,394 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-
-system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode6 -c tsNumOfMPeers -v 5
-
-print ============================ step1
-print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
-sleep 4000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step2
-print ========= start dnode2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step3
-print ========= start dnode3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step4
-print ========= start dnode4
-system sh/exec.sh -n dnode4 -s start
-sql create dnode 192.168.0.4
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step5
-print ========= start dnode5
-system sh/exec.sh -n dnode5 -s start
-sql create dnode 192.168.0.5
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-
-print ============================ step6
-print ========= start dnode6
-system sh/exec.sh -n dnode6 -s start
-sql create dnode 192.168.0.6
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-if $dnode6Role != null then
-  return -1
-endi
-
-print ============================ step7
-print ========= drop dnode2
-sql drop dnode 192.168.0.2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-if $dnode6Role != slave then
-  return -1
-endi
-
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode2 -s start
-
-print ============================ step8
-print ========= create dnode2
-sql create dnode 192.168.0.2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-if $dnode6Role != slave then
-  return -1
-endi
-
-print ============================ step9
-print ========= stop dnode1
-system sh/exec.sh -n dnode1 -s stop
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-if $dnode1Role != undecided then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != master then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-if $dnode6Role != slave then
-  return -1
-endi
-
-print ============================ step10
-print ========= stop dnode1
-sql drop dnode 192.168.0.1
-sleep 8000
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-
-if $dnode1Role != null then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != master then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-if $dnode6Role != slave then
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-system sh/exec.sh -n dnode4 -s stop
-system sh/exec.sh -n dnode5 -s stop
-system sh/exec.sh -n dnode6 -s stop
\ No newline at end of file
diff --git a/tests/script/unique/mnode/backup/mgmt57.sim b/tests/script/unique/mnode/backup/mgmt57.sim
deleted file mode 100644
index 8c6950a8df..0000000000
--- a/tests/script/unique/mnode/backup/mgmt57.sim
+++ /dev/null
@@ -1,408 +0,0 @@
-system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
-system sh/ip.sh -i 6 -s up
-system sh/ip.sh -i 7 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
-system sh/deploy.sh -n dnode6 -m 192.168.0.1 -i 192.168.0.6
-system sh/deploy.sh -n dnode7 -m 192.168.0.1 -i 192.168.0.7
-
-system sh/cfg.sh -n dnode1 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode2 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode3 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode4 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode5 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode6 -c tsNumOfMPeers -v 5
-system sh/cfg.sh -n dnode7 -c tsNumOfMPeers -v 5
-
-print ============================ step1
-print ========= start dnode1
-system sh/exec.sh -n dnode1 -s start
-sleep 4000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step2
-print ========= start dnode2
-system sh/exec.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != null then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step3
-print ========= start dnode3
-system sh/exec.sh -n dnode3 -s start
-sql create dnode 192.168.0.3
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != null then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step4
-print ========= start dnode4
-system sh/exec.sh -n dnode4 -s start
-sql create dnode 192.168.0.4
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != null then
-  return -1
-endi
-
-print ============================ step5
-print ========= start dnode5
-system sh/exec.sh -n dnode5 -s start
-sql create dnode 192.168.0.5
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-
-print ============================ step6
-print ========= start dnode6
-system sh/exec.sh -n dnode6 -s start
-sql create dnode 192.168.0.6
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-if $dnode6Role != null then
-  return -1
-endi
-
-
-print ============================ step7
-print ========= start dnode7
-system sh/exec.sh -n dnode7 -s start
-sql create dnode 192.168.0.7
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != slave then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-if $dnode6Role != null then
-  return -1
-endi
-
-print ============================ step8
-print ========= drop dnode2
-sql drop dnode 192.168.0.2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode2 -s start
-
-print ============================ step9
-print ========= create dnode2
-sql create dnode 192.168.0.2
-sleep 6000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-
-if $dnode1Role != master then
-  return -1
-endi
-if $dnode2Role != null then
-  return -1
-endi
-if $dnode3Role != slave then
-  return -1
-endi
-if $dnode4Role != slave then
-  return -1
-endi
-if $dnode5Role != slave then
-  return -1
-endi
-
-print ============================ step10
-print ========= stop dnode1
-system sh/exec.sh -n dnode1 -s stop
-sleep 8000
-
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-if $dnode1Role != undecided then
-  return -1
-endi
-if $dnode3Role != master then
-  return -1
-endi
-
-print ============================ step11
-print ========= stop dnode1
-sql drop dnode 192.168.0.1
-sleep 8000
-sql show mnodes
-$dnode1Role = $data3_192.168.0.1
-$dnode2Role = $data3_192.168.0.2
-$dnode3Role = $data3_192.168.0.3
-$dnode4Role = $data3_192.168.0.4
-$dnode5Role = $data3_192.168.0.5
-$dnode6Role = $data3_192.168.0.6
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
-print 192.168.0.5 ==> $dnode5Role
-print 192.168.0.6 ==> $dnode6Role
-
-
-if $dnode1Role != null then
-  return -1
-endi
-if $dnode3Role != master then
-  return -1
-endi
-
-system sh/exec.sh -n dnode1 -s stop
-system sh/exec.sh -n dnode2 -s stop
-system sh/exec.sh -n dnode3 -s stop
-system sh/exec.sh -n dnode4 -s stop
-system sh/exec.sh -n dnode5 -s stop
-system sh/exec.sh -n dnode6 -s stop
-system sh/exec.sh -n dnode7 -s stop
\ No newline at end of file
diff --git a/tests/script/unique/mnode/mgmt22.sim b/tests/script/unique/mnode/mgmt22.sim
index 9081e50ef5..5e2b5623e3 100644
--- a/tests/script/unique/mnode/mgmt22.sim
+++ b/tests/script/unique/mnode/mgmt22.sim
@@ -1,35 +1,26 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-
 print ============== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
   return -1
 endi
 
 print ============== step2
 system sh/exec_up.sh -n dnode2 -s start
-sql create dnode 192.168.0.2
+sql create dnode $hostname2
 
 $x = 0
 show2: 
@@ -40,12 +31,12 @@ show2:
 	endi
 	
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
 	goto show2
 endi
-if $data3_2 != slave then
+if $data2_2 != slave then
 	goto show2
 endi
 
@@ -76,12 +67,12 @@ show6:
 	endi
 	
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
 	goto show6
 endi
-if $data3_2 != slave then
+if $data2_2 != slave then
 	goto show6
 endi
 
@@ -99,13 +90,13 @@ show7:
 	endi
 	
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-print 192.168.0.3 ==> $data3_3
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data3_3
+if $data2_1 != master then
 	goto show7
 endi
-if $data3_2 != slave then
+if $data2_2 != slave then
 	goto show7
 endi
 if $data3_3 != null then
diff --git a/tests/script/unique/mnode/mgmt23.sim b/tests/script/unique/mnode/mgmt23.sim
index c5ab9e27ea..6e2f0c8f56 100644
--- a/tests/script/unique/mnode/mgmt23.sim
+++ b/tests/script/unique/mnode/mgmt23.sim
@@ -1,29 +1,20 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-
 print ============== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
   return -1
 endi
 
@@ -40,12 +31,12 @@ show2:
 	endi
 
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
 	goto show2
 endi
-if $data3_2 != slave then
+if $data2_2 != slave then
 	goto show2
 endi
 
@@ -58,9 +49,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -80,9 +71,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -99,9 +90,8 @@ system sh/exec_up.sh -n dnode2 -s stop
 print ============== step5
 sleep 2000
 sql create dnode 192.168.0.2
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3
 system sh/exec_up.sh -n dnode2 -s start
 sleep 8000
 
@@ -109,9 +99,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
diff --git a/tests/script/unique/mnode/mgmt24.sim b/tests/script/unique/mnode/mgmt24.sim
index dac3ca4cc0..22454c8b5f 100644
--- a/tests/script/unique/mnode/mgmt24.sim
+++ b/tests/script/unique/mnode/mgmt24.sim
@@ -1,29 +1,20 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-
 print ============== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
   return -1
 endi
 
@@ -40,12 +31,12 @@ show2:
 	endi
 	
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
 	goto show2
 endi
-if $data3_2 != slave then
+if $data2_2 != slave then
 	goto show2
 endi
 
@@ -73,12 +64,12 @@ step5:
 
 sql show mnodes -x step5
     
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
 	goto step5
 endi
-if $data3_2 != slave then
+if $data2_2 != slave then
 	goto step5
 endi
 
diff --git a/tests/script/unique/mnode/mgmt25.sim b/tests/script/unique/mnode/mgmt25.sim
index 4f5e2bf3c8..652492db45 100644
--- a/tests/script/unique/mnode/mgmt25.sim
+++ b/tests/script/unique/mnode/mgmt25.sim
@@ -1,29 +1,20 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-
 print ============== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
   return -1
 endi
 
@@ -40,12 +31,12 @@ show2:
 	endi
 	
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
 	goto show2
 endi
-if $data3_2 != slave then
+if $data2_2 != slave then
 	goto show2
 endi
 
@@ -58,9 +49,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -80,9 +71,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
diff --git a/tests/script/unique/mnode/mgmt26.sim b/tests/script/unique/mnode/mgmt26.sim
index 57c6003431..5ad095db0b 100644
--- a/tests/script/unique/mnode/mgmt26.sim
+++ b/tests/script/unique/mnode/mgmt26.sim
@@ -1,29 +1,20 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-
 print ============== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
   return -1
 endi
 
@@ -40,12 +31,12 @@ show2:
 	endi
 	
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+if $data2_1 != master then
 	goto show2
 endi
-if $data3_2 != slave then
+if $data2_2 != slave then
 	goto show2
 endi
 
@@ -58,9 +49,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -81,9 +72,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -97,9 +88,8 @@ endi
 
 print ============== step5
 system sh/exec_up.sh -n dnode2 -s stop
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3
 sleep 5000
 system sh/exec_up.sh -n dnode2 -s start
 sql create dnode 192.168.0.2
@@ -109,9 +99,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
diff --git a/tests/script/unique/mnode/mgmt33.sim b/tests/script/unique/mnode/mgmt33.sim
index b2235ca6dc..de28dc41a2 100644
--- a/tests/script/unique/mnode/mgmt33.sim
+++ b/tests/script/unique/mnode/mgmt33.sim
@@ -1,30 +1,21 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 3
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.2
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.2
-
 print ============== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
 
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-print 192.168.0.3 ==> $data3_3
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data3_3
+if $data2_1 != master then
   return -1
 endi
 if $data3_2 != null then
@@ -43,9 +34,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -66,9 +57,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -88,9 +79,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -105,9 +96,8 @@ endi
 system sh/exec_up.sh -n dnode2 -s stop
 sleep 3000
 
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3
 system sh/exec_up.sh -n dnode2 -s start
 
 print ============== step5
@@ -118,9 +108,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_4
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -140,9 +130,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_4
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != offline then
   return -1
@@ -162,9 +152,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != null then
   return -1
diff --git a/tests/script/unique/mnode/mgmt34.sim b/tests/script/unique/mnode/mgmt34.sim
index 1c12b2ee39..2ba090fe9e 100644
--- a/tests/script/unique/mnode/mgmt34.sim
+++ b/tests/script/unique/mnode/mgmt34.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 3
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
@@ -21,10 +21,10 @@ sleep 3000
 sql connect
 
 sql show mnodes
-print 192.168.0.1 ==> $data3_1
-print 192.168.0.2 ==> $data3_2
-print 192.168.0.3 ==> $data3_3
-if $data3_1 != master then
+print dnode1 ==> $data2_1
+print dnode2 ==> $data2_2
+print dnode3 ==> $data3_3
+if $data2_1 != master then
   return -1
 endi
 if $data3_2 != null then
@@ -44,10 +44,10 @@ $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
 $dnode4Role = $data3_4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != master then
   return -1
@@ -72,10 +72,10 @@ $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
 $dnode4Role = $data3_4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != master then
   return -1
@@ -101,10 +101,10 @@ $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
 $dnode4Role = $data3_4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != master then
   return -1
@@ -128,10 +128,10 @@ $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
 $dnode4Role = $data3_4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != master then
   return -1
@@ -149,9 +149,8 @@ endi
 system sh/exec_up.sh -n dnode2 -s stop
 sleep 3000
 
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 3
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3
 system sh/exec_up.sh -n dnode2 -s start
 
 print ============== step6
@@ -163,10 +162,10 @@ $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
 $dnode4Role = $data3_4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != master then
   return -1
@@ -190,10 +189,10 @@ $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
 $dnode4Role = $data3_4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != offline then
   return -1
@@ -208,10 +207,10 @@ $dnode1Role = $data3_1
 $dnode2Role = $data3_5
 $dnode3Role = $data3_3
 $dnode4Role = $data3_4
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
-print 192.168.0.4 ==> $dnode4Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
+print dnode4 ==> $dnode4Role
 
 if $dnode1Role != null then
   return -1
diff --git a/tests/script/unique/mnode/mgmtr2.sim b/tests/script/unique/mnode/mgmtr2.sim
index 666b8a7b33..60907c90ba 100644
--- a/tests/script/unique/mnode/mgmtr2.sim
+++ b/tests/script/unique/mnode/mgmtr2.sim
@@ -1,21 +1,12 @@
 system sh/stop_dnodes.sh
-
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode2 -c numOfMPeers -v 2
 system sh/cfg.sh -n dnode3 -c numOfMPeers -v 2
 
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.3
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.3
-system sh/cfg.sh -n dnode3 -c secondIp -v 192.168.0.3
-
 print ============== step1
 system sh/exec_up.sh -n dnode1 -s start
 sql connect
@@ -25,9 +16,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
@@ -70,9 +61,9 @@ sql show mnodes
 $dnode1Role = $data3_1
 $dnode2Role = $data3_2
 $dnode3Role = $data3_3
-print 192.168.0.1 ==> $dnode1Role
-print 192.168.0.2 ==> $dnode2Role
-print 192.168.0.3 ==> $dnode3Role
+print dnode1 ==> $dnode1Role
+print dnode2 ==> $dnode2Role
+print dnode3 ==> $dnode3Role
 
 if $dnode1Role != master then
   return -1
diff --git a/tests/script/unique/mnode/secondIp.sim b/tests/script/unique/mnode/secondIp.sim
index 6902c7d498..ae339c3d21 100644
--- a/tests/script/unique/mnode/secondIp.sim
+++ b/tests/script/unique/mnode/secondIp.sim
@@ -1,10 +1,6 @@
 system sh/stop_dnodes.sh
-
-system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2
-
-system sh/cfg.sh -n dnode1 -c secondIp -v 192.168.0.1
-system sh/cfg.sh -n dnode2 -c secondIp -v 192.168.0.1
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 
 print ========== step1 dnode2 start
 system sh/exec_up.sh -n dnode2 -s start
@@ -17,10 +13,10 @@ sleep 3000
 
 print ========== step3 
 sql show dnodes
-print 192.168.0.1 openvnodes $data3_1
-print 192.168.0.2 openvnodes $data3_2
-print 192.168.0.1 totalvnodes $data4_1
-print 192.168.0.2 totalvnodes $data4_2
+print dnode1 openvnodes $data3_1
+print dnode2 openvnodes $data3_2
+print dnode1 totalvnodes $data4_1
+print dnode2 totalvnodes $data4_2
 
 if $rows != 2 then 
   return -1
diff --git a/tests/script/unique/stream/metrics_balance.sim b/tests/script/unique/stream/metrics_balance.sim
index 9efb32060c..86137f8d13 100644
--- a/tests/script/unique/stream/metrics_balance.sim
+++ b/tests/script/unique/stream/metrics_balance.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c statusInterval -v 1
@@ -189,9 +189,9 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 0 then
   goto show1
@@ -214,9 +214,9 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show2
diff --git a/tests/script/unique/stream/metrics_replica1_dnode2.sim b/tests/script/unique/stream/metrics_replica1_dnode2.sim
index e55ffbefd7..c2a3c813c3 100644
--- a/tests/script/unique/stream/metrics_replica1_dnode2.sim
+++ b/tests/script/unique/stream/metrics_replica1_dnode2.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
diff --git a/tests/script/unique/stream/metrics_replica2_dnode2.sim b/tests/script/unique/stream/metrics_replica2_dnode2.sim
index a3bcd45048..d5631be8d4 100644
--- a/tests/script/unique/stream/metrics_replica2_dnode2.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode2.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
index 3731df7f27..6e3baf424c 100644
--- a/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode2_vnoden.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
diff --git a/tests/script/unique/stream/metrics_replica2_dnode3.sim b/tests/script/unique/stream/metrics_replica2_dnode3.sim
index 092232b061..a5756e711c 100644
--- a/tests/script/unique/stream/metrics_replica2_dnode3.sim
+++ b/tests/script/unique/stream/metrics_replica2_dnode3.sim
@@ -1,11 +1,11 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/stream/metrics_replica3_dnode4.sim b/tests/script/unique/stream/metrics_replica3_dnode4.sim
index 900e26f8da..7451347186 100644
--- a/tests/script/unique/stream/metrics_replica3_dnode4.sim
+++ b/tests/script/unique/stream/metrics_replica3_dnode4.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/stream/metrics_vnode_stop.sim b/tests/script/unique/stream/metrics_vnode_stop.sim
index 47eff851d7..20236276ea 100644
--- a/tests/script/unique/stream/metrics_vnode_stop.sim
+++ b/tests/script/unique/stream/metrics_vnode_stop.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
@@ -97,8 +97,8 @@ print =============   step6
 sql close
 system sh/exec.sh -n dnode1 -s stop
 system sh/exec.sh -n dnode2 -s stop
-system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/exec.sh -n dnode2 -s start
diff --git a/tests/script/unique/stream/table_balance.sim b/tests/script/unique/stream/table_balance.sim
index 4b77f25189..9bf9b9ed47 100644
--- a/tests/script/unique/stream/table_balance.sim
+++ b/tests/script/unique/stream/table_balance.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 4
 system sh/cfg.sh -n dnode1 -c statusInterval -v 1
@@ -124,9 +124,9 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 0 then
   goto show1
@@ -149,9 +149,9 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 2 then
   goto show2
diff --git a/tests/script/unique/stream/table_move.sim b/tests/script/unique/stream/table_move.sim
index 3a4c1c976f..fd03426dd5 100644
--- a/tests/script/unique/stream/table_move.sim
+++ b/tests/script/unique/stream/table_move.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
 system sh/cfg.sh -n dnode2 -c numOfTotalVnodes -v 8
@@ -161,9 +161,9 @@ show1:
 	endi
 sql show dnodes -x show1
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 6 then
   goto show1
@@ -186,9 +186,9 @@ show2:
 	endi
 sql show dnodes -x show2
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != 7 then
   goto show2
@@ -215,9 +215,9 @@ show6:
 	endi
 sql show dnodes -x show6
 $dnode1Vnodes = $data3_192.168.0.1
-print 192.168.0.1 $dnode1Vnodes
+print dnode1 $dnode1Vnodes
 $dnode2Vnodes = $data3_192.168.0.2
-print 192.168.0.2 $dnode2Vnodes
+print dnode2 $dnode2Vnodes
 
 if $dnode1Vnodes != null then
   goto show6
diff --git a/tests/script/unique/stream/table_replica1_dnode2.sim b/tests/script/unique/stream/table_replica1_dnode2.sim
index 5165732535..f087b815fe 100644
--- a/tests/script/unique/stream/table_replica1_dnode2.sim
+++ b/tests/script/unique/stream/table_replica1_dnode2.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
diff --git a/tests/script/unique/stream/table_replica2_dnode2.sim b/tests/script/unique/stream/table_replica2_dnode2.sim
index 177d2ec344..d35039f617 100644
--- a/tests/script/unique/stream/table_replica2_dnode2.sim
+++ b/tests/script/unique/stream/table_replica2_dnode2.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/exec.sh -n dnode1 -s start
diff --git a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
index ace39d0604..581a4ab06b 100644
--- a/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
+++ b/tests/script/unique/stream/table_replica2_dnode2_vnoden.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfTotalVnodes -v 8
diff --git a/tests/script/unique/stream/table_replica2_dnode3.sim b/tests/script/unique/stream/table_replica2_dnode3.sim
index 658a3dd00c..302b006b21 100644
--- a/tests/script/unique/stream/table_replica2_dnode3.sim
+++ b/tests/script/unique/stream/table_replica2_dnode3.sim
@@ -1,11 +1,11 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/stream/table_replica3_dnode4.sim b/tests/script/unique/stream/table_replica3_dnode4.sim
index 60cab2574e..5fbd27ad42 100644
--- a/tests/script/unique/stream/table_replica3_dnode4.sim
+++ b/tests/script/unique/stream/table_replica3_dnode4.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/stream/table_vnode_stop.sim b/tests/script/unique/stream/table_vnode_stop.sim
index c4548dda59..05ad2d6a5f 100644
--- a/tests/script/unique/stream/table_vnode_stop.sim
+++ b/tests/script/unique/stream/table_vnode_stop.sim
@@ -1,9 +1,9 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numOfMPeers -v 2
@@ -98,8 +98,8 @@ print =============   step6
 sql close
 system sh/exec.sh -n dnode1 -s stop
 system sh/exec.sh -n dnode2 -s stop
-system sh/deploy.sh -n dnode1 -m 192.168.0.2 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.2 -i 192.168.0.2
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 sleep 2000
diff --git a/tests/script/unique/table/delete_part.sim b/tests/script/unique/table/delete_part.sim
index dae57366d0..189bd6c431 100644
--- a/tests/script/unique/table/delete_part.sim
+++ b/tests/script/unique/table/delete_part.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/unique/vnode/backup/replica4.sim b/tests/script/unique/vnode/backup/replica4.sim
index c6eeeca58f..5334b21d53 100644
--- a/tests/script/unique/vnode/backup/replica4.sim
+++ b/tests/script/unique/vnode/backup/replica4.sim
@@ -1,14 +1,14 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/unique/vnode/backup/replica5.sim b/tests/script/unique/vnode/backup/replica5.sim
index 3a4f28bdc2..e2e45c0e25 100644
--- a/tests/script/unique/vnode/backup/replica5.sim
+++ b/tests/script/unique/vnode/backup/replica5.sim
@@ -1,16 +1,16 @@
 system sh/stop_dnodes.sh
 
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/ip.sh -i 5 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
-system sh/deploy.sh -n dnode5 -m 192.168.0.1 -i 192.168.0.5
+
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
+system sh/deploy.sh -n dnode5 -i 5
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/unique/vnode/commit.sim b/tests/script/unique/vnode/commit.sim
index 572f4e08ec..67f6f027b8 100644
--- a/tests/script/unique/vnode/commit.sim
+++ b/tests/script/unique/vnode/commit.sim
@@ -1,8 +1,8 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
diff --git a/tests/script/unique/vnode/many.sim b/tests/script/unique/vnode/many.sim
index b5b87fc108..ca1475190c 100644
--- a/tests/script/unique/vnode/many.sim
+++ b/tests/script/unique/vnode/many.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/vnode/replica2_basic.sim b/tests/script/unique/vnode/replica2_basic.sim
index 647d692e8e..2926873750 100644
--- a/tests/script/unique/vnode/replica2_basic.sim
+++ b/tests/script/unique/vnode/replica2_basic.sim
@@ -1,8 +1,8 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode1 -c numofMpeers -v 3
@@ -120,7 +120,7 @@ endi
 
 print =================== step 8
 system sh/ip.sh -i 1 -s down
-system sh/ip.sh -i 2 -s up
+
 sleep 2000
 $y = $x + $N
 $expect = $N * 6
@@ -137,7 +137,7 @@ if $rows != $expect then
 endi
 
 print =================== step 9
-system sh/ip.sh -i 2 -s up
+
 sleep 2000
 $y = $x + $N
 $expect = $N * 7
@@ -155,7 +155,7 @@ endi
 
 print =================== step 10
 system sh/ip.sh -i 2 -s down
-system sh/ip.sh -i 1 -s up
+
 sleep 2000
 $y = $x + $N
 $expect = $N * 8
@@ -172,7 +172,7 @@ if $rows != $expect then
 endi
 
 print =================== step 11
-system sh/ip.sh -i 2 -s up
+
 sleep 2000
 $y = $x + $N
 $expect = $N * 9
diff --git a/tests/script/unique/vnode/replica2_basic2.sim b/tests/script/unique/vnode/replica2_basic2.sim
index 9eb6b4a6ac..0380dfa588 100644
--- a/tests/script/unique/vnode/replica2_basic2.sim
+++ b/tests/script/unique/vnode/replica2_basic2.sim
@@ -1,13 +1,13 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
 
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
diff --git a/tests/script/unique/vnode/replica2_repeat.sim b/tests/script/unique/vnode/replica2_repeat.sim
index 9d7caacb59..d8d5c4089e 100644
--- a/tests/script/unique/vnode/replica2_repeat.sim
+++ b/tests/script/unique/vnode/replica2_repeat.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/vnode/replica3_basic.sim b/tests/script/unique/vnode/replica3_basic.sim
index b401e5fc4b..858c570fc4 100644
--- a/tests/script/unique/vnode/replica3_basic.sim
+++ b/tests/script/unique/vnode/replica3_basic.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/vnode/replica3_repeat.sim b/tests/script/unique/vnode/replica3_repeat.sim
index 299036dace..afdcda0dcf 100644
--- a/tests/script/unique/vnode/replica3_repeat.sim
+++ b/tests/script/unique/vnode/replica3_repeat.sim
@@ -1,12 +1,12 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/ip.sh -i 4 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
-system sh/deploy.sh -n dnode4 -m 192.168.0.1 -i 192.168.0.4
+
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
+system sh/deploy.sh -n dnode4 -i 4
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/script/unique/vnode/replica3_vgroup.sim b/tests/script/unique/vnode/replica3_vgroup.sim
index a88c6854be..50fa40629d 100644
--- a/tests/script/unique/vnode/replica3_vgroup.sim
+++ b/tests/script/unique/vnode/replica3_vgroup.sim
@@ -1,10 +1,10 @@
 system sh/stop_dnodes.sh
-system sh/ip.sh -i 1 -s up
-system sh/ip.sh -i 2 -s up
-system sh/ip.sh -i 3 -s up
-system sh/deploy.sh -n dnode1 -m 192.168.0.1 -i 192.168.0.1
-system sh/deploy.sh -n dnode2 -m 192.168.0.1 -i 192.168.0.2
-system sh/deploy.sh -n dnode3 -m 192.168.0.1 -i 192.168.0.3
+
+
+
+system sh/deploy.sh -n dnode1 -i 1
+system sh/deploy.sh -n dnode2 -i 2
+system sh/deploy.sh -n dnode3 -i 3
 system sh/cfg.sh -n dnode1 -c commitLog -v 0
 system sh/cfg.sh -n dnode2 -c commitLog -v 0
 system sh/cfg.sh -n dnode3 -c commitLog -v 0
diff --git a/tests/test-all.sh b/tests/test-all.sh
index 907ef4bedd..98ecd71dd8 100755
--- a/tests/test-all.sh
+++ b/tests/test-all.sh
@@ -40,7 +40,6 @@ fi
 
 totalPyFailed=`grep 'failed\|fault' pytest-out.txt | wc -l`
 if [ "$totalPyFailed" -ne "0" ]; then
-  cat pytest-out.txt
   echo -e "${RED} ### Total $totalPyFailed python case(s) failed! ### ${NC}"
   exit $totalPyFailed
 fi
diff --git a/tests/test/c/importOneRow.c b/tests/test/c/importOneRow.c
index 25eeb0b392..902cf46c3a 100644
--- a/tests/test/c/importOneRow.c
+++ b/tests/test/c/importOneRow.c
@@ -107,7 +107,7 @@ void* taos_execute(void *param) {
   char     fqdn[TSDB_FQDN_LEN];
   uint16_t port;
 
-  taosGetFqdnPortFromEp(tsMaster, fqdn, &port);
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
 
   void *taos = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port);
   if (taos == NULL) taos_error(taos);
diff --git a/tests/test/c/importPerTabe.c b/tests/test/c/importPerTabe.c
index e53707c55f..15b3fc2572 100644
--- a/tests/test/c/importPerTabe.c
+++ b/tests/test/c/importPerTabe.c
@@ -71,7 +71,7 @@ void createDbAndTable() {
   char     fqdn[TSDB_FQDN_LEN];
   uint16_t port;
 
-  taosGetFqdnPortFromEp(tsMaster, fqdn, &port);
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
 
   con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port);
   if (con == NULL) {
@@ -198,7 +198,7 @@ void *syncTest(void *param) {
   char     fqdn[TSDB_FQDN_LEN];
   uint16_t port;
 
-  taosGetFqdnPortFromEp(tsMaster, fqdn, &port);
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
 
   con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port);
   if (con == NULL) {
diff --git a/tests/test/c/insertPerRow.c b/tests/test/c/insertPerRow.c
index 7d17283b88..6b5a678093 100644
--- a/tests/test/c/insertPerRow.c
+++ b/tests/test/c/insertPerRow.c
@@ -70,7 +70,7 @@ void createDbAndTable() {
 
   char fqdn[TSDB_FQDN_LEN];
   uint16_t port;
-  taosGetFqdnPortFromEp(tsMaster, fqdn, &port);
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
   con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port);
   if (con == NULL) {
     pError("failed to connect to DB, reason:%s", taos_errstr(con));
@@ -197,7 +197,7 @@ void *syncTest(void *param) {
   char     fqdn[TSDB_FQDN_LEN];
   uint16_t port;
 
-  taosGetFqdnPortFromEp(tsMaster, fqdn, &port);
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
   con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port);
   if (con == NULL) {
     pError("index:%d, failed to connect to DB, reason:%s", pInfo->threadIndex, taos_errstr(con));
diff --git a/tests/test/c/insertPerTable.c b/tests/test/c/insertPerTable.c
index e280a72854..a439abec88 100644
--- a/tests/test/c/insertPerTable.c
+++ b/tests/test/c/insertPerTable.c
@@ -71,7 +71,7 @@ void createDbAndTable() {
   char     fqdn[TSDB_FQDN_LEN];
   uint16_t port;
 
-  taosGetFqdnPortFromEp(tsMaster, fqdn, &port);
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
 
   con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port);
   if (con == NULL) {
@@ -199,7 +199,7 @@ void *syncTest(void *param) {
   char     fqdn[TSDB_FQDN_LEN];
   uint16_t port;
 
-  taosGetFqdnPortFromEp(tsMaster, fqdn, &port);
+  taosGetFqdnPortFromEp(tsFirst, fqdn, &port);
 
   con = taos_connect(fqdn, tsDefaultUser, tsDefaultPass, NULL, port);
   if (con == NULL) {
diff --git a/tests/tsim/src/simExe.c b/tests/tsim/src/simExe.c
index dd7f268f3e..b407289c3a 100644
--- a/tests/tsim/src/simExe.c
+++ b/tests/tsim/src/simExe.c
@@ -36,7 +36,12 @@ void simLogSql(char *sql) {
   fflush(fp);
 }
 
+char *simParseHostName(char *varName);
 char *simGetVariable(SScript *script, char *varName, int varLen) {
+  if (strncmp(varName, "hostname", 8) == 0) {
+    return simParseHostName(varName);
+  }
+
   if (strncmp(varName, "error", varLen) == 0) return script->error;
 
   if (strncmp(varName, "rows", varLen) == 0) return script->rows;
diff --git a/tests/tsim/src/simSystem.c b/tests/tsim/src/simSystem.c
index 55f1c97d3e..bac68c22d3 100644
--- a/tests/tsim/src/simSystem.c
+++ b/tests/tsim/src/simSystem.c
@@ -19,6 +19,7 @@
 #include "tglobal.h"
 #include "ttimer.h"
 #include "tutil.h"
+#include "tsocket.h"
 
 SScript *simScriptList[MAX_MAIN_SCRIPT_NUM];
 SCommand simCmdList[SIM_CMD_END];
@@ -26,8 +27,50 @@ int simScriptPos = -1;
 int simScriptSucced = 0;
 int simDebugFlag = 135;
 void simCloseTaosdConnect(SScript *script);
+char simHostName[128];
+
+char *simParseHostName(char *varName) {
+  static char hostName[140];
+
+  int index = atoi(varName + 8);
+  int port = 7100;
+  switch (index) {
+    case 1:
+      port = 7100;
+      break;
+    case 2:
+      port = 7200;
+      break;
+    case 3:
+      port = 7300;
+      break;
+    case 4:
+      port = 7400;
+      break;
+    case 5:
+      port = 7500;
+      break;
+    case 6:
+      port = 7600;
+      break;
+    case 7:
+      port = 7700;
+      break;
+    case 8:
+      port = 7800;
+      break;
+    case 9:
+      port = 7900;
+      break;
+  }
+  
+  sprintf(hostName, "'%s:%d'", simHostName, port);
+  //simPrint("hostName:%s", hostName);
+  return hostName;
+}
 
 bool simSystemInit() {
+  taosGetFqdn(simHostName);
   taos_init();
   simInitsimCmdList();
   memset(simScriptList, 0, sizeof(SScript *) * MAX_MAIN_SCRIPT_NUM);