new 1.1.1 release with bug fix and new features
(cherry picked from commit e19aa06b4434a882efb63dfeb16ad99c8ccbbcde)
This commit is contained in:
gitee-cmd
openeuler-sync-bot
parent
0afb6352ac
commit
470f8a8703
@ -1,54 +0,0 @@
|
||||
From 35907042fbdbe7949671cb508ee4690d91e27e0b Mon Sep 17 00:00:00 2001
|
||||
From: root <root@localhost.localdomain>
|
||||
Date: Sat, 18 Sep 2021 14:33:03 +0800
|
||||
Subject: [PATCH] add missed file and better cli output
|
||||
|
||||
---
|
||||
aops-cli/aops_cli/commands/task_cmd.py | 4 ++--
|
||||
aops-utils/aops_utils/excel2dict/__init__.py | 12 ++++++++++++
|
||||
2 files changed, 14 insertions(+), 2 deletions(-)
|
||||
create mode 100644 aops-utils/aops_utils/excel2dict/__init__.py
|
||||
|
||||
diff --git a/aops-cli/aops_cli/commands/task_cmd.py b/aops-cli/aops_cli/commands/task_cmd.py
|
||||
index 7d918e0..cd72b8c 100644
|
||||
--- a/aops-cli/aops_cli/commands/task_cmd.py
|
||||
+++ b/aops-cli/aops_cli/commands/task_cmd.py
|
||||
@@ -23,7 +23,7 @@ from aops_utils.restful.helper import make_manager_url
|
||||
from aops_utils.restful.response import MyResponse
|
||||
from aops_utils.restful.status import SUCCEED
|
||||
from aops_utils.cli_utils import add_page, cli_request, add_access_token, add_query_args
|
||||
-from aops_utils.cli_utils import request_without_print, print_row_from_result
|
||||
+from aops_utils.cli_utils import request_without_print, pretty_json
|
||||
|
||||
|
||||
class TaskCommand(BaseCommand):
|
||||
@@ -151,7 +151,7 @@ class TaskCommand(BaseCommand):
|
||||
result = request_without_print('POST', manager_url, pyload, header, params.access_token)
|
||||
task_infos = result.pop('task_infos', [])
|
||||
print(result)
|
||||
- print_row_from_result(task_infos)
|
||||
+ print(pretty_json(task_infos))
|
||||
|
||||
@staticmethod
|
||||
def manage_requests_delete(**kwargs):
|
||||
diff --git a/aops-utils/aops_utils/excel2dict/__init__.py b/aops-utils/aops_utils/excel2dict/__init__.py
|
||||
new file mode 100644
|
||||
index 0000000..e90ecf9
|
||||
--- /dev/null
|
||||
+++ b/aops-utils/aops_utils/excel2dict/__init__.py
|
||||
@@ -0,0 +1,12 @@
|
||||
+#!/usr/bin/python3
|
||||
+# ******************************************************************************
|
||||
+# Copyright (c) Huawei Technologies Co., Ltd. 2021-2021. All rights reserved.
|
||||
+# licensed under the Mulan PSL v2.
|
||||
+# You can use this software according to the terms and conditions of the Mulan PSL v2.
|
||||
+# You may obtain a copy of Mulan PSL v2 at:
|
||||
+# http://license.coscl.org.cn/MulanPSL2
|
||||
+# THIS SOFTWARE IS PROVIDED ON AN 'AS IS' BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR
|
||||
+# IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR
|
||||
+# PURPOSE.
|
||||
+# See the Mulan PSL v2 for more details.
|
||||
+# ******************************************************************************/
|
||||
--
|
||||
2.30.0
|
||||
|
||||
25
0001-fix-diag-return.patch
Normal file
25
0001-fix-diag-return.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 8c73f575b7a61b965b173e8267d8a389f48d5190 Mon Sep 17 00:00:00 2001
|
||||
From: gitee-cmd <chemingdao@huawei.com>
|
||||
Date: Sun, 26 Sep 2021 22:04:31 +0800
|
||||
Subject: [PATCH] fix diag return
|
||||
|
||||
---
|
||||
adoctor-cli/adoctor_cli/commands/diag_cmd.py | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/adoctor-cli/adoctor_cli/commands/diag_cmd.py b/adoctor-cli/adoctor_cli/commands/diag_cmd.py
|
||||
index fb03a0c..9852a9d 100644
|
||||
--- a/adoctor-cli/adoctor_cli/commands/diag_cmd.py
|
||||
+++ b/adoctor-cli/adoctor_cli/commands/diag_cmd.py
|
||||
@@ -143,6 +143,7 @@ class DiagCommand(BaseCommand):
|
||||
}
|
||||
result = request_without_print('POST', diag_url, pyload, header, params.access_token)
|
||||
print(pretty_json(result))
|
||||
+ return
|
||||
times -= 1
|
||||
print("There is no task can be found in diagnosis scheduler, please try again.")
|
||||
|
||||
--
|
||||
2.24.3 (Apple Git-128)
|
||||
|
||||
|
||||
Binary file not shown.
17
A-Ops.spec
17
A-Ops.spec
@ -1,12 +1,13 @@
|
||||
Name: A-Ops
|
||||
Version: v1.1.0
|
||||
Release: 2
|
||||
Version: v1.1.1
|
||||
Release: 1
|
||||
Summary: The intelligent ops toolkit for openEuler
|
||||
License: MulanPSL2
|
||||
URL: https://gitee.com/openeuler/A-Ops
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source1: A-Ops-web-node-modules.tar.gz
|
||||
patch0001: 0001-add-missed-file-and-better-cli-output.patch
|
||||
patch0001: 0001-fix-diag-return.patch
|
||||
|
||||
|
||||
# build for gopher
|
||||
BuildRequires: cmake gcc-c++ yum elfutils-devel clang >= 10.0.1 llvm libconfig-devel
|
||||
@ -109,7 +110,7 @@ Executor of diagnose module. Get messages from kafka and do the diagnose tasks.
|
||||
%package -n adoctor-cli
|
||||
Summary: command line tool of A-doctor
|
||||
Requires: aops-utils = %{version}-%{release}
|
||||
|
||||
Requires: python3-tqdm
|
||||
|
||||
%description -n adoctor-cli
|
||||
commandline tool of adoctor, offer commands for executing diagnose, importing/exporting diagnose tree,
|
||||
@ -489,6 +490,14 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Sep 26 2021 chemingdao<chemingdao@huawei.com> - v1.1.1-1
|
||||
- New release 1.1.1, bug fix and new features.
|
||||
- 1. Web issues fix: display fix and domain management modification.
|
||||
- 2. Fix cli display issues and add loading bar of diag.
|
||||
- 3. Fix return of gala-ragdoll.
|
||||
- 4. Fix log level.
|
||||
- 5. haproxy probe with vport info.
|
||||
|
||||
* Sat Sep 18 2021 zhuyuncheng<zhuyuncheng@huawei.com> - v1.1.0-2
|
||||
- add missed file and better cli output
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user