From b5ca5aa05983f2600ea785bc8efbb8f71e57bc15 Mon Sep 17 00:00:00 2001
From: fumingwei <fumingwei@geedgenetworks.com>
Date: Mon, 17 Oct 2022 14:40:29 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E6=96=B0=E5=A2=9Ecompatible=5Fmode?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9,=E7=94=A8=E6=9D=A5=E9=80=82?=
 =?UTF-8?q?=E9=85=8D7400,9140=E7=8E=AF=E5=A2=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 images_build/client/dign_client/bin/client.py | 32 ++++++++++++-------
 scripts/tsg-diagnose-oneshot                  |  2 +-
 scripts/tsg-diagnose-periodical               |  2 +-
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/images_build/client/dign_client/bin/client.py b/images_build/client/dign_client/bin/client.py
index bf5d18c..f878ccc 100644
--- a/images_build/client/dign_client/bin/client.py
+++ b/images_build/client/dign_client/bin/client.py
@@ -1256,6 +1256,7 @@ class TsgDiagnose:
         self.dign_duration = 0
         self.max_service_function_index = 1
         self.list_service_function_index = []
+        self.compatible_mode = False
 
     def _get_dign_option(self):
         parser = argparse.ArgumentParser(description="Tsg Tools - tsg diagnose", epilog = "Example:help")
@@ -1265,11 +1266,13 @@ class TsgDiagnose:
         parser.add_argument('-l','--loop',  action='store_true', default = False, help='Tsg diagnose loop, exit when recv a signal')
         parser.add_argument('-m','--max_service_function_index',  type = int, default = 1, help='Specifies the max index of service_function,range:1-256')
         parser.add_argument('-d','--list_service_function_index', nargs='+', type = int, help='Specifies the list of service function index')
+        parser.add_argument('-o','--compatible_mode',  action='store_true', default = False, help='Tsg diagnose compatible mode to running')
         args = parser.parse_args()
         self.interval = args.interval
         self.loop = args.loop
         self.count = args.count
         self.config = args.configpath
+        self.compatible_mode = args.compatible_mode
         self.max_service_function_index = args.max_service_function_index
         self.list_service_function_index = args.list_service_function_index
         if self.count  == 0:
@@ -1362,19 +1365,24 @@ class TsgDiagnose:
         print(format(("Service function id:" + str(id_service_function) + ",Test  end  time: " + time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())),'=^70s'))
 
     def _dign_service_function_running(self):
-        if self.list_service_function_index == None:
-            for id_service_function in range(1,self.max_service_function_index + 1):
-                set_http_request_resolve(id_service_function)
-                set_dns_server_ip(id_service_function)
-                #print(REQUEST_RESOLVE)
-                self._dign_running(id_service_function)
+        if self.compatible_mode == True:
+            set_http_request_resolve(30)
+            set_dns_server_ip(35)
+            self._dign_running(1)
         else:
-            self.list_service_function_index.sort()
-            for id_service_function in self.list_service_function_index:
-                set_http_request_resolve(id_service_function)
-                set_dns_server_ip(id_service_function)
-                #print(REQUEST_RESOLVE)
-                self._dign_running(id_service_function)
+            if self.list_service_function_index == None:
+                for id_service_function in range(1,self.max_service_function_index + 1):
+                    set_http_request_resolve(id_service_function)
+                    set_dns_server_ip(id_service_function)
+                    #print(REQUEST_RESOLVE)
+                    self._dign_running(id_service_function)
+            else:
+                self.list_service_function_index.sort()
+                for id_service_function in self.list_service_function_index:
+                    set_http_request_resolve(id_service_function)
+                    set_dns_server_ip(id_service_function)
+                    #print(REQUEST_RESOLVE)
+                    self._dign_running(id_service_function)
 
     def dign_exec(self):
         self._get_dign_option()
diff --git a/scripts/tsg-diagnose-oneshot b/scripts/tsg-diagnose-oneshot
index 059bf3c..62970b4 100644
--- a/scripts/tsg-diagnose-oneshot
+++ b/scripts/tsg-diagnose-oneshot
@@ -51,6 +51,6 @@ if [ -f "$K3S_BIN_PATH" ]; then
 else
     systemctl start tsg-diagnose
     sleep 10
-    docker exec -it dign-client /bin/sh -c "python bin/client.py"
+    docker exec -it dign-client /bin/sh -c "python bin/client.py -o"
 fi
 
diff --git a/scripts/tsg-diagnose-periodical b/scripts/tsg-diagnose-periodical
index e758154..a7f4c2d 100644
--- a/scripts/tsg-diagnose-periodical
+++ b/scripts/tsg-diagnose-periodical
@@ -51,6 +51,6 @@ if [ -f "$K3S_BIN_PATH" ]; then
 else
     systemctl start tsg-diagnose
     sleep 10
-    docker exec -it dign-client /bin/sh -c "python bin/client.py -l"
+    docker exec -it dign-client /bin/sh -c "python bin/client.py -l -o"
 fi