Commit 7bb5746c by sanshi

经验手册

parent 21a73a57
......@@ -6,15 +6,14 @@
from __future__ import division
from WorkApi.APP.Api.api_login import ApiLogin
from WorkApi.APP.Device.device_create import DeviceCreate
from WorkCase import CaseBase
from WorkCase.APP import AppBase
from WorkData.Argus.members import DataMembers
from WorkData.Zabbix.events import DataEvents
from WorkData.Zabbix.problem import DataProblem as ZabbixDataProblem
from WorkUtils.UtilsLog import UtilsLog
from WorkUtils.UtilsResponse import UtilsResponse
from WorkUtils.UtilsDataBase import UtilsDataBase
from WorkApi.APP.Experience.experience_create import ExperienceCreate
from WorkData.Argus.experience import DataExperience
from WorkData.Argus.experience_alarm_rule import DataExperienceAlarmRule
......@@ -39,7 +38,7 @@ import allure
@allure.feature("测试模块:experience.create")
class TestExperienceCreate(object):
log = UtilsLog()
env = CaseBase().app_environment
env = CaseBase().environment_test
host = env["host"]
db_url = env["db_url"]
db_port = env["db_port"]
......@@ -47,14 +46,21 @@ class TestExperienceCreate(object):
db_pw = env["db_pw"]
db_base = env["db_base"]
host_zabbix = env["host_zabbix"]
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"
base_type_agent = 126
base_type_snmp = 127
base_business_id_1 = "12"
base_business_id_2 = "13"
base_business_id_1 = 12
base_business_id_2 = 13
base_type_tree_1 = [1, 120, base_type_agent]
base_type_tree_2 = [1, 120, base_type_snmp]
......@@ -68,6 +74,8 @@ class TestExperienceCreate(object):
base_name = "SS 自动化专用 经验手册相关"
base_eventid = 91000000
session_zabbix = UtilsDataBase().conn_mysql(db_url=db_url_zabbix, db_port=db_port_zabbix, db_base=db_base_zabbix,
db_user=db_user_zabbix, db_pw=db_pw_zabbix)
session = UtilsDataBase().conn_mysql(db_url=db_url, db_port=db_port, db_base=db_base, db_user=db_user, db_pw=db_pw)
@classmethod
......@@ -80,11 +88,14 @@ class TestExperienceCreate(object):
sql = DataHosts().select_all_like_host_name(session=cls.session, host_name=cls.base_name)
for x, y in enumerate(sql):
DataHostsItems().delete_host_id(session=cls.session, host_id=y.hostid)
DataProblem().delete_like_name(session=cls.session, name=cls.base_name)
DataProblem().delete_like_eventid(session=cls.session, eventid=cls.base_eventid)
DataHosts().delete_like_host_name(session=cls.session, host_name=cls.base_name)
DataTag().delete_like_tag(session=cls.session, tag=cls.base_name)
DataExperience().delete_like_title(session=cls.session, title=cls.base_title)
ZabbixDataProblem().delete_like_eventid(session=cls.session_zabbix, eventid=cls.base_eventid)
DataEvents().delete_like_eventid(session=cls.session_zabbix, eventid=cls.base_eventid)
@classmethod
def teardown_class(cls):
cls.log.debug("结束执行测试套件.......")
......@@ -108,6 +119,12 @@ class TestExperienceCreate(object):
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("连接数据库:Zabbix")
def db_session_zabbix(self):
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("查询表:experience")
def select_experience(self, experienceid=None, title=None, content=None):
session = self.db_session()
......@@ -174,6 +191,22 @@ class TestExperienceCreate(object):
sql = DataHostsItems().select_all_from_allKeys(session=session, host_id=host_id)
return sql
@allure.step("新增表数据:events+problem, problem")
def insert_problem(self, eventid=None, clock=None, severity=None):
session = self.db_session_zabbix()
DataEvents().insert_one(session, eventid=eventid, source=0, _object=0, objectid=self.host_id, clock=clock,
value=0, acknowledged=0, ns=0, name=self.name, severity=severity)
session = self.db_session_zabbix()
ZabbixDataProblem().insert_one(session, eventid=eventid, source=0, _object=0, objectid=self.host_id, clock=clock,
r_eventid=None, r_clock=0, r_ns=0, correlationid=0, userid=0,
acknowledged=0, ns=0, name=self.name, severity=severity)
session = self.db_session()
DataProblem().insert_one(session=session, eventid=eventid, source=0, _object=0, objectid=self.host_id, clock=clock,
ns=0, r_clock=0, r_ns=0, acknowledged=0, acknowledged_time=0, severity=severity,
status=0, hostid=self.host_id, name=self.name)
@allure.step("创建测试数据")
def case_create(self, num):
self.name = self.base_name + num
......@@ -181,24 +214,22 @@ class TestExperienceCreate(object):
session = self.db_session()
self.alarm_ruleid = DataAlarmRule().insert_one(session=session, name=self.name, status=1, severity=1,
manual_close=0, enable_time_default=1, create_time=1)
manual_close=0, enable_time_default=1, create_time=1,
description="description")
session = self.db_session()
self.businessid = DataBusinesses().insert_one(session=session, name=self.name, _type=1)
self.hostid = self.app.case_create_host(
self.host_id = self.app.case_create_host(
name=self.name, host_type=self.base_type_snmp, iplist=self.base_ip, port=self.base_port,
businessIds=self.base_business_id_1 + "," + self.base_business_id_2
businessIds=[self.base_business_id_1, self.base_business_id_2]
)
sql = self.select_hosts_items(host_id=self.hostid)
sql = self.select_hosts_items(host_id=self.host_id)
itemids = []
for x, y in enumerate(sql):
itemids.append(y.id)
self.itemid = itemids[0]
session = self.db_session()
DataProblem().insert_one(session=session, eventid=self.eventid, source=0, _object=0, objectid=0, clock=0, ns=0,
r_clock=0, r_ns=0, acknowledged=0, acknowledged_time=0, severity=0,
status=0, hostid=self.hostid, name=self.name)
self.insert_problem(eventid=self.eventid, clock=0, severity=1)
@allure.step("校验数据")
def check_select(self, response, title, content, description):
......@@ -260,8 +291,8 @@ class TestExperienceCreate(object):
response = self.app.experience_create(token=self.token, title=title, content=content, hostTypes=[self.base_type_snmp],
hostTypeTree=[self.base_type_tree_1, self.base_type_tree_2],
alarmRuleids=[self.alarm_ruleid], businessids=[self.businessid], hostids=[self.hostid],
manageIpList=[self.hostid], itemids=[self.itemid], problemidList=[self.eventid],
alarmRuleids=[self.alarm_ruleid], businessids=[self.businessid], hostids=[self.host_id],
manageIpList=[self.host_id], itemids=[self.itemid], problemidList=[self.eventid],
tagNameList=[self.base_name], description=description)
self.app.check_code(response=response, code=0)
self.check_select(response=response, title=title, content=content, description=description)
......@@ -279,7 +310,7 @@ class TestExperienceCreate(object):
sql = self.select_experience_hosts(experienceid=self.experienceid)
assert sql != []
for x, y in enumerate(sql):
assert y.hostid == self.hostid
assert y.hostid == self.host_id
# 校验第四个表
sql = self.select_experience_hosts_type(experienceid=self.experienceid)
assert sql != []
......@@ -289,7 +320,7 @@ class TestExperienceCreate(object):
sql = self.select_experience_ips(experienceid=self.experienceid)
assert sql != []
for x, y in enumerate(sql):
assert y.hostid == self.hostid
assert y.hostid == self.host_id
# 校验第六个表
sql = self.select_experience_items(experienceid=self.experienceid)
assert sql != []
......
......@@ -11,12 +11,12 @@ from WorkApi.APP.Device.device_create import DeviceCreate
from WorkCase import CaseBase
from WorkCase.APP import AppBase
from WorkData.Argus.members import DataMembers
from WorkData.Zabbix.events import DataEvents
from WorkUtils.UtilsLog import UtilsLog
from WorkUtils.UtilsResponse import UtilsResponse
from WorkUtils.UtilsDataBase import UtilsDataBase
from WorkApi.APP.Experience.experience_create import ExperienceCreate
from WorkApi.APP.Experience.experience_delete import ExperienceDelete
from WorkData.Zabbix.problem import DataProblem as ZabbixDataProblem
from WorkData.Argus.experience import DataExperience
from WorkData.Argus.experience_alarm_rule import DataExperienceAlarmRule
......@@ -41,7 +41,7 @@ import allure
@allure.feature("测试模块:experience.delete")
class TestExperienceDelete(object):
log = UtilsLog()
env = CaseBase().app_environment
env = CaseBase().environment_test
host = env["host"]
db_url = env["db_url"]
db_port = env["db_port"]
......@@ -49,14 +49,21 @@ class TestExperienceDelete(object):
db_pw = env["db_pw"]
db_base = env["db_base"]
host_zabbix = env["host_zabbix"]
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"
base_type_agent = 126
base_type_snmp = 127
base_business_id_1 = "12"
base_business_id_2 = "13"
base_business_id_1 = 12
base_business_id_2 = 13
base_ip = "172.16.3.170"
base_port = 161
......@@ -67,6 +74,8 @@ class TestExperienceDelete(object):
base_name = "SS 自动化专用 经验手册相关"
base_eventid = 91000000
session_zabbix = UtilsDataBase().conn_mysql(db_url=db_url_zabbix, db_port=db_port_zabbix, db_base=db_base_zabbix,
db_user=db_user_zabbix, db_pw=db_pw_zabbix)
session = UtilsDataBase().conn_mysql(db_url=db_url, db_port=db_port, db_base=db_base, db_user=db_user, db_pw=db_pw)
@classmethod
......@@ -79,11 +88,14 @@ class TestExperienceDelete(object):
sql = DataHosts().select_all_like_host_name(session=cls.session, host_name=cls.base_name)
for x, y in enumerate(sql):
DataHostsItems().delete_host_id(session=cls.session, host_id=y.hostid)
DataProblem().delete_like_name(session=cls.session, name=cls.base_name)
DataProblem().delete_like_eventid(session=cls.session, eventid=cls.base_eventid)
DataHosts().delete_like_host_name(session=cls.session, host_name=cls.base_name)
DataTag().delete_like_tag(session=cls.session, tag=cls.base_name)
DataExperience().delete_like_title(session=cls.session, title=cls.base_title)
ZabbixDataProblem().delete_like_eventid(session=cls.session_zabbix, eventid=cls.base_eventid)
DataEvents().delete_like_eventid(session=cls.session_zabbix, eventid=cls.base_eventid)
@classmethod
def teardown_class(cls):
cls.log.debug("结束执行测试套件.......")
......@@ -180,13 +192,14 @@ class TestExperienceDelete(object):
session = self.db_session()
self.alarm_ruleid = DataAlarmRule().insert_one(session=session, name=self.name, status=1, severity=1,
manual_close=0, enable_time_default=1, create_time=1)
manual_close=0, enable_time_default=1, create_time=1,
description="description")
session = self.db_session()
self.businessid = DataBusinesses().insert_one(session=session, name=self.name, _type=1)
self.hostid = self.app.case_create_host(
name=self.name, host_type=self.base_type_snmp, iplist=self.base_ip, port=self.base_port,
businessIds=self.base_business_id_1 + "," + self.base_business_id_2
businessIds=[self.base_business_id_1, self.base_business_id_2]
)
sql = self.select_hosts_items(host_id=self.hostid)
......
......@@ -18,6 +18,8 @@ from WorkData.Argus.hosts_items import DataHostsItems
from WorkData.Argus.members import DataMembers
from WorkData.Argus.problem import DataProblem
from WorkData.Argus.tag import DataTag
from WorkData.Zabbix.events import DataEvents
from WorkData.Zabbix.problem import DataProblem as ZabbixDataProblem
from WorkUtils.UtilsLog import UtilsLog
from WorkUtils.UtilsResponse import UtilsResponse
from WorkUtils.UtilsDataBase import UtilsDataBase
......@@ -31,7 +33,7 @@ import allure
@allure.feature("测试模块:experience.items.list")
class TestExperienceItemsList(object):
log = UtilsLog()
env = CaseBase().app_environment
env = CaseBase().environment_test
host = env["host"]
db_url = env["db_url"]
db_port = env["db_port"]
......@@ -39,10 +41,21 @@ class TestExperienceItemsList(object):
db_pw = env["db_pw"]
db_base = env["db_base"]
host_zabbix = env["host_zabbix"]
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"
session_zabbix = UtilsDataBase().conn_mysql(db_url=db_url_zabbix, db_port=db_port_zabbix, db_base=db_base_zabbix,
db_user=db_user_zabbix, db_pw=db_pw_zabbix)
session = UtilsDataBase().conn_mysql(db_url=db_url, db_port=db_port, db_base=db_base, db_user=db_user, db_pw=db_pw)
@classmethod
def setup_class(cls):
cls.log.debug("开始执行测试套件.......")
......@@ -51,17 +64,6 @@ class TestExperienceItemsList(object):
def teardown_class(cls):
cls.log.debug("结束执行测试套件.......")
DataAlarmRule().delete_like_name(session=cls.session, name=cls.base_name)
DataBusinesses().delete_like_name(session=cls.session, name=cls.base_name)
sql = DataHosts().select_all_like_host_name(session=cls.session, host_name=cls.base_name)
for x, y in enumerate(sql):
DataHostsItems().delete_host_id(session=cls.session, host_id=y.hostid)
DataProblem().delete_like_name(session=cls.session, name=cls.base_name)
DataHosts().delete_like_host_name(session=cls.session, host_name=cls.base_name)
DataTag().delete_like_tag(session=cls.session, tag=cls.base_name)
DataExperience().delete_like_title(session=cls.session, title=cls.base_title)
def setup_method(self):
self.log.debug("测试用例执行开始...")
......
......@@ -19,6 +19,8 @@ from WorkData.Argus.hosts_items import DataHostsItems
from WorkData.Argus.members import DataMembers
from WorkData.Argus.problem import DataProblem
from WorkData.Argus.tag import DataTag
from WorkData.Zabbix.problem import DataProblem as ZabbixDataProblem
from WorkData.Zabbix.events import DataEvents
from WorkUtils.UtilsLog import UtilsLog
from WorkUtils.UtilsDataBase import UtilsDataBase
from WorkUtils.UtilsResponse import UtilsResponse
......@@ -32,7 +34,7 @@ import allure
@allure.feature("测试模块:experience.problem.list")
class TestExperienceProblemList(object):
log = UtilsLog()
env = CaseBase().app_environment
env = CaseBase().environment_test
host = env["host"]
db_url = env["db_url"]
db_port = env["db_port"]
......@@ -40,8 +42,12 @@ class TestExperienceProblemList(object):
db_pw = env["db_pw"]
db_base = env["db_base"]
base_env = CaseBase().environment
base_host = base_env["host"]
host_zabbix = env["host_zabbix"]
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
......@@ -49,8 +55,8 @@ class TestExperienceProblemList(object):
base_type_agent = 126
base_type_snmp = 127
base_business_id_1 = "12"
base_business_id_2 = "13"
base_business_id_1 = 12
base_business_id_2 = 13
base_ip = "172.16.3.170"
base_port = 161
......@@ -61,6 +67,8 @@ class TestExperienceProblemList(object):
base_name = "SS 自动化专用 经验手册相关"
base_eventid = 91000000
session_zabbix = UtilsDataBase().conn_mysql(db_url=db_url_zabbix, db_port=db_port_zabbix, db_base=db_base_zabbix,
db_user=db_user_zabbix, db_pw=db_pw_zabbix)
session = UtilsDataBase().conn_mysql(db_url=db_url, db_port=db_port, db_base=db_base, db_user=db_user, db_pw=db_pw)
@classmethod
......@@ -73,11 +81,14 @@ class TestExperienceProblemList(object):
sql = DataHosts().select_all_like_host_name(session=cls.session, host_name=cls.base_name)
for x, y in enumerate(sql):
DataHostsItems().delete_host_id(session=cls.session, host_id=y.hostid)
DataProblem().delete_like_name(session=cls.session, name=cls.base_name)
DataProblem().delete_like_eventid(session=cls.session, eventid=cls.base_eventid)
DataHosts().delete_like_host_name(session=cls.session, host_name=cls.base_name)
DataTag().delete_like_tag(session=cls.session, tag=cls.base_name)
DataExperience().delete_like_title(session=cls.session, title=cls.base_title)
ZabbixDataProblem().delete_like_eventid(session=cls.session_zabbix, eventid=cls.base_eventid)
DataEvents().delete_like_eventid(session=cls.session_zabbix, eventid=cls.base_eventid)
@classmethod
def teardown_class(cls):
cls.log.debug("结束执行测试套件.......")
......@@ -92,8 +103,9 @@ class TestExperienceProblemList(object):
def teardown_method(self):
self.log.debug("测试用例执行结束...")
self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["OFF"])
self.update_members_status(members_id=self.base_id, value=CaseBase().status["ON"])
self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["OFF"])
self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["ON"])
@allure.step("查询表:hosts_items")
def select_hosts_items(self, host_id=None):
......@@ -108,13 +120,14 @@ class TestExperienceProblemList(object):
session = self.db_session()
self.alarm_ruleid = DataAlarmRule().insert_one(session=session, name=self.name, status=1, severity=1,
manual_close=0, enable_time_default=1, create_time=1)
manual_close=0, enable_time_default=1, create_time=1,
description="description")
session = self.db_session()
self.businessid = DataBusinesses().insert_one(session=session, name=self.name, _type=1)
self.hostid = self.app.case_create_host(
name=self.name, host_type=self.base_type_snmp, iplist=self.base_ip, port=self.base_port,
businessIds=self.base_business_id_1 + "," + self.base_business_id_2
businessIds=[self.base_business_id_1, self.base_business_id_2]
)
sql = self.select_hosts_items(host_id=self.hostid)
......
......@@ -10,7 +10,8 @@ from WorkApi.APP.Api.api_login import ApiLogin
from WorkApi.APP.Device.device_create import DeviceCreate
from WorkCase import CaseBase
from WorkCase.APP import AppBase
from WorkData.Argus.members import DataMembers
from WorkData.Zabbix.problem import DataProblem as ZabbixDataProblem
from WorkData.Zabbix.events import DataEvents
from WorkUtils.UtilsLog import UtilsLog
from WorkUtils.UtilsResponse import UtilsResponse
from WorkUtils.UtilsDataBase import UtilsDataBase
......@@ -41,7 +42,7 @@ import allure
@allure.feature("测试模块:experience.update")
class TestExperienceUpdate(object):
log = UtilsLog()
env = CaseBase().app_environment
env = CaseBase().environment_test
host = env["host"]
db_url = env["db_url"]
db_port = env["db_port"]
......@@ -49,14 +50,21 @@ class TestExperienceUpdate(object):
db_pw = env["db_pw"]
db_base = env["db_base"]
host_zabbix = env["host_zabbix"]
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"
base_type_agent = 126
base_type_snmp = 127
base_business_id_1 = "12"
base_business_id_2 = "13"
base_business_id_1 = 12
base_business_id_2 = 13
base_ip = "172.16.3.170"
base_port = 161
......@@ -69,6 +77,8 @@ class TestExperienceUpdate(object):
base_eventid = 91000000
base_update_eventid = 91000010
session_zabbix = UtilsDataBase().conn_mysql(db_url=db_url_zabbix, db_port=db_port_zabbix, db_base=db_base_zabbix,
db_user=db_user_zabbix, db_pw=db_pw_zabbix)
session = UtilsDataBase().conn_mysql(db_url=db_url, db_port=db_port, db_base=db_base, db_user=db_user, db_pw=db_pw)
@classmethod
......@@ -81,11 +91,14 @@ class TestExperienceUpdate(object):
sql = DataHosts().select_all_like_host_name(session=cls.session, host_name=cls.base_name)
for x, y in enumerate(sql):
DataHostsItems().delete_host_id(session=cls.session, host_id=y.hostid)
DataProblem().delete_like_name(session=cls.session, name=cls.base_name)
DataProblem().delete_like_eventid(session=cls.session, eventid=cls.base_eventid)
DataHosts().delete_like_host_name(session=cls.session, host_name=cls.base_name)
DataTag().delete_like_tag(session=cls.session, tag=cls.base_name)
DataExperience().delete_like_title(session=cls.session, title=cls.base_title)
ZabbixDataProblem().delete_like_eventid(session=cls.session_zabbix, eventid=cls.base_eventid)
DataEvents().delete_like_eventid(session=cls.session_zabbix, eventid=cls.base_eventid)
@classmethod
def teardown_class(cls):
cls.log.debug("结束执行测试套件.......")
......@@ -176,13 +189,14 @@ class TestExperienceUpdate(object):
session = self.db_session()
self.alarm_ruleid = DataAlarmRule().insert_one(session=session, name=self.name, status=1, severity=1,
manual_close=0, enable_time_default=1, create_time=1)
manual_close=0, enable_time_default=1, create_time=1,
description="description")
session = self.db_session()
self.businessid = DataBusinesses().insert_one(session=session, name=self.name, _type=1)
self.hostid = self.app.case_create_host(
name=self.name, host_type=self.base_type_snmp, iplist=self.base_ip, port=self.base_port,
businessIds=self.base_business_id_1 + "," + self.base_business_id_2
businessIds=[self.base_business_id_1, self.base_business_id_2]
)
sql = self.select_hosts_items(host_id=self.hostid)
......@@ -202,13 +216,14 @@ class TestExperienceUpdate(object):
session = self.db_session()
self.update_alarm_ruleid = DataAlarmRule().insert_one(session=session, name=self.name, status=1, severity=1,
manual_close=0, enable_time_default=1, create_time=1)
manual_close=0, enable_time_default=1, create_time=1,
description="description")
session = self.db_session()
self.update_businessid = DataBusinesses().insert_one(session=session, name=self.name, _type=1)
self.update_hostid = self.app.case_create_host(
name=self.name, host_type=self.base_type_snmp, iplist=self.base_ip, port=self.base_port,
businessIds=self.base_business_id_1 + "," + self.base_business_id_2
businessIds=[self.base_business_id_1, self.base_business_id_2]
)
sql = self.select_hosts_items(host_id=self.hostid)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment