整个底层代码重构

.idea/dictionaries/Administrator.xml

@@ -9,6 +9,7 @@
       <w>authtype</w>
       <w>bookid</w>
       <w>bookids</w>
+      <w>businessesid</w>
       <w>businessid</w>
       <w>businessids</w>
       <w>contextname</w>

WorkCase/API/DRule/test_drule_create.py

@@ -23,10 +23,10 @@ class TestDRuleCreate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试发现规则"
     base_iprange = "192.168.0.1-254"

WorkCase/API/DRule/test_drule_delete.py

@@ -24,10 +24,10 @@ class TestDRuleDelete(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试发现规则"
     base_iprange = "192.168.0.1-254"

WorkCase/API/DRule/test_drule_get.py

@@ -24,10 +24,10 @@ class TestDRuleGet(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试发现规则"
     base_iprange = "192.168.0.1-254"

WorkCase/API/DRule/test_drule_update.py

@@ -24,10 +24,10 @@ class TestDRuleUpdate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试发现规则"
     base_iprange = "192.168.0.1-254"

WorkCase/API/Host/test_host_create.py

@@ -28,10 +28,10 @@ class TestHostCreate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_group_id = 99

WorkCase/API/Host/test_host_delete.py

@@ -24,10 +24,10 @@ class TestHostDelete(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_groupid = 99

WorkCase/API/Host/test_host_get.py

@@ -26,10 +26,10 @@ class TestHostGet(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_groupid = 99

WorkCase/API/Host/test_host_update.py

@@ -26,10 +26,10 @@ class TestHostUpdate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_groupid = 99

WorkCase/API/HostGroup/test_hostgroup_create.py

@@ -22,10 +22,10 @@ class TestHostGroupCreate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试主机组"
 

WorkCase/API/HostGroup/test_hostgroup_delete.py

@@ -23,10 +23,10 @@ class TestHostGroupDelete(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试主机组"
 

WorkCase/API/HostGroup/test_hostgroup_get.py

@@ -23,10 +23,10 @@ class TestHostGroupGet(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试主机组"
 

WorkCase/API/HostGroup/test_hostgroup_update.py

@@ -24,10 +24,10 @@ class TestHostGroupUpdate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试主机组"
 

WorkCase/API/Items/test_items_get.py

@@ -27,10 +27,10 @@ class TestItemsGet(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_groupid = 99

WorkCase/API/Problem/test_problem_acknowledge.py

@@ -29,10 +29,10 @@ class TestProblemAcknowledge(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_name = "SS EVENT"

WorkCase/API/Problem/test_problem_get.py

@@ -22,10 +22,10 @@ class TestProblemGet(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     @classmethod

WorkCase/API/Problem/test_problem_getLatest.py

@@ -22,10 +22,10 @@ class TestProblemGetLatest(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     @classmethod

WorkCase/API/Trigger/test_trigger_create.py

@@ -24,10 +24,10 @@ class TestTriggerCreate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_name = "SS测试主机"

WorkCase/API/Trigger/test_trigger_delete.py

@@ -25,10 +25,10 @@ class TestTriggerDelete(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_description = "SS测试触发器-删除"

WorkCase/API/Trigger/test_trigger_get.py

@@ -26,10 +26,10 @@ class TestTriggerGet(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_description = "SS测试触发器型-查询"

WorkCase/API/Trigger/test_trigger_update.py

@@ -26,10 +26,10 @@ class TestTriggerUpdate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
     host = env["host_zabbix"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
+    db_url = env["db_url_zabbix"]
+    db_port = env["db_port_zabbix"]
+    db_user = env["db_user_zabbix"]
+    db_pw = env["db_pw_zabbix"]
     db_base = env["db_base_zabbix"]
 
     base_description = "SS测试触发器-更新"

WorkCase/API/__init__.py

@@ -5,6 +5,8 @@
 import allure
 
 from WorkApi.API.Problem.problem_get import ProblemGet
+from WorkApi.API.Trigger.trigger_create import TriggerCreate
+from WorkUtils.UtilsResponse import UtilsResponse
 
 
 class ApiBase(object):
@@ -12,6 +14,31 @@ class ApiBase(object):
         self.host = host
         self.token = None
 
+    @allure.step("断言返回结果：校验排序")
+    def check_sortfield(self, response, possible):
+        result = UtilsResponse().get_result(response=response)
+        UtilsResponse().check_sort(_list=result, key="groupid", possible=possible)
+
+    @allure.step("断言返回结果：校验返回数据的数量")
+    def check_num(self, response, num):
+        result = UtilsResponse().get_result(response=response)
+        assert len(result) == num
+
+    @allure.step("断言返回结果")
+    def check_code(self, response, code):
+        _code = UtilsResponse().get_code(response=response)
+        assert _code == code
+
+    @allure.step("断言返回错误信息")
+    def check_msg(self, response, msg):
+        _msg = UtilsResponse().get_msg(response=response)
+        assert _msg == msg
+
+    @allure.step("断言返回错误结果")
+    def check_status(self, response, status):
+        _status = UtilsResponse().get_status(response=response)
+        assert _status == status
+
     @allure.step("调用接口：problem.get")
     def problem_get(self, eventids=None, groupids=None, hostids=None, objectids=None, applicationids=None,
                     source=None, _object=None, acknowledged=None, suppressed=None, severities=None, evaltype=None,
@@ -56,3 +83,18 @@ class ApiBase(object):
         api.startSearch = startSearch
         api.get_response()
         return api.response
+
+    @allure.step("调用接口：trigger.create")
+    def trigger_create(self, description=None, expression=None, tags_tag=None, tags_value=None,
+                       priority=None, _type=None, correlation_mode=None, status=None):
+        api = TriggerCreate(_host=self.host)
+        api.description = description
+        api.expression = expression
+        api.priority = priority
+        api.type = _type
+        api.correlation_mode = correlation_mode
+        api.status = status
+        api.tags_tag = tags_tag
+        api.tags_value = tags_value
+        api.get_response()
+        return api.response
\ No newline at end of file

WorkCase/__init__.py

@@ -26,13 +26,18 @@ class CaseBase:
             # 阿蒙
             # "host": "http://172.16.3.25:3334",
             # 东方
-            "host": "http://172.16.3.78:3334",
+            "host": "http://172.16.3.78:3334/api",
             "db_url": "172.16.2.155",
             "db_port": 3306,
             "db_user": "root",
             "db_pw": "123456",
             "db_base": "argus",
-            "db_base_zabbix": "zabbix"
+
+            "db_url_zabbix": "172.16.2.153",
+            "db_port_zabbix": 3306,
+            "db_user_zabbix": "zmops",
+            "db_pw_zabbix": "0VMoH%W7|h",
+            "db_base_zabbix": "zabbix2"
             # "db_url": "172.16.2.153",
             # "db_port": 3306,
             # "db_user": "zmops",
@@ -73,5 +78,10 @@ class CaseBase:
             "db_user": "argus",
             "db_pw": "Argus@2019",
             "db_base": "argus",
-            "db_base_zabbix": "argus1"
+
+            "db_url_zabbix": "172.16.2.153",
+            "db_port_zabbix": 3306,
+            "db_user_zabbix": "zmops",
+            "db_pw_zabbix": "0VMoH%W7|h",
+            "db_base_zabbix": "zabbix"
         }
\ No newline at end of file