From 3d8a75f8e5f1d8958b5313e59403261919c974bf Mon Sep 17 00:00:00 2001 From: byb11 Date: Sat, 8 May 2021 10:12:16 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9log=E7=BA=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=85=B3=E9=94=AE=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 04-CustomLibrary/Custometest/LogSchema.py | 44 ++++++++++------------- 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/04-CustomLibrary/Custometest/LogSchema.py b/04-CustomLibrary/Custometest/LogSchema.py index 00b4d73..52fbf70 100644 --- a/04-CustomLibrary/Custometest/LogSchema.py +++ b/04-CustomLibrary/Custometest/LogSchema.py @@ -261,11 +261,8 @@ def loglistverify(logurl, schemauerl, token, starttime, endtime, logtype, filter "fields": fields, "filter": filtervalue } - print(data) - print(json.dumps(data)) response1 = requests.post(url=url, data=json.dumps(data), headers=headers) code = response1.json()["code"] - print(response1.json()) assert code == 200 print(response1.json()["code"]) return response1.json() @@ -284,38 +281,35 @@ def distributed_query(logurl, token): #日志检索条件校验 纯接口 def LogRetrieve(schemaurl,host,port,token,logType,datajson): + number = random.randint(0, 2147483647) + str1 = random.choice('abcdefghijklmnopqrstuvwxyz') data=datajson["data"]["list"][0] keylist = LogResponseVAL.getKeys(data) a = schema(schemaurl, token) fields=a["data"]["fields"] for i in keylist: conditions = data[i] - if conditions != None: - for field in fields: - name = field["name"] - if i == name: - if field["type"] == "string": - filter = "logType=" + logType + "&" + "filter=" + i + "=" + "'" + conditions + "'" + for field in fields: + name = field["name"] + if i == name: + if field["type"] == "string": + filter = "logType=" + logType + "&" + "filter=" + i + "=" + "'" + str1 + "'" + Logurl = "http://" + host + ":" + port + "/v1/interface/gateway/sql/galaxy/log/filter/validation?" + filter + print(Logurl) + responsebody = distributed_query(Logurl, token) + else: + if i == "common_recv_time" or i == "common_start_time" or i == "common_end_time" or i == "common_processing_time": + timeArray = time.strptime(conditions, "%Y-%m-%d %H:%M:%S") + timeStamp = str(int(time.mktime(timeArray))) + filter = "logType=" + logType + "&" + "filter=" + i + "=" + timeStamp Logurl = "http://" + host + ":" + port + "/v1/interface/gateway/sql/galaxy/log/filter/validation?" + filter print(Logurl) responsebody = distributed_query(Logurl, token) else: - if i == "common_recv_time" or i == "common_start_time" or i == "common_end_time" or i == "common_processing_time": - timeArray = time.strptime(conditions, "%Y-%m-%d %H:%M:%S") - timeStamp = str(int(time.mktime(timeArray))) - filter = "logType=" + logType + "&" + "filter=" + i + "=" + timeStamp - Logurl = "http://" + host + ":" + port + "/v1/interface/gateway/sql/galaxy/log/filter/validation?" + filter - print(Logurl) - responsebody = distributed_query(Logurl, token) - else: - filter = "logType="+logType+"&"+"filter="+i+"="+conditions - Logurl = "http://"+host+":"+port+"/v1/interface/gateway/sql/galaxy/log/filter/validation?"+filter - print(Logurl) - responsebody = distributed_query(Logurl, token) - - - - + filter = "logType=" + logType + "&" + "filter=" + i + "=" + str(number) + Logurl = "http://" + host + ":" + port + "/v1/interface/gateway/sql/galaxy/log/filter/validation?" + filter + print(Logurl) + responsebody = distributed_query(Logurl, token) # 原始日志检索时间分布计算