优化主机接口模块

.idea/dictionaries/Administrator.xml

@@ -31,6 +31,7 @@
       <w>hstgrp</w>
       <w>interfaceid</w>
       <w>interfaceids</w>
+      <w>iplist</w>
       <w>ipmi</w>
       <w>itemid</w>
       <w>itemids</w>
@@ -66,6 +67,7 @@
       <w>scrapy</w>
       <w>securitylevel</w>
       <w>securityname</w>
+      <w>serialnumber</w>
       <w>serviceids</w>
       <w>snmpv</w>
       <w>sortfield</w>

WorkApi/APP/Device/device_create.py

+# -*- coding: utf-8 -*-
+# 创建资产
+# 作者: 陈磊
+# 时间: 2019-11-25
+from WorkUtils.UtilsRequest import UtilsRequest
+from WorkUtils.UtilsLog import UtilsLog
+from WorkApi.ApiBase import ApiBase, GetBase
+
+
+class DeviceCreate(object):
+    def __init__(self, _host):
+        """
+        :param _host: 域名
+        :return:
+        """
+        self.log = UtilsLog()
+        self.log.info("调用创建资产")
+        self.log.info(self.__class__)
+
+        self._host = _host
+        self._headers = {}
+        self._path = "/device/create"
+        self._url = self._host + self._path
+        self._params = {}
+        self._json = {}
+        self._data = {}
+        self.response = ""
+
+        self.token = None
+        self.hostName = None
+        self.hostType = None
+        self.iplist = None
+        self.dns = None
+        self.monitorInterface = None
+        self.monitorType = None
+        self.parentHost = None
+        self.businessIds = None
+        self.opsPerson = None
+        self.snmpCommunity = None
+        self.ipmiAuthtype = None
+        self.ipmiPrivilege = None
+        self.ipmiUsername = None
+        self.ipmiPassword = None
+        self.factory = None
+        self.model = None
+        self.version = None
+        self.serialnumber = None
+        self.description = None
+        self.monitorStatus = None
+
+        self.api = UtilsRequest()
+
+    def get_response(self):
+        base = ApiBase()
+        base.dict_add_key(_key="token", value=self.token)
+        self._headers = base._json
+
+        base = ApiBase()
+        base.dict_add_key(_key="hostName", value=self.hostName)
+        base.dict_add_key(_key="hostType", value=self.hostType)
+        base.dict_add_key(_key="iplist", value=self.iplist)
+        base.dict_add_key(_key="dns", value=self.dns)
+        base.dict_add_key(_key="monitorInterface", value=self.monitorInterface)
+        base.dict_add_key(_key="monitorType", value=self.monitorType)
+        base.dict_add_key(_key="parentHost", value=self.parentHost)
+        base.dict_add_key(_key="businessIds", value=self.businessIds)
+        base.dict_add_key(_key="opsPerson", value=self.opsPerson)
+        base.dict_add_key(_key="snmpCommunity", value=self.snmpCommunity)
+        base.dict_add_key(_key="ipmiAuthtype", value=self.ipmiAuthtype)
+        base.dict_add_key(_key="ipmiPrivilege", value=self.ipmiPrivilege)
+        base.dict_add_key(_key="ipmiUsername", value=self.ipmiUsername)
+        base.dict_add_key(_key="ipmiPassword", value=self.ipmiPassword)
+        base.dict_add_key(_key="factory", value=self.factory)
+        base.dict_add_key(_key="model", value=self.model)
+        base.dict_add_key(_key="version", value=self.version)
+        base.dict_add_key(_key="serialnumber", value=self.serialnumber)
+        base.dict_add_key(_key="description", value=self.description)
+        base.dict_add_key(_key="monitorStatus", value=self.monitorStatus)
+
+        self._json = base._json
+        self.response = self.api.post(url=self._url, headers=self._headers, json=self._json)

WorkCase/APP/Rule/test_rule_create.py

@@ -215,7 +215,7 @@ class TestRuleCreate(object):
                                     triggersList_hostName=["SS TEST HOST04"], triggersList_itemid=[39676],
                                     triggersList_itemName=["agent.ping]"], triggersList_function=["avg"],
                                     triggersList_operator=["="], triggersList_constant=[888],
-                                    triggersList_parameters_unit=["m"], triggersList_parameters_value=[5], triggersList_onlineFlag=[True])
+                                    triggersList_parameters_unit=["m"], triggersList_parameters_value=[5], triggersList_onlineFlag=[False])
         self.check_code(response=response, code=0)
 
     @allure.title("rule.create：创建icmp设备在线规则")
@@ -260,4 +260,4 @@ if __name__ == "__main__":
 
     a = TestRuleCreate()
     a.setup_class()
-    a.test_case_05()
+    a.test_case_06()