Merge pull request #1883 from eeff/v2.8

Pick to v2.8 fix(core): persist group when adding gtags
This commit is contained in:
fengzeroz
2024-03-07 17:33:41 +08:00
committed by GitHub
2 changed files with 6 additions and 1 deletions
+2
View File
@@ -1256,6 +1256,8 @@ int neu_adapter_add_gtags(neu_adapter_t *adapter, neu_req_add_gtag_t *cmd,
neu_adapter_driver_add_group((neu_adapter_driver_t *) adapter,
cmd->groups[group_index].group,
cmd->groups[group_index].interval);
adapter_storage_add_group(adapter->name, cmd->groups[group_index].group,
cmd->groups[group_index].interval);
for (int tag_index = 0; tag_index < cmd->groups[group_index].n_tag;
tag_index++) {
int add_tag_result = neu_adapter_driver_add_tag(
+4 -1
View File
@@ -9,7 +9,7 @@ class TestLog:
@description(given="multiple non-existing groups and multiple correct tags",
when="adding",
then="successfully added")
def test_adding_correct_gtags_nonexisting_groups(self):
def test_adding_correct_gtags_nonexisting_groups(self, class_setup_and_teardown):
response = api.add_node(node='modbus-tcp-tag-test', plugin=PLUGIN_MODBUS_TCP)
assert 200 == response.status_code
assert 0 == response.json()['error']
@@ -63,6 +63,9 @@ class TestLog:
assert 200 == response.status_code
assert NEU_ERR_SUCCESS == response.json()['error']
# check data persisted
class_setup_and_teardown.restart()
response = api.get_group()
assert 200 == response.status_code
assert 'group_1' == response.json()['groups'][0]['group']