From 22d6f2774f899d27bd3424e579c5b56e57566931 Mon Sep 17 00:00:00 2001 From: wenxin Date: Tue, 6 Dec 2022 17:45:08 +0800 Subject: [PATCH] update delete host (cherry picked from commit d324ede061fd9b568d47e6eff81f0d5f388f269e) --- 0001-update-delete-host.patch | 28 ++++++++++++++++++++++++++++ aops-zeus.spec | 8 ++++++-- 2 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 0001-update-delete-host.patch diff --git a/0001-update-delete-host.patch b/0001-update-delete-host.patch new file mode 100644 index 0000000..e60aa4a --- /dev/null +++ b/0001-update-delete-host.patch @@ -0,0 +1,28 @@ +From e6b2a47ac13080a2e4eed63d7e8972c95307d04c Mon Sep 17 00:00:00 2001 +From: wenxin +Date: Mon, 5 Dec 2022 23:35:28 +0800 +Subject: [PATCH] update delete host + +--- + zeus/host_manager/view.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/zeus/host_manager/view.py b/zeus/host_manager/view.py +index ecb046c..ed2de8c 100644 +--- a/zeus/host_manager/view.py ++++ b/zeus/host_manager/view.py +@@ -172,7 +172,10 @@ class DeleteHost(BaseResponse): + Returns: + dict: response body + """ +- return jsonify(self.handle_request(DeleteHostSchema, self)) ++ return jsonify(self.handle_request_db(DeleteHostSchema, ++ HostProxy(), ++ 'delete_host', ++ SESSION)) + + + class GetHost(BaseResponse): +-- +2.37.1.windows.1 + diff --git a/aops-zeus.spec b/aops-zeus.spec index 917d44f..065aeb6 100644 --- a/aops-zeus.spec +++ b/aops-zeus.spec @@ -1,10 +1,11 @@ Name: aops-zeus Version: v1.1.1 -Release: 1 +Release: 2 Summary: A host and user manager service which is the foundation of aops. License: MulanPSL2 URL: https://gitee.com/openeuler/%{name} Source0: %{name}-%{version}.tar.gz +Patch0001: 0001-update-delete-host.patch BuildRequires: python3-setuptools Requires: aops-vulcanus >= %{version}-%{release} @@ -19,7 +20,7 @@ A host and user manager service which is the foundation of aops. %prep -%autosetup -n %{name}-%{version} +%autosetup -n %{name}-%{version} -p1 # build for aops-zeus @@ -40,6 +41,9 @@ A host and user manager service which is the foundation of aops. %changelog +* Tue Dec 06 2022 wenxin - v1.1.1-2 +- update delete host, remove the judgment about the workflow + * Fri Dec 02 2022 wenxin - v1.1.1-1 - set timeout for cve scan,cve fix ,repo set -- Gitee