From d1b049c433fe0175a024fda77c204cd9c287c018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=92=90?= Date: Fri, 22 Mar 2024 17:13:19 +0800 Subject: [PATCH] Add get_net_interval and get_net_times functions to global_parameter.py --- category/get_net_info.py | 6 ++++++ common/global_parameter.py | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/category/get_net_info.py b/category/get_net_info.py index aed1ba2..dad3fb1 100644 --- a/category/get_net_info.py +++ b/category/get_net_info.py @@ -12,6 +12,7 @@ if sys.getdefaultencoding() != 'utf-8': from common.decorator_wrap import DecoratorWrap from common.file import FileOperation +from common.global_parameter import GlobalParameter from common.log import Logger from common.command import Command @@ -30,6 +31,11 @@ class NetInfo: self.__netdev_ring = [] # #网卡连接状态信息 self.__link_status = {} + + # 默认时间间隔为1s + self.__interval = GlobalParameter().get_net_interval() + # 默认执行5次 + self.__times = GlobalParameter().get_net_times() def __get_devices(self): ''' diff --git a/common/global_parameter.py b/common/global_parameter.py index 665d3d8..2122e68 100644 --- a/common/global_parameter.py +++ b/common/global_parameter.py @@ -33,6 +33,12 @@ class GlobalParameter: # 默认执行5次 self.g_disk_times = GlobalCall.get_json_value("Getting.Common.Disk.times" , 5, Config.get_json_dict()) + + # *-----------------------get net info------------------- + # 默认时间间隔为1s + self.g_net_interval = GlobalCall.get_json_value("Getting.Common.Net.interval", 1, Config.get_json_dict()) + # 默认执行5次 + self.g_net_times = GlobalCall.get_json_value("Getting.Common.Net.times", 5, Config.get_json_dict()) # -------------------cpu parameters----------------------- @property @@ -59,4 +65,12 @@ class GlobalParameter: @property def get_disk_times(self): - return self.g_disk_times \ No newline at end of file + return self.g_disk_times + + # -------------------net parameters----------------------- + def get_net_interval(self): + return self.g_net_interval + + def get_net_times(self): + return self.g_net_times + \ No newline at end of file -- Gitee