Improve the `agent_files_deletion` test #2296

yanazaeva · 2021-12-02T16:51:11Z

Related issue
#2282

Description

This closes #2282. In this PR we are adding two sleep functions in different places in order to:

allow the agent properly reconnect with the manager after the restart.
give some time to the synchronization in the cluster.

Rebits

GJ, but some changes are required.

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py

yanazaeva · 2021-12-10T18:30:32Z

After @Rebits review, the first sleep set in order to wait for the agent to properly restart and reconnect was replaced by a fixture to monitor the agent enrollment event in the ossec.log:

wazuh-qa/tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py

Line 41 in 4b5d228

 HostMonitor(inventory_path=inventory_path, messages_path=messages_path, tmp_path=tmp_path).run() 

However, the other two sleep functions present in the code are necessary as it seems that there is no log registering the addition of information to the global.db database. This addition takes almost 50 seconds, so the time to sync is set to 60. Also, the first of these sleep functions were moved right after the agent restarted, which seems to be a more suitable place. The second one remains where it was originally.

Lastly, two lines were added at the beginning of the test to clean the old ossec.log and cluster.log before every execution.

davidjiglesias

'However, the other two sleep functions present in the code are necessary as it seems that there is no log registering the addition of information to the global.db database. This addition takes almost 50 seconds, so the time to sync is set to 60'

The addition of the agent information to global.db can be found in ossec.log with debug 2 for modulesd:

wazuh-modulesd:database[21279] wm_database.c:279 at wm_sync_agents(): DEBUG: Synchronizing agent 38990 '1-5srgA8E40i9Wj3tz-debian10'.

I suggest adding a new HostMonitor to detect this addition in the master node. Also, 50 seconds seems to be a lot of time for an already connected agent to appear in global.db.

yanazaeva · 2021-12-21T17:04:11Z

Modified the test according to the feedback and explained all the changes here.

Rebits

LGTM

snaow · 2021-12-29T08:21:11Z

Hi team, some comments after my review:

Do not create files dynamically using Ansible "content". It's way better to create an artifact somewhere (test directory or QA Framework directory) and copy the file into the host.
https:/wazuh/wazuh-qa/pull/2296/files#diff-30a029777cc7b982949c2af07bde8bef83b427736d92b3ae0359afca33ce50cfR103-R113
Use relative paths please, I know this happens everywhere in other tests but let's start to do this properly when we can.
Use logs/cluster.log instead and later on Python implementation append the "wazuh_home" path (/var/ossec/) (same thing happen when running run_host commands).
https:/wazuh/wazuh-qa/pull/2296/files#diff-c2f74d5cd13632948a6adf9b934d0820082ca629c0fc7eeb9e8312e241b8fb80R2-R19
I can see we are running bin/cluster_control -a to get agent status, but a few lines below (line 62), we are using API calls to get other agent info, why not use API calls every time instead of running Bash commands?
https:/wazuh/wazuh-qa/pull/2296/files#diff-5350928a3d5d51eb7dbe1264355a07e2bf675d33ff3ef6a79b0bf5404f205f98R38-R40

yanazaeva · 2021-12-30T14:43:06Z

Added all the changes proposed by @snaow.

Test result

	Results
R1	🟢
R2	🟢
R3	🟢
R4	🟢
R5	🟢

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py

tests/system/provisioning/basic_cluster/playbook.yml

tests/system/README.md

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py

yanazaeva · 2022-01-05T14:46:48Z

These are the test results after applying the changes proposed by @juliamagan:

	Results
R1	🟢
R2	🟢
R3	🟢

juliamagan · 2022-01-05T16:31:23Z

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py

+ response = host_manager.make_api_call(host=master_host, method='GET', token=master_token,
+ endpoint='/agents?status=active')
+ assert response['status'] == 200, 'Failed when trying to get the active agents'
+ if int(response['json']['data']['total_affected_items']) == 4:


We should check that the expected agent is active, not that there are 4 total_affected_items

juliamagan · 2022-01-07T11:42:07Z

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py

+ elif time() > timeout:
+ print("The agent 'wazuh-agent3' is not 'Active' yet.")


We are not exiting the while, so when we can't find the wazuh-agent3 active, the test will keep printing The agent 'wazuh-agent3' is not 'Active' yet. forever.

yanazaeva · 2022-01-10T10:03:18Z

Added @juliamagan's changes. Tests results after modifications:

	Results
R1	🟢
R2	🟢
R3	🟢

juliamagan · 2022-01-10T17:08:13Z

Testing

Wazuh branch	Wazuh-QA branch
v4.3.0-rc2	feature/2282-add-more-time-for-sync

	Results
R1	🟢
R2	🟢
R3	🟢

Add sleep function to allow the agent's proper reconnection

bc71c05

yanazaeva added team/framework feature/cluster feature/api labels Dec 2, 2021

yanazaeva requested a review from davidjiglesias December 2, 2021 16:51

yanazaeva self-assigned this Dec 2, 2021

AdriiiPRodri self-requested a review December 7, 2021 09:52

AdriiiPRodri previously approved these changes Dec 7, 2021

View reviewed changes

Rebits added the subteam/qa-hurricane label Dec 9, 2021

Rebits requested changes Dec 9, 2021

View reviewed changes

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py Outdated Show resolved Hide resolved

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py Outdated Show resolved Hide resolved

yanazaeva dismissed AdriiiPRodri’s stale review via bca0a10 December 10, 2021 17:52

yanazaeva requested review from Rebits and AdriiiPRodri December 10, 2021 17:53

Change after review

4b5d228

yanazaeva force-pushed the feature/2282-add-more-time-for-sync branch from bca0a10 to 4b5d228 Compare December 10, 2021 18:21

davidjiglesias approved these changes Dec 14, 2021

View reviewed changes

davidjiglesias requested changes Dec 14, 2021

View reviewed changes

yanazaeva force-pushed the feature/2282-add-more-time-for-sync branch 2 times, most recently from a2871a6 to 3cdf73a Compare December 21, 2021 16:53

yanazaeva requested a review from davidjiglesias December 21, 2021 17:05

yanazaeva force-pushed the feature/2282-add-more-time-for-sync branch from 3cdf73a to d1e0a10 Compare December 22, 2021 10:53

yanazaeva changed the title ~~Add sleep function to files_deletion test~~ Improve the agent_files_deletion test Dec 22, 2021

davidjiglesias previously approved these changes Dec 22, 2021

View reviewed changes

yanazaeva dismissed davidjiglesias’s stale review via 05fead9 December 22, 2021 12:35

yanazaeva force-pushed the feature/2282-add-more-time-for-sync branch 3 times, most recently from 03237e5 to 8bd17a4 Compare December 22, 2021 15:06

Rebits previously approved these changes Dec 22, 2021

View reviewed changes

yanazaeva requested a review from Rebits December 27, 2021 08:09

davidjiglesias previously approved these changes Dec 28, 2021

View reviewed changes

yanazaeva dismissed stale reviews from davidjiglesias and Selutario via c2eba34 December 30, 2021 10:42

yanazaeva force-pushed the feature/2282-add-more-time-for-sync branch 2 times, most recently from 9e43f99 to 1f9deb5 Compare December 30, 2021 14:20

yanazaeva requested review from davidjiglesias and Selutario December 30, 2021 14:43

Selutario suggested changes Dec 31, 2021

View reviewed changes

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py Outdated Show resolved Hide resolved

tests/system/test_cluster/test_agent_files_deletion/test_agent_files_deletion.py Outdated Show resolved Hide resolved

Changes after latest review by Snaow

95a2b6b

yanazaeva force-pushed the feature/2282-add-more-time-for-sync branch from 1f9deb5 to 95a2b6b Compare December 31, 2021 09:26

yanazaeva requested a review from Selutario December 31, 2021 09:39

Selutario previously approved these changes Dec 31, 2021

View reviewed changes

juliamagan requested changes Jan 4, 2022

View reviewed changes

yanazaeva dismissed Selutario’s stale review via 3c6e20c January 5, 2022 14:47

yanazaeva requested a review from juliamagan January 5, 2022 14:48

Changes after Julia's review

0f14e59

yanazaeva force-pushed the feature/2282-add-more-time-for-sync branch from 3c6e20c to 0f14e59 Compare January 5, 2022 15:27

juliamagan requested changes Jan 5, 2022

View reviewed changes

juliamagan requested changes Jan 7, 2022

View reviewed changes

Changes after Julia's review

fe34d17

yanazaeva requested a review from juliamagan January 10, 2022 10:04

snaow merged commit 8df834b into master Jan 11, 2022

snaow deleted the feature/2282-add-more-time-for-sync branch January 11, 2022 09:37

snaow mentioned this pull request Jan 27, 2022

QA Release - Rev 430031 #2500

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve the `agent_files_deletion` test #2296

Improve the `agent_files_deletion` test #2296

yanazaeva commented Dec 2, 2021

Rebits left a comment

yanazaeva commented Dec 10, 2021

davidjiglesias left a comment

yanazaeva commented Dec 21, 2021

Rebits left a comment

snaow commented Dec 29, 2021

yanazaeva commented Dec 30, 2021

yanazaeva commented Jan 5, 2022

juliamagan Jan 5, 2022

juliamagan Jan 7, 2022

yanazaeva commented Jan 10, 2022 •

edited

Loading

juliamagan commented Jan 10, 2022 •

edited

Loading

		elif time() > timeout:
		print("The agent 'wazuh-agent3' is not 'Active' yet.")

Improve the agent_files_deletion test #2296

Improve the agent_files_deletion test #2296

Conversation

yanazaeva commented Dec 2, 2021

Description

Rebits left a comment

Choose a reason for hiding this comment

yanazaeva commented Dec 10, 2021

davidjiglesias left a comment

Choose a reason for hiding this comment

yanazaeva commented Dec 21, 2021

Rebits left a comment

Choose a reason for hiding this comment

snaow commented Dec 29, 2021

yanazaeva commented Dec 30, 2021

Test result

yanazaeva commented Jan 5, 2022

juliamagan Jan 5, 2022

Choose a reason for hiding this comment

juliamagan Jan 7, 2022

Choose a reason for hiding this comment

yanazaeva commented Jan 10, 2022 • edited Loading

juliamagan commented Jan 10, 2022 • edited Loading

Testing

Improve the `agent_files_deletion` test #2296

Improve the `agent_files_deletion` test #2296

yanazaeva commented Jan 10, 2022 •

edited

Loading

juliamagan commented Jan 10, 2022 •

edited

Loading