From 266ac30d96336204f4ebe040faf624d01dcebb37 Mon Sep 17 00:00:00 2001
From: Alex Duan <417921451@qq.com>
Date: Sat, 23 Dec 2023 16:28:39 +0800
Subject: [PATCH] feat: support -L -D for test.py submit

---
 tests/army/frame/common.py        |  2 +-
 tests/army/frame/server/dnodes.py | 23 +++++++++++++++++------
 tests/army/test.py                |  7 ++++---
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/tests/army/frame/common.py b/tests/army/frame/common.py
index b8704080c0..5cdb3f9f46 100644
--- a/tests/army/frame/common.py
+++ b/tests/army/frame/common.py
@@ -23,7 +23,7 @@ import taos
 from frame.log import *
 from frame.sql import *
 from frame.cases import *
-from TDengine.tests.army.frame.server.dnodes import *
+from frame.server.dnodes import *
 from frame.common import *
 from frame.constant import *
 from dataclasses import dataclass,field
diff --git a/tests/army/frame/server/dnodes.py b/tests/army/frame/server/dnodes.py
index 7eee6f4bb6..8368a1573e 100644
--- a/tests/army/frame/server/dnodes.py
+++ b/tests/army/frame/server/dnodes.py
@@ -115,7 +115,7 @@ class TDSimClient:
 
 
 class TDDnode:
-    def __init__(self, index, level, disk):
+    def __init__(self, index=1, level=1, disk=1):
         self.index = index
         self.level = level
         self.disk  = disk
@@ -212,12 +212,19 @@ class TDDnode:
             self.remote_conn.run("python3 ./test.py %s -d %s -e %s"%(valgrindStr,remoteCfgDictStr,execCmdStr))
 
     def deploy(self, *updatecfgDict):
+        # logDir
         self.logDir = os.path.join(self.path,"sim","dnode%d" % self.index, "log")
+        # dataDir
         simPath = os.path.join(self.path, "sim", "dnode%d" % self.index)
-        for i in range(1, self.level):
-            for j in range(1, self.disk):
+        primary = 1
+        for i in range(self.level):
+            for j in range(self.disk):
                 eDir = os.path.join(simPath, f"data{i}{j}")
-                self.dataDir.append(eDir)
+                self.dataDir.append(f"{eDir} {i} {primary}")
+                if primary == 1:
+                    primary = 0
+
+        # taos.cfg
         self.cfgDir = os.path.join(self.path,"sim","dnode%d" % self.index, "cfg")
         self.cfgPath = os.path.join(self.path,"sim","dnode%d" % self.index, "cfg","taos.cfg")
         
@@ -238,7 +245,7 @@ class TDDnode:
         # if os.system(cmd) != 0:
         #     tdLog.exit(cmd)
         for eDir in self.dataDir:
-             os.makedirs(self.dataDir)
+             os.makedirs(eDir.split(' ')[0])
 
         # cmd = "mkdir -p " + self.logDir
         # if os.system(cmd) != 0:
@@ -284,7 +291,11 @@ class TDDnode:
                     self.addExtraCfg(key, value)
         if (self.remoteIP == ""):
             for key, value in self.cfgDict.items():
-                self.cfg(key, value)
+                if type(value) == list:
+                    for v in value:
+                        self.cfg(key, v)
+                else:
+                    self.cfg(key, value)
         else:
             self.remoteExec(self.cfgDict, "tdDnodes.deploy(%d,updateCfgDict)"%self.index)
 
diff --git a/tests/army/test.py b/tests/army/test.py
index 25cb9b383d..83d065b24b 100644
--- a/tests/army/test.py
+++ b/tests/army/test.py
@@ -114,8 +114,9 @@ if __name__ == "__main__":
     level = 1
     disk  = 1
 
-    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:N:M:Q:C:RWD:n:i:aP', [
-        'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'restart', 'updateCfgDict', 'killv', 'execCmd','dnodeNums','mnodeNums','queryPolicy','createDnodeNums','restful','websocket','adaptercfgupdate','replicaVar','independentMnode','previous'])
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:N:M:Q:C:RWU:n:i:aP:L:D:', [
+        'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'restart', 'updateCfgDict', 'killv', 'execCmd','dnodeNums','mnodeNums',
+        'queryPolicy','createDnodeNums','restful','websocket','adaptercfgupdate','replicaVar','independentMnode',"asan",'previous','level','disk'])
     for key, value in opts:
         if key in ['-h', '--help']:
             tdLog.printNoPrefix(
@@ -137,7 +138,7 @@ if __name__ == "__main__":
             tdLog.printNoPrefix('-C create Dnode Numbers in one cluster')
             tdLog.printNoPrefix('-R restful realization form')
             tdLog.printNoPrefix('-W websocket connection')
-            tdLog.printNoPrefix('-D taosadapter update cfg dict ')
+            tdLog.printNoPrefix('-U taosadapter update cfg dict ')
             tdLog.printNoPrefix('-n the number of replicas')
             tdLog.printNoPrefix('-i independentMnode Mnode')
             tdLog.printNoPrefix('-a address sanitizer mode')