触发器删除

WorkCase/API/Trigger/test_trigger_create.py

@@ -37,7 +37,7 @@ class TestTriggerCreate(object):
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
         session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataTriggers().delete_description(session=session, description=cls.base_description)
+        DataTriggers().delete_like_description(session=session, description=cls.base_description)
 
     @classmethod
     def teardown_class(cls):

WorkCase/API/Trigger/test_trigger_delete.py

@@ -32,13 +32,13 @@ class TestTriggerDelete(object):
     db_base = env["db_base"]
     base_name = "SS测试主机原型"
     base_description = "SS测试触发器"
-    base_expression = "{Zabbix server:vfs.fs.size[{#FSNAME},pfree].last()}<20"
+    base_expression = "{Template OS Linux:agent.ping.nodata(5m)}=1"
 
     @classmethod
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
         session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataTriggers().delete_description(session=session, description=cls.base_description)
+        DataTriggers().delete_like_description(session=session, description=cls.base_description)
 
     @classmethod
     def teardown_class(cls):
@@ -61,10 +61,8 @@ class TestTriggerDelete(object):
         return api.response
 
     @allure.step("创建测试数据")
-    def case_create(self):
-        tags_tag = ["volume"]
-        tags_value = ["{#FSNAME}"]
-        response = self.trigger_create(description=self.base_description, expression=self.base_expression, tags_tag=tags_tag, tags_value=tags_value)
+    def case_create(self, num):
+        response = self.trigger_create(description=self.base_description + num, expression=self.base_expression)
         self.check_code(response=response, code=0)
         triggerid = UtilsResponse().get_result(response=response)["triggerids"][0]
         return triggerid
@@ -121,7 +119,7 @@ class TestTriggerDelete(object):
     @allure.story("删除触发器：删除的ID存在")
     @allure.severity("blocker")
     def test_case_01(self):
-        triggerid = self.case_create()
+        triggerid = self.case_create(num="01")
 
         response = self.trigger_delete(triggerids=[triggerid])
         self.check_code(response=response, code=0)
@@ -130,7 +128,7 @@ class TestTriggerDelete(object):
     @allure.title("trigger.delete：删除的ID不存在 500")
     @allure.story("删除触发器：删除的ID不存在 500")
     def test_case_02(self):
-        triggerid = self.case_create()
+        triggerid = self.case_create(num="02")
 
         response = self.trigger_delete(triggerids=[triggerid])
         self.check_code(response=response, code=0)
@@ -142,9 +140,9 @@ class TestTriggerDelete(object):
     @allure.title("trigger.delete：删除多个ID")
     @allure.story("删除触发器：删除多个ID")
     def test_case_03(self):
-        triggerid_1 = self.case_create()
-        triggerid_2 = self.case_create()
-        triggerid_3 = self.case_create()
+        triggerid_1 = self.case_create(num="021")
+        triggerid_2 = self.case_create(num="022")
+        triggerid_3 = self.case_create(num="023")
 
         response = self.trigger_delete(triggerids=[triggerid_1, triggerid_2, triggerid_3])
         self.check_code(response=response, code=0)

WorkCase/API/Trigger/test_trigger_get.py

@@ -33,13 +33,13 @@ class TestTriggerGet(object):
     db_base = env["db_base"]
     base_name = "SS测试主机原型"
     base_description = "SS测试触发器原型"
-    base_expression = "{Zabbix server:vfs.fs.size[{#FSNAME},pfree].last()}<20"
+    base_expression = "{Template OS Linux:agent.ping.nodata(5m)}=1"
 
     @classmethod
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
         session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataTriggers().delete_description(session=session, description=cls.base_description)
+        DataTriggers().delete_like_description(session=session, description=cls.base_description)
 
     @classmethod
     def teardown_class(cls):
@@ -62,10 +62,8 @@ class TestTriggerGet(object):
         return api.response
 
     @allure.step("创建测试数据")
-    def case_create(self):
-        tags_tag = ["volume"]
-        tags_value = ["{#FSNAME}"]
-        response = self.trigger_create(description=self.base_description, expression=self.base_expression, tags_tag=tags_tag, tags_value=tags_value)
+    def case_create(self, num):
+        response = self.trigger_create(description=self.base_description + num, expression=self.base_expression)
         self.check_code(response=response, code=0)
         triggerid = UtilsResponse().get_result(response=response)["triggerids"][0]
         return triggerid
