140 lines
4.5 KiB
Diff
140 lines
4.5 KiB
Diff
From 6ba93db6c012b7547e80fc71e7dc3dd96d6f0aa4 Mon Sep 17 00:00:00 2001
|
|
From: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 18 Oct 2023 02:49:04 +0000
|
|
Subject: [PATCH 1/5] optimize Import
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Signed-off-by: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
---
|
|
zeus/config_manager/view.py | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/zeus/config_manager/view.py b/zeus/config_manager/view.py
|
|
index 6779153..0aa9682 100644
|
|
--- a/zeus/config_manager/view.py
|
|
+++ b/zeus/config_manager/view.py
|
|
@@ -22,7 +22,6 @@ from typing import List, Dict
|
|
from vulcanus.multi_thread_handler import MultiThreadHandler
|
|
from vulcanus.restful.resp import state
|
|
from vulcanus.restful.response import BaseResponse
|
|
-from zeus.conf import configuration
|
|
from zeus.conf.constant import CERES_COLLECT_FILE, CERES_SYNC_CONF
|
|
from zeus.database.proxy.host import HostProxy
|
|
from zeus.function.model import ClientConnectArgs
|
|
--
|
|
Gitee
|
|
|
|
|
|
From a43c526f7e8dcda9fe9b46ff6e1f80f370954259 Mon Sep 17 00:00:00 2001
|
|
From: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 18 Oct 2023 02:56:33 +0000
|
|
Subject: [PATCH 2/5] update zeus/tests/host_manager/test_add_host.py.
|
|
|
|
Signed-off-by: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
---
|
|
zeus/tests/host_manager/test_add_host.py | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/zeus/tests/host_manager/test_add_host.py b/zeus/tests/host_manager/test_add_host.py
|
|
index c51be95..6b8b1b0 100644
|
|
--- a/zeus/tests/host_manager/test_add_host.py
|
|
+++ b/zeus/tests/host_manager/test_add_host.py
|
|
@@ -17,7 +17,6 @@ from io import BytesIO
|
|
from unittest import mock
|
|
|
|
import paramiko
|
|
-import sqlalchemy
|
|
from paramiko import AuthenticationException
|
|
from sqlalchemy.orm.collections import InstrumentedList
|
|
|
|
--
|
|
Gitee
|
|
|
|
|
|
From d03456b27fdc16c868c0b871b3f43786cc383146 Mon Sep 17 00:00:00 2001
|
|
From: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 18 Oct 2023 02:58:24 +0000
|
|
Subject: [PATCH 3/5] update zeus/host_manager/ssh.py.
|
|
|
|
Signed-off-by: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
---
|
|
zeus/host_manager/ssh.py | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/zeus/host_manager/ssh.py b/zeus/host_manager/ssh.py
|
|
index 11f6383..a4e7628 100644
|
|
--- a/zeus/host_manager/ssh.py
|
|
+++ b/zeus/host_manager/ssh.py
|
|
@@ -15,7 +15,6 @@ from io import StringIO
|
|
from typing import Tuple
|
|
|
|
import paramiko
|
|
-from paramiko import sftp
|
|
|
|
from vulcanus.log.log import LOGGER
|
|
from vulcanus.restful.resp import state
|
|
--
|
|
Gitee
|
|
|
|
|
|
From 887b9525192140c5142b62c14b91c1656b3a657a Mon Sep 17 00:00:00 2001
|
|
From: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 18 Oct 2023 02:59:12 +0000
|
|
Subject: [PATCH 4/5] update zeus/tests/host_manager/test_delete_host.py.
|
|
|
|
Signed-off-by: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
---
|
|
zeus/tests/host_manager/test_delete_host.py | 2 --
|
|
1 file changed, 2 deletions(-)
|
|
|
|
diff --git a/zeus/tests/host_manager/test_delete_host.py b/zeus/tests/host_manager/test_delete_host.py
|
|
index 59a4098..5a0aea6 100644
|
|
--- a/zeus/tests/host_manager/test_delete_host.py
|
|
+++ b/zeus/tests/host_manager/test_delete_host.py
|
|
@@ -12,8 +12,6 @@
|
|
# ******************************************************************************/
|
|
from unittest import mock
|
|
|
|
-import sqlalchemy
|
|
-
|
|
from vulcanus.exceptions import DatabaseConnectionFailed
|
|
from vulcanus.restful.resp import state
|
|
from vulcanus.restful.response import BaseResponse
|
|
--
|
|
Gitee
|
|
|
|
|
|
From 089c24550ae9f5720629376692344870316e97a6 Mon Sep 17 00:00:00 2001
|
|
From: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
Date: Wed, 18 Oct 2023 03:00:38 +0000
|
|
Subject: [PATCH 5/5] update zeus/vulnerability_manage/view.py.
|
|
|
|
Signed-off-by: xuyongliang_01 <xuyongliang_yewu@cmss.chinamobile.com>
|
|
---
|
|
zeus/vulnerability_manage/view.py | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/zeus/vulnerability_manage/view.py b/zeus/vulnerability_manage/view.py
|
|
index 345978f..c56f672 100644
|
|
--- a/zeus/vulnerability_manage/view.py
|
|
+++ b/zeus/vulnerability_manage/view.py
|
|
@@ -15,12 +15,11 @@ import time
|
|
import threading
|
|
from typing import Dict, Tuple
|
|
|
|
-from flask import Response, request
|
|
+from flask import Response
|
|
import sqlalchemy
|
|
import gevent
|
|
|
|
from vulcanus.log.log import LOGGER
|
|
-from vulcanus.multi_thread_handler import MultiThreadHandler
|
|
from vulcanus.restful.resp import state
|
|
from vulcanus.restful.response import BaseResponse
|
|
from zeus.conf import configuration
|
|
--
|
|
Gitee
|
|
|