Commit 1f11336d by sanshi

整个业务代码重构

parent 406cd0c4
...@@ -188,8 +188,9 @@ class TestRuleCreate(object): ...@@ -188,8 +188,9 @@ class TestRuleCreate(object):
@allure.story("创建告警规则:创建普通告警规则") @allure.story("创建告警规则:创建普通告警规则")
@allure.severity("blocker") @allure.severity("blocker")
def test_case_04(self): def test_case_04(self):
host_name = self.base_host_name + "04"
name = self.base_name + "04" name = self.base_name + "04"
host_id = self.app.case_create_host(name=name, host_type=self.base_type_agent, host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
iplist=self.base_ip, port=self.base_port, 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)
...@@ -208,8 +209,9 @@ class TestRuleCreate(object): ...@@ -208,8 +209,9 @@ class TestRuleCreate(object):
@allure.title("rule.create:创建agent设备在线规则") @allure.title("rule.create:创建agent设备在线规则")
@allure.story("创建告警规则:创建agent设备在线规则") @allure.story("创建告警规则:创建agent设备在线规则")
def test_case_05(self): def test_case_05(self):
host_name = self.base_host_name + "05"
name = self.base_name + "05" name = self.base_name + "05"
host_id = self.app.case_create_host(name=name, host_type=self.base_type_agent, host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
iplist=self.base_ip, port=self.base_port, 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)
item_key = "agent.ping" item_key = "agent.ping"
...@@ -224,8 +226,9 @@ class TestRuleCreate(object): ...@@ -224,8 +226,9 @@ class TestRuleCreate(object):
@allure.title("rule.create:创建agent设备离线规则") @allure.title("rule.create:创建agent设备离线规则")
@allure.story("创建告警规则:创建agent设备离线规则") @allure.story("创建告警规则:创建agent设备离线规则")
def test_case_06(self): def test_case_06(self):
host_name = self.base_host_name + "06"
name = self.base_name + "06" name = self.base_name + "06"
host_id = self.app.case_create_host(name=name, host_type=self.base_type_agent, host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
iplist=self.base_ip, port=self.base_port, 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)
item_key = "agent.ping" item_key = "agent.ping"
...@@ -240,8 +243,9 @@ class TestRuleCreate(object): ...@@ -240,8 +243,9 @@ class TestRuleCreate(object):
@allure.title("rule.create:创建icmp设备在线规则") @allure.title("rule.create:创建icmp设备在线规则")
@allure.story("创建告警规则:创建icmp设备在线规则") @allure.story("创建告警规则:创建icmp设备在线规则")
def test_case_07(self): def test_case_07(self):
host_name = self.base_host_name + "07"
name = self.base_name + "07" name = self.base_name + "07"
host_id = self.app.case_create_host(name=name, host_type=self.base_type_snmp, host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_snmp,
iplist=self.base_ip, port=self.base_port, 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)
item_key = "icmpping" item_key = "icmpping"
...@@ -256,8 +260,9 @@ class TestRuleCreate(object): ...@@ -256,8 +260,9 @@ class TestRuleCreate(object):
@allure.title("rule.create:创建icmp设备离线规则") @allure.title("rule.create:创建icmp设备离线规则")
@allure.story("创建告警规则:创建icmp设备离线规则") @allure.story("创建告警规则:创建icmp设备离线规则")
def test_case_08(self): def test_case_08(self):
host_name = self.base_host_name + "08"
name = self.base_name + "08" name = self.base_name + "08"
host_id = self.app.case_create_host(name=name, host_type=self.base_type_snmp, host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_snmp,
iplist=self.base_ip, port=self.base_port, 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)
item_key = "icmpping" item_key = "icmpping"
...@@ -272,8 +277,9 @@ class TestRuleCreate(object): ...@@ -272,8 +277,9 @@ class TestRuleCreate(object):
@allure.title("rule.create:创建普通告警规则-所有字段校验") @allure.title("rule.create:创建普通告警规则-所有字段校验")
@allure.story("创建告警规则:创建普通告警规则-所有字段校验") @allure.story("创建告警规则:创建普通告警规则-所有字段校验")
def test_case_09(self): def test_case_09(self):
host_name = self.base_host_name + "09"
name = self.base_name + "09" name = self.base_name + "09"
host_id = self.app.case_create_host(name=name, host_type=self.base_type_agent, host_id = self.app.case_create_host(name=host_name, host_type=self.base_type_agent,
iplist=self.base_ip, port=self.base_port, 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)
...@@ -305,4 +311,5 @@ if __name__ == "__main__": ...@@ -305,4 +311,5 @@ if __name__ == "__main__":
# a = TestRuleCreate() # a = TestRuleCreate()
# a.setup_class() # a.setup_class()
# a.test_case_08() # a.setup_method()
# a.test_case_02()
...@@ -23,7 +23,8 @@ class CaseBase: ...@@ -23,7 +23,8 @@ class CaseBase:
} }
self.app_environment = { self.app_environment = {
"host": "http://172.16.3.78:3334", "host": "http://172.16.3.25:3334",
# "host": "http://172.16.3.78:3334",
"db_url": "172.16.2.155", "db_url": "172.16.2.155",
"db_port": 3306, "db_port": 3306,
"db_user": "root", "db_user": "root",
......
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