fix(tests): start local agent be default

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

Fixes: #1042

Author: dracher

tests/bluechi_test/test.py

@@ -51,6 +51,14 @@ def __init__(
 
         self._test_init_time = datetime.datetime.now()
 
+        self.set_bluechi_local_agent_config(
+            BluechiAgentConfig(
+                file_name="agent.conf",
+                node_name="node-local",
+                controller_address="unix:path=/run/bluechi/bluechi.sock",
+            ).deep_copy()
+        )
+
     def set_bluechi_controller_config(self, cfg: BluechiControllerConfig):
         self.bluechi_controller_config = cfg
 

tests/tests/tier0/bluechi-agent-resolve-fqdn/test_bluechi_agent_resolve_fqdn.py

@@ -46,4 +46,6 @@ def test_agent_resolve_fqdn(
 
     bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)
 
+    bluechi_test.set_bluechi_local_agent_config(None)
+
     bluechi_test.run(verify_resolving_fqdn)

tests/tests/tier0/bluechi-and-agent-on-same-machine/python/is_node_connected.py

@@ -10,9 +10,9 @@
 
 class TestNodeIsConnected(unittest.TestCase):
     def test_node_is_connected(self):
-        n = Node("node-foo")
+        n = Node("node-local")
         assert n.status == "online"
-        assert n.name == "node-foo"
+        assert n.name == "node-local"
 
 
 if __name__ == "__main__":

tests/tests/tier0/bluechi-and-agent-on-same-machine/test_bluechi_and_agent_on_same_machine.py

@@ -6,11 +6,11 @@
 import os
 from typing import Dict
 
-from bluechi_test.config import BluechiAgentConfig, BluechiControllerConfig
+from bluechi_test.config import BluechiControllerConfig
 from bluechi_test.machine import BluechiAgentMachine, BluechiControllerMachine
 from bluechi_test.test import BluechiTest
 
-node_foo_name = "node-foo"
+node_foo_name = "node-local"
 
 
 def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
@@ -29,13 +29,4 @@ def test_bluechi_and_agent_on_same_machine(
     bluechi_ctrl_default_config.allowed_node_names = [node_foo_name]
 
     bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)
-    # don't add node_foo_config to bluechi_test to prevent it being started
-    # as separate container
-    bluechi_test.set_bluechi_local_agent_config(
-        BluechiAgentConfig(
-            controller_address="unix:path=/run/bluechi/bluechi.sock",
-            node_name=node_foo_name,
-            file_name="agent.conf",
-        ).deep_copy()
-    )
     bluechi_test.run(exec)

tests/tests/tier0/bluechi-controller-socket-activation/python/is_node_connected.py

@@ -10,7 +10,7 @@
 
 from bluechi.api import Node
 
-NODE_NAME = "node-foo"
+NODE_NAME = "node-local"
 
 
 class TestNodeIsConnected(unittest.TestCase):

tests/tests/tier0/bluechi-controller-socket-activation/test_bluechi_controller_socket_activation.py

@@ -7,12 +7,12 @@
 import os
 from typing import Dict
 
-from bluechi_test.config import BluechiAgentConfig, BluechiControllerConfig
+from bluechi_test.config import BluechiControllerConfig
 from bluechi_test.machine import BluechiAgentMachine, BluechiControllerMachine
 from bluechi_test.test import BluechiTest
 
 LOGGER = logging.getLogger(__name__)
-NODE_FOO = "node-foo"
+NODE_FOO = "node-local"
 
 
 def exec(ctrl: BluechiControllerMachine, _: Dict[str, BluechiAgentMachine]):
@@ -22,19 +22,6 @@ def exec(ctrl: BluechiControllerMachine, _: Dict[str, BluechiAgentMachine]):
     ctrl.systemctl.start_unit("bluechi-controller.socket")
     assert ctrl.wait_for_unit_state_to_be("bluechi-controller.socket", "active")
 
-    agent_config = BluechiAgentConfig(
-        file_name="agent.conf",
-        controller_address="unix:path=/run/bluechi/bluechi.sock",
-        node_name=NODE_FOO,
-    )
-    ctrl.create_file(
-        agent_config.get_confd_dir(),
-        agent_config.file_name,
-        agent_config.serialize(),
-    )
-
-    ctrl.systemctl.start_unit("bluechi-agent.service")
-    ctrl.wait_for_unit_state_to_be("bluechi-agent.service", "active")
     ctrl.wait_for_unit_state_to_be("bluechi-controller.service", "active")
 
     result, output = ctrl.run_python(os.path.join("python", "is_node_connected.py"))

tests/tests/tier0/bluechi-is-online-system-monitor/test_bluechi_is_online_system_monitor.py

@@ -14,7 +14,7 @@
 LOGGER = logging.getLogger(__name__)
 
 AGENT_ONE = "agent-one"
-AGENT_TWO = "agent-two"
+AGENT_TWO = "node-local"
 SLEEP_DURATION = get_test_env_value_int("SLEEP_DURATION", 2)
 
 
@@ -77,9 +77,9 @@ def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
 
     # Test 3: Agent-two offline
     LOGGER.debug("Stopping agent-two.")
-    nodes[AGENT_TWO].systemctl.stop_unit("bluechi-agent")
+    ctrl.systemctl.stop_unit("bluechi-agent")
 
-    assert nodes[AGENT_TWO].wait_for_unit_state_to_be("bluechi-agent", "inactive")
+    assert ctrl.wait_for_unit_state_to_be("bluechi-agent", "inactive")
 
     monitor_result_test_three = MonitorResult()
     monitor_thread = threading.Thread(
@@ -95,15 +95,15 @@ def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
 
     # Bring agent-two back online
     LOGGER.debug("Starting agent-two.")
-    nodes[AGENT_TWO].systemctl.start_unit("bluechi-agent")
+    ctrl.systemctl.start_unit("bluechi-agent")
 
     # Test 4: Both agents offline
     LOGGER.debug("Stopping both agents.")
     nodes[AGENT_ONE].systemctl.stop_unit("bluechi-agent")
-    nodes[AGENT_TWO].systemctl.stop_unit("bluechi-agent")
+    ctrl.systemctl.stop_unit("bluechi-agent")
 
     assert nodes[AGENT_ONE].wait_for_unit_state_to_be("bluechi-agent", "inactive")
-    assert nodes[AGENT_TWO].wait_for_unit_state_to_be("bluechi-agent", "inactive")
+    assert ctrl.wait_for_unit_state_to_be("bluechi-agent", "inactive")
 
     monitor_result_test_four = MonitorResult()
     monitor_thread = threading.Thread(
@@ -120,7 +120,7 @@ def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
     # Bring both agents back online
     LOGGER.debug("Starting both agents.")
     nodes[AGENT_ONE].systemctl.start_unit("bluechi-agent")
-    nodes[AGENT_TWO].systemctl.start_unit("bluechi-agent")
+    ctrl.systemctl.start_unit("bluechi-agent")
 
     # Test 5: Controller offline
     LOGGER.debug("Stopping the controller.")
@@ -147,13 +147,9 @@ def test_bluechi_is_online_system_monitor(
     agent_one_cfg = bluechi_node_default_config.deep_copy()
     agent_one_cfg.node_name = AGENT_ONE
 
-    agent_two_cfg = bluechi_node_default_config.deep_copy()
-    agent_two_cfg.node_name = AGENT_TWO
-
     bluechi_ctrl_default_config.allowed_node_names = [AGENT_ONE, AGENT_TWO]
 
     bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)
     bluechi_test.add_bluechi_agent_config(agent_one_cfg)
-    bluechi_test.add_bluechi_agent_config(agent_two_cfg)
 
     bluechi_test.run(exec)

tests/tests/tier0/bluechi-is-online-system/test_bluechi_is_online_system.py

@@ -12,13 +12,12 @@
 LOGGER = logging.getLogger(__name__)
 
 AGENT_ONE = "agent-one"
-AGENT_TWO = "agent-two"
+AGENT_TWO = "node-local"
 
 
 def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
 
     agent_one = nodes[AGENT_ONE]
-    agent_two = nodes[AGENT_TWO]
 
     # Test 1: Both agents and controller are online
     LOGGER.debug("Testing with both agents and controller online.")
@@ -38,20 +37,20 @@ def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
 
     # Test 3: Agent-two offline
     LOGGER.debug("Stopping agent-two.")
-    agent_two.systemctl.stop_unit("bluechi-agent")
+    ctrl.systemctl.stop_unit("bluechi-agent")
 
     assert (
         not ctrl.bluechi_is_online.system_is_online()
     ), "Expected system to report offline when agent-two is inactive"
 
     # Bring agent-two back online
     LOGGER.debug("Starting agent-two.")
-    agent_two.systemctl.start_unit("bluechi-agent")
+    ctrl.systemctl.start_unit("bluechi-agent")
 
     # Test 4: Both agents are offline
     LOGGER.debug("Stopping both agents.")
     agent_one.systemctl.stop_unit("bluechi-agent")
-    agent_two.systemctl.stop_unit("bluechi-agent")
+    ctrl.systemctl.stop_unit("bluechi-agent")
 
     assert (
         not ctrl.bluechi_is_online.system_is_online()
@@ -60,7 +59,7 @@ def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
     # Bring both agents back online
     LOGGER.debug("Starting both agents.")
     agent_one.systemctl.start_unit("bluechi-agent")
-    agent_two.systemctl.start_unit("bluechi-agent")
+    ctrl.systemctl.start_unit("bluechi-agent")
 
     # Test 5: Controller offline
     LOGGER.debug("Stopping the controller.")
@@ -80,13 +79,9 @@ def test_bluechi_is_online_system(
     agent_one_cfg = bluechi_node_default_config.deep_copy()
     agent_one_cfg.node_name = AGENT_ONE
 
-    agent_two_cfg = bluechi_node_default_config.deep_copy()
-    agent_two_cfg.node_name = AGENT_TWO
-
     bluechi_ctrl_default_config.allowed_node_names = [AGENT_ONE, AGENT_TWO]
 
     bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)
     bluechi_test.add_bluechi_agent_config(agent_one_cfg)
-    bluechi_test.add_bluechi_agent_config(agent_two_cfg)
 
     bluechi_test.run(exec)

tests/tests/tier0/bluechi-list-units-on-all-nodes/test_bluechi_list_units_on_all_nodes.py

@@ -17,7 +17,7 @@
 from bluechi_test.test import BluechiTest
 
 node_foo_name = "node-foo"
-node_bar_name = "node-bar"
+node_bar_name = "node-local"
 
 
 def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
@@ -51,13 +51,9 @@ def test_bluechi_nodes_statuses(
     node_foo_cfg = bluechi_node_default_config.deep_copy()
     node_foo_cfg.node_name = node_foo_name
 
-    node_bar_cfg = bluechi_node_default_config.deep_copy()
-    node_bar_cfg.node_name = node_bar_name
-
     bluechi_ctrl_default_config.allowed_node_names = [node_foo_name, node_bar_name]
 
     bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)
     bluechi_test.add_bluechi_agent_config(node_foo_cfg)
-    bluechi_test.add_bluechi_agent_config(node_bar_cfg)
 
     bluechi_test.run(exec)

tests/tests/tier0/bluechi-nodes-statuses/test_bluechi_nodes_statuses.py

@@ -10,7 +10,7 @@
 from bluechi_test.test import BluechiTest
 
 node_foo_name = "node-foo"
-node_bar_name = "node-bar"
+node_bar_name = "node-local"
 
 
 def verify_status_output(output: str, expected: Dict[str, str]):
@@ -51,13 +51,9 @@ def test_bluechi_nodes_statuses(
     node_foo_cfg = bluechi_node_default_config.deep_copy()
     node_foo_cfg.node_name = node_foo_name
 
-    node_bar_cfg = bluechi_node_default_config.deep_copy()
-    node_bar_cfg.node_name = node_bar_name
-
     bluechi_ctrl_default_config.allowed_node_names = [node_foo_name, node_bar_name]
 
     bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)
     bluechi_test.add_bluechi_agent_config(node_foo_cfg)
-    bluechi_test.add_bluechi_agent_config(node_bar_cfg)
 
     bluechi_test.run(exec)

tests/tests/tier0/bluechi-reset-failed-node/test_bluechi_reset_failed_node.py

@@ -13,32 +13,31 @@
 
 LOGGER = logging.getLogger(__name__)
 NODE_FOO = "node-foo"
-NODE_BAR = "node-bar"
+NODE_BAR = "node-local"
 
 
 def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
 
     node_foo = nodes[NODE_FOO]
-    node_bar = nodes[NODE_BAR]
 
     failed_service_node_bar = SimpleRemainingService(name="simple.service")
     failed_service_node_bar.set_option(Section.Service, Option.ExecStart, "/s")
     failed_service_node_foo = SimpleRemainingService(name="simple.service")
     failed_service_node_foo.set_option(Section.Service, Option.ExecStart, "/s")
 
     node_foo.install_systemd_service(failed_service_node_bar)
-    node_bar.install_systemd_service(failed_service_node_foo)
+    ctrl.install_systemd_service(failed_service_node_foo)
 
     ctrl.bluechictl.start_unit(NODE_FOO, failed_service_node_foo.name)
     ctrl.bluechictl.start_unit(NODE_BAR, failed_service_node_bar.name)
 
     assert node_foo.wait_for_unit_state_to_be(failed_service_node_foo.name, "failed")
-    assert node_bar.wait_for_unit_state_to_be(failed_service_node_bar.name, "failed")
+    assert ctrl.wait_for_unit_state_to_be(failed_service_node_bar.name, "failed")
 
     ctrl.bluechictl.reset_failed(node_name=NODE_FOO)
 
     assert node_foo.wait_for_unit_state_to_be(failed_service_node_foo.name, "inactive")
-    assert node_bar.wait_for_unit_state_to_be(failed_service_node_bar.name, "failed")
+    assert ctrl.wait_for_unit_state_to_be(failed_service_node_bar.name, "failed")
 
 
 def test_bluechi_reset_failed_node(
@@ -49,11 +48,7 @@ def test_bluechi_reset_failed_node(
     node_foo_cfg = bluechi_node_default_config.deep_copy()
     node_foo_cfg.node_name = NODE_FOO
 
-    node_bar_cfg = bluechi_node_default_config.deep_copy()
-    node_bar_cfg.node_name = NODE_BAR
-
     bluechi_test.add_bluechi_agent_config(node_foo_cfg)
-    bluechi_test.add_bluechi_agent_config(node_bar_cfg)
 
     bluechi_ctrl_default_config.allowed_node_names = [NODE_FOO, NODE_BAR]
     bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)

tests/tests/tier0/bluechi-reset-failed/test_bluechi_reset_failed.py

@@ -13,32 +13,31 @@
 
 LOGGER = logging.getLogger(__name__)
 NODE_FOO = "node-foo"
-NODE_BAR = "node-bar"
+NODE_BAR = "node-local"
 
 
 def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
 
     node_foo = nodes[NODE_FOO]
-    node_bar = nodes[NODE_BAR]
 
     failed_service_node_bar = SimpleRemainingService(name="simple.service")
     failed_service_node_bar.set_option(Section.Service, Option.ExecStart, "/s")
     failed_service_node_foo = SimpleRemainingService(name="simple.service")
     failed_service_node_foo.set_option(Section.Service, Option.ExecStart, "/s")
 
     node_foo.install_systemd_service(failed_service_node_bar)
-    node_bar.install_systemd_service(failed_service_node_foo)
+    ctrl.install_systemd_service(failed_service_node_foo)
 
     ctrl.bluechictl.start_unit(NODE_FOO, failed_service_node_foo.name)
-    ctrl.bluechictl.start_unit(NODE_BAR, failed_service_node_bar.name)
+    ctrl.systemctl_start_and_wait(failed_service_node_bar.name)
 
     assert node_foo.wait_for_unit_state_to_be(failed_service_node_foo.name, "failed")
-    assert node_bar.wait_for_unit_state_to_be(failed_service_node_bar.name, "failed")
+    assert ctrl.wait_for_unit_state_to_be(failed_service_node_bar.name, "failed")
 
     ctrl.bluechictl.reset_failed()
 
     assert node_foo.wait_for_unit_state_to_be(failed_service_node_foo.name, "inactive")
-    assert node_bar.wait_for_unit_state_to_be(failed_service_node_bar.name, "inactive")
+    assert ctrl.wait_for_unit_state_to_be(failed_service_node_bar.name, "inactive")
 
 
 def test_bluechi_reset_failed(
@@ -49,11 +48,7 @@ def test_bluechi_reset_failed(
     node_foo_cfg = bluechi_node_default_config.deep_copy()
     node_foo_cfg.node_name = NODE_FOO
 
-    node_bar_cfg = bluechi_node_default_config.deep_copy()
-    node_bar_cfg.node_name = NODE_BAR
-
     bluechi_test.add_bluechi_agent_config(node_foo_cfg)
-    bluechi_test.add_bluechi_agent_config(node_bar_cfg)
 
     bluechi_ctrl_default_config.allowed_node_names = [NODE_FOO, NODE_BAR]
     bluechi_test.set_bluechi_controller_config(bluechi_ctrl_default_config)

tests/tests/tier0/monitor-agent-loses-connection/test_monitor_agent_loses_connection.py

@@ -49,6 +49,7 @@ def exec(ctrl: BluechiControllerMachine, nodes: Dict[str, BluechiAgentMachine]):
 def test_monitor_agent_loses_connection(
     bluechi_test: BluechiTest, bluechi_ctrl_default_config: BluechiControllerConfig
 ):
+    bluechi_test.set_bluechi_local_agent_config(None)
 
     bluechi_ctrl_default_config.allowed_node_names = [node_foo_name]
 

tests/tests/tier0/monitor-multiple-nodes-and-units/python/monitor.py

@@ -10,7 +10,7 @@
 from bluechi.api import Controller, Monitor, Node, Structure
 
 node_name_foo = "node-foo"
-node_name_bar = "node-bar"
+node_name_bar = "node-local"
 
 service_simple = "simple.service"
 service_also_simple = "also-simple.service"