Fix ansible_builtin_runtime.yml w.r.t. c.g and c.n (#70322) (#70400)

* Fix module_utils for community.general.
* Fix module_utils for community.network.
* Add forgotten entry for community.general.

(cherry picked from commit 24915b2ccf)

lib/ansible/config/ansible_builtin_runtime.yml

@@ -7599,8 +7599,10 @@ plugin_routing:
       redirect: community.digitalocean.digital_ocean
     dimensiondata:
       redirect: community.general.dimensiondata
-    swarm:
+    docker.common:
-      redirect: community.general.swarm
+      redirect: community.general.docker.common
+    docker.swarm:
+      redirect: community.general.docker.swarm
     exoscale:
       redirect: ngine_io.exoscale.exoscale
     f5_utils:
@@ -7625,8 +7627,8 @@ plugin_routing:
       redirect: community.general.hwc_utils
     ibm_sa_utils:
       redirect: community.general.ibm_sa_utils
-    keycloak:
+    identity.keycloak:
-      redirect: community.general.keycloak
+      redirect: community.general.identity.keycloak
     infinibox:
       redirect: community.general.infinibox
     influxdb:
@@ -7651,42 +7653,42 @@ plugin_routing:
       redirect: community.general.mysql
     api:
       redirect: skydive.skydive.api
-    a10:
+    network.a10:
-      redirect: community.network.a10
+      redirect: community.network.network.a10
-    aireos:
+    network.aireos:
-      redirect: community.network.aireos
+      redirect: community.network.network.aireos
-    aos:
+    network.aos:
-      redirect: community.network.aos
+      redirect: community.network.network.aos
-    apconos:
+    network.apconos:
-      redirect: community.network.apconos
+      redirect: community.network.network.apconos
-    aruba:
+    network.aruba:
-      redirect: community.network.aruba
+      redirect: community.network.network.aruba
-    ansible_utils:
+    network.avi.ansible_utils:
-      redirect: community.network.ansible_utils
+      redirect: community.network.network.avi.ansible_utils
-    avi:
+    network.avi.avi:
-      redirect: community.network.avi
+      redirect: community.network.network.avi.avi
-    avi_api:
+    network.avi.avi_api:
-      redirect: community.network.avi_api
+      redirect: community.network.network.avi.avi_api
-    bigswitch:
+    network.bigswitch:
-      redirect: community.network.bigswitch
+      redirect: community.network.network.bigswitch
-    ce:
+    network.cloudengine.ce:
-      redirect: community.network.ce
+      redirect: community.network.network.cloudengine.ce
-    cnos:
+    network.cnos.cnos:
-      redirect: community.network.cnos
+      redirect: community.network.network.cnos.cnos
-    cnos_devicerules:
+    network.cnos.cnos_devicerules:
-      redirect: community.network.cnos_devicerules
+      redirect: community.network.network.cnos.cnos_devicerules
-    cnos_errorcodes:
+    network.cnos.cnos_errorcodes:
-      redirect: community.network.cnos_errorcodes
+      redirect: community.network.network.cnos.cnos_errorcodes
-    edgeos:
+    network.edgeos:
-      redirect: community.network.edgeos
+      redirect: community.network.network.edgeos
-    edgeswitch:
+    network.edgeswitch.edgeswitch:
-      redirect: community.network.edgeswitch
+      redirect: community.network.network.edgeswitch.edgeswitch
-    edgeswitch_interface:
+    network.edgeswitch.edgeswitch_interface:
-      redirect: community.network.edgeswitch_interface
+      redirect: community.network.network.edgeswitch.edgeswitch_interface
-    enos:
+    network.enos:
-      redirect: community.network.enos
+      redirect: community.network.network.enos
-    eric_eccli:
+    network.eric_eccli:
-      redirect: community.network.eric_eccli
+      redirect: community.network.network.eric_eccli
     facts:
       redirect: vyos.vyos.facts
     l2_interfaces:
@@ -7697,54 +7699,54 @@ plugin_routing:
       redirect: vyos.vyos.lldp_interfaces
     vlans:
       redirect: junipernetworks.junos.vlans
-    exos:
+    network.exos:
-      redirect: community.network.exos
+      redirect: community.network.network.exos
     utils:
       redirect: vyos.vyos.utils
-    iworkflow:
+    network.iworkflow:
-      redirect: community.network.iworkflow
+      redirect: community.network.network.iworkflow  # does not exist in community.general!
-    legacy:
+    network.exos.facts.legacy:
-      redirect: community.network.legacy
+      redirect: community.network.network.exos.facts.legacy
     urls:
       redirect: amazon.aws.urls
-    fortianalyzer:
+    network.fortianalyzer:
-      redirect: community.network.fortianalyzer
+      redirect: community.network.network.fortianalyzer
-    configuration:
+    network.ftd.configuration:
-      redirect: community.network.configuration
+      redirect: community.network.network.ftd.configuration
-    device:
+    network.ftd.device:
-      redirect: community.network.device
+      redirect: community.network.network.ftd.device
-    fdm_swagger_client:
+    network.ftd.fdm_swagger_client:
-      redirect: community.network.fdm_swagger_client
+      redirect: community.network.network.ftd.fdm_swagger_client
-    operation:
+    network.ftd.operation:
-      redirect: community.network.operation
+      redirect: community.network.network.ftd.operation
-    icx:
+    network.icx:
-      redirect: community.network.icx
+      redirect: community.network.network.icx
-    ironware:
+    network.ironware:
-      redirect: community.network.ironware
+      redirect: community.network.network.ironware
-    netscaler:
+    network.netscaler:
-      redirect: community.network.netscaler
+      redirect: community.network.network.netscaler
-    netvisor:
+    network.netvisor.netvisor:
-      redirect: community.network.netvisor
+      redirect: community.network.network.netvisor.netvisor
-    pn_nvos:
+    network.netvisor.pn_nvos:
-      redirect: community.network.pn_nvos
+      redirect: community.network.network.netvisor.pn_nvos
-    nos:
+    network.nos:
-      redirect: community.network.nos
+      redirect: community.network.network.nos
-    nso:
+    network.nso:
-      redirect: community.network.nso
+      redirect: community.network.network.nso
     onyx:
       redirect: mellanox.onyx.onyx
-    ordnance:
+    network.ordnance:
-      redirect: community.network.ordnance
+      redirect: community.network.network.ordnance
-    panos:
+    network.panos:
-      redirect: community.network.panos
+      redirect: community.network.network.panos
-    routeros:
+    network.routeros:
-      redirect: community.network.routeros
+      redirect: community.network.network.routeros
-    slxos:
+    network.slxos:
-      redirect: community.network.slxos
+      redirect: community.network.network.slxos
-    sros:
+    network.sros:
-      redirect: community.network.sros
+      redirect: community.network.network.sros
-    voss:
+    network.voss:
-      redirect: community.network.voss
+      redirect: community.network.network.voss
     oneandone:
       redirect: community.general.oneandone
     oneview:
@@ -7753,8 +7755,8 @@ plugin_routing:
       redirect: community.general.online
     opennebula:
       redirect: community.general.opennebula
-    oci_utils:
+    oracle.oci_utils:
-      redirect: community.general.oci_utils
+      redirect: community.general.oracle.oci_utils
     postgres:
       redirect: community.general.postgres
     pure:
@@ -7767,18 +7769,18 @@ plugin_routing:
       redirect: community.general.redfish_utils
     redhat:
       redirect: community.general.redhat
-    dellemc_idrac:
+    remote_management.dellemc.dellemc_idrac:
-      redirect: community.general.dellemc_idrac
+      redirect: community.general.remote_management.dellemc.dellemc_idrac
-    ome:
+    remote_management.dellemc.ome:
-      redirect: community.general.ome
+      redirect: community.general.remote_management.dellemc.ome
     scaleway:
       redirect: community.general.scaleway
-    bitbucket:
+    source_control.bitbucket:
-      redirect: community.general.bitbucket
+      redirect: community.general.source_control.bitbucket
-    emc_vnx:
+    storage.emc.emc_vnx:
-      redirect: community.general.emc_vnx
+      redirect: community.general.storage.emc.emc_vnx
-    hpe3par:
+    storage.hpe3par:
-      redirect: community.general.hpe3par
+      redirect: community.general.storage.hpe3par
     univention_umc:
       redirect: community.general.univention_umc
     utm_utils: