Skip to content

Z
zmops-test
Commit 2d53cc77 by sanshi
Options

IP地址簿修改

parent 74cc6a32
Showing with 95 additions and 296 deletions
WorkApi/APP/AddressBook/addressbook_create.py
...@@ -32,7 +32,8 @@ class AddressBookCreate(object): ...@@ -32,7 +32,8 @@ class AddressBookCreate(object):
self.name = None self.name = None
self.iplist = None self.iplist = None
self.available = None self.available = None
self.type = None self.snmpPort = None
self.snmpCommunity = None
self.delay = None self.delay = None
self.api = UtilsRequest() self.api = UtilsRequest()
...@@ -46,7 +47,8 @@ class AddressBookCreate(object): ...@@ -46,7 +47,8 @@ class AddressBookCreate(object):
base.dict_add_key(_key="name", value=self.name) base.dict_add_key(_key="name", value=self.name)
base.dict_add_key(_key="iplist", value=self.iplist) base.dict_add_key(_key="iplist", value=self.iplist)
base.dict_add_key(_key="available", value=self.available) base.dict_add_key(_key="available", value=self.available)
base.dict_add_key(_key="type", value=self.type) base.dict_add_key(_key="snmpPort", value=self.snmpPort)
base.dict_add_key(_key="snmpCommunity", value=self.snmpCommunity)
base.dict_add_key(_key="delay", value=self.delay) base.dict_add_key(_key="delay", value=self.delay)
self._json = base._json self._json = base._json
self.response = self.api.post(url=self._url, headers=self._headers, json=self._json) self.response = self.api.post(url=self._url, headers=self._headers, json=self._json)
WorkApi/APP/AddressBook/addressbook_update.py
...@@ -30,8 +30,9 @@ class AddressBookUpdate(object): ...@@ -30,8 +30,9 @@ class AddressBookUpdate(object):
self.bookid = None self.bookid = None
self.name = None self.name = None
self.iplist = None self.iplist = None
self.type = None
self.available = None self.available = None
self.snmpPort = None
self.snmpCommunity = None
self.delay = None self.delay = None
self.api = UtilsRequest() self.api = UtilsRequest()
...@@ -45,8 +46,9 @@ class AddressBookUpdate(object): ...@@ -45,8 +46,9 @@ class AddressBookUpdate(object):
base.dict_add_key(_key="name", value=self.name) base.dict_add_key(_key="name", value=self.name)
base.dict_add_key(_key="bookid", value=self.bookid) base.dict_add_key(_key="bookid", value=self.bookid)
base.dict_add_key(_key="iplist", value=self.iplist) base.dict_add_key(_key="iplist", value=self.iplist)
base.dict_add_key(_key="type", value=self.type)
base.dict_add_key(_key="available", value=self.available) base.dict_add_key(_key="available", value=self.available)
base.dict_add_key(_key="snmpPort", value=self.snmpPort)
base.dict_add_key(_key="snmpCommunity", value=self.snmpCommunity)
base.dict_add_key(_key="delay", value=self.delay) base.dict_add_key(_key="delay", value=self.delay)
self._json = base._json self._json = base._json
self.response = self.api.post(url=self._url, headers=self._headers, json=self._json) self.response = self.api.post(url=self._url, headers=self._headers, json=self._json)
WorkCase/APP/AddressBook/test_addressbokk_iplist_get.py
...@@ -61,16 +61,11 @@ class TestAddressBookIplistGet(object): ...@@ -61,16 +61,11 @@ class TestAddressBookIplistGet(object):
self.log.debug("测试用例执行开始...") self.log.debug("测试用例执行开始...")
self.app = AppBase(host=self.host) self.app = AppBase(host=self.host)
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"])
self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password) self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password)
def teardown_method(self): def teardown_method(self):
self.log.debug("测试用例执行结束...") self.log.debug("测试用例执行结束...")
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("连接数据库：Argus") @allure.step("连接数据库：Argus")
def db_session(self): def db_session(self):
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) 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)
...@@ -114,44 +109,18 @@ class TestAddressBookIplistGet(object): ...@@ -114,44 +109,18 @@ class TestAddressBookIplistGet(object):
assert x == 0 assert x == 0
assert sql_r != [] assert sql_r != []
@allure.title("addressbook.iplist.get：token未传")
@allure.story("查询地址簿列表：token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.addressbook_iplist_get()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("addressbook.iplist.get：token的用户已删除")
@allure.story("查询地址簿列表：token的用户已删除")
@allure.severity("blocker")
def test_case_02(self):
self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
response = self.app.addressbook_iplist_get(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("addressbook.iplist.get：token的用户已禁用")
@allure.story("查询地址簿列表：token的用户已禁用")
@allure.severity("blocker")
def test_case_03(self):
self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
response = self.app.addressbook_iplist_get(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("addressbook.iplist.get：无参数调用") @allure.title("addressbook.iplist.get：无参数调用")
@allure.story("查询地址簿列表：无参数调用") @allure.story("查询地址簿列表：无参数调用")
@allure.severity("blocker") @allure.severity("blocker")
def test_case_04(self): def test_case_01(self):
response = self.app.addressbook_iplist_get(token=self.token) response = self.app.addressbook_iplist_get(token=self.token)
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
@allure.title("addressbook.iplist.get：ruleid查询") @allure.title("addressbook.iplist.get：ruleid查询")
@allure.story("查询地址簿列表：ruleid查询") @allure.story("查询地址簿列表：ruleid查询")
def test_case_05(self): def test_case_02(self):
name = self.base_name + "05" name = self.base_name + "02"
address_id = self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) address_id = self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"])
sql = self.select_address_book(address_id=address_id) sql = self.select_address_book(address_id=address_id)
assert sql != [] assert sql != []
ruleid = None ruleid = None
...@@ -163,9 +132,9 @@ class TestAddressBookIplistGet(object): ...@@ -163,9 +132,9 @@ class TestAddressBookIplistGet(object):
@allure.title("addressbook.iplist.get：available=0查询") @allure.title("addressbook.iplist.get：available=0查询")
@allure.story("查询地址簿列表：available=0查询") @allure.story("查询地址簿列表：available=0查询")
def test_case_06(self): def test_case_03(self):
name = self.base_name + "06" name = self.base_name + "03"
self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"])
response = self.app.addressbook_iplist_get(token=self.token, available=CaseBase().available["ON"]) response = self.app.addressbook_iplist_get(token=self.token, available=CaseBase().available["ON"])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
...@@ -173,9 +142,9 @@ class TestAddressBookIplistGet(object): ...@@ -173,9 +142,9 @@ class TestAddressBookIplistGet(object):
@allure.title("addressbook.iplist.get：available=1查询") @allure.title("addressbook.iplist.get：available=1查询")
@allure.story("查询地址簿列表：available=1查询") @allure.story("查询地址簿列表：available=1查询")
def test_case_07(self): def test_case_04(self):
name = self.base_name + "07" name = self.base_name + "04"
self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["OFF"], _type=1) self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["OFF"])
response = self.app.addressbook_iplist_get(token=self.token, available=CaseBase().available["OFF"]) response = self.app.addressbook_iplist_get(token=self.token, available=CaseBase().available["OFF"])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
......
WorkCase/APP/AddressBook/test_addressbook_create.py
...@@ -49,6 +49,8 @@ class TestAddressBookCreate(object): ...@@ -49,6 +49,8 @@ class TestAddressBookCreate(object):
base_iprange = "172.16.3.1-254" base_iprange = "172.16.3.1-254"
base_delay = "1h" base_delay = "1h"
base_port = 161
base_community = "public"
@classmethod @classmethod
def setup_class(cls): def setup_class(cls):
...@@ -68,16 +70,11 @@ class TestAddressBookCreate(object): ...@@ -68,16 +70,11 @@ class TestAddressBookCreate(object):
self.log.debug("测试用例执行开始...") self.log.debug("测试用例执行开始...")
self.app = AppBase(host=self.host) self.app = AppBase(host=self.host)
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"])
self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password) self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password)
def teardown_method(self): def teardown_method(self):
self.log.debug("测试用例执行结束...") self.log.debug("测试用例执行结束...")
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("连接数据库：Argus") @allure.step("连接数据库：Argus")
def db_session(self): def db_session(self):
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) 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)
...@@ -108,7 +105,7 @@ class TestAddressBookCreate(object): ...@@ -108,7 +105,7 @@ class TestAddressBookCreate(object):
return sql return sql
@allure.step("校验查询结果") @allure.step("校验查询结果")
def check_select(self, response, name, available, check_type, dchecks_type, dchecks_key_, dchecks_snmp_community, def check_select(self, response, name, available, dchecks_type, dchecks_key_, dchecks_snmp_community,
dchecks_ports, dchecks_host_source, dchecks_name_source): dchecks_ports, dchecks_host_source, dchecks_name_source):
self.druleid = UtilsResponse().get_data(response=response) self.druleid = UtilsResponse().get_data(response=response)
sql = self.select_address_book(address_id=self.druleid) sql = self.select_address_book(address_id=self.druleid)
...@@ -117,8 +114,7 @@ class TestAddressBookCreate(object): ...@@ -117,8 +114,7 @@ class TestAddressBookCreate(object):
for x, y in enumerate(sql): for x, y in enumerate(sql):
assert y.name == name assert y.name == name
assert y.available == available assert y.available == available
assert y.delay == "1h" assert y.delay == self.base_delay
assert y.checktype == check_type
assert x == 0 assert x == 0
self.ruleid = y.ruleid self.ruleid = y.ruleid
...@@ -129,7 +125,6 @@ class TestAddressBookCreate(object): ...@@ -129,7 +125,6 @@ class TestAddressBookCreate(object):
assert y.iprange == self.base_iprange assert y.iprange == self.base_iprange
assert y.delay == self.base_delay assert y.delay == self.base_delay
assert y.status == available assert y.status == available
assert y.delay == "1h"
assert x == 0 assert x == 0
sql = self.select_dchecks(druleid=self.ruleid) sql = self.select_dchecks(druleid=self.ruleid)
...@@ -146,79 +141,31 @@ class TestAddressBookCreate(object): ...@@ -146,79 +141,31 @@ class TestAddressBookCreate(object):
assert y.snmpv3_privprotocol == 0 assert y.snmpv3_privprotocol == 0
assert x == 0 assert x == 0
@allure.title("addressbook.create：token未传") @allure.title("addressbook.create：创建可用地址簿")
@allure.story("创建地址簿：token未传") @allure.story("创建地址簿：创建可用地址簿")
@allure.severity("blocker") @allure.severity("blocker")
def test_case_01(self): def test_case_01(self):
response = self.app.addressbook_create() name = self.base_name + "01"
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("addressbook.create：token的用户已删除")
@allure.story("创建地址簿：token的用户已删除")
@allure.severity("blocker")
def test_case_02(self):
self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
response = self.app.addressbook_create(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("addressbook.create：token的用户已禁用")
@allure.story("创建地址簿：token的用户已禁用")
@allure.severity("blocker")
def test_case_03(self):
self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
response = self.app.addressbook_create(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("addressbook.create：创建可用地址簿 类型 Agent")
@allure.story("创建地址簿：创建可用地址簿 类型 Agent")
@allure.severity("blocker")
def test_case_04(self):
name = self.base_name + "04"
response = self.app.addressbook_create(token=self.token, name=name, iplist=self.base_iplist, response = self.app.addressbook_create(token=self.token, name=name, iplist=self.base_iplist,
available=CaseBase().available["ON"], delay="1h", _type=1) snmpPort=self.base_port, snmpCommunity=self.base_community,
available=CaseBase().available["ON"], delay=self.base_delay)
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
self.check_select(response=response, name=name, available=CaseBase().available["ON"], check_type=1, self.check_select(response=response, name=name, available=CaseBase().available["ON"],
dchecks_type=9, dchecks_key_="system.uname", dchecks_snmp_community="", dchecks_type=11, dchecks_key_="sysName.0", dchecks_snmp_community=self.base_community,
dchecks_ports=10050, dchecks_host_source=2, dchecks_name_source=2)
@allure.title("addressbook.create：创建可用地址簿 类型 snmp")
@allure.story("创建地址簿：创建可用地址簿 类型 snmp")
@allure.severity("blocker")
def test_case_05(self):
name = self.base_name + "05"
response = self.app.addressbook_create(token=self.token, name=name, iplist=self.base_iplist,
available=CaseBase().available["ON"], delay="1m", _type=2)
self.app.check_code(response=response, code=0)
self.check_select(response=response, name=name, available=CaseBase().available["ON"], check_type=2,
dchecks_type=11, dchecks_key_="1.3.6.1.2.1.25.4.2.1.2", dchecks_snmp_community="{$SNMP_COMMUNITY}",
dchecks_ports=161, dchecks_host_source=2, dchecks_name_source=2) dchecks_ports=161, dchecks_host_source=2, dchecks_name_source=2)
@allure.title("addressbook.create：创建可用地址簿 类型 icmp")
@allure.story("创建地址簿：创建可用地址簿 类型 icmp")
@allure.severity("blocker")
def test_case_06(self):
name = self.base_name + "06"
response = self.app.addressbook_create(token=self.token, name=name, iplist=self.base_iplist,
available=CaseBase().available["ON"], delay="1h", _type=3)
self.app.check_code(response=response, code=0)
self.check_select(response=response, name=name, available=CaseBase().available["ON"], check_type=3,
dchecks_type=12, dchecks_key_="", dchecks_snmp_community="",
dchecks_ports=0, dchecks_host_source=2, dchecks_name_source=2)
@allure.title("addressbook.create：创建禁用地址簿") @allure.title("addressbook.create：创建禁用地址簿")
@allure.story("创建地址簿：创建禁用地址簿") @allure.story("创建地址簿：创建禁用地址簿")
@allure.severity("blocker") @allure.severity("blocker")
def test_case_07(self): def test_case_02(self):
name = self.base_name + "07" name = self.base_name + "02"
response = self.app.addressbook_create(token=self.token, name=name, iplist=self.base_iplist, _type=1, response = self.app.addressbook_create(token=self.token, name=name, iplist=self.base_iplist,
available=CaseBase().available["OFF"], delay="1h") snmpPort=self.base_port, snmpCommunity=self.base_community,
available=CaseBase().available["OFF"], delay=self.base_delay)
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
self.check_select(response=response, name=name, available=CaseBase().available["OFF"], check_type=1, self.check_select(response=response, name=name, available=CaseBase().available["OFF"],
dchecks_type=9, dchecks_key_="system.uname", dchecks_snmp_community="", dchecks_type=11, dchecks_key_="sysName.0", dchecks_snmp_community=self.base_community,
dchecks_ports=10050, dchecks_host_source=2, dchecks_name_source=2) dchecks_ports=161, dchecks_host_source=2, dchecks_name_source=2)
if __name__ == "__main__": if __name__ == "__main__":
...@@ -228,13 +175,13 @@ if __name__ == "__main__": ...@@ -228,13 +175,13 @@ if __name__ == "__main__":
import os import os
# 执行自动化测试用例 # 执行自动化测试用例
# case_info = os.path.split(__file__) case_info = os.path.split(__file__)
# case = UtilsCmd().pytest_cmd() case = UtilsCmd().pytest_cmd()
# r = UtilsPyTest(case=case, case_info=case_info) r = UtilsPyTest(case=case, case_info=case_info)
# r.run_main() r.run_main()
a = TestAddressBookCreate() # a = TestAddressBookCreate()
a.setup_class() # a.setup_class()
a.setup_method() # a.setup_method()
a.test_case_05() # a.test_case_04()
WorkCase/APP/AddressBook/test_addressbook_delete.py
...@@ -65,16 +65,11 @@ class TestAddressBookDelete(object): ...@@ -65,16 +65,11 @@ class TestAddressBookDelete(object):
self.log.debug("测试用例执行开始...") self.log.debug("测试用例执行开始...")
self.app = AppBase(host=self.host) self.app = AppBase(host=self.host)
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"])
self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password) self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password)
def teardown_method(self): def teardown_method(self):
self.log.debug("测试用例执行结束...") self.log.debug("测试用例执行结束...")
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("连接数据库：Argus") @allure.step("连接数据库：Argus")
def db_session(self): def db_session(self):
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) 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)
...@@ -106,38 +101,12 @@ class TestAddressBookDelete(object): ...@@ -106,38 +101,12 @@ class TestAddressBookDelete(object):
sql_r = self.select_drule(name=name) sql_r = self.select_drule(name=name)
assert sql_r == [] assert sql_r == []
@allure.title("addressbook.delete：token未传")
@allure.story("删除地址簿：token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.addressbook_delete()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("addressbook.delete：token的用户已删除")
@allure.story("删除地址簿：token的用户已删除")
@allure.severity("blocker")
def test_case_02(self):
self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
response = self.app.addressbook_delete(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("addressbook.delete：token的用户已禁用")
@allure.story("删除地址簿：token的用户已禁用")
@allure.severity("blocker")
def test_case_03(self):
self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
response = self.app.addressbook_delete(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("addressbook.delete：删除一个") @allure.title("addressbook.delete：删除一个")
@allure.story("删除地址簿：删除一个") @allure.story("删除地址簿：删除一个")
@allure.severity("blocker") @allure.severity("blocker")
def test_case_04(self): def test_case_01(self):
name = self.base_name + "04" name = self.base_name + "01"
bookid_1 = self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) bookid_1 = self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"])
response = self.app.addressbook_delete(token=self.token, bookids=[bookid_1]) response = self.app.addressbook_delete(token=self.token, bookids=[bookid_1])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
...@@ -145,13 +114,13 @@ class TestAddressBookDelete(object): ...@@ -145,13 +114,13 @@ class TestAddressBookDelete(object):
@allure.title("addressbook.delete：删除多个") @allure.title("addressbook.delete：删除多个")
@allure.story("删除地址簿：删除多个") @allure.story("删除地址簿：删除多个")
def test_case_05(self): def test_case_02(self):
name_1 = self.base_name + "051" name_1 = self.base_name + "021"
name_2 = self.base_name + "052" name_2 = self.base_name + "022"
name_3 = self.base_name + "053" name_3 = self.base_name + "023"
bookid_1 = self.app.case_create_addressbook(name=name_1, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) bookid_1 = self.app.case_create_addressbook(name=name_1, iplist=self.base_iplist, available=CaseBase().available["ON"])
bookid_2 = self.app.case_create_addressbook(name=name_2, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) bookid_2 = self.app.case_create_addressbook(name=name_2, iplist=self.base_iplist, available=CaseBase().available["ON"])
bookid_3 = self.app.case_create_addressbook(name=name_3, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) bookid_3 = self.app.case_create_addressbook(name=name_3, iplist=self.base_iplist, available=CaseBase().available["ON"])
response = self.app.addressbook_delete(token=self.token, bookids=[bookid_1, bookid_2, bookid_3]) response = self.app.addressbook_delete(token=self.token, bookids=[bookid_1, bookid_2, bookid_3])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
......
WorkCase/APP/AddressBook/test_addressbook_disabled.py
...@@ -65,16 +65,11 @@ class TestAddressBookDisabled(object): ...@@ -65,16 +65,11 @@ class TestAddressBookDisabled(object):
self.log.debug("测试用例执行开始...") self.log.debug("测试用例执行开始...")
self.app = AppBase(host=self.host) self.app = AppBase(host=self.host)
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"])
self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password) self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password)
def teardown_method(self): def teardown_method(self):
self.log.debug("测试用例执行结束...") self.log.debug("测试用例执行结束...")
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("连接数据库：Argus") @allure.step("连接数据库：Argus")
def db_session(self): def db_session(self):
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) 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)
...@@ -116,38 +111,12 @@ class TestAddressBookDisabled(object): ...@@ -116,38 +111,12 @@ class TestAddressBookDisabled(object):
assert x == 0 assert x == 0
assert sql_r != [] assert sql_r != []
@allure.title("addressbook.disabled：token未传")
@allure.story("禁用地址簿：token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.addressbook_disabled()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("addressbook.disabled：token的用户已删除")
@allure.story("禁用地址簿：token的用户已删除")
@allure.severity("blocker")
def test_case_02(self):
self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
response = self.app.addressbook_disabled(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("addressbook.disabled：token的用户已禁用")
@allure.story("禁用地址簿：token的用户已禁用")
@allure.severity("blocker")
def test_case_03(self):
self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
response = self.app.addressbook_disabled(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("addressbook.disabled：禁用一个") @allure.title("addressbook.disabled：禁用一个")
@allure.story("禁用地址簿：禁用一个") @allure.story("禁用地址簿：禁用一个")
@allure.severity("blocker") @allure.severity("blocker")
def test_case_04(self): def test_case_01(self):
name = self.base_name + "04" name = self.base_name + "01"
bookid_1 = self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) bookid_1 = self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"])
response = self.app.addressbook_disabled(token=self.token, bookids=[bookid_1]) response = self.app.addressbook_disabled(token=self.token, bookids=[bookid_1])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
...@@ -155,13 +124,13 @@ class TestAddressBookDisabled(object): ...@@ -155,13 +124,13 @@ class TestAddressBookDisabled(object):
@allure.title("addressbook.disabled：禁用多个") @allure.title("addressbook.disabled：禁用多个")
@allure.story("禁用地址簿：禁用多个") @allure.story("禁用地址簿：禁用多个")
def test_case_05(self): def test_case_02(self):
name_1 = self.base_name + "051" name_1 = self.base_name + "021"
name_2 = self.base_name + "052" name_2 = self.base_name + "022"
name_3 = self.base_name + "053" name_3 = self.base_name + "023"
bookid_1 = self.app.case_create_addressbook(name=name_1, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) bookid_1 = self.app.case_create_addressbook(name=name_1, iplist=self.base_iplist, available=CaseBase().available["ON"])
bookid_2 = self.app.case_create_addressbook(name=name_2, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) bookid_2 = self.app.case_create_addressbook(name=name_2, iplist=self.base_iplist, available=CaseBase().available["ON"])
bookid_3 = self.app.case_create_addressbook(name=name_3, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) bookid_3 = self.app.case_create_addressbook(name=name_3, iplist=self.base_iplist, available=CaseBase().available["ON"])
response = self.app.addressbook_disabled(token=self.token, bookids=[bookid_1, bookid_2, bookid_3]) response = self.app.addressbook_disabled(token=self.token, bookids=[bookid_1, bookid_2, bookid_3])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
......
WorkCase/APP/AddressBook/test_addressbook_enabled.py
...@@ -65,16 +65,11 @@ class TestAddressBookEnable(object): ...@@ -65,16 +65,11 @@ class TestAddressBookEnable(object):
self.log.debug("测试用例执行开始...") self.log.debug("测试用例执行开始...")
self.app = AppBase(host=self.host) self.app = AppBase(host=self.host)
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"])
self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password) self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password)
def teardown_method(self): def teardown_method(self):
self.log.debug("测试用例执行结束...") self.log.debug("测试用例执行结束...")
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("连接数据库：Argus") @allure.step("连接数据库：Argus")
def db_session(self): def db_session(self):
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) 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)
...@@ -116,38 +111,12 @@ class TestAddressBookEnable(object): ...@@ -116,38 +111,12 @@ class TestAddressBookEnable(object):
assert x == 0 assert x == 0
assert sql_r != [] assert sql_r != []
@allure.title("addressbook.enabled：token未传")
@allure.story("启用地址簿：token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.addressbook_enabled()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("addressbook.enabled：token的用户已删除")
@allure.story("启用地址簿：token的用户已删除")
@allure.severity("blocker")
def test_case_02(self):
self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
response = self.app.addressbook_enabled(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("addressbook.enabled：token的用户已禁用")
@allure.story("启用地址簿：token的用户已禁用")
@allure.severity("blocker")
def test_case_03(self):
self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
response = self.app.addressbook_enabled(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("addressbook.enabled：启用一个") @allure.title("addressbook.enabled：启用一个")
@allure.story("启用地址簿：启用一个") @allure.story("启用地址簿：启用一个")
@allure.severity("blocker") @allure.severity("blocker")
def test_case_04(self): def test_case_01(self):
name = self.base_name + "04" name = self.base_name + "01"
bookid_1 = self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["OFF"], _type=1) bookid_1 = self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["OFF"])
response = self.app.addressbook_enabled(token=self.token, bookids=[bookid_1]) response = self.app.addressbook_enabled(token=self.token, bookids=[bookid_1])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
...@@ -155,13 +124,13 @@ class TestAddressBookEnable(object): ...@@ -155,13 +124,13 @@ class TestAddressBookEnable(object):
@allure.title("addressbook.enabled：启用多个") @allure.title("addressbook.enabled：启用多个")
@allure.story("启用地址簿：启用多个") @allure.story("启用地址簿：启用多个")
def test_case_05(self): def test_case_02(self):
name_1 = self.base_name + "051" name_1 = self.base_name + "021"
name_2 = self.base_name + "052" name_2 = self.base_name + "022"
name_3 = self.base_name + "053" name_3 = self.base_name + "023"
bookid_1 = self.app.case_create_addressbook(name=name_1, iplist=self.base_iplist, available=CaseBase().available["OFF"], _type=1) bookid_1 = self.app.case_create_addressbook(name=name_1, iplist=self.base_iplist, available=CaseBase().available["OFF"])
bookid_2 = self.app.case_create_addressbook(name=name_2, iplist=self.base_iplist, available=CaseBase().available["OFF"], _type=1) bookid_2 = self.app.case_create_addressbook(name=name_2, iplist=self.base_iplist, available=CaseBase().available["OFF"])
bookid_3 = self.app.case_create_addressbook(name=name_3, iplist=self.base_iplist, available=CaseBase().available["OFF"], _type=1) bookid_3 = self.app.case_create_addressbook(name=name_3, iplist=self.base_iplist, available=CaseBase().available["OFF"])
response = self.app.addressbook_enabled(token=self.token, bookids=[bookid_1, bookid_2, bookid_3]) response = self.app.addressbook_enabled(token=self.token, bookids=[bookid_1, bookid_2, bookid_3])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
......
WorkCase/APP/AddressBook/test_addressbook_get.py
...@@ -65,16 +65,11 @@ class TestAddressBookGet(object): ...@@ -65,16 +65,11 @@ class TestAddressBookGet(object):
self.log.debug("测试用例执行开始...") self.log.debug("测试用例执行开始...")
self.app = AppBase(host=self.host) self.app = AppBase(host=self.host)
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"])
self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password) self.token = self.app.get_base_token(login_name=self.login_name, base_password=self.base_password)
def teardown_method(self): def teardown_method(self):
self.log.debug("测试用例执行结束...") self.log.debug("测试用例执行结束...")
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("连接数据库：Argus") @allure.step("连接数据库：Argus")
def db_session(self): def db_session(self):
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) 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)
...@@ -118,44 +113,18 @@ class TestAddressBookGet(object): ...@@ -118,44 +113,18 @@ class TestAddressBookGet(object):
assert x == 0 assert x == 0
assert sql_r != [] assert sql_r != []
@allure.title("addressbook.get：token未传")
@allure.story("查询地址簿：token未传")
@allure.severity("blocker")
def test_case_01(self):
response = self.app.addressbook_get()
self.app.check_code(response=response, code=2001)
self.app.check_msg(response=response, msg="token不存在")
@allure.title("addressbook.get：token的用户已删除")
@allure.story("查询地址簿：token的用户已删除")
@allure.severity("blocker")
def test_case_02(self):
self.app.update_members_del_flag(session=self.db_session(), members_id=self.base_id, value=CaseBase().del_flag["ON"])
response = self.app.addressbook_get(token=self.token)
self.app.check_code(response=response, code=2004)
self.app.check_msg(response=response, msg="用户不存在")
@allure.title("addressbook.get：token的用户已禁用")
@allure.story("查询地址簿：token的用户已禁用")
@allure.severity("blocker")
def test_case_03(self):
self.app.update_members_status(session=self.db_session(), members_id=self.base_id, value=CaseBase().status["OFF"])
response = self.app.addressbook_get(token=self.token)
self.app.check_code(response=response, code=2003)
self.app.check_msg(response=response, msg="账户已被禁用")
@allure.title("addressbook.get：无参数调用") @allure.title("addressbook.get：无参数调用")
@allure.story("查询地址簿：无参数调用") @allure.story("查询地址簿：无参数调用")
@allure.severity("blocker") @allure.severity("blocker")
def test_case_04(self): def test_case_01(self):
response = self.app.addressbook_get(token=self.token) response = self.app.addressbook_get(token=self.token)
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
@allure.title("addressbook.get：name精确查询") @allure.title("addressbook.get：name精确查询")
@allure.story("查询地址簿：name精确查询") @allure.story("查询地址簿：name精确查询")
def test_case_05(self): def test_case_02(self):
name = self.base_name + "05" name = self.base_name + "02"
self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"])
response = self.app.addressbook_get(token=self.token, name=name) response = self.app.addressbook_get(token=self.token, name=name)
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
...@@ -163,9 +132,9 @@ class TestAddressBookGet(object): ...@@ -163,9 +132,9 @@ class TestAddressBookGet(object):
@allure.title("addressbook.get：available=0查询") @allure.title("addressbook.get：available=0查询")
@allure.story("查询地址簿：available=0查询") @allure.story("查询地址簿：available=0查询")
def test_case_06(self): def test_case_03(self):
name = self.base_name + "06" name = self.base_name + "03"
self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"], _type=1) self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["ON"])
response = self.app.addressbook_get(token=self.token, available=CaseBase().available["ON"]) response = self.app.addressbook_get(token=self.token, available=CaseBase().available["ON"])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
...@@ -173,9 +142,9 @@ class TestAddressBookGet(object): ...@@ -173,9 +142,9 @@ class TestAddressBookGet(object):
@allure.title("addressbook.get：available=1查询") @allure.title("addressbook.get：available=1查询")
@allure.story("查询地址簿：available=1查询") @allure.story("查询地址簿：available=1查询")
def test_case_07(self): def test_case_04(self):
name = self.base_name + "07" name = self.base_name + "04"
self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["OFF"], _type=1) self.app.case_create_addressbook(name=name, iplist=self.base_iplist, available=CaseBase().available["OFF"])
response = self.app.addressbook_get(token=self.token, available=CaseBase().available["OFF"]) response = self.app.addressbook_get(token=self.token, available=CaseBase().available["OFF"])
self.app.check_code(response=response, code=0) self.app.check_code(response=response, code=0)
......
WorkCase/APP/__init__.py
...@@ -180,13 +180,14 @@ class AppBase(object): ...@@ -180,13 +180,14 @@ class AppBase(object):
return api.response return api.response
@allure.step("调用接口：addressbook.create") @allure.step("调用接口：addressbook.create")
def addressbook_create(self, token=None, name=None, iplist=None, available=None, _type=None, delay=None): def addressbook_create(self, token=None, name=None, iplist=None, available=None, snmpPort=None, snmpCommunity=None, delay=None):
api = AddressBookCreate(_host=self.host) api = AddressBookCreate(_host=self.host)
api.token = token api.token = token
api.name = name api.name = name
api.iplist = iplist api.iplist = iplist
api.available = available api.available = available
api.type = _type api.snmpPort = snmpPort
api.snmpCommunity = snmpCommunity
api.delay = delay api.delay = delay
api.get_response() api.get_response()
return api.response return api.response
...@@ -234,13 +235,14 @@ class AppBase(object): ...@@ -234,13 +235,14 @@ class AppBase(object):
return api.response return api.response
@allure.step("调用接口：addressbook.update") @allure.step("调用接口：addressbook.update")
def addressbook_update(self, token=None, bookid=None, name=None, iplist=None, _type=None, available=None): def addressbook_update(self, token=None, bookid=None, name=None, iplist=None,snmpPort=None, snmpCommunity=None, available=None):
api = AddressBookUpdate(_host=self.host) api = AddressBookUpdate(_host=self.host)
api.token = token api.token = token
api.bookid = bookid api.bookid = bookid
api.name = name api.name = name
api.iplist = iplist api.iplist = iplist
api.type = _type api.snmpPort = snmpPort
api.snmpCommunity = snmpCommunity
api.available = available api.available = available
api.get_response() api.get_response()
return api.response return api.response
...@@ -457,8 +459,9 @@ class AppBase(object): ...@@ -457,8 +459,9 @@ class AppBase(object):
return business_id return business_id
@allure.step("创建测试数据-地址簿") @allure.step("创建测试数据-地址簿")
def case_create_addressbook(self, name, iplist, available, _type=None): def case_create_addressbook(self, name, iplist, available):
response = self.addressbook_create(token=self.token, name=name, iplist=iplist, available=available, _type=_type, delay="1h") response = self.addressbook_create(token=self.token, name=name, iplist=iplist, available=available,
snmpPort=161, snmpCommunity="public", delay="1h")
self.check_code(response=response, code=0) self.check_code(response=response, code=0)
address_id = UtilsResponse().get_data(response=response) address_id = UtilsResponse().get_data(response=response)
return address_id return address_id
......
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