资产创建

WorkApi/APP/Device/device_delete.py

@@ -27,7 +27,7 @@ class DeviceDelete(object):
         self.response = ""
 
         self.token = None
-        self.id = None
+        self.hostids = None
 
         self.api = UtilsRequest()
 
@@ -37,7 +37,7 @@ class DeviceDelete(object):
         self._headers = base._json
 
         base = ApiBase()
-        base.dict_add_key(_key="id", value=self.id)
+        base.dict_add_key(_key="hostids", value=self.hostids)
 
         self._json = base._json
         self.response = self.api.post(url=self._url, headers=self._headers, json=self._json)

WorkCase/APP/Device/test_device_create.py

@@ -42,7 +42,7 @@ class TestDeviceCreate(object):
     base_dns = "sanshi.zmops.com"
     base_port = 999
 
-    base_name = "SS测试资产"
+    base_name = "SS测试资产-创建"
 
     @classmethod
     def setup_class(cls):
@@ -135,13 +135,15 @@ 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, factory_id,
+                     monitor_status, iplist, dns, monitor_interface, business_ids, ops_person, factoryId,
                      model, version, serialnumber, description, snmp_community, ipmi_authtype, ipmi_privilege,
                      ipmi_username, ipmi_password):
         data = UtilsResponse().get_data(response=response)
         sql = self.select_hosts(hostid=data)
+        assert sql != []
         for x, y in enumerate(sql):
             assert y.host_name == name
+            assert y.asset_code != ""
             assert y.manage_ip == manage_ip
             # assert y.departmentid == departmentid
             assert y.manage_level == manage_level
@@ -155,7 +157,7 @@ class TestDeviceCreate(object):
             assert int(y.business_ids) == business_ids
             # assert y.port == port
             assert y.ops_person == ops_person
-            assert y.factory_id == factory_id
+            assert y.factory_id == factoryId
             assert y.model == model
             assert y.version == version
             assert y.serialnumber == serialnumber
@@ -215,7 +217,7 @@ class TestDeviceCreate(object):
 
         name = self.base_name + "04"
         response = self.device_create(token=self.token, hostName=name, hostType=self.base_type_agent, iplist=self.base_ip, monitorInterface=self.base_port,
-                                      monitorType=1)
+                                      monitorType=1, manageLevel=1)
         self.check_code(response=response, code=0)
 
     @allure.title("device.create：创建agent资产,dns识别")
@@ -226,7 +228,7 @@ class TestDeviceCreate(object):
 
         name = self.base_name + "05"
         response = self.device_create(token=self.token, hostName=name, hostType=self.base_type_agent, iplist=self.base_ip, dns=self.base_dns,
-                                      monitorInterface=self.base_port, monitorType=2)
+                                      monitorInterface=self.base_port, monitorType=2, manageLevel=1)
         self.check_code(response=response, code=0)
 
     @allure.title("device.create：创建snmp资产,ip识别")
@@ -237,7 +239,7 @@ class TestDeviceCreate(object):
 
         name = self.base_name + "06"
         response = self.device_create(token=self.token, hostName=name, hostType=self.base_type_snmp, iplist=self.base_ip, monitorInterface=self.base_port,
-                                      monitorType=1)
+                                      monitorType=1, manageLevel=1)
         self.check_code(response=response, code=0)
 
     @allure.title("device.create：创建snmp资产,dns识别")
@@ -248,7 +250,7 @@ class TestDeviceCreate(object):
 
         name = self.base_name + "07"
         response = self.device_create(token=self.token, hostName=name, hostType=self.base_type_snmp, iplist=self.base_ip, dns=self.base_dns,
-                                      monitorInterface=self.base_port, monitorType=2)
+                                      monitorInterface=self.base_port, monitorType=2, manageLevel=1)
         self.check_code(response=response, code=0)
 
     @allure.title("device.create：创建资产-所有字段")
@@ -258,7 +260,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", 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",
                                       factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description",
                                       monitorStatus=1)
@@ -266,7 +268,7 @@ class TestDeviceCreate(object):
         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",
                           ipmi_authtype=1, ipmi_privilege=1, ipmi_username="ipmiUsername", ipmi_password="ipmiPassword",
-                          factory_id=1, model="model", version="version", serialnumber="serialnumber", description="description")
+                          factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description")
 
 
 if __name__ == "__main__":
@@ -283,4 +285,4 @@ if __name__ == "__main__":
 
     # a = TestDeviceCreate()
     # a.setup_class()
-    # a.test_case_08()
+    # a.test_case_04()