整个底层代码换环境测试

WorkCase/API/DRule/test_drule_create.py

@@ -21,13 +21,13 @@ import allure
 @allure.feature("测试模块：drule.create")
 class TestDRuleCreate(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试发现规则"
     base_iprange = "192.168.0.1-254"
     base_delay = "1h"

WorkCase/API/DRule/test_drule_delete.py

@@ -22,13 +22,13 @@ import allure
 @allure.feature("测试模块：drule.delete")
 class TestDRuleDelete(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试发现规则"
     base_iprange = "192.168.0.1-254"
     base_delay = "1h"

WorkCase/API/DRule/test_drule_get.py

@@ -22,13 +22,13 @@ import allure
 @allure.feature("测试模块：drule.get")
 class TestDRuleGet(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试发现规则"
     base_iprange = "192.168.0.1-254"
     base_delay = "1h"

WorkCase/API/DRule/test_drule_update.py

@@ -22,13 +22,13 @@ import allure
 @allure.feature("测试模块：drule.update")
 class TestDRuleUpdate(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试发现规则"
     base_iprange = "192.168.0.1-254"
     base_delay = "1h"

WorkCase/API/Host/test_host_create.py

@@ -26,17 +26,17 @@ import allure
 @allure.feature("测试模块：host.create")
 class TestHostCreate(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
 
-    base_group_id = 101
-    base_name = "SS TEST HOST"
-    base_ip = "10.0.0.10"
+    base_group_id = 99
+    base_name = "SS TEST HOST CREATE"
+    base_ip = "172.16.3.170"
     base_host = "SS测试主机"
     base_description = "SS测试主机描述"
 

WorkCase/API/Host/test_host_delete.py

@@ -22,17 +22,17 @@ import allure
 @allure.feature("测试模块：host.delete")
 class TestHostDelete(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
 
-    base_groupid = 101
+    base_groupid = 99
     base_name = "SS TEST HOST DELETE"
-    base_ip = "10.0.0.10"
+    base_ip = "172.16.3.170"
     base_description = "SS自动化测试主机描述, 请勿删除"
 
     @classmethod
@@ -128,7 +128,7 @@ class TestHostDelete(object):
             "useip": 1,
             "ip": self.base_ip,
             "dns": "",
-            "port": 100,
+            "port": 161,
             "bulk": 1
         }
         response = self.host_create(host=host, description=description, groupids=[self.base_groupid],

WorkCase/API/Host/test_host_get.py

@@ -24,17 +24,17 @@ import allure
 @allure.feature("测试模块：host.get")
 class TestHostGet(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
 
-    base_groupid = 101
+    base_groupid = 99
     base_name = "SS TEST HOST GET"
-    base_ip = "10.0.0.10"
+    base_ip = "172.16.3.170"
     base_description = "SS自动化测试主机描述, 请勿删除"
 
     @classmethod
@@ -143,7 +143,7 @@ class TestHostGet(object):
             "useip": 1,
             "ip": self.base_ip,
             "dns": "",
-            "port": 100,
+            "port": 161,
             "bulk": 1
         }
         response = self.host_create(host=host, description=description, groupids=[self.base_groupid],

WorkCase/API/Host/test_host_update.py

@@ -24,18 +24,18 @@ import allure
 @allure.feature("测试模块：host.update")
 class TestHostUpdate(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
 
-    base_groupid = 101
+    base_groupid = 99
     base_name = "SS TEST HOST UPDATE"
-    base_ip = "10.0.0.10"
-    base_port = 100
+    base_ip = "172.16.3.170"
+    base_port = 161
     base_description = "SS自动化测试主机描述, 请勿删除"
 
     @classmethod

WorkCase/API/HostGroup/test_hostgroup_create.py

@@ -16,19 +16,17 @@ from WorkData.Zabbix.hstgrp import DataHstGrp
 
 import allure
 
-# allure.label("")
-
 
 @allure.feature("测试模块：hostgroup.create")
 class TestHostGroupCreate(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试主机组"
 
     @classmethod

WorkCase/API/HostGroup/test_hostgroup_delete.py

@@ -17,19 +17,17 @@ from WorkData.Zabbix.hstgrp import DataHstGrp
 
 import allure
 
-# allure.label("")
-
 
 @allure.feature("测试模块：hostgroup.delete")
 class TestHostGroupDelete(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试主机组"
 
     @classmethod

WorkCase/API/HostGroup/test_hostgroup_get.py

@@ -17,19 +17,17 @@ from WorkCase import CaseBase
 
 import allure
 
-# allure.label("")
-
 
 @allure.feature("测试模块：hostgroup.get")
 class TestHostGroupGet(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试主机组"
 
     @classmethod

WorkCase/API/HostGroup/test_hostgroup_update.py

@@ -22,13 +22,13 @@ import allure
 @allure.feature("测试模块：hostgroup.update")
 class TestHostGroupUpdate(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
     base_name = "SS自动化测试主机组"
 
     @classmethod

WorkCase/API/HostInterface/test_hostinterface_delete.py

-# -*- coding: utf-8 -*-
-# 测试用例
-# 作者: 陈磊
-# 时间: 2019-11-12
-
-
-from __future__ import division
-
-from WorkApi.API.Host.host_create import HostCreate
-from WorkCase import CaseBase
-from WorkUtils.UtilsLog import UtilsLog
-from WorkUtils.UtilsDataBase import UtilsDataBase
-from WorkUtils.UtilsResponse import UtilsResponse
-from WorkApi.API.HostInterface.hostInterface_create import HostInterfaceCreate
-from WorkApi.API.HostInterface.hostInterface_delete import HostInterfaceDelete
-
-from WorkData.Zabbix.interface import DataInterface
-from WorkData.Zabbix.hosts import DataHosts
-from WorkData.Zabbix.items import DataItems
-
-import allure
-
-# allure.label("")
-
-
-@allure.feature("测试模块：hostinterface.delete")
-class TestHostInterfaceDelete(object):
-    log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
-    db_url = env["db_url"]
-    db_port = env["db_port"]
-    db_user = env["db_user"]
-    db_pw = env["db_pw"]
-    db_base = env["db_base"]
-    base_name = "SS测试主机接口"
-    base_ip = "10.0.0.28"
-    base_hostid = 10266
-    base_dns = "sanshi.zmops.cn"
-    base_port = "127"
-
-    base_host_name = "SS TEST HOST"
-    base_description = "SS TEST HOST-interface"
-    base_groupid = 101
-
-    new_ip = "192.168.1.28"
-    new_port = "721"
-
-    @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)
-        sql = DataHosts().select_like_name(session=session, name=cls.base_host_name)
-
-        for x, y in enumerate(sql):
-            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)
-            DataItems().delete_hostid(session=session, hostid=y.hostid)
-
-        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)
-        DataHosts().delete_like_name(session=session, name=cls.base_host_name)
-
-    @classmethod
-    def teardown_class(cls):
-        cls.log.debug("结束执行测试套件.......")
-
-    def setup_method(self):
-        self.log.debug("测试用例执行开始...")
-
-    def teardown_method(self):
-        self.log.debug("测试用例执行结束...")
-
-    @allure.step("调用接口：hostinterface.create")
-    def hostinterface_create(self, dns=None, hostid=None, ip=None, main=None, port=None, _type=None, useip=None, bulk=None):
-        api = HostInterfaceCreate(_host=self.host)
-        api.dns = dns
-        api.hostid = hostid
-        api.ip = ip
-        api.main = main
-        api.port = port
-        api.type = _type
-        api.useip = useip
-        api.bulk = bulk
-        api.get_response()
-        return api.response
-
-    @allure.step("调用接口：hostinterface.delete")
-    def hostinterface_delete(self, interfaceids=None):
-        api = HostInterfaceDelete(_host=self.host)
-        api.interfaceids = interfaceids
-        api.get_response()
-        return api.response
-
-    @allure.step("连接数据库：zabbix")
-    def db_session(self):
-        session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
-        return session
-
-    @allure.step("创建测试数据")
-    def case_create(self, ip, hostid, main, port, _type, useip, bulk, dns):
-        response = self.hostinterface_create(ip=ip, hostid=hostid, main=main, port=port, _type=_type, useip=useip, bulk=bulk, dns=dns)
-        self.check_code(response=response, code=0)
-        interfaceid = UtilsResponse().get_result(response=response)["interfaceids"][0]
-        return interfaceid
-
-    @allure.step("查询表：interface")
-    def select_interface(self, interfaceid=None):
-        session = self.db_session()
-        sql = DataInterface().select_all_from_allKeys(session=session, interfaceid=interfaceid)
-        return sql
-
-    @allure.step("校验查询结果")
-    def check_select(self, interfaceid):
-        sql = self.select_interface(interfaceid=interfaceid)
-        assert sql == []
-
-    @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("调用接口：host.create")
-    def host_create(self, host=None, name=None, description=None, groupids=None, interfaces=None, tags=None, templateids=None, macros=None,
-                    inventory=None, status=None, inventory_mode=None):
-        api = HostCreate(_host=self.host)
-        api.host = host
-        api.name = name
-        api.description = description
-        api.groupids = groupids
-        api.interfaces = interfaces
-        api.tags = tags
-        api.templateids = templateids
-        api.macros = macros
-        api.inventory = inventory
-        api.status = status
-        api.inventory_mode = inventory_mode
-        api.tls_connect = 1
-        api.tls_accept = 1
-        api.tls_psk_identity = ""
-        api.tls_psk = ""
-        api.get_response()
-        return api.response
-
-    @allure.step("创建测试数据")
-    def case_host_create(self, num):
-        templateid = 10001
-
-        host = self.base_host_name + num
-        description = self.base_description + num
-        interfaces = {
-            "type": 2,
-            "main": 1,
-            "useip": 1,
-            "ip": self.base_ip,
-            "dns": "",
-            "port": 100,
-            "bulk": 1
-        }
-        response = self.host_create(host=host, description=description, groupids=[self.base_groupid],
-                                    interfaces=[interfaces], status=0, templateids=[templateid],
-                                    macros=[{
-                                        "macro": "{$SNMP_COMMUNITY}",
-                                        "value": "public"
-                                    }])
-        self.check_code(response=response, code=0)
-        self.hostid = UtilsResponse().get_result(response=response)["hostids"][0]
-        self.delete_interfaces()
-        return self.hostid
-
-    @allure.step("删除所有已存在的接口")
-    def delete_interfaces(self):
-        session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base, db_user=self.db_user, db_pw=self.db_pw)
-        DataInterface().delete_hostid(session=session, hostid=self.hostid)
-
-    @allure.title("hostinterface.delete：删除的ID存在")
-    @allure.story("删除主机接口：删除的ID存在")
-    @allure.severity("blocker")
-    def test_case_01(self):
-        self.case_host_create(num="01")
-        interfaceid = self.case_create(ip=self.base_ip, dns="", hostid=self.hostid, main=1, port=self.base_port, _type=1, useip=1, bulk=1)
-
-        response = self.hostinterface_delete(interfaceids=[interfaceid])
-        self.check_code(response=response, code=0)
-        self.check_select(interfaceid=interfaceid)
-
-    @allure.title("hostinterface.delete：删除的ID不存在 500")
-    @allure.story("删除主机接口：删除的ID不存在 500")
-    def test_case_02(self):
-        self.case_host_create(num="02")
-        interfaceid = self.case_create(ip=self.base_ip, dns="", hostid=self.hostid, main=1, port=self.base_port, _type=2, useip=1, bulk=1)
-
-        response = self.hostinterface_delete(interfaceids=[interfaceid])
-        self.check_code(response=response, code=0)
-        self.check_select(interfaceid=interfaceid)
-
-        response = self.hostinterface_delete(interfaceids=[interfaceid])
-        self.check_status(response=response, status=500)
-
-    @allure.title("hostinterface.delete：删除多个ID")
-    @allure.story("删除主机接口：删除多个ID")
-    def test_case_03(self):
-        self.case_host_create(num="03")
-        interfaceid_1 = self.case_create(ip=self.base_ip, dns="", hostid=self.hostid, main=1, port=self.base_port, _type=2, useip=1, bulk=1)
-        interfaceid_2 = self.case_create(ip=self.base_ip, dns="", hostid=self.hostid, main=0, port=self.base_port, _type=2, useip=1, bulk=1)
-        interfaceid_3 = self.case_create(ip=self.base_ip, dns="", hostid=self.hostid, main=0, port=self.base_port, _type=2, useip=1, bulk=1)
-
-        response = self.hostinterface_delete(interfaceids=[interfaceid_1, interfaceid_2, interfaceid_3])
-        self.check_code(response=response, code=0)
-        self.check_select(interfaceid=interfaceid_1)
-        self.check_select(interfaceid=interfaceid_2)
-        self.check_select(interfaceid=interfaceid_3)
-
-
-if __name__ == "__main__":
-    from WorkUtils.UtilsPyTest import UtilsPyTest
-    from WorkUtils.UtilsCmd import UtilsCmd
-
-    import os
-
-    # 执行自动化测试用例
-    case_info = os.path.split(__file__)
-    case = UtilsCmd().pytest_cmd()
-    r = UtilsPyTest(case=case, case_info=case_info)
-    r.run_main()
-
-    # a = TestHostInterfaceDelete()
-    # a.setup_class()
-    # a.test_case_03()
-    # a.test_case_02()
-    # a.test_case_03()
-    # a.test_case_06()

WorkCase/API/Items/test_items_get.py

@@ -25,17 +25,17 @@ import allure
 @allure.feature("测试模块：items.get")
 class TestItemsGet(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
 
-    base_groupid = 101
+    base_groupid = 99
     base_name = "SS TEST HOST ITEMS"
-    base_ip = "10.0.0.10"
+    base_ip = "172.16.3.170"
     base_description = "SS自动化测试主机描述, 请勿删除"
 
     @classmethod
@@ -95,7 +95,7 @@ class TestItemsGet(object):
             "useip": 1,
             "ip": self.base_ip,
             "dns": "",
-            "port": 100,
+            "port": 161,
             "bulk": 1
         }
         response = self.host_create(host=host, description=description, groupids=[self.base_groupid], interfaces=[interfaces], status=0, templateids=[templateid],

WorkCase/API/Problem/test_problem_acknowledge.py

@@ -27,13 +27,13 @@ import time
 @allure.feature("测试模块：problem.acknowledge")
 class TestProblemAcknowledge(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
 
     base_name = "SS EVENT"
     base_host_name = "SS HOST EVENT"
@@ -224,7 +224,8 @@ class TestProblemAcknowledge(object):
     def test_case_02(self):
         response = self.problem_acknowledge(action=1)
         self.check_code(response=response, code=100)
-        self.check_msg(response=response, msg="[eventids]不能为空")
+        # self.check_msg(response=response, msg="[eventids]不能为空")
+        self.check_msg(response=response, msg="[eventids]must not be empty")
 
     @allure.title("problem.acknowledge：action=1 关闭一个告警")
     @allure.story("告警忽略/关闭：action=1 关闭一个告警")

WorkCase/API/Problem/test_problem_get.py

@@ -20,13 +20,13 @@ import allure
 @allure.feature("测试模块：problem.get")
 class TestProblemGet(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
 
     @classmethod
     def setup_class(cls):

WorkCase/API/Problem/test_problem_getLatest.py

@@ -20,13 +20,13 @@ import allure
 @allure.feature("测试模块：problem.getLatest")
 class TestProblemGetLatest(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
 
     @classmethod
     def setup_class(cls):

WorkCase/API/Trigger/test_trigger_create.py

@@ -22,13 +22,14 @@ import allure
 @allure.feature("测试模块：trigger.create")
 class TestTriggerCreate(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
+
     base_name = "SS测试主机"
     base_description = "SS测试触发器-创建"
     base_expression = "{Template OS Linux:agent.ping.nodata(5m)}=1"

WorkCase/API/Trigger/test_trigger_delete.py

@@ -23,13 +23,14 @@ import allure
 @allure.feature("测试模块：trigger.delete")
 class TestTriggerDelete(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
+
     base_description = "SS测试触发器-删除"
     base_expression = "{Template OS Linux:agent.ping.nodata(5m)}=1"
 

WorkCase/API/Trigger/test_trigger_get.py

@@ -24,13 +24,14 @@ import allure
 @allure.feature("测试模块：trigger.get")
 class TestTriggerGet(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
+
     base_description = "SS测试触发器型-查询"
     base_expression = "{Template OS Linux:agent.ping.nodata(5m)}=1"
 

WorkCase/API/Trigger/test_trigger_update.py

@@ -24,13 +24,14 @@ import allure
 @allure.feature("测试模块：trigger.update")
 class TestTriggerUpdate(object):
     log = UtilsLog()
-    env = CaseBase().environment
-    host = env["host"]
+    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_base = env["db_base"]
+    db_base = env["db_base_zabbix"]
+
     base_description = "SS测试触发器-更新"
     base_expression = "{Template OS Linux:agent.ping.nodata(5m)}=1"
     new_expression = "{Template OS Linux:agent.ping.nodata(5m)}=2"

WorkCase/__init__.py

@@ -64,3 +64,14 @@ class CaseBase:
             "ON": 0,
             "OFF": 1
         }
+
+        self.environment_test = {
+            "host": "http://client.argus.zmops.cn/api",
+            "host_zabbix": "http://api.argus.zmops.cn",
+            "db_url": "47.110.118.218",
+            "db_port": 23306,
+            "db_user": "argus",
+            "db_pw": "Argus@2019",
+            "db_base": "argus",
+            "db_base_zabbix": "argus1"
+        }
\ No newline at end of file