modify functions

tests/pytest/util/common.py

@@ -13,25 +13,70 @@
 
 import random
 import string
-import os
 from util.sql import tdSql
 from util.dnodes import tdDnodes
+import requests
+import time
 class TDCom:
     def init(self, conn, logSql):
         tdSql.init(conn.cursor(), logSql)
 
-    def cleanTb(self):
+    def preDefine(self):
+        header = {'Authorization': 'Basic cm9vdDp0YW9zZGF0YQ=='}
+        sql_url = "http://127.0.0.1:6041/rest/sql"
+        sqlt_url = "http://127.0.0.1:6041/rest/sqlt"
+        sqlutc_url = "http://127.0.0.1:6041/rest/sqlutc"
+        influx_url = "http://127.0.0.1:6041/influxdb/v1/write"
+        telnet_url = "http://127.0.0.1:6041/opentsdb/v1/put/telnet"
+        return header, sql_url, sqlt_url, sqlutc_url, influx_url, telnet_url
+
+    def restApiPost(self, sql):
+        requests.post(self.preDefine()[1], sql.encode("utf-8"), headers = self.preDefine()[0])
+
+    def createDb(self, dbname="test", db_update_tag=0):
+        if db_update_tag == 0:
+            self.restApiPost(f"drop database if exists {dbname}")
+            self.restApiPost(f"create database if not exists {dbname} precision 'us'")
+        else:
+            self.restApiPost(f"drop database if exists {dbname}")
+            self.restApiPost(f"create database if not exists {dbname} precision 'us' update 1")
+        tdSql.execute(f'use {dbname}')
+
+    def genUrl(self, url_type, dbname, precision):
+        if url_type == "influxdb":
+            if precision is None:
+                url = self.preDefine()[4] + "?" + "db=" + dbname
+            else:
+                url = self.preDefine()[4] + "?" + "db=" + dbname + "&precision=" + precision
+        elif url_type == "telnet":
+            url = self.preDefine()[5] + "/" + dbname
+        else:
+            url = self.preDefine()[1]
+        return url
+
+    def schemalessApiPost(self, sql, url_type="influxdb", dbname="test", precision=None):
+        if url_type == "influxdb":
+            url = self.genUrl(url_type, dbname, precision)
+        elif url_type == "telnet":
+            url = self.genUrl(url_type, dbname)
+        res = requests.post(url, sql.encode("utf-8"), headers = self.preDefine()[0])
+        return res
+
+    def cleanTb(self, type="taosc"):
+        '''
+            type is taosc or restful
+        '''
         query_sql = "show stables"
         res_row_list = tdSql.query(query_sql, True)
         stb_list = map(lambda x: x[0], res_row_list)
         for stb in stb_list:
+            if type == "taosc":
                 tdSql.execute(f'drop table if exists {stb}')
+            elif type == "restful":
+                self.restApiPost(f"drop table if exists {stb}")
 
-        query_sql = "show tables"
-        res_row_list = tdSql.query(query_sql, True)
-        tb_list = map(lambda x: x[0], res_row_list)
-        for tb in tb_list:
-            tdSql.execute(f'drop table if exists {tb}')
+    def dateToTs(self, datetime_input):
+        return int(time.mktime(time.strptime(datetime_input, "%Y-%m-%d %H:%M:%S.%f")))
 
     def getLongName(self, len, mode = "mixed"):
         """