创建资产

WorkCase/APP/Device/test_device_create.py

@@ -137,7 +137,7 @@ class TestDeviceCreate(object):
 
     @allure.step("校验查询结果")
     def check_select(self, response, name, manage_ip, manage_level, host_type,
-                     monitor_status, iplist, dns, monitor_interface, business_ids, ops_person, factoryId,
+                     monitor_status, iplist, dns, monitor_interface, ops_person, factoryId,
                      model, version, serialnumber, description, snmp_community, ipmi_authtype, ipmi_privilege,
                      ipmi_username, ipmi_password):
         data = UtilsResponse().get_data(response=response)
@@ -269,7 +269,7 @@ class TestDeviceCreate(object):
                                       monitorStatus=1)
         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, business_ids=1, ops_person=11, snmp_community="snmpCommunity",
+                          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",
                           factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description")
 

WorkCase/APP/Device/test_device_delete.py

@@ -92,7 +92,7 @@ class TestDeviceDelete(object):
                       monitorInterface=None, monitorType=None,
                       parentHost=None, businessIds=None, opsPerson=None, snmpCommunity=None, ipmiAuthtype=None,
                       ipmiPrivilege=None, ipmiUsername=None, ipmiPassword=None,
-                      factory=None, model=None, version=None, serialnumber=None,
+                      factoryId=None, model=None, version=None, serialnumber=None,
                       description=None, monitorStatus=None):
         api = DeviceCreate(_host=self.host)
         api.token = token
@@ -111,7 +111,7 @@ class TestDeviceDelete(object):
         api.ipmiPrivilege = ipmiPrivilege
         api.ipmiUsername = ipmiUsername
         api.ipmiPassword = ipmiPassword
-        api.factory = factory
+        api.factoryId = factoryId
         api.model = model
         api.version = version
         api.serialnumber = serialnumber
@@ -121,10 +121,10 @@ class TestDeviceDelete(object):
         return api.response
 
     @allure.step("调用接口：device.delete")
-    def device_delete(self, token=None, _id=None):
+    def device_delete(self, token=None, hostids=None):
         api = DeviceDelete(_host=self.host)
         api.token = token
-        api.id = _id
+        api.hostids = hostids
         api.get_response()
         return api.response
 
@@ -156,13 +156,13 @@ class TestDeviceDelete(object):
         return sql
 
     @allure.step("校验查询结果")
-    def check_select(self):
-        sql = self.select_hosts(hostid=self.device_id)
+    def check_select(self, device_id):
+        sql = self.select_hosts(device_id)
         for x, y in enumerate(sql):
             assert y.del_flag == 1
             assert x == 0
 
-        sql = self.select_hosts_zabbix(hostid=self.device_id)
+        sql = self.select_hosts_zabbix(hostid=device_id)
         assert sql == []
 
     @allure.step("断言返回结果")
@@ -179,11 +179,12 @@ class TestDeviceDelete(object):
     def case_create(self, num):
         name = self.base_name + num
         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", businessIds=1, opsPerson=11, snmpCommunity="snmpCommunity",
+                                      monitorType=1, manageLevel=1, parentHost="parentHost", businessIds=[1], opsPerson=11, snmpCommunity="snmpCommunity",
                                       ipmiAuthtype=1, ipmiPrivilege=1, ipmiUsername="ipmiUsername", ipmiPassword="ipmiPassword",
-                                      factory="factory", model="model", version="version", serialnumber="serialnumber", description="description",
+                                      factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description",
                                       monitorStatus=1)
         self.device_id = UtilsResponse().get_data(response=response)
+        return self.device_id
 
     @allure.title("device.delete：token未传")
     @allure.story("删除资产：token未传")
@@ -222,9 +223,24 @@ class TestDeviceDelete(object):
         self.get_base_token()
 
         self.case_create(num="04")
-        response = self.device_delete(token=self.token, _id=self.device_id)
+        response = self.device_delete(token=self.token, hostids=[self.device_id])
         self.check_code(response=response, code=0)
-        self.check_select()
+        self.check_select(device_id=self.device_id)
+
+    @allure.title("device.delete：删除多个")
+    @allure.story("删除资产：删除多个")
+    @allure.severity("blocker")
+    def test_case_05(self):
+        self.get_base_token()
+
+        device_id_1 = self.case_create(num="051")
+        device_id_2 = self.case_create(num="052")
+        device_id_3 = self.case_create(num="053")
+        response = self.device_delete(token=self.token, hostids=[device_id_1, device_id_2, device_id_3])
+        self.check_code(response=response, code=0)
+        self.check_select(device_id=device_id_1)
+        self.check_select(device_id=device_id_2)
+        self.check_select(device_id=device_id_3)
 
 
 if __name__ == "__main__":

