用户管理增加告警字段

WorkApi/APP/Members/Update/members_update_info.py

@@ -38,6 +38,9 @@ class MembersUpdateInfo(object):
         self.wechatUrl = None
         self.dingdingUrl = None
         self.remark = None
+        self.silenceTime = None
+        self.period = None
+        self.severity = None
         self.id = None
 
         self.api = UtilsRequest()
@@ -57,6 +60,9 @@ class MembersUpdateInfo(object):
         base.dict_add_key(_key="wechatUrl", value=self.wechatUrl)
         base.dict_add_key(_key="dingdingUrl", value=self.dingdingUrl)
         base.dict_add_key(_key="remark", value=self.remark)
+        base.dict_add_key(_key="silenceTime", value=self.silenceTime)
+        base.dict_add_key(_key="period", value=self.period)
+        base.dict_add_key(_key="severity", value=self.severity)
         base.dict_add_key(_key="id", value=self.id)
 
         self.local_json = base._json

WorkApi/APP/Members/members_create.py

@@ -26,8 +26,6 @@ class MembersCreate(object):
         self._data = {}
         self.response = ""
 
-        self.local_json = {}
-
         self.token = None
         self.name = None
         self.position = None
@@ -38,6 +36,9 @@ class MembersCreate(object):
         self.wechatUrl = None
         self.dingdingUrl = None
         self.remark = None
+        self.silenceTime = None
+        self.period = None
+        self.severity = None
 
         self.api = UtilsRequest()
 
@@ -56,8 +57,9 @@ class MembersCreate(object):
         base.dict_add_key(_key="wechatUrl", value=self.wechatUrl)
         base.dict_add_key(_key="dingdingUrl", value=self.dingdingUrl)
         base.dict_add_key(_key="remark", value=self.remark)
+        base.dict_add_key(_key="silenceTime", value=self.silenceTime)
+        base.dict_add_key(_key="period", value=self.period)
+        base.dict_add_key(_key="severity", value=self.severity)
 
-        self.local_json = base._json
-
-        self._json = self.local_json
+        self._json = base._json
         self.response = self.api.post(url=self._url, headers=self._headers, json=self._json)

WorkCase/APP/HostType/test_hosttype_get.py

@@ -196,9 +196,9 @@ class TestHostTypeGet(object):
         self.get_base_token()
         self.case_create(num="05", parentId=1, description=None)
 
-        response = self.hostType_get(token=self.token, parentId=1)
+        response = self.hostType_get(token=self.token, parentId=999)
         self.check_code(response=response, code=0)
-        self.check_select(response=response, title=self.title, parent_id=1, template_ids=None,
+        self.check_select(response=response, title=self.title, parent_id=999, template_ids=None,
                           interfaces=None, description=None, sortid=None)
 
     @allure.title("hosttype.get：description成功查询")

WorkCase/APP/Members/test_members_create.py

@@ -67,7 +67,8 @@ class TestMembersCreate(object):
 
     @allure.step("调用接口：members.create")
     def members_create(self, token=None, name=None, position=None, role=None, password=None,
-                       phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None):
+                       phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None,
+                       silenceTime=None, period=None, severity=None):
         api = MembersCreate(_host=self.host)
         api.token = token
         api.name = name
@@ -79,6 +80,9 @@ class TestMembersCreate(object):
         api.wechatUrl = wechatUrl
         api.dingdingUrl = dingdingUrl
         api.remark = remark
+        api.silenceTime = silenceTime
+        api.period = period
+        api.severity = severity
         api.get_response()
         return api.response
 
@@ -124,7 +128,8 @@ class TestMembersCreate(object):
         return sql
 
     @allure.step("校验查询结果")
-    def check_select(self, response, name, position, role, password, phone, email, wechatUrl, dingdingUrl, remark):
+    def check_select(self, response, name, position, role, password, phone, email, wechatUrl, dingdingUrl, remark,
+                     silenceTime, period, severity):
         members_id = UtilsResponse().get_data(response=response)
         sql = self.select_members(members_id=members_id)
         for x, y in enumerate(sql):
@@ -137,6 +142,9 @@ class TestMembersCreate(object):
             assert y.wechat_url == wechatUrl
             assert y.dingding_url == dingdingUrl
             assert y.remark == remark
+            assert y.silence_time == silenceTime
+            assert y.period == period
+            assert y.severity == severity
             assert y.status == 0
 
     @allure.step("断言返回结果")
@@ -197,10 +205,11 @@ class TestMembersCreate(object):
         name = self.base_name + "05"
         response = self.members_create(token=self.token, name=name, password=self.base_password, role=0,
                                        position="position", phone="phone", email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl",
-                                       remark="remark")
+                                       remark="remark", silenceTime="1h", period="1-7,00:23:59", severity="0,1,2,3,4,5")
         self.check_code(response=response, code=0)
         self.check_select(response=response, name=name, password=self.base_password, role=0, position="position",
-                          phone="phone", email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark")
+                          phone="phone", email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark",
+                          silenceTime="1h", period="1-7,00:23:59", severity="0,1,2,3,4,5")
 
 
 if __name__ == "__main__":

WorkCase/APP/Members/test_members_update_info.py

@@ -66,7 +66,8 @@ class TestMembersUpdateInfo(object):
 
     @allure.step("调用接口：members.create")
     def members_create(self, token=None, name=None, position=None, role=None, password=None,
-                       phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None):
+                       phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None,
+                       silenceTime=None, period=None, severity=None):
         api = MembersCreate(_host=self.host)
         api.token = token
         api.name = name
@@ -78,12 +79,16 @@ class TestMembersUpdateInfo(object):
         api.wechatUrl = wechatUrl
         api.dingdingUrl = dingdingUrl
         api.remark = remark
+        api.silenceTime = silenceTime
+        api.period = period
+        api.severity = severity
         api.get_response()
         return api.response
 
     @allure.step("调用接口：members.update.info")
     def members_update_info(self, token=None, name=None, position=None, role=None, password=None,
-                            phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None, _id=None):
+                            phone=None, email=None, wechatUrl=None, dingdingUrl=None, remark=None, _id=None,
+                            silenceTime=None, period=None, severity=None):
         api = MembersUpdateInfo(_host=self.host)
         api.token = token
         api.name = name
@@ -95,6 +100,9 @@ class TestMembersUpdateInfo(object):
         api.wechatUrl = wechatUrl
         api.dingdingUrl = dingdingUrl
         api.remark = remark
+        api.silenceTime = silenceTime
+        api.period = period
+        api.severity = severity
         api.id = _id
         api.get_response()
         return api.response
@@ -141,7 +149,8 @@ class TestMembersUpdateInfo(object):
         return sql
 
     @allure.step("校验查询结果")
-    def check_select(self, response, name, position, role, password, phone, email, wechatUrl, dingdingUrl, remark):
+    def check_select(self, response, name, position, role, password, phone, email, wechatUrl, dingdingUrl, remark,
+                     silenceTime, period, severity):
         members_id = UtilsResponse().get_data(response=response)
         sql = self.select_members(members_id=members_id)
         for x, y in enumerate(sql):
@@ -154,6 +163,9 @@ class TestMembersUpdateInfo(object):
             assert y.wechat_url == wechatUrl
             assert y.dingding_url == dingdingUrl
             assert y.remark == remark
+            assert y.silence_time == silenceTime
+            assert y.period == period
+            assert y.severity == severity
             assert y.status == 0
 
     @allure.step("断言返回结果")
@@ -208,10 +220,12 @@ class TestMembersUpdateInfo(object):
 
         response = self.members_update_info(token=self.token, _id=memberId, name=name + "修改",
                                             password="Test", role=1, position="position", phone="phone",
-                                            email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark")
+                                            email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark",
+                                            silenceTime="1h", period="1-7,00:23:59", severity="0,1,2,3,4,5")
         self.check_code(response=response, code=0)
         self.check_select(response=response, name=name + "修改", password="Test", role=1, position="position",
-                          phone="phone", email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark")
+                          phone="phone", email="email", wechatUrl="wechatUrl", dingdingUrl="dingdingUrl", remark="remark",
+                          silenceTime="1h", period="1-7,00:23:59", severity="0,1,2,3,4,5")
 
 
 if __name__ == "__main__":

WorkData/Argus/members.py

@@ -38,6 +38,9 @@ class Members(Base):
     wechat_url = Column(VARCHAR(255), comment="微信访问接口")
     dingding_url = Column(BigInteger, comment="钉钉访问接口")
     del_flag = Column(Integer, comment="(0:存在；1：删除)")
+    silence_time = Column(VARCHAR(32), comment="静默时间 时间单位（m:分钟，h:小时，d:天）")
+    period = Column(VARCHAR(32), comment="工作时间")
+    severity = Column(VARCHAR(32), comment="告警级别")
 
 
 class DataMembers(object):