告警规则模块调整

WorkCase/APP/Rule/test_rule_create.py

@@ -291,7 +291,7 @@ class TestRuleCreate(object):
                                     triggersList_parameters_unit=["m"], triggersList_parameters_value=[5])
         self.check_code(response=response, code=0)
         rule_id = UtilsResponse().get_data(response=response)
-        self.check_sql(rule_id=rule_id, name=name, severity=2, url="url", description="description", status=0, manualClose=0,
+        self.check_sql(rule_id=rule_id, name=name, severity=2, url=None, description=None, status=0, manualClose=0,
                        enableTimeDefault=0, period=None, periodType=None)
 
     @allure.title("rule.create：创建agent设备在线规则")
@@ -329,8 +329,13 @@ class TestRuleCreate(object):
         item_key = "icmpping"
         self.case_create(num="07", item_key=item_key)
         name = self.base_name + "07"
+        sql = self.select_hosts_items(key_=item_key, host_id=self.host_id)
+        item_id = 0
+        for x, y in enumerate(sql):
+            assert x == 0
+            item_id = y.id
         response = self.rule_create(token=self.token, name=name, severity=0, status=1, manualClose=1, triggersList_hostid=[self.host_id],
-                                    triggersList_hostName=[self.host_name], triggersList_itemid=[self.item_id],
+                                    triggersList_hostName=[self.host_name], triggersList_itemid=[item_id],
                                     triggersList_itemName=[item_key], triggersList_function=["avg"],
                                     triggersList_operator=["="], triggersList_constant=[888],
                                     triggersList_parameters_unit=["m"], triggersList_parameters_value=[5], triggersList_onlineFlag=[True])
@@ -343,8 +348,13 @@ class TestRuleCreate(object):
         item_key = "icmpping"
         self.case_create(num="08", item_key=item_key)
         name = self.base_name + "08"
+        sql = self.select_hosts_items(key_=item_key, host_id=self.host_id)
+        item_id = 0
+        for x, y in enumerate(sql):
+            assert x == 0
+            item_id = y.id
         response = self.rule_create(token=self.token, name=name, severity=0, status=1, manualClose=1, triggersList_hostid=[self.host_id],
-                                    triggersList_hostName=[self.host_name], triggersList_itemid=[self.item_id],
+                                    triggersList_hostName=[self.host_name], triggersList_itemid=[item_id],
                                     triggersList_itemName=[item_key], triggersList_function=["avg"],
                                     triggersList_operator=["="], triggersList_constant=[888],
                                     triggersList_parameters_unit=["m"], triggersList_parameters_value=[5], triggersList_onlineFlag=[False])

WorkCase/APP/Rule/test_rule_get.py

@@ -316,7 +316,7 @@ class TestRuleGet(object):
         self.check_code(response=response, code=0)
         data = UtilsResponse().get_data(response=response)
         for x, y in enumerate(data["list"]):
-            assert y["status"] == 0
+            assert y["name"] == self.name
 
 
 if __name__ == "__main__":