Pull up automation config further #19

Change-Id: I750cc84b912109bd31900b7fbf3affac8d11ee37

Author: LarsMichelsen

cmk/gui/wato/pages/folders.py

@@ -77,6 +77,7 @@
 )
 from cmk.gui.watolib.agent_registration import remove_tls_registration
 from cmk.gui.watolib.audit_log_url import make_object_audit_log_url
+from cmk.gui.watolib.automations import make_automation_config
 from cmk.gui.watolib.check_mk_automations import delete_hosts
 from cmk.gui.watolib.configuration_bundle_store import is_locked_by_quick_setup
 from cmk.gui.watolib.groups_io import load_contact_group_information
@@ -637,7 +638,12 @@ def action(self) -> ActionResult:
             if isinstance(self._folder, SearchFolder):
                 raise MKUserError(None, _("This action can not be performed on search results"))
             remove_tls_registration(
-                self._folder.get_hosts_by_site(list(self._folder.hosts())),
+                [
+                    (make_automation_config(active_config.sites[site_id]), hosts)
+                    for site_id, hosts in self._folder.get_hosts_by_site(
+                        list(self._folder.hosts())
+                    ).items()
+                ],
                 debug=active_config.debug,
             )
             return None
@@ -722,7 +728,13 @@ def action(self) -> ActionResult:
             if isinstance(self._folder, SearchFolder):
                 raise MKUserError(None, _("This action can not be performed on search results"))
             remove_tls_registration(
-                self._folder.get_hosts_by_site(selected_host_names), debug=active_config.debug
+                [
+                    (make_automation_config(active_config.sites[site_id]), hosts)
+                    for site_id, hosts in self._folder.get_hosts_by_site(
+                        selected_host_names
+                    ).items()
+                ],
+                debug=active_config.debug,
             )
 
         return None

cmk/gui/wato/pages/hosts.py

@@ -516,7 +516,13 @@ def action(self) -> ActionResult:
 
         if request.var("_remove_tls_registration"):
             remove_tls_registration(
-                {self._host.site_id(): [self._host.name()]}, debug=active_config.debug
+                [
+                    (
+                        make_automation_config(active_config.sites[self._host.site_id()]),
+                        [self._host.name()],
+                    )
+                ],
+                debug=active_config.debug,
             )
             return None
 

cmk/gui/watolib/agent_registration.py

@@ -4,35 +4,40 @@
 # conditions defined in the file COPYING, which is part of this source code package.
 
 import json
-from collections.abc import Mapping, Sequence
+from collections.abc import Sequence
 
 from cmk.ccc.exceptions import MKGeneralException
 from cmk.ccc.hostaddress import HostName
-from cmk.ccc.site import SiteId
 
 from cmk.utils.agent_registration import get_uuid_link_manager
 
-from cmk.gui.config import active_config
 from cmk.gui.http import request
 from cmk.gui.log import logger
-from cmk.gui.site_config import site_is_local
 from cmk.gui.watolib.automation_commands import AutomationCommand
-from cmk.gui.watolib.automations import do_remote_automation, RemoteAutomationConfig
+from cmk.gui.watolib.automations import (
+    do_remote_automation,
+    LocalAutomationConfig,
+    RemoteAutomationConfig,
+)
 
 
 def remove_tls_registration(
-    hosts_by_site: Mapping[SiteId, Sequence[HostName]], *, debug: bool
+    hosts_by_site: Sequence[
+        tuple[LocalAutomationConfig | RemoteAutomationConfig, Sequence[HostName]]
+    ],
+    *,
+    debug: bool,
 ) -> None:
-    for site_id, host_names in hosts_by_site.items():
+    for automation_config, host_names in hosts_by_site:
         if not host_names:
             continue
 
-        if site_is_local(site_config := active_config.sites[site_id], site_id):
+        if isinstance(automation_config, LocalAutomationConfig):
             _remove_tls_registration(host_names)
             continue
 
         do_remote_automation(
-            RemoteAutomationConfig.from_site_config(site_config),
+            automation_config,
             "remove-tls-registration",
             [("host_names", json.dumps(host_names))],
             debug=debug,