IP地址下拉框

WorkCase/APP/Analyze/test_analyze_general.py

 # -*- coding: utf-8 -*-
 # 测试用例
 # 作者: 陈磊
-# 时间: 2019-12-02
+# 时间: 2019-12-05
 
 
 from __future__ import division
@@ -13,6 +13,8 @@ from WorkUtils.UtilsResponse import UtilsResponse
 
 from WorkApi.APP.Analyze.analyze_general import AnalyzeGeneral
 
+from WorkData.Argus.problem import DataProblem
+
 from WorkCase import CaseBase
 
 import allure
@@ -46,9 +48,13 @@ class TestAnalyzeGeneral(object):
 
     def setup_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"])
 
     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"])
 
     @allure.step("调用接口：analyze.general")
     def analyze_general(self, token=None, startTime=None, endTime=None, severity=None, manageLevel=None, resloveFlag=None,
@@ -124,7 +130,7 @@ class TestAnalyzeGeneral(object):
     @allure.severity("blocker")
     def test_case_02(self):
         self.get_base_token()
-        self.update_members_del_flag(members_id=self.base_id, value=1)
+        self.update_members_del_flag(members_id=self.base_id, value=CaseBase().del_flag["ON"])
         response = self.analyze_general(token=self.token)
         self.check_code(response=response, code=2004)
         self.check_msg(response=response, msg="用户不存在")
@@ -134,7 +140,7 @@ class TestAnalyzeGeneral(object):
     @allure.severity("blocker")
     def test_case_03(self):
         self.get_base_token()
-        self.update_members_status(members_id=self.base_id, value=1)
+        self.update_members_status(members_id=self.base_id, value=CaseBase().status["OFF"])
         response = self.analyze_general(token=self.token)
         self.check_code(response=response, code=2003)
         self.check_msg(response=response, msg="账户已被禁用")

WorkCase/APP/Device/test_device_asset_ips.py

@@ -147,7 +147,7 @@ class TestDeviceAssetIps(object):
     def case_create(self, num):
         self.name = self.base_name + num
         response = self.device_create(token=self.token, hostName=self.name, hostType=self.base_type_agent, iplist=self.base_ip, monitorInterface=self.base_port,
-                                      monitorType=1, manageLevel=1, parentHost="parentHost", businessIds=1, opsPerson=11, snmpCommunity="snmpCommunity",
+                                      monitorType=1, manageLevel=1, parentHost=1, businessIds=1, opsPerson=11, snmpCommunity="snmpCommunity",
                                       ipmiAuthtype=1, ipmiPrivilege=1, ipmiUsername="ipmiUsername", ipmiPassword="ipmiPassword",
                                       factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description",
                                       monitorStatus=1)

WorkCase/APP/Device/test_device_create.py

@@ -138,7 +138,7 @@ class TestDeviceCreate(object):
         return sql
 
     @allure.step("校验查询结果")
-    def check_select(self, response, name, manage_ip, manage_level, host_type,
+    def check_select(self, response, name, manage_ip, manage_level, host_type, parent_host,
                      monitor_status, iplist, dns, monitor_interface, ops_person, factoryId,
                      model, version, serialnumber, description, snmp_community, ipmi_authtype, ipmi_privilege,
                      ipmi_username, ipmi_password, businessIds, businessTree):
@@ -152,7 +152,7 @@ class TestDeviceCreate(object):
             # assert y.departmentid == departmentid
             assert y.manage_level == manage_level
             assert y.host_type == host_type
-            # assert y.parent_host == parent_host
+            assert y.parent_host == parent_host
             # assert y.available == available
             assert y.monitor_status == monitor_status
             assert y.iplist == iplist
@@ -278,7 +278,7 @@ class TestDeviceCreate(object):
 
         name = self.base_name + "08"
         response = self.device_create(token=self.token, hostName=name, hostType=self.base_type_agent, iplist=self.base_ip, monitorInterface=self.base_port,
-                                      monitorType=1, manageLevel=1, parentHost="parentHost",
+                                      monitorType=1, manageLevel=1, parentHost=1,
                                       businessIds=self.base_business_id_1 + "," + self.base_business_id_2, businessTree="businessTree",
                                       opsPerson=11, snmpCommunity="snmpCommunity",
                                       ipmiAuthtype=1, ipmiPrivilege=1, ipmiUsername="ipmiUsername", ipmiPassword="ipmiPassword",
@@ -287,7 +287,7 @@ class TestDeviceCreate(object):
         self.check_code(response=response, code=0)
         self.check_select(response=response, name=name, manage_ip=self.base_ip, manage_level=1, host_type=self.base_type_agent, monitor_status=1,
                           iplist=self.base_ip, dns=None, monitor_interface=self.base_port, ops_person=11, snmp_community="snmpCommunity",
-                          ipmi_authtype=1, ipmi_privilege=1, ipmi_username="ipmiUsername", ipmi_password="ipmiPassword",
+                          ipmi_authtype=1, ipmi_privilege=1, ipmi_username="ipmiUsername", ipmi_password="ipmiPassword", parent_host=1,
                           factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description",
                           businessIds=self.base_business_id_1 + "," + self.base_business_id_2, businessTree="businessTree")
 
@@ -299,12 +299,11 @@ if __name__ == "__main__":
     import os
 
     # 执行自动化测试用例
-    # case_info = os.path.split(__file__)
-    # case = UtilsCmd().pytest_cmd()
-    # r = UtilsPyTest(case=case, case_info=case_info)
-    # r.run_main()
-
-    a = TestDeviceCreate()
-    a.setup_class()
-    a.setup_method()
-    a.test_case_02()
+    case_info = os.path.split(__file__)
+    case = UtilsCmd().pytest_cmd()
+    r = UtilsPyTest(case=case, case_info=case_info)
+    r.run_main()
+
+    # a = TestDeviceCreate()
+    # a.setup_class()
+    # a.test_case_08()