@@ -182,15 +180,15 @@ class TestTriggerGet(object):
     @allure.title("trigger.get：triggerids=特定IDs, output=[description]")
     @allure.story("查询触发器：triggerids=特定IDs, output=[description]")
     def test_case_04(self):
-        # triggerid = self.case_create()
+        triggerid = self.case_create(num="04")
 
-        response = self.trigger_get(triggerids=[16241], output=["description", "expression"])
+        response = self.trigger_get(triggerids=[triggerid], output=["description", "expression"])
         self.check_code(response=response, code=0)
 
     @allure.title("trigger.get：triggerids=特定IDs, output=[description, status, value, flags]")
     @allure.story("查询触发器：triggerids=特定IDs, output=[description, status, value, flags]")
     def test_case_05(self):
-        triggerid = self.case_create()
+        triggerid = self.case_create(num="05")
 
         response = self.trigger_get(triggerids=[triggerid], output=["description", "status", "value", "flags"])
         self.check_code(response=response, code=0)

WorkCase/API/TriggerPrototype/test_triggerprototype_create.py

@@ -37,7 +37,7 @@ class TestTriggerPrototypeCreate(object):
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
         session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataTriggers().delete_description(session=session, description=cls.base_description)
+        DataTriggers().delete_like_description(session=session, description=cls.base_description)
 
     @classmethod
     def teardown_class(cls):

WorkCase/API/TriggerPrototype/test_triggerprototype_delete.py

@@ -38,7 +38,7 @@ class TestTriggerPrototypeDelete(object):
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
         session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataTriggers().delete_description(session=session, description=cls.base_description)
+        DataTriggers().delete_like_description(session=session, description=cls.base_description)
 
     @classmethod
     def teardown_class(cls):

WorkCase/API/TriggerPrototype/test_triggerprototype_get.py

@@ -39,7 +39,7 @@ class TestTriggerPrototypeGet(object):
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
         session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataTriggers().delete_description(session=session, description=cls.base_description)
+        DataTriggers().delete_like_description(session=session, description=cls.base_description)
 
     @classmethod
     def teardown_class(cls):

WorkCase/API/TriggerPrototype/test_triggerprototype_update.py

@@ -41,10 +41,10 @@ class TestTriggerPrototypeUpdate(object):
     def setup_class(cls):
         cls.log.debug("开始执行测试套件.......")
         session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataTriggers().delete_description(session=session, description=cls.base_description)
+        DataTriggers().delete_like_description(session=session, description=cls.base_description)
 
         session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataTriggers().delete_description(session=session, description=cls.new_description)
+        DataTriggers().delete_like_description(session=session, description=cls.new_description)
 
     @classmethod
     def teardown_class(cls):

WorkData/Zabbix/triggers.py

@@ -78,7 +78,7 @@ class DataTriggers(object):
             session.close()
             return error
 
-    def delete_description(self, session, description):
+    def delete_like_description(self, session, description):
         """
         :param session: 指针
         :param description:
@@ -87,7 +87,7 @@ class DataTriggers(object):
         self.log.debug("查询数据库:")
         try:
             self.log.debug("删除相关测试数据")
-            session.query(self.table).filter_by(description=description).delete(synchronize_session=False)
+            session.query(self.table).filte(self.table.description.like(description + "%")).delete(synchronize_session=False)
             # session.delete(sql)
             session.commit()
             session.close()
@@ -98,24 +98,3 @@ class DataTriggers(object):
             self.log.error(error)
             session.close()
             return error
-
-    def delete_description(self, session, description):
-        """
-        :param session: 指针
-        :param description:
-        :return:
-        """
-        self.log.debug("查询数据库:")
-        try:
-            self.log.debug("删除相关测试数据")
-            session.query(self.table).filter_by(description=description).delete(synchronize_session=False)
-            # session.delete(sql)
-            session.commit()
-            session.close()
-            self.log.debug("删除成功")
-            return True
-        except UtilsDataBase().errors as error:
-            self.log.error("异常:")
-            self.log.error(error)
-            session.close()
-            return error
\ No newline at end of file