packages/aops-ceres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add field os_version for register

Browse Source
This commit is contained in:
wenxin 2022-11-23 11:39:23 +08:00
parent 96f2ac1492
commit bd16f18546
2 changed files with 72 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
0001-add-field-os_version-for-register.patch Normal file
View File

@ -0,0 +1,66 @@
From 6034a3711f5917ad57173a261a16610ed8a9461e Mon Sep 17 00:00:00 2001
From: wenxin <shusheng.wen@outlook.com>
Date: Wed, 23 Nov 2022 10:31:23 +0800
Subject: [PATCH 1/1] add field os_version for register
---
ceres/function/register.py | 1 +
ceres/tests/function/test_register.py | 11 ++++++++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ceres/function/register.py b/ceres/function/register.py
index 9c72e79..e4e7fe1 100644
--- a/ceres/function/register.py
+++ b/ceres/function/register.py
@@ -77,6 +77,7 @@ def register(register_info: dict) -> int:
data['public_ip'] = Collect.get_host_ip()
data['agent_port'] = register_info.get('agent_port') or \
configuration.ceres.get('PORT')
+ data["os_version"] = Collect.get_system_info()
manager_ip = register_info.get('manager_ip')
manager_port = register_info.get('manager_port')
diff --git a/ceres/tests/function/test_register.py b/ceres/tests/function/test_register.py
index b7d3a6e..312ca32 100644
--- a/ceres/tests/function/test_register.py
+++ b/ceres/tests/function/test_register.py
@@ -14,6 +14,7 @@ import unittest
from unittest import mock
import responses
+from ceres.manages.collect_manage import Collect
from ceres.function.register import register, register_info_to_dict
from ceres.function.status import SUCCESS, PARAM_ERROR
@@ -23,7 +24,9 @@ class TestRegister(unittest.TestCase):
@responses.activate
@mock.patch('builtins.open', mock.mock_open())
- def test_register_should_return_200_when_input_correct(self):
+ @mock.patch.object(Collect, "get_system_info")
+ def test_register_should_return_200_when_input_correct(self, mock_os_version):
+ mock_os_version.return_value = 'mock version'
input_data = {
"web_username": "admin",
"web_password": "changeme",
@@ -233,7 +236,9 @@ class TestRegister(unittest.TestCase):
@responses.activate
@mock.patch('builtins.open', mock.mock_open())
- def test_register_should_return_success_when_input_with_no_agent_port(self):
+ @mock.patch.object(Collect, "get_system_info")
+ def test_register_should_return_success_when_input_with_no_agent_port(self, mock_os_version):
+ mock_os_version.return_value = "mock version"
responses.add(responses.POST,
'http://127.0.0.1:11111/manage/host/add',
json={"token": "hdahdahiudahud", "code": SUCCESS},
@@ -265,4 +270,4 @@ class TestRegister(unittest.TestCase):
def test_register_info_to_dict_should_return_empty_dict_when_input_is_not_json_string(self):
mock_string = '{mock'
res = register_info_to_dict(mock_string)
- self.assertEqual({}, res)
\ No newline at end of file
+ self.assertEqual({}, res)
--
2.37.1.windows.1

8
aops-ceres.spec
View File

@ -1,10 +1,11 @@
Name: aops-ceres
Version: v1.0.0
Release: 1
Release: 2
Summary: An agent which needs to be adopted in client, it managers some plugins, such as gala-gopher(kpi collection), fluentd(log collection) and so on.
License: MulanPSL2
URL: https://gitee.com/openeuler/%{name}
Source0: %{name}-%{version}.tar.gz
Patch0001: 0001-add-field-os_version-for-register.patch
BuildRequires: python3-setuptools
@ -20,7 +21,7 @@ An agent which needs to be adopted in client, it managers some plugins, such as
%prep
%autosetup -n %{name}-%{version}
%autosetup -n %{name}-%{version} -p1
# build for aops-ceres
@ -41,5 +42,8 @@ An agent which needs to be adopted in client, it managers some plugins, such as
%changelog
* Wed Nov 23 2022 wenxin<shusheng.wen@outlook.com> - v1.0.0-2
- update register: add field os_version for register
* Tue Nov 22 2022 zhuyuncheng<zhuyuncheng@huawei.com> - v1.0.0-1
- Package init