WorkCase/APP/Device/test_device_get.py

@@ -90,7 +90,7 @@ class TestDeviceGet(object):
                       monitorInterface=None, monitorType=None,
                       parentHost=None, businessIds=None, opsPerson=None, snmpCommunity=None, ipmiAuthtype=None,
                       ipmiPrivilege=None, ipmiUsername=None, ipmiPassword=None,
-                      factory=None, model=None, version=None, serialnumber=None,
+                      factoryId=None, model=None, version=None, serialnumber=None,
                       description=None, monitorStatus=None):
         api = DeviceCreate(_host=self.host)
         api.token = token
@@ -109,7 +109,7 @@ class TestDeviceGet(object):
         api.ipmiPrivilege = ipmiPrivilege
         api.ipmiUsername = ipmiUsername
         api.ipmiPassword = ipmiPassword
-        api.factory = factory
+        api.factoryId = factoryId
         api.model = model
         api.version = version
         api.serialnumber = serialnumber
@@ -158,10 +158,11 @@ class TestDeviceGet(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="parentHost", businessIds=[1], opsPerson=11, snmpCommunity="snmpCommunity",
                                       ipmiAuthtype=1, ipmiPrivilege=1, ipmiUsername="ipmiUsername", ipmiPassword="ipmiPassword",
-                                      factory="factory", model="model", version="version", serialnumber="serialnumber", description="description",
+                                      factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description",
                                       monitorStatus=1)
+        self.check_code(response=response, code=0)
         self.device_id = UtilsResponse().get_data(response=response)
 
     @allure.step("断言返回结果")
@@ -213,65 +214,13 @@ class TestDeviceGet(object):
         response = self.device_get(token=self.token)
         self.check_code(response=response, code=0)
 
-    @allure.title("device.get：name查询")
-    @allure.story("查询资产：name查询")
+    @allure.title("device.get：hostType查询")
+    @allure.story("查询资产：hostType查询")
     def test_case_05(self):
         self.get_base_token()
         self.case_create(num="05")
-
-        response = self.device_get(token=self.token, name=self.base_name)
-        self.check_code(response=response, code=0)
-        data = UtilsResponse().get_data(response=response)
-        for x, y in enumerate(data):
-            assert y["id"] == self.device_id
-            assert y["name"] == self.name
-            assert y["type"] == self.base_type_agent
-            assert x == 0
-
-    @allure.title("device.get：type查询")
-    @allure.story("查询资产：type查询")
-    def test_case_06(self):
-        self.get_base_token()
-        self.case_create(num="06")
-
-        response = self.device_get(token=self.token, _type=self.base_type_agent)
-        self.check_code(response=response, code=0)
-        data = UtilsResponse().get_data(response=response)
-        ids = []
-        for x, y in enumerate(data):
-            assert y["type"] == self.base_type_agent
-            ids.append(y["id"])
-        assert self.device_id in ids
-
-    @allure.title("device.get：manageLevel查询")
-    @allure.story("查询资产：manageLevel查询")
-    def test_case_07(self):
-        self.get_base_token()
-        self.case_create(num="07")
-
-        response = self.device_get(token=self.token, manageLevel=1)
-        self.check_code(response=response, code=0)
-        data = UtilsResponse().get_data(response=response)
-        ids = []
-        for x, y in enumerate(data):
-            assert y["manageLevel"] == 1
-            ids.append(y["id"])
-        assert self.device_id in ids
-
-    @allure.title("device.get：memberId查询")
-    @allure.story("查询资产：memberId查询")
-    def test_case_08(self):
-        self.get_base_token()
-        self.case_create(num="08")
-
-        response = self.device_get(token=self.token, memberId=11)
+        response = self.device_get(token=self.token)
         self.check_code(response=response, code=0)
-        data = UtilsResponse().get_data(response=response)
-        ids = []
-        for x, y in enumerate(data):
-            assert y["memberName"] == "sanshi"
-            ids.append(y["id"])
-        assert self.device_id in ids
 
 
 if __name__ == "__main__":
@@ -281,11 +230,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 = TestDeviceGet()
-    # a.setup_class()
-    # a.test_case_08()
+    # case_info = os.path.split(__file__)
+    # case = UtilsCmd().pytest_cmd()
+    # r = UtilsPyTest(case=case, case_info=case_info)
+    # r.run_main()
+
+    a = TestDeviceGet()
+    a.setup_class()
+    a.test_case_04()