新环境

WorkCase/APP/AddressBook/test_addressbokk_iplist_get.py

@@ -22,13 +22,18 @@ import allure
 @allure.feature("测试模块：addressbook.iplist.get")
 class TestAddressBookIplistGet(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测试用户名"
@@ -44,8 +49,9 @@ class TestAddressBookIplistGet(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)
         DataAddressBook().delete_like_name(session=session, name=cls.base_name)
 
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base_zabbix, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataDrules().delete_like_name(session=session, name=cls.base_name)
+        session_zabbix = UtilsDataBase().conn_mysql(db_url=cls.db_url_zabbix, db_port=cls.db_port_zabbix, db_base=cls.db_base_zabbix,
+                                                    db_user=cls.db_user_zabbix, db_pw=cls.db_pw_zabbix)
+        DataDrules().delete_like_name(session=session_zabbix, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):
@@ -72,7 +78,8 @@ class TestAddressBookIplistGet(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("查询表：drule")

WorkCase/APP/AddressBook/test_addressbook_create.py

@@ -26,13 +26,18 @@ import allure
 @allure.feature("测试模块：addressbook.create")
 class TestAddressBookCreate(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测试用户名"
@@ -51,8 +56,9 @@ class TestAddressBookCreate(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)
         DataAddressBook().delete_like_name(session=session, name=cls.base_name)
 
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base_zabbix, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataDrules().delete_like_name(session=session, name=cls.base_name)
+        session_zabbix = UtilsDataBase().conn_mysql(db_url=cls.db_url_zabbix, db_port=cls.db_port_zabbix, db_base=cls.db_base_zabbix,
+                                                    db_user=cls.db_user_zabbix, db_pw=cls.db_pw_zabbix)
+        DataDrules().delete_like_name(session=session_zabbix, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):
@@ -79,7 +85,8 @@ class TestAddressBookCreate(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("查询表：drules")

WorkCase/APP/AddressBook/test_addressbook_delete.py

@@ -26,13 +26,18 @@ import allure
 @allure.feature("测试模块：addressbook.delete")
 class TestAddressBookDelete(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测试用户名"
@@ -48,8 +53,9 @@ class TestAddressBookDelete(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)
         DataAddressBook().delete_like_name(session=session, name=cls.base_name)
 
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base_zabbix, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataDrules().delete_like_name(session=session, name=cls.base_name)
+        session_zabbix = UtilsDataBase().conn_mysql(db_url=cls.db_url_zabbix, db_port=cls.db_port_zabbix, db_base=cls.db_base_zabbix,
+                                                    db_user=cls.db_user_zabbix, db_pw=cls.db_pw_zabbix)
+        DataDrules().delete_like_name(session=session_zabbix, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):
@@ -76,7 +82,8 @@ class TestAddressBookDelete(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("查询表：drule")

WorkCase/APP/AddressBook/test_addressbook_disabled.py

@@ -26,13 +26,18 @@ import allure
 @allure.feature("测试模块：addressbook.disabled")
 class TestAddressBookDisabled(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测试用户名"
@@ -48,8 +53,9 @@ class TestAddressBookDisabled(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)
         DataAddressBook().delete_like_name(session=session, name=cls.base_name)
 
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base_zabbix, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataDrules().delete_like_name(session=session, name=cls.base_name)
+        session_zabbix = UtilsDataBase().conn_mysql(db_url=cls.db_url_zabbix, db_port=cls.db_port_zabbix, db_base=cls.db_base_zabbix,
+                                                    db_user=cls.db_user_zabbix, db_pw=cls.db_pw_zabbix)
+        DataDrules().delete_like_name(session=session_zabbix, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):
@@ -76,7 +82,8 @@ class TestAddressBookDisabled(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("查询表：drule")

WorkCase/APP/AddressBook/test_addressbook_enabled.py

@@ -26,13 +26,18 @@ import allure
 @allure.feature("测试模块：addressbook.enabled")
 class TestAddressBookEnable(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测试用户名"
@@ -48,8 +53,9 @@ class TestAddressBookEnable(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)
         DataAddressBook().delete_like_name(session=session, name=cls.base_name)
 
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base_zabbix, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataDrules().delete_like_name(session=session, name=cls.base_name)
+        session_zabbix = UtilsDataBase().conn_mysql(db_url=cls.db_url_zabbix, db_port=cls.db_port_zabbix, db_base=cls.db_base_zabbix,
+                                                    db_user=cls.db_user_zabbix, db_pw=cls.db_pw_zabbix)
+        DataDrules().delete_like_name(session=session_zabbix, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):
@@ -76,7 +82,8 @@ class TestAddressBookEnable(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("查询表：drule")

WorkCase/APP/AddressBook/test_addressbook_get.py

@@ -26,13 +26,18 @@ import allure
 @allure.feature("测试模块：addressbook.get")
 class TestAddressBookGet(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测试用户名"
@@ -48,8 +53,9 @@ class TestAddressBookGet(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)
         DataAddressBook().delete_like_name(session=session, name=cls.base_name)
 
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base_zabbix, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataDrules().delete_like_name(session=session, name=cls.base_name)
+        session_zabbix = UtilsDataBase().conn_mysql(db_url=cls.db_url_zabbix, db_port=cls.db_port_zabbix, db_base=cls.db_base_zabbix,
+                                                    db_user=cls.db_user_zabbix, db_pw=cls.db_pw_zabbix)
+        DataDrules().delete_like_name(session=session_zabbix, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):
@@ -76,7 +82,8 @@ class TestAddressBookGet(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("查询表：drule")

WorkCase/APP/AddressBook/test_addressbook_update.py

@@ -27,13 +27,18 @@ import allure
 @allure.feature("测试模块：addressbook.update")
 class TestAddressBookUpdate(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测试用户名"
@@ -53,8 +58,9 @@ class TestAddressBookUpdate(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)
         DataAddressBook().delete_like_name(session=session, name=cls.base_name)
 
-        session = UtilsDataBase().conn_mysql(db_url=cls.db_url, db_port=cls.db_port, db_base=cls.db_base_zabbix, db_user=cls.db_user, db_pw=cls.db_pw)
-        DataDrules().delete_like_name(session=session, name=cls.base_name)
+        session_zabbix = UtilsDataBase().conn_mysql(db_url=cls.db_url_zabbix, db_port=cls.db_port_zabbix, db_base=cls.db_base_zabbix,
+                                                    db_user=cls.db_user_zabbix, db_pw=cls.db_pw_zabbix)
+        DataDrules().delete_like_name(session=session_zabbix, name=cls.base_name)
 
     @classmethod
     def teardown_class(cls):
@@ -81,7 +87,8 @@ class TestAddressBookUpdate(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("查询表：drules")