资产模块

WorkApi/APP/Device/device_get.py

@@ -27,6 +27,7 @@ class DeviceGet(object):
         self.response = ""
 
         self.token = None
+        self.menuId = None
         self.name = None
         self.type = None
         self.manageLevel = None
@@ -36,8 +37,8 @@ class DeviceGet(object):
         self.businessIds = None
         self.memberId = None
         self.factoryId = None
-        self.ipBegin = None
-        self.ipEnd = None
+        self.assetCode = None
+        self.manageIp = None
 
         self.api = UtilsRequest()
 
@@ -56,8 +57,8 @@ class DeviceGet(object):
         base.dict_add_key(_key="businessIds", value=self.businessIds)
         base.dict_add_key(_key="memberId", value=self.memberId)
         base.dict_add_key(_key="factoryId", value=self.factoryId)
-        base.dict_add_key(_key="ipBegin", value=self.ipBegin)
-        base.dict_add_key(_key="ipEnd", value=self.ipEnd)
+        base.dict_add_key(_key="assetCode", value=self.assetCode)
+        base.dict_add_key(_key="manageIp", value=self.manageIp)
 
         self._params = base._json
         self.response = self.api.get(url=self._url, headers=self._headers, params=self._params)

WorkCase/APP/Device/test_device_asset_ips.py

@@ -26,8 +26,8 @@ import allure
 @allure.feature("测试模块：device.asset.ips")
 class TestDeviceAssetIps(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
-    host = "http://172.16.3.78:3334"
+    env = CaseBase().app_environment_host
+    host = env["host"]
     db_url = env["db_url"]
     db_port = env["db_port"]
     db_user = env["db_user"]

WorkCase/APP/Device/test_device_create.py

@@ -24,7 +24,7 @@ import allure
 @allure.feature("测试模块：device.create")
 class TestDeviceCreate(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
+    env = CaseBase().app_environment_host
     host = env["host"]
     db_url = env["db_url"]
     db_port = env["db_port"]

WorkCase/APP/Device/test_device_delete.py

@@ -26,8 +26,8 @@ import allure
 @allure.feature("测试模块：device.delete")
 class TestDeviceDelete(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
-    host = "http://172.16.3.78:3334"
+    env = CaseBase().app_environment_host
+    host = env["host"]
     db_url = env["db_url"]
     db_port = env["db_port"]
     db_user = env["db_user"]
@@ -46,6 +46,8 @@ class TestDeviceDelete(object):
     base_port = 999
 
     base_name = "SS测试资产-删除"
+    base_business_id_1 = "12"
+    base_business_id_2 = "13"
 
     @classmethod
     def setup_class(cls):
@@ -179,7 +181,8 @@ 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=self.base_business_id_1 + "," + self.base_business_id_2,
+                                      opsPerson=11, snmpCommunity="snmpCommunity",
                                       ipmiAuthtype=1, ipmiPrivilege=1, ipmiUsername="ipmiUsername", ipmiPassword="ipmiPassword",
                                       factoryId=1, model="model", version="version", serialnumber="serialnumber", description="description",
                                       monitorStatus=1)
@@ -250,11 +253,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 = TestDeviceDelete()
-    # a.setup_class()
-    # a.test_case_04()
+    # case_info = os.path.split(__file__)
+    # case = UtilsCmd().pytest_cmd()
+    # r = UtilsPyTest(case=case, case_info=case_info)
+    # r.run_main()
+
+    a = TestDeviceDelete()
+    a.setup_class()
+    a.test_case_05()

WorkCase/APP/Device/test_device_get.py

@@ -25,8 +25,8 @@ import allure
 @allure.feature("测试模块：device.get")
 class TestDeviceGet(object):
     log = UtilsLog()
-    env = CaseBase().app_environment
-    host = "http://172.16.3.78:3334"
+    env = CaseBase().app_environment_host
+    host = env["host"]
     db_url = env["db_url"]
     db_port = env["db_port"]
     db_user = env["db_user"]
@@ -44,6 +44,10 @@ class TestDeviceGet(object):
     base_port = 999
 
     base_name = "SS测试资产-查询"
+    base_business_id_1 = "12"
+    base_business_id_2 = "13"
+    base_business_name_1 = "SS专用业务1"
+    base_business_name_2 = "SS专用业务2"
 
     @classmethod
     def setup_class(cls):
@@ -87,7 +91,7 @@ class TestDeviceGet(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,
@@ -98,11 +102,13 @@ class TestDeviceGet(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
@@ -119,11 +125,12 @@ class TestDeviceGet(object):
         return api.response
 
     @allure.step("调用接口：device.get")
-    def device_get(self, token=None, name=None, _type=None, manageLevel=None, monitorStatus=None,
+    def device_get(self, token=None, menuId=None, name=None, _type=None, manageLevel=None, monitorStatus=None,
                    parentHost=None, businessIds=None, available=None, memberId=None, factoryId=None,
-                   ipBegin=None, ipEnd=None):
+                   assetCode=None, manageIp=None):
         api = DeviceGet(_host=self.host)
         api.token = token
+        api.menuId = menuId
         api.name = name
         api.type = _type
         api.manageLevel = manageLevel
@@ -133,8 +140,8 @@ class TestDeviceGet(object):
         api.businessIds = businessIds
         api.memberId = memberId
         api.factoryId = factoryId
-        api.ipBegin = ipBegin
-        api.ipEnd = ipEnd
+        api.assetCode = assetCode
+        api.manageIp = manageIp
         api.get_response()
         return api.response
 
@@ -157,13 +164,17 @@ class TestDeviceGet(object):
     @allure.step("创建测试数据")
     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",
+        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=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",
                                       monitorStatus=1)
         self.check_code(response=response, code=0)
         self.device_id = UtilsResponse().get_data(response=response)
+        return self.device_id
 
     @allure.step("断言返回结果")
     def check_code(self, response, code):
@@ -175,6 +186,12 @@ class TestDeviceGet(object):
         _msg = UtilsResponse().get_msg(response=response)
         assert _msg == msg
 
+    @allure.step("校验数据")
+    def check_data(self, response, _key, _value):
+        data = UtilsResponse().get_data(response=response)
+        for x, y in enumerate(data["list"]):
+            assert y[_key] == _value
+
     @allure.title("device.get：token未传")
     @allure.story("查询资产：token未传")
     @allure.severity("blocker")
@@ -214,13 +231,86 @@ class TestDeviceGet(object):
         response = self.device_get(token=self.token)
         self.check_code(response=response, code=0)
 
-    @allure.title("device.get：hostType查询")
-    @allure.story("查询资产：hostType查询")
+    @allure.title("device.get：name查询")
+    @allure.story("查询资产：name查询")
     def test_case_05(self):
         self.get_base_token()
         self.case_create(num="05")
-        response = self.device_get(token=self.token)
+        response = self.device_get(token=self.token, name=self.name)
+        self.check_code(response=response, code=0)
+        self.check_data(response=response, _key="name", _value=self.name)
+
+    @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)
+        self.check_data(response=response, _key="hostType", _value=self.base_type_agent)
+
+    @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)
+        self.check_data(response=response, _key="manageLevel", _value=1)
+
+    @allure.title("device.get：monitorStatus查询")
+    @allure.story("查询资产：monitorStatus查询")
+    def test_case_08(self):
+        self.get_base_token()
+        self.case_create(num="08")
+        response = self.device_get(token=self.token, monitorStatus=1)
+        self.check_code(response=response, code=0)
+        self.check_data(response=response, _key="monitorStatus", _value=1)
+
+    @allure.title("device.get：available查询")
+    @allure.story("查询资产：available查询")
+    def test_case_09(self):
+        self.get_base_token()
+        self.case_create(num="09")
+        response = self.device_get(token=self.token, available=1)
+        self.check_code(response=response, code=0)
+        self.check_data(response=response, _key="available", _value=1)
+
+    @allure.title("device.get：businessIds查询")
+    @allure.story("查询资产：businessIds查询")
+    def test_case_10(self):
+        self.get_base_token()
+        self.case_create(num="10")
+        response = self.device_get(token=self.token, businessIds=self.base_business_id_1 + "," + self.base_business_id_2)
+        self.check_code(response=response, code=0)
+        self.check_data(response=response, _key="businessesNames", _value=self.base_business_name_1 + "," + self.base_business_name_2)
+
+    @allure.title("device.get：memberId查询")
+    @allure.story("查询资产：memberId查询")
+    def test_case_11(self):
+        self.get_base_token()
+        self.case_create(num="11")
+        response = self.device_get(token=self.token, memberId=11)
+        self.check_code(response=response, code=0)
+        self.check_data(response=response, _key="memberName", _value="sanshi")
+
+    @allure.title("device.get：factoryId查询")
+    @allure.story("查询资产：factoryId查询")
+    def test_case_12(self):
+        self.get_base_token()
+        self.case_create(num="12")
+        response = self.device_get(token=self.token, factoryId=1)
+        self.check_code(response=response, code=0)
+        self.check_data(response=response, _key="factoryId", _value=1)
+
+    @allure.title("device.get：manageIp查询")
+    @allure.story("查询资产：manageIp查询")
+    def test_case_13(self):
+        self.get_base_token()
+        self.case_create(num="13")
+        response = self.device_get(token=self.token, manageIp=self.base_ip)
         self.check_code(response=response, code=0)
+        self.check_data(response=response, _key="manageIp", _value=self.base_ip)
 
 
 if __name__ == "__main__":
@@ -230,11 +320,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_04()
+    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_06()