告警规则优化

WorkCase/APP/Rule/test_rule_create.py

@@ -48,7 +48,7 @@ class TestRuleCreate(object):
     base_host_name = "SS测试主机"
     base_name = "SS测试告警规则名称"
     base_template_id_agent = 10001
-    base_template_id_snmp = 10190
+    base_template_id_snmp = 10186
 
     @classmethod
     def setup_class(cls):
@@ -208,12 +208,12 @@ class TestRuleCreate(object):
         return api.response
 
     @allure.step("创建测试数据")
-    def case_create(self, num, item_key):
+    def case_create(self, num, hostType, item_key, snmpCommunity=None):
         name = self.base_host_name + num
         # 创建资产设备
-        response = self.device_create(token=self.token, hostName=name, hostType=self.base_type_agent,
+        response = self.device_create(token=self.token, hostName=name, hostType=hostType,
                                       iplist=self.base_ip, monitorInterface=self.base_port,
-                                      monitorType=1)
+                                      monitorType=1, snmpCommunity=snmpCommunity)
         self.check_code(response=response, code=0)
         # 得到host_id
         self.host_id = UtilsResponse().get_data(response=response)
@@ -282,10 +282,10 @@ class TestRuleCreate(object):
     def test_case_04(self):
         self.get_base_token()
         item_key = "system.cpu.load[percpu,avg15]"
-        self.case_create(num="04", item_key=item_key)
+        self.case_create(num="04", item_key=item_key, hostType=self.base_type_agent)
         name = self.base_name + "04"
         response = self.rule_create(token=self.token, name=name, severity=2, status=0, manualClose=0, triggersList_hostid=[self.host_id],
-                                    triggersList_hostName=[self.host_name], triggersList_itemid=[self.base_template_id_agent],
+                                    triggersList_hostName=[self.host_name], triggersList_itemid=[self.item_id],
                                     triggersList_itemName=[item_key], triggersList_function=["avg"],
                                     triggersList_operator=["="], triggersList_constant=[888],
                                     triggersList_parameters_unit=["m"], triggersList_parameters_value=[5])
@@ -299,7 +299,7 @@ class TestRuleCreate(object):
     def test_case_05(self):
         self.get_base_token()
         item_key = "agent.ping"
-        self.case_create(num="05", item_key=item_key)
+        self.case_create(num="05", item_key=item_key, hostType=self.base_type_agent)
         name = self.base_name + "05"
         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],
@@ -313,7 +313,7 @@ class TestRuleCreate(object):
     def test_case_06(self):
         self.get_base_token()
         item_key = "agent.ping"
-        self.case_create(num="06", item_key=item_key)
+        self.case_create(num="06", item_key=item_key, hostType=self.base_type_agent)
         name = self.base_name + "06"
         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],
@@ -327,15 +327,10 @@ class TestRuleCreate(object):
     def test_case_07(self):
         self.get_base_token()
         item_key = "icmpping"
-        self.case_create(num="07", item_key=item_key)
+        self.case_create(num="07", item_key=item_key, hostType=self.base_type_snmp, snmpCommunity="public")
         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=[item_id],
+                                    triggersList_hostName=[self.host_name], triggersList_itemid=[self.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])
@@ -346,15 +341,10 @@ class TestRuleCreate(object):
     def test_case_08(self):
         self.get_base_token()
         item_key = "icmpping"
-        self.case_create(num="08", item_key=item_key)
+        self.case_create(num="08", item_key=item_key, hostType=self.base_type_snmp, snmpCommunity="public")
         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=[item_id],
+                                    triggersList_hostName=[self.host_name], triggersList_itemid=[self.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])
@@ -365,7 +355,7 @@ class TestRuleCreate(object):
     def test_case_09(self):
         self.get_base_token()
         item_key = "system.cpu.load[percpu,avg15]"
-        self.case_create(num="09", item_key=item_key)
+        self.case_create(num="09", item_key=item_key, hostType=self.base_type_agent)
         name = self.base_name + "09"
         response = self.rule_create(token=self.token, name=name, severity=3, url="url", description="description",
                                     status=1, manualClose=1, triggersList_hostid=[self.host_id], enableTimeDefault=1,