告警规则新环境测试

WorkCase/APP/Rule/test_rule_create.py

@@ -28,13 +28,18 @@ import allure
 @allure.feature("测试模块：rule.create")
 class TestRuleCreate(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
+    env = CaseBase().environment_test
     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"]
+
+    db_url_zabbix = env["db_url_zabbix"]
+    db_port_zabbix = env["db_port_zabbix"]
+    db_user_zabbix = env["db_user_zabbix"]
+    db_pw_zabbix = env["db_pw_zabbix"]
     db_base_zabbix = env["db_base_zabbix"]
 
     login_name = "SS测试用户名"
@@ -49,7 +54,7 @@ class TestRuleCreate(object):
     base_dns = "sanshi.zmops.com"
     base_port = 161
 
-    base_host_name = "SS 自动化专用"
+    base_host_name = "SS 自动化告警规则专用"
     base_name = "SS 自动化告警规则"
     base_template_id_agent = 10001
     base_template_id_snmp = 10186
@@ -88,7 +93,8 @@ class TestRuleCreate(object):
 
     @allure.step("连接数据库：Zabbix")
     def db_session_zabbix(self):
-        session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base_zabbix, db_user=self.db_user, db_pw=self.db_pw)
+        session = UtilsDataBase().conn_mysql(db_url=self.db_url_zabbix, db_port=self.db_port_zabbix, db_base=self.db_base_zabbix,
+                                             db_user=self.db_user_zabbix, db_pw=self.db_pw_zabbix)
         return session
 
     @allure.step("查询表：alarm_rule")
@@ -312,4 +318,4 @@ if __name__ == "__main__":
     # a = TestRuleCreate()
     # a.setup_class()
     # a.setup_method()
-    # a.test_case_02()
+    # a.test_case_07()

WorkCase/APP/Rule/test_rule_delete.py

@@ -29,14 +29,18 @@ import allure
 @allure.feature("测试模块：rule.delete")
 class TestRuleDelete(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
-    host_create = "http://172.16.3.78:3334"
+    env = CaseBase().environment_test
     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"]
+
+    db_url_zabbix = env["db_url_zabbix"]
+    db_port_zabbix = env["db_port_zabbix"]
+    db_user_zabbix = env["db_user_zabbix"]
+    db_pw_zabbix = env["db_pw_zabbix"]
     db_base_zabbix = env["db_base_zabbix"]
 
     login_name = "SS测试用户名"
@@ -90,7 +94,8 @@ class TestRuleDelete(object):
 
     @allure.step("连接数据库：Zabbix")
     def db_session_zabbix(self):
-        session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base_zabbix, db_user=self.db_user, db_pw=self.db_pw)
+        session = UtilsDataBase().conn_mysql(db_url=self.db_url_zabbix, db_port=self.db_port_zabbix, db_base=self.db_base_zabbix,
+                                             db_user=self.db_user_zabbix, db_pw=self.db_pw_zabbix)
         return session
 
     @allure.step("查询表：alarm_rule")

WorkCase/APP/Rule/test_rule_get.py

@@ -28,8 +28,7 @@ import allure
 @allure.feature("测试模块：rule.get")
 class TestRuleGet(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
-    host_create = "http://172.16.3.78:3334"
+    env = CaseBase().environment_test
     host = env["host"]
     db_url = env["db_url"]
     db_port = env["db_port"]
@@ -37,6 +36,12 @@ class TestRuleGet(object):
     db_pw = env["db_pw"]
     db_base = env["db_base"]
 
+    db_url_zabbix = env["db_url_zabbix"]
+    db_port_zabbix = env["db_port_zabbix"]
+    db_user_zabbix = env["db_user_zabbix"]
+    db_pw_zabbix = env["db_pw_zabbix"]
+    db_base_zabbix = env["db_base_zabbix"]
+
     login_name = "SS测试用户名"
     base_id = 10
     base_password = "123456"
@@ -191,7 +196,7 @@ class TestRuleGet(object):
         response = self.app.rule_get(token=self.token, itemid=self.item_id)
         self.app.check_code(response=response, code=0)
         for x, y in enumerate(UtilsResponse().get_data(response=response)["list"]):
-            for q, w in enumerate(y["triggers"]):
+            for q, w in enumerate(y["triggersList"]):
                 assert w["itemid"] == self.item_id
 
     @allure.title("rule.get：manageLevel查询")
@@ -213,7 +218,7 @@ class TestRuleGet(object):
         self.app.check_code(response=response, code=0)
 
         for x, y in enumerate(UtilsResponse().get_data(response=response)["list"]):
-            for q, w in enumerate(y["triggers"]):
+            for q, w in enumerate(y["triggersList"]):
                 sql = self.select_hosts(hostid=w["hostid"])
                 assert sql != []
                 for e, t in enumerate(sql):

WorkCase/APP/Rule/test_rule_list.py

@@ -30,8 +30,7 @@ import allure
 @allure.feature("测试模块：rule.list")
 class TestRuleList(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
-    host_create = "http://172.16.3.78:3334"
+    env = CaseBase().environment_test
     host = env["host"]
     db_url = env["db_url"]
     db_port = env["db_port"]
@@ -39,6 +38,12 @@ class TestRuleList(object):
     db_pw = env["db_pw"]
     db_base = env["db_base"]
 
+    db_url_zabbix = env["db_url_zabbix"]
+    db_port_zabbix = env["db_port_zabbix"]
+    db_user_zabbix = env["db_user_zabbix"]
+    db_pw_zabbix = env["db_pw_zabbix"]
+    db_base_zabbix = env["db_base_zabbix"]
+
     login_name = "SS测试用户名"
     base_id = 10
     base_password = "123456"

WorkCase/APP/Rule/test_rule_update.py

@@ -29,8 +29,7 @@ import allure
 @allure.feature("测试模块：rule.update")
 class TestRuleUpdate(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
-    host_create = "http://172.16.3.78:3334"
+    env = CaseBase().environment_test
     host = env["host"]
     db_url = env["db_url"]
     db_port = env["db_port"]
@@ -38,6 +37,12 @@ class TestRuleUpdate(object):
     db_pw = env["db_pw"]
     db_base = env["db_base"]
 
+    db_url_zabbix = env["db_url_zabbix"]
+    db_port_zabbix = env["db_port_zabbix"]
+    db_user_zabbix = env["db_user_zabbix"]
+    db_pw_zabbix = env["db_pw_zabbix"]
+    db_base_zabbix = env["db_base_zabbix"]
+
     login_name = "SS测试用户名"
     base_id = 10
     base_password = "123456"
@@ -89,7 +94,8 @@ class TestRuleUpdate(object):
 
     @allure.step("连接数据库：Zabbix")
     def db_session_zabbix(self):
-        session = UtilsDataBase().conn_mysql(db_url=self.db_url, db_port=self.db_port, db_base=self.db_base_zabbix, db_user=self.db_user, db_pw=self.db_pw)
+        session = UtilsDataBase().conn_mysql(db_url=self.db_url_zabbix, db_port=self.db_port_zabbix, db_base=self.db_base_zabbix,
+                                             db_user=self.db_user_zabbix, db_pw=self.db_pw_zabbix)
         return session
 
     @allure.step("查询表：alarm_rule")