创建资产

WorkApi/APP/Device/device_create.py

@@ -31,11 +31,13 @@ class DeviceCreate(object):
         self.hostType = None
         self.manageLevel = None
         self.iplist = None
+        self.port = None
         self.dns = None
         self.monitorInterface = None
         self.monitorType = None
         self.parentHost = None
         self.businessIds = None
+        self.businessTree = None
         self.opsPerson = None
         self.snmpCommunity = None
         self.ipmiAuthtype = None
@@ -61,11 +63,13 @@ class DeviceCreate(object):
         base.dict_add_key(_key="hostType", value=self.hostType)
         base.dict_add_key(_key="manageLevel", value=self.manageLevel)
         base.dict_add_key(_key="iplist", value=self.iplist)
+        base.dict_add_key(_key="port", value=self.port)
         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="businessTree", value=self.businessTree)
         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)

WorkCase/APP/Device/test_device_create.py

@@ -25,7 +25,7 @@ import allure
 class TestDeviceCreate(object):
     log = UtilsLog()
     env = CaseBase().app_environment
-    host = "http://172.16.3.78:3334"
+    host = env["host"]
     db_url = env["db_url"]
     db_port = env["db_port"]
     db_user = env["db_user"]
@@ -43,8 +43,8 @@ class TestDeviceCreate(object):
     base_port = 999
 
     base_name = "SS测试资产-创建"
-    base_business_id_1 = 12
-    base_business_id_2 = 13
+    base_business_id_1 = "12"
+    base_business_id_2 = "13"
 
     @classmethod
     def setup_class(cls):
@@ -88,7 +88,7 @@ class TestDeviceCreate(object):
 
     @allure.step("调用接口：device.create")
     def device_create(self, token=None, hostName=None, hostType=None, manageLevel=None, iplist=None, dns=None,
-                      monitorInterface=None, monitorType=None,
+                      monitorInterface=None, monitorType=None, port=None, businessTree=None,
                       parentHost=None, businessIds=None, opsPerson=None, snmpCommunity=None, ipmiAuthtype=None,
                       ipmiPrivilege=None, ipmiUsername=None, ipmiPassword=None,
                       factoryId=None, model=None, version=None, serialnumber=None,
@@ -99,11 +99,13 @@ class TestDeviceCreate(object):
         api.hostType = hostType
         api.manageLevel = manageLevel
         api.iplist = iplist
+        api.port = port
         api.dns = dns
         api.monitorInterface = monitorInterface
         api.monitorType = monitorType
         api.parentHost = parentHost
         api.businessIds = businessIds
+        api.businessTree = businessTree
         api.opsPerson = opsPerson
         api.snmpCommunity = snmpCommunity
         api.ipmiAuthtype = ipmiAuthtype
@@ -139,7 +141,7 @@ class TestDeviceCreate(object):
     def check_select(self, response, name, manage_ip, manage_level, host_type,
                      monitor_status, iplist, dns, monitor_interface, ops_person, factoryId,
                      model, version, serialnumber, description, snmp_community, ipmi_authtype, ipmi_privilege,
-                     ipmi_username, ipmi_password):
+                     ipmi_username, ipmi_password, businessIds, businessTree):
         data = UtilsResponse().get_data(response=response)
         sql = self.select_hosts(hostid=data)
         assert sql != []
@@ -156,7 +158,8 @@ class TestDeviceCreate(object):
             assert y.iplist == iplist
             assert y.dns == dns
             assert int(y.monitor_interface) == monitor_interface
-            assert y.business_ids == str(self.base_business_id_1) + "," + str(self.base_business_id_2)
+            assert y.business_ids == businessIds
+            assert y.business_tree == businessTree
             # assert y.port == port
             assert y.ops_person == ops_person
             assert y.factory_id == factoryId
@@ -171,6 +174,15 @@ class TestDeviceCreate(object):
             assert y.ipmi_password == ipmi_password
             assert x == 0
 
+    @allure.step("校验查询结果")
+    def check_monitor_type(self, response, name, monitor_type):
+        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.monitor_type == monitor_type
+
     @allure.step("断言返回结果")
     def check_code(self, response, code):
         _code = UtilsResponse().get_code(response=response)
@@ -221,6 +233,7 @@ class TestDeviceCreate(object):
         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)
         self.check_code(response=response, code=0)
+        self.check_monitor_type(response=response, name=name, monitor_type=1)
 
     @allure.title("device.create：创建agent资产,dns识别")
     @allure.story("创建资产：创建agent资产,dns识别")
@@ -232,6 +245,7 @@ class TestDeviceCreate(object):
         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, manageLevel=1)
         self.check_code(response=response, code=0)
+        self.check_monitor_type(response=response, name=name, monitor_type=2)
 
     @allure.title("device.create：创建snmp资产,ip识别")
     @allure.story("创建资产：创建snmp资产,ip识别")
@@ -243,6 +257,7 @@ class TestDeviceCreate(object):
         response = self.device_create(token=self.token, hostName=name, hostType=self.base_type_snmp, iplist=self.base_ip, monitorInterface=self.base_port,
                                       monitorType=1, manageLevel=1)
         self.check_code(response=response, code=0)
+        self.check_monitor_type(response=response, name=name, monitor_type=1)
 
     @allure.title("device.create：创建snmp资产,dns识别")
     @allure.story("创建资产：创建snmp资产,dns识别")
@@ -254,6 +269,7 @@ class TestDeviceCreate(object):
         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, manageLevel=1)
         self.check_code(response=response, code=0)
+        self.check_monitor_type(response=response, name=name, monitor_type=2)
 
     @allure.title("device.create：创建资产-所有字段")
     @allure.story("创建资产：创建资产-所有字段")
@@ -262,7 +278,8 @@ 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=[self.base_business_id_1, self.base_business_id_2],
+                                      monitorType=1, manageLevel=1, parentHost="parentHost",
+                                      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",
                                       factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description",
@@ -271,7 +288,8 @@ 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, 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")
+                          factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description",
+                          businessIds=self.base_business_id_1 + "," + self.base_business_id_2, businessTree="businessTree")
 
 
 if __name__ == "__main__":

WorkData/Argus/hosts.py

@@ -36,7 +36,9 @@ class Hosts(Base):
     iplist = Column(VARCHAR(255), comment="IP列表 分号隔开")
     dns = Column(VARCHAR(255), comment="域名")
     monitor_interface = Column(VARCHAR(255), comment="监控接口 分号隔开")
+    monitor_type = Column(Integer, comment="监控方式（1：ip 2：dns）")
     business_ids = Column(VARCHAR(255), comment="业务id（对应于zabbix系统的分组）")
+    business_tree = Column(VARCHAR(255), comment="业务树")
     port = Column(VARCHAR(30), comment="服务端口号")
     ops_person = Column(Integer, comment="运维人员")
     factory_id = Column(VARCHAR(255), comment="厂商")
@@ -52,6 +54,7 @@ class Hosts(Base):
     create_time = Column(BigInteger, comment="创建时间")
     del_flag = Column(Integer, comment="0:存在；1：删除")
     discovered = Column(Integer, comment="0-非自动发现  1- 自动发现主机")
+    update_time = Column(BigInteger, comment="修改时间")
 
 
 class DataHosts(object):