优化主机创建

WorkCase/API/Host/test_host_create.py

@@ -27,7 +27,8 @@ import allure
 class TestHostCreate(object):
     log = UtilsLog()
     env = CaseBase().environment_test
-    host = env["host_zabbix"]
+    # host = env["host_zabbix"]
+    host = "http://172.16.3.197:7070"
     db_url = env["db_url_zabbix"]
     db_port = env["db_port_zabbix"]
     db_user = env["db_user_zabbix"]
@@ -54,6 +55,9 @@ class TestHostCreate(object):
         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_name)
 
+        import time
+        time.sleep(5)
+
     @classmethod
     def teardown_class(cls):
         cls.log.debug("结束执行测试套件.......")
@@ -115,10 +119,10 @@ class TestHostCreate(object):
         sql = DataFunctions().select_all_from_allKeys(session=session, triggerid=triggerid, itemid=itemid)
         return sql
 
-    @allure.step("查询表：templateid")
-    def select_triggers(self, templateid=None):
+    @allure.step("查询表：triggers")
+    def select_triggers(self, triggerid=None, templateid=None):
         session = self.db_session()
-        sql = DataTriggers().select_all_from_allKeys(session=session, templateid=templateid)
+        sql = DataTriggers().select_all_from_allKeys(session=session, triggerid=triggerid, templateid=templateid)
         return sql
 
     @allure.step("查询表：hostmacro")
@@ -213,7 +217,7 @@ class TestHostCreate(object):
         host = self.base_name + "04"
         description = self.base_description + "04"
         interfaces = {
-            "type": 2,
+            "type": 1,
             "main": 1,
             "useip": 1,
             "ip": self.base_ip,
@@ -262,6 +266,8 @@ class TestHostCreate(object):
         sql = self.select_items(hostid=templateid)
         for x, y in enumerate(sql):
             itemids.append(y.itemid)
+        self.log.debug("itemids=")
+        self.log.debug(itemids)
 
         self.log.debug("根据模板监控项IDs, 获取模板触发器IDs")
         triggers = []
@@ -269,6 +275,8 @@ class TestHostCreate(object):
             sql = self.select_functions(itemid=y)
             for q, w in enumerate(sql):
                 triggers.append(w.triggerid)
+        self.log.debug("triggers=")
+        self.log.debug(triggers)
 
         new_itemids = []
         self.log.info("校验监控项是否根据模板监控器已创建")
@@ -277,18 +285,24 @@ class TestHostCreate(object):
             assert sql != []
             for q, w in enumerate(sql):
                 new_itemids.append(w.itemid)
+        self.log.debug("new_itemids=")
+        self.log.debug(new_itemids)
 
         new_triggers = []
-        self.log.info("校验触发器是否根据模板触发器已创建")
-        for x, y in enumerate(triggers):
-            sql = self.select_triggers(templateid=y)
-            assert sql != []
-            for q, w in enumerate(sql):
-                new_triggers.append(w.triggerid)
-
         self.log.info("校验监控器与触发器关系是否已创建")
+        for x, y in enumerate(new_itemids):
+            sql = self.select_functions(itemid=y)
+            if sql:
+                for q, w in enumerate(sql):
+                    new_triggers.append(w.triggerid)
+            else:
+                pass
+        self.log.debug("new_triggers=")
+        self.log.debug(new_triggers)
+
+        self.log.info("校验触发器是否根据关系表已创建")
         for x, y in enumerate(new_triggers):
-            sql = self.select_functions(triggerid=y)
+            sql = self.select_triggers(triggerid=y)
             assert sql != []
 
         self.log.info("校验主机宏是否已创建")