From 3eba8b8792a8ae733e49c44b3183d3be03caa167 Mon Sep 17 00:00:00 2001
From: John R Barker <john@johnrbarker.com>
Date: Mon, 20 Jul 2020 20:33:53 +0100
Subject: [PATCH] dellemc related module name changes (#70749) (#70761)

(cherry picked from commit f9bb5c9c5a1ffdd45a10bf3dddf42d3ea1624b80)

Co-authored-by: Mohamed Javeed <mohamed_javeed_faroo@dell.com>
---
 .../config/ansible_builtin_runtime.yml        | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/lib/ansible/config/ansible_builtin_runtime.yml b/lib/ansible/config/ansible_builtin_runtime.yml
index 2cf3d717388..c45734bc631 100644
--- a/lib/ansible/config/ansible_builtin_runtime.yml
+++ b/lib/ansible/config/ansible_builtin_runtime.yml
@@ -6713,23 +6713,23 @@ plugin_routing:
     ovirt_vnic_profile_info:
       redirect: ovirt.ovirt.ovirt_vnic_profile_info
     dellos10_command:
-      redirect: dellemc_networking.os10.os10_command
+      redirect: dellemc.os10.os10_command
     dellos10_facts:
-      redirect: dellemc_networking.os10.os10_facts
+      redirect: dellemc.os10.os10_facts
     dellos10_config:
-      redirect: dellemc_networking.os10.os10_config
+      redirect: dellemc.os10.os10_config
     dellos9_facts:
-      redirect: dellemc.os9.dellos9_facts
+      redirect: dellemc.os9.os9_facts
     dellos9_command:
-      redirect: dellemc.os9.dellos9_command
+      redirect: dellemc.os9.os9_command
     dellos9_config:
-      redirect: dellemc.os9.dellos9_config
+      redirect: dellemc.os9.os9_config
     dellos6_facts:
-      redirect: dellemc.os6.dellos6_facts
+      redirect: dellemc.os6.os6_facts
     dellos6_config:
-      redirect: dellemc.os6.dellos6_config
+      redirect: dellemc.os6.os6_config
     dellos6_command:
-      redirect: dellemc.os6.dellos6_command
+      redirect: dellemc.os6.os6_command
     hcloud_location_facts:
       redirect: hetzner.hcloud.hcloud_location_facts
     hcloud_server_info:
@@ -7759,8 +7759,11 @@ plugin_routing:
     network.common.utils:
       redirect: ansible.netcommon.network.common.utils
     network.dellos10.dellos10:
-      redirect: dellemc_networking.os10.network.os10
-    # FIXME: no collection source found for dellos6/dellos9
+      redirect: dellemc.os10.network.os10
+    network.dellos9.dellos9:
+      redirect: dellemc.os9.network.os9
+    network.dellos6.dellos6:
+      redirect: dellemc.os6.network.os6
     network.edgeos.edgeos:
       redirect: community.network.network.edgeos.edgeos
     network.edgeswitch.edgeswitch:
@@ -8893,11 +8896,11 @@ plugin_routing:
     junos:
       redirect: junipernetworks.junos.junos
     dellos10:
-      redirect: dellemc_networking.os10.os10
+      redirect: dellemc.os10.os10
     dellos9:
-      redirect: dellemc.os9.dellos9
+      redirect: dellemc.os9.os9
     dellos6:
-      redirect: dellemc.os6.dellos6
+      redirect: dellemc.os6.os6
     vyos:
       redirect: vyos.vyos.vyos
   terminal:
@@ -8956,11 +8959,11 @@ plugin_routing:
     junos:
       redirect: junipernetworks.junos.junos
     dellos10:
-      redirect: dellemc_networking.os10.os10
+      redirect: dellemc.os10.os10
     dellos9:
-      redirect: dellemc.os9.dellos9
+      redirect: dellemc.os9.os9
     dellos6:
-      redirect: dellemc.os6.dellos6
+      redirect: dellemc.os6.os6
     vyos:
       redirect: vyos.vyos.vyos
   action:
@@ -9074,11 +9077,11 @@ plugin_routing:
     junos:
       redirect: junipernetworks.junos.junos
     dellos10:
-      redirect: dellemc_networking.os10.os10
+      redirect: dellemc.os10.os10
     dellos9:
-      redirect: dellemc.os9.dellos9
+      redirect: dellemc.os9.os9
     dellos6:
-      redirect: dellemc.os6.dellos6
+      redirect: dellemc.os6.os6
     vyos:
       redirect: vyos.vyos.vyos
   become:
@@ -9399,11 +9402,11 @@ plugin_routing:
     ovirt_info:
       redirect: ovirt.ovirt.ovirt_info
     dellos10:
-      redirect: dellemc_networking.os10.os10
+      redirect: dellemc.os10.os10
     dellos9:
-      redirect: dellemc.os9.dellos9
+      redirect: dellemc.os9.os9
     dellos6:
-      redirect: dellemc.os6.dellos6
+      redirect: dellemc.os6.os6
     hcloud:
       redirect: hetzner.hcloud.hcloud
     skydive: