触发器和触发器原型封装

.idea/dictionaries/Administrator.xml

@@ -2,16 +2,35 @@
   <dictionary name="Administrator">
     <words>
       <w>applicationids</w>
+      <w>discoveryids</w>
       <w>evaltype</w>
       <w>eventid</w>
       <w>eventids</w>
+      <w>groupid</w>
       <w>groupids</w>
+      <w>hostid</w>
       <w>hostids</w>
+      <w>hostmonitor</w>
+      <w>hostprototype</w>
+      <w>itemids</w>
+      <w>lastchange</w>
+      <w>mediatype</w>
+      <w>mediatypeids</w>
       <w>objectid</w>
       <w>objectids</w>
       <w>preservekeys</w>
+      <w>ruleid</w>
+      <w>ruleids</w>
+      <w>sanshi</w>
       <w>sortfield</w>
       <w>sortorder</w>
+      <w>templated</w>
+      <w>templateid</w>
+      <w>templateids</w>
+      <w>triggerid</w>
+      <w>triggerids</w>
+      <w>triggerprototype</w>
+      <w>zabbix</w>
       <w>zmops</w>
     </words>
   </dictionary>

WorkApi/API/Trigger/trigger_create.py

@@ -44,8 +44,11 @@ class TriggerCreate(object):
         self.correlation_mode = None
         self.correlation_tag = None
         self.manual_close = None
+
+        self.dependencies = None
         self.tags = None
 
+        self.dependencies_triggerid = None
         self.tags_tag = None
         self.tags_value = None
 
@@ -62,6 +65,15 @@ class TriggerCreate(object):
         else:
             pass
 
+        if self.dependencies_triggerid is not None:
+            self.dependencies = []
+            for x, y in enumerate(self.dependencies_triggerid):
+                base = ApiBase()
+                base.dict_add_key(_key="triggerid", value=self.dependencies_triggerid, num=x)
+                self.tags.append(base._json)
+        else:
+            pass
+
         base = ApiBase()
         base.dict_add_key(_key="triggerid", value=self.triggerid)
         base.dict_add_key(_key="description", value=self.description)
@@ -77,6 +89,7 @@ class TriggerCreate(object):
         base.dict_add_key(_key="correlation_mode", value=self.correlation_mode)
         base.dict_add_key(_key="correlation_tag", value=self.correlation_tag)
         base.dict_add_key(_key="manual_close", value=self.manual_close)
+        base.dict_add_key(_key="dependencies", value=self.dependencies)
         base.dict_add_key(_key="tags", value=self.tags)
 
         self.local_json = base._json

WorkApi/API/Trigger/trigger_delete.py

+# -*- coding: utf-8 -*-
+# 删除触发器
+# 作者: 陈磊
+# 时间: 2019-11-19
+from WorkApi.ApiBase import ApiBase
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+
+
+class TriggerDelete(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用删除触发器")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/trigger/delete"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self.local_json = {}
+        self.response = ""
+
+        self.triggerids = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        base = ApiBase()
+        base.dict_add_key(_key="triggerids", value=self.triggerids)
+        self.local_json = base._json
+        self._json = self.local_json
+        self.response = self.api.post(url=self._url, json=self._json)

WorkApi/API/Trigger/trigger_get.py

+# -*- coding: utf-8 -*-
+# 查询触发器
+# 作者: 陈磊
+# 时间: 2019-11-19
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase, GetBase
+
+
+class TriggerGet(GetBase):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        super().__init__()
+        self.log = UtilsLog()
+        self.log.info("调用查询触发器")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/trigger/get"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self._data = {}
+        self.response = ""
+
+        self.local_json = {}
+        self.triggerids = None
+        self.groupids = None
+        self.templateids = None
+        self.hostids = None
+        self.itemids = None
+        self.applicationids = None
+        self.functions = None
+        self.group = None
+        self.host = None
+        self.inherited = None
+        self.templated = None
+        self.dependent = None
+        self.monitored = None
+        self.active = None
+        self.maintenance = None
+        self.withUnacknowledgedEvents = None
+        self.withAcknowledgedEvents = None
+        self.withLastEventUnacknowledged = None
+        self.skipDependent = None
+        self.lastChangeSince = None
+        self.lastChangeTill = None
+        self.only_true = None
+        self.min_severity = None
+        self.evaltype = None
+        self.tags = None
+        self.expandComment = None
+        self.expandDescription = None
+        self.expandExpression = None
+        self.selectGroups = None
+        self.selectHosts = None
+        self.selectItems = None
+        self.selectFunctions = None
+        self.selectDependencies = None
+        self.selectDiscoveryRule = None
+        self.selectLastEvent = None
+        self.selectTags = None
+        self.selectTriggerDiscovery = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        self.get_base_json()
+
+        base = ApiBase()
+        base.dict_add_key(_key="triggerids", value=self.triggerids)
+        base.dict_add_key(_key="groupids", value=self.groupids)
+        base.dict_add_key(_key="templateids", value=self.templateids)
+        base.dict_add_key(_key="hostids", value=self.hostids)
+        base.dict_add_key(_key="itemids", value=self.itemids)
+        base.dict_add_key(_key="applicationids", value=self.applicationids)
+        base.dict_add_key(_key="functions", value=self.functions)
+        base.dict_add_key(_key="group", value=self.group)
+        base.dict_add_key(_key="host", value=self.host)
+        base.dict_add_key(_key="inherited", value=self.inherited)
+        base.dict_add_key(_key="templated", value=self.templated)
+        base.dict_add_key(_key="dependent", value=self.dependent)
+        base.dict_add_key(_key="monitored", value=self.monitored)
+        base.dict_add_key(_key="active", value=self.active)
+        base.dict_add_key(_key="maintenance", value=self.maintenance)
+        base.dict_add_key(_key="withUnacknowledgedEvents", value=self.withUnacknowledgedEvents)
+        base.dict_add_key(_key="withAcknowledgedEvents", value=self.withAcknowledgedEvents)
+        base.dict_add_key(_key="withLastEventUnacknowledged", value=self.withLastEventUnacknowledged)
+        base.dict_add_key(_key="skipDependent", value=self.skipDependent)
+        base.dict_add_key(_key="lastChangeSince", value=self.lastChangeSince)
+        base.dict_add_key(_key="lastChangeTill", value=self.lastChangeTill)
+        base.dict_add_key(_key="only_true", value=self.only_true)
+        base.dict_add_key(_key="min_severity", value=self.min_severity)
+        base.dict_add_key(_key="evaltype", value=self.evaltype)
+        base.dict_add_key(_key="tags", value=self.tags)
+        base.dict_add_key(_key="expandComment", value=self.expandComment)
+        base.dict_add_key(_key="expandDescription", value=self.expandDescription)
+        base.dict_add_key(_key="expandExpression", value=self.expandExpression)
+        base.dict_add_key(_key="selectGroups", value=self.selectGroups)
+        base.dict_add_key(_key="selectHosts", value=self.selectHosts)
+        base.dict_add_key(_key="selectItems", value=self.selectItems)
+        base.dict_add_key(_key="selectFunctions", value=self.selectFunctions)
+        base.dict_add_key(_key="selectDependencies", value=self.selectDependencies)
+        base.dict_add_key(_key="selectDiscoveryRule", value=self.selectDiscoveryRule)
+        base.dict_add_key(_key="selectLastEvent", value=self.selectLastEvent)
+        base.dict_add_key(_key="selectTags", value=self.selectTags)
+        base.dict_add_key(_key="selectTriggerDiscovery", value=self.selectTriggerDiscovery)
+
+        self.local_json = base._json
+
+        # self.log.debug(self.local_json)
+        # self.log.debug(self.base_json)
+
+        # 当前接口支持的参数与公共参数合并
+        add = ApiBase()
+        add.dict_add_dict(_dict_1=self.local_json, _dict_2=self.base_json)
+        self._json = add._json
+        self.response = self.api.post(url=self._url, json=self._json)

WorkApi/API/Trigger/trigger_update.py

+# -*- coding: utf-8 -*-
+# 更新触发器
+# 作者: 陈磊
+# 时间: 2019-11-19
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase
+
+
+class TriggerUpdate(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用更新触发器")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/trigger/update"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self.local_json = {}
+        self.response = ""
+
+        self.triggerid = None
+        self.description = None
+        self.expression = None
+        self.comments = None
+        self.error = None
+        self.flags = None
+        self.lastchange = None
+        self.priority = None
+        self.state = None
+        self.status = None
+        self.templateid = None
+        self.type = None
+        self.url = None
+        self.recovery_mode = None
+        self.recovery_expression = None
+        self.correlation_mode = None
+        self.correlation_tag = None
+        self.manual_close = None
+
+        self.dependencies = None
+        self.tags = None
+
+        self.dependencies_triggerid = None
+        self.tags_tag = None
+        self.tags_value = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        if self.tags_tag is not None:
+            self.tags = []
+            for x, y in enumerate(self.tags_tag):
+                base = ApiBase()
+                base.dict_add_key(_key="tag", value=self.tags_tag[x])
+                base.dict_add_key(_key="value", value=self.tags_value[x])
+                self.tags.append(base._json)
+        else:
+            pass
+
+        if self.dependencies_triggerid is not None:
+            self.dependencies = []
+            for x, y in enumerate(self.dependencies_triggerid):
+                base = ApiBase()
+                base.dict_add_key(_key="triggerid", value=self.dependencies_triggerid, num=x)
+                self.tags.append(base._json)
+        else:
+            pass
+
+        base = ApiBase()
+        base.dict_add_key(_key="triggerid", value=self.triggerid)
+        base.dict_add_key(_key="description", value=self.description)
+        base.dict_add_key(_key="expression", value=self.expression)
+        base.dict_add_key(_key="comments", value=self.comments)
+        base.dict_add_key(_key="priority", value=self.priority)
+        base.dict_add_key(_key="status", value=self.status)
+        base.dict_add_key(_key="templateid", value=self.templateid)
+        base.dict_add_key(_key="type", value=self.type)
+        base.dict_add_key(_key="url", value=self.url)
+        base.dict_add_key(_key="recovery_mode", value=self.recovery_mode)
+        base.dict_add_key(_key="recovery_expression", value=self.recovery_expression)
+        base.dict_add_key(_key="correlation_mode", value=self.correlation_mode)
+        base.dict_add_key(_key="correlation_tag", value=self.correlation_tag)
+        base.dict_add_key(_key="manual_close", value=self.manual_close)
+        base.dict_add_key(_key="dependencies", value=self.dependencies)
+        base.dict_add_key(_key="tags", value=self.tags)
+
+        self.local_json = base._json
+        self._json = self.local_json
+        self.response = self.api.post(url=self._url, json=[self._json])

WorkApi/API/TriggerPrototype/triggerPrototype_create.py

@@ -40,8 +40,11 @@ class TriggerPrototypeCreate(object):
         self.correlation_mode = None
         self.correlation_tag = None
         self.manual_close = None
+
+        self.dependencies = None
         self.tags = None
 
+        self.dependencies_triggerid = None
         self.tags_tag = None
         self.tags_value = None
 
@@ -58,6 +61,15 @@ class TriggerPrototypeCreate(object):
         else:
             pass
 
+        if self.dependencies_triggerid is not None:
+            self.dependencies = []
+            for x, y in enumerate(self.dependencies_triggerid):
+                base = ApiBase()
+                base.dict_add_key(_key="triggerid", value=self.dependencies_triggerid, num=x)
+                self.tags.append(base._json)
+        else:
+            pass
+
         base = ApiBase()
         base.dict_add_key(_key="triggerid", value=self.triggerid)
         base.dict_add_key(_key="description", value=self.description)
@@ -73,6 +85,7 @@ class TriggerPrototypeCreate(object):
         base.dict_add_key(_key="correlation_mode", value=self.correlation_mode)
         base.dict_add_key(_key="correlation_tag", value=self.correlation_tag)
         base.dict_add_key(_key="manual_close", value=self.manual_close)
+        base.dict_add_key(_key="dependencies", value=self.dependencies)
         base.dict_add_key(_key="tags", value=self.tags)
 
         self.local_json = base._json

WorkApi/API/TriggerPrototype/triggerPrototype_get.py

@@ -58,20 +58,20 @@ class TriggerPrototypeGet(GetBase):
         self.get_base_json()
 
         base = ApiBase()
-        base.dict_add_key(_key="groupids", value=self.active)
-        base.dict_add_key(_key="hostids", value=self.applicationids)
-        base.dict_add_key(_key="maintenanceids", value=self.discoveryids)
-        base.dict_add_key(_key="maintenanceids", value=self.functions)
-        base.dict_add_key(_key="groupids", value=self.group)
-        base.dict_add_key(_key="hostids", value=self.groupids)
-        base.dict_add_key(_key="maintenanceids", value=self.host)
-        base.dict_add_key(_key="maintenanceids", value=self.hostids)
-        base.dict_add_key(_key="groupids", value=self.inherited)
-        base.dict_add_key(_key="hostids", value=self.maintenance)
-        base.dict_add_key(_key="maintenanceids", value=self.min_severity)
-        base.dict_add_key(_key="maintenanceids", value=self.monitored)
-        base.dict_add_key(_key="groupids", value=self.templated)
-        base.dict_add_key(_key="hostids", value=self.templateids)
+        base.dict_add_key(_key="active", value=self.active)
+        base.dict_add_key(_key="applicationids", value=self.applicationids)
+        base.dict_add_key(_key="discoveryids", value=self.discoveryids)
+        base.dict_add_key(_key="functions", value=self.functions)
+        base.dict_add_key(_key="group", value=self.group)
+        base.dict_add_key(_key="groupids", value=self.groupids)
+        base.dict_add_key(_key="host", value=self.host)
+        base.dict_add_key(_key="hostids", value=self.hostids)
+        base.dict_add_key(_key="inherited", value=self.inherited)
+        base.dict_add_key(_key="maintenance", value=self.maintenance)
+        base.dict_add_key(_key="min_severity", value=self.min_severity)
+        base.dict_add_key(_key="monitored", value=self.monitored)
+        base.dict_add_key(_key="templated", value=self.templated)
+        base.dict_add_key(_key="templateids", value=self.templateids)
         base.dict_add_key(_key="triggerids", value=self.triggerids)
         base.dict_add_key(_key="expandExpression", value=self.expandExpression)
         base.dict_add_key(_key="selectDiscoveryRule", value=self.selectDiscoveryRule)

WorkApi/API/TriggerPrototype/triggerPrototype_update.py

@@ -40,8 +40,11 @@ class TriggerPrototypeUpdate(object):
         self.correlation_mode = None
         self.correlation_tag = None
         self.manual_close = None
+
+        self.dependencies = None
         self.tags = None
 
+        self.dependencies_triggerid = None
         self.tags_tag = None
         self.tags_value = None
 
@@ -58,6 +61,15 @@ class TriggerPrototypeUpdate(object):
         else:
             pass
 
+        if self.dependencies_triggerid is not None:
+            self.dependencies = []
+            for x, y in enumerate(self.dependencies_triggerid):
+                base = ApiBase()
+                base.dict_add_key(_key="triggerid", value=self.dependencies_triggerid, num=x)
+                self.tags.append(base._json)
+        else:
+            pass
+
         base = ApiBase()
         base.dict_add_key(_key="triggerid", value=self.triggerid)
         base.dict_add_key(_key="description", value=self.description)
@@ -73,6 +85,7 @@ class TriggerPrototypeUpdate(object):
         base.dict_add_key(_key="correlation_mode", value=self.correlation_mode)
         base.dict_add_key(_key="correlation_tag", value=self.correlation_tag)
         base.dict_add_key(_key="manual_close", value=self.manual_close)
+        base.dict_add_key(_key="dependencies", value=self.dependencies)
         base.dict_add_key(_key="tags", value=self.tags)
 
         self.local_json = base._json

WorkCase/API/TriggerPrototype/test_triggerprototype_update.py

@@ -126,7 +126,7 @@ class TestTriggerPrototypeUpdate(object):
             assert y.tag == tags_tag[x]
             assert y.value == tags_value[x]
 
-    @allure.title("hostprototype.update：修改name")
+    @allure.title("triggerprototype.update：修改name")
     @allure.story("更新主机原型：修改name")
     @allure.severity("blocker")
     def test_case_01(self):