Fix(tests): start local agent by default #1065
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
dracher
force-pushed
the
VROOM-26373
branch
2 times, most recently
from
4b1ab93 to
979a98f
Compare
dracher
requested review from
alexlarsson,
engelmi,
mkemel and
rhatdan
as code owners
mwperina
reviewed
Apr 18, 2025
tests/tests/tier0/bluechi-agent-resolve-fqdn/test_bluechi_agent_resolve_fqdn.py
Show resolved
Hide resolved
There was a problem hiding this comment.
Hmm, shouldn't we remove this test completely as we test local UDS connection by default?
tests/tests/tier0/bluechi-is-online-system-monitor/test_bluechi_is_online_system_monitor.py
Outdated
Show resolved
Hide resolved
tests/tests/tier0/bluechi-is-online-system-monitor/test_bluechi_is_online_system_monitor.py
Outdated
Show resolved
Hide resolved
tests/tests/tier0/proxy-service-stop-bluechi-dep/test_proxy_service_stop_bluechi_dep.py
Outdated
Show resolved
Hide resolved
...xy-service-stop-requesting-with-unneeded/test_proxy_service_stop_requesting_with_unneeded.py
Outdated
Show resolved
Hide resolved
tests/tests/tier0/proxy-service-stop-requesting/test_proxy_service_stop_requesting.py
Outdated
Show resolved
Hide resolved
tests/tests/tier0/proxy-service-stop-target/test_proxy_service_stop_target.py
Outdated
Show resolved
Hide resolved
tests/bluechi_test/test.py
Outdated
| @@ -253,6 +261,9 @@ def setup( | |||
| if self.bluechi_controller_config is None: | |||
| raise Exception("Bluechi Controller configuration not set") | |||
|
|
|||
| if self.bluechi_local_agent_config is not None: | |||
| self.bluechi_controller_config.allowed_node_names.append("node-local") | |||
There was a problem hiding this comment.
Hmm, instead of appending node-local to allowed_node_names here wouldn't it be cleaner to do that inside BluechiController Machine class?
class BluechiControllerMachine(BluechiMachine):
def __init__(
self,
name: str,
client: Client,
ctrl_config: BluechiControllerConfig,
agent_config: BluechiAgentConfig = None,
) -> None:
super().__init__(name, client)
self.bluechictl = BluechiCtl(client)
self.config = ctrl_config
self.config_agent = agent_config
if self.config_agent is not None:
self.config.allowed_node_names.append(self.config_agent.node_name)
self.create_file(
self.config_agent.get_confd_dir(),
self.config_agent.file_name,
self.config_agent.serialize(),
)
# add confd file to container
self.create_file(
self.config.get_confd_dir(), self.config.file_name, self.config.serialize()
)
self.copy_machine_lib()There was a problem hiding this comment.
In the current implementation， it can't append the node-ctrl name inside BluechiController Machine class, it will be overwrite by it
update all test cases(which requires 2 agents) to use node-local as second agent remove redundant agent configs and use the controller machine for local agent operations simplify test setups by removing unnecessary agent configuration current progress: - [x] monitor-wildcard-unit-changes - [x] proxy-service-start - [x] bluechi-reset-failed - [x] monitor-multiple-nodes-and-units - [x] monitor-system-status 3 agents - [x] bluechi-nodes-statuses - [x] bluechi-is-oneline-system - [x] bluechi-reset-failed - [x] bluechi-reset-failed-node - [x] proxy-service-stop-target - [x] proxy-service-stop-requesting - [x] proxy-service-stop-bluechi-dep - [x] bluechi-list-units-on-all-nodes - [x] monitor-wildcard-node-reconnect - [x] bluechi-is-online-system-monitor - [x] monitor-multiple-nodes-and-units - [x] proxy-service-fails-on-execstart - [x] proxy-service-fails-on-typo-in-file - [x] proxy-service-multiple-services-one-node - [x] service-fails-on-non-existent-service - [x] service-stop-requesting-with-unneeded - [x] multiple-services-multiple-nodes - [x] propagate-target-service-failure - [x] socket-activation-parallel - use global constant for node-ctrl name Fixes: eclipse-bluechi#1042
engelmi
reviewed
Apr 24, 2025
| @@ -63,6 +63,9 @@ def test_agent_invalid_configuration( | |||
| bluechi_node_default_config: BluechiAgentConfig, | |||
| bluechi_ctrl_default_config: BluechiControllerConfig, | |||
| ): | |||
| # Disable default local agent on controller node using UDS, | |||
There was a problem hiding this comment.
Not related to this PR, but would be great to fix it here:
The name of the function should reflect the file name - so test_agent_invalid_configuration should be renamed to test_bluechi_agent_connect_via_controller_address.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
update all test cases(which requires 2 agents) to use node-local as second agent remove redundant agent configs and use the controller machine for local agent operations simplify test setups by removing unnecessary agent configuration
current progress:
bluechi-agent-invalid-port-configurationFixes: #1042