Changing namespace from dellemc_networking to dellemc

GOVCERT-LU · May 19, 2020 · db8de6a · db8de6a
1 parent 2a8c400
commit db8de6a
Show file tree

Hide file tree

Showing 289 changed files with 534 additions and 534 deletions.
diff --git a/README.md b/README.md
@@ -22,18 +22,18 @@ device running Dell EMC SmartFabric OS10.
 ## Collection Installation
 Install the latest version of OS10 collection from Ansible Galaxy:
 
-    ansible-galaxy collection install dellemc_networking.os10
+    ansible-galaxy collection install dellemc.os10
 
 To install a specific version, a version range identifier must be specified. For example, to install the most recent version that is greater than or equal to 1.0.0 and less than 2.0.0:
 
-    ansible-galaxy collection install 'dellemc_networking.os10:>=1.0.0,<2.0.0'
+    ansible-galaxy collection install 'dellemc.os10:>=1.0.0,<2.0.0'
 
 ## Sample playbook
 
     - hosts: os10_sw1
       connection: network_cli
       collections:
-        - dellemc_networking.os10
+        - dellemc.os10
       roles:
         - os10_vlan
 
@@ -45,7 +45,7 @@ To install a specific version, a version range identifier must be specified. For
     # parameters for connection type network_cli
     ansible_ssh_user: xxxx
     ansible_ssh_pass: xxxx
-    ansible_network_os: dellemc_networking.os10.os10
+    ansible_network_os: dellemc.os10.os10
 
 ## Sample inventory.yaml
 

diff --git a/galaxy.yml b/galaxy.yml
@@ -4,14 +4,14 @@ authors:
 - Shreeja R <[email protected]>
 dependencies:
   ansible.netcommon: '>=0.0.1'
-description: Ansible collections for Dell EMC PowerSwitch platforms running Dell EMC SmartFabric OS10
+description: Ansible network collections for Dell EMC PowerSwitch platforms running Dell EMC SmartFabric OS10
 license_file: LICENSE
 name: os10
-namespace: dellemc_networking
+namespace: dellemc
 readme: README.md
 tags: [dell, dellemc, os10, emc, networking]
-version: 1.0.2
-repository: https://github.com/ansible-collections/dellemc_networking.os10
-documentation: https://github.com/ansible-collections/dellemc_networking.os10/tree/master/docs
-homepage: https://github.com/ansible-collections/dellemc_networking.os10
-issues: https://github.com/ansible-collections/dellemc_networking.os10/issues
+version: 0.0.1
+repository: https://github.com/ansible-collections/dellemc.os10
+documentation: https://github.com/ansible-collections/dellemc.os10/tree/master/docs
+homepage: https://github.com/ansible-collections/dellemc.os10
+issues: https://github.com/ansible-collections/dellemc.os10/issues
diff --git a/playbooks/clos_fabric_ebgp/datacenter.yaml b/playbooks/clos_fabric_ebgp/datacenter.yaml
@@ -3,7 +3,7 @@
   gather_facts: no
   connection: network_cli
   collections:
-    - dellemc_networking.os10
+    - dellemc.os10
   roles:
     - os10_interface
     - os10_bgp

diff --git a/playbooks/clos_fabric_ebgp/group_vars/all b/playbooks/clos_fabric_ebgp/group_vars/all
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 
 os10_snmp:
   snmp_community:

diff --git a/playbooks/clos_fabric_ebgp/group_vars/spine.yaml b/playbooks/clos_fabric_ebgp/group_vars/spine.yaml
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 
 os10_system:
   hostname: "{{ spine_hostname }}"

diff --git a/playbooks/clos_fabric_ebgp/host_vars/leaf1.yaml b/playbooks/clos_fabric_ebgp/host_vars/leaf1.yaml
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 leaf_hostname: "leaf-1"
 os10_system:
   hostname: "{{ leaf_hostname }}"

diff --git a/playbooks/clos_fabric_ebgp/host_vars/leaf2.yaml b/playbooks/clos_fabric_ebgp/host_vars/leaf2.yaml
@@ -1,7 +1,7 @@
 hostname: leaf2
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 leaf_hostname: "leaf-2"
 os10_system:
   hostname: "{{ leaf_hostname }}"

diff --git a/playbooks/clos_fabric_ebgp/host_vars/leaf3.yaml b/playbooks/clos_fabric_ebgp/host_vars/leaf3.yaml
@@ -1,7 +1,7 @@
 hostname: leaf3
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 leaf_hostname: "leaf-3"
 os10_system:
   hostname: "{{ leaf_hostname }}"

diff --git a/playbooks/clos_fabric_ebgp/host_vars/leaf4.yaml b/playbooks/clos_fabric_ebgp/host_vars/leaf4.yaml
@@ -1,7 +1,7 @@
 hostname: leaf4
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 leaf_hostname: "leaf-4"
 os10_system:
   hostname: "{{ leaf_hostname }}"

diff --git a/playbooks/clos_fabric_ebgp/host_vars/spine1.yaml b/playbooks/clos_fabric_ebgp/host_vars/spine1.yaml
@@ -1,7 +1,7 @@
 hostname: spine1
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 spine_hostname: "spine-1"
 
 os10_interface:

diff --git a/playbooks/clos_fabric_ebgp/host_vars/spine2.yaml b/playbooks/clos_fabric_ebgp/host_vars/spine2.yaml
@@ -1,7 +1,7 @@
 hostname: spine2
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 spine_hostname: "spine-2"
 os10_interface:
     ethernet 1/1/1:

diff --git a/playbooks/vxlan_evpn/datacenter.yaml b/playbooks/vxlan_evpn/datacenter.yaml
@@ -2,7 +2,7 @@
 - hosts: datacenter
   connection: network_cli
   collections:
-    - dellemc_networking.os10
+    - dellemc.os10
   vars:
     build_dir: "/home/administrator/ansible/debug"
   roles:

diff --git a/playbooks/vxlan_evpn/host_vars/prim-vtep1.yaml b/playbooks/vxlan_evpn/host_vars/prim-vtep1.yaml
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 
 os10_system:
   hostname: "VLT1-Primary"

diff --git a/playbooks/vxlan_evpn/host_vars/prim-vtep2.yaml b/playbooks/vxlan_evpn/host_vars/prim-vtep2.yaml
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 
 os10_system:
   hostname: "VLT2-Primary"

diff --git a/playbooks/vxlan_evpn/host_vars/sec-vtep1.yaml b/playbooks/vxlan_evpn/host_vars/sec-vtep1.yaml
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 
 os10_system:
   hostname: "VLT1-SEC"

diff --git a/playbooks/vxlan_evpn/host_vars/sec-vtep2.yaml b/playbooks/vxlan_evpn/host_vars/sec-vtep2.yaml
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 
 os10_system:
   hostname: "VLT2-SEC"

diff --git a/playbooks/vxlan_evpn/host_vars/spine1.yaml b/playbooks/vxlan_evpn/host_vars/spine1.yaml
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 
 os10_system:
   hostname: "spine1"

diff --git a/playbooks/vxlan_evpn/host_vars/spine2.yaml b/playbooks/vxlan_evpn/host_vars/spine2.yaml
@@ -1,6 +1,6 @@
 ansible_ssh_user: xxxxx
 ansible_ssh_pass: xxxxx
-ansible_network_os: dellemc_networking.os10.os10
+ansible_network_os: dellemc.os10.os10
 
 os10_system:
   hostname: "spine2"

diff --git a/plugins/action/os10.py b/plugins/action/os10.py
@@ -30,7 +30,7 @@
 from ansible.module_utils.connection import Connection
 from ansible.plugins.action.network import ActionModule as ActionNetworkModule
 from ansible.module_utils.network.common.utils import load_provider
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import os10_provider_spec
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import os10_provider_spec
 from ansible.utils.display import Display
 
 display = Display()
@@ -53,7 +53,7 @@ def run(self, tmp=None, task_vars=None):
             provider = load_provider(os10_provider_spec, self._task.args)
             pc = copy.deepcopy(self._play_context)
             pc.connection = 'network_cli'
-            pc.network_os = 'dellemc_networking.os10.os10'
+            pc.network_os = 'dellemc.os10.os10'
             pc.remote_addr = provider['host'] or self._play_context.remote_addr
             pc.port = int(provider['port'] or self._play_context.port or 22)
             pc.remote_user = provider['username'] or self._play_context.connection_user

diff --git a/plugins/cliconf/os10.py b/plugins/cliconf/os10.py
@@ -45,7 +45,7 @@ class Cliconf(CliconfBase):
     def get_device_info(self):
         device_info = {}
 
-        device_info['network_os'] = 'dellemc_networking.os10.os10'
+        device_info['network_os'] = 'dellemc.os10.os10'
         reply = self.get('show version')
         data = to_text(reply, errors='surrogate_or_strict').strip()
 

diff --git a/plugins/modules/os10_command.py b/plugins/modules/os10_command.py
@@ -27,7 +27,7 @@
     before returning or timing out if the condition is not met.
   - This module does not support running commands in configuration mode.
     Please use M(os10_config) to configure Dell EMC OS10 devices.
-extends_documentation_fragment: dellemc_networking.os10.os10
+extends_documentation_fragment: dellemc.os10.os10
 options:
   commands:
     description:
@@ -129,8 +129,8 @@
 import time
 
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import run_commands
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import os10_argument_spec, check_args
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import run_commands
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import os10_argument_spec, check_args
 from ansible.module_utils.network.common.utils import ComplexList
 from ansible.module_utils.network.common.parsing import Conditional
 from ansible.module_utils.six import string_types

diff --git a/plugins/modules/os10_config.py b/plugins/modules/os10_config.py
@@ -25,7 +25,7 @@
     for segmenting configuration into sections.  This module provides
     an implementation for working with OS10 configuration sections in
     a deterministic way.
-extends_documentation_fragment: dellemc_networking.os10.os10
+extends_documentation_fragment: dellemc.os10.os10
 options:
   lines:
     description:
@@ -200,10 +200,10 @@
   sample: /playbooks/ansible/backup/os10_config.2016-07-16@22:28:34
 """
 from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import get_config, get_sublevel_config
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import os10_argument_spec, check_args
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import load_config, run_commands
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import WARNING_PROMPTS_RE
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import get_config, get_sublevel_config
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import os10_argument_spec, check_args
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import load_config, run_commands
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import WARNING_PROMPTS_RE
 from ansible.module_utils.network.common.config import NetworkConfig, dumps
 
 

diff --git a/plugins/modules/os10_facts.py b/plugins/modules/os10_facts.py
@@ -25,7 +25,7 @@
     base network fact keys with C(ansible_net_<fact>).  The facts
     module will always collect a base set of facts from the device
     and can enable or disable collection of additional facts.
-extends_documentation_fragment: dellemc_networking.os10.os10
+extends_documentation_fragment: dellemc.os10.os10
 options:
   gather_subset:
     description:
@@ -128,8 +128,8 @@
 except ImportError:
     import xml.etree.ElementTree as ET
 
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import run_commands
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.os10 import os10_argument_spec, check_args
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import run_commands
+from ansible_collections.dellemc.os10.plugins.module_utils.network.os10 import os10_argument_spec, check_args
 from ansible.module_utils.basic import AnsibleModule
 from ansible.module_utils.six import iteritems
 

diff --git a/plugins/modules/show_system_network_summary.py b/plugins/modules/show_system_network_summary.py
@@ -4,7 +4,7 @@
 __copyright__ = "(c) 2020 Dell Inc. or its subsidiaries. All rights reserved. Dell, EMC, and other trademarks are trademarks of Dell Inc. or its subsidiaries. Other trademarks may be trademarks of their respective owners."
 
 import re
-from ansible_collections.dellemc_networking.os10.plugins.module_utils.network.base_network_show import BaseNetworkShow as BaseNetworkShow
+from ansible_collections.dellemc.os10.plugins.module_utils.network.base_network_show import BaseNetworkShow as BaseNetworkShow
 
 DOCUMENTATION = '''
 module: show_system_network_summary_ansible_module

diff --git a/roles/os10_aaa/README.md b/roles/os10_aaa/README.md
@@ -6,7 +6,7 @@ This role facilitates the configuration of authentication authorization acccount
 Role variables
 --------------
 
-- Role is abstracted using the *ansible_network_os* variable that can take dellemc_networking.os10.os10 as value
+- Role is abstracted using the *ansible_network_os* variable that can take dellemc.os10.os10 as value
 - If *os10_cfg_generate* is set to true, the variable generates the role configuration commands in a file
 - Any role variable with a corresponding state variable set to absent negates the configuration of that variable
 - Setting an empty value for any variable negates the corresponding configuration
@@ -89,7 +89,7 @@ When *os10_cfg_generate* is set to true, the variable generates the configuratio
     ansible_become_pass: xxxxx
     ansible_ssh_user: xxxxx
     ansible_ssh_pass: xxxxx
-    ansible_network_os: dellemc_networking.os10.os10
+    ansible_network_os: dellemc.os10.os10
     build_dir: ../temp/temp_os10
 
     os10_aaa:
@@ -128,7 +128,7 @@ When *os10_cfg_generate* is set to true, the variable generates the configuratio
 
     - hosts: leaf1
       roles:
-         - dellemc_networking.os10.os10_aaa
+         - dellemc.os10.os10_aaa
 
 **Run**
 

diff --git a/roles/os10_aaa/defaults/main.yml b/roles/os10_aaa/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-# defaults file for dellemc_networking.os10.os10_aaa
+# defaults file for dellemc.os10.os10_aaa
 attribute_type:
     mandatory: mandatory
     on_for_login_auth: on-for-login-auth

diff --git a/roles/os10_aaa/handlers/main.yml b/roles/os10_aaa/handlers/main.yml
@@ -1,2 +1,2 @@
 ---
-# handlers file for dellemc_networking.os10.os10_aaa
+# handlers file for dellemc.os10.os10_aaa
diff --git a/roles/os10_aaa/tasks/main.yml b/roles/os10_aaa/tasks/main.yml
@@ -1,4 +1,4 @@
 ---
-# tasks file for dellemc_networking.os10.os10_aaa
+# tasks file for dellemc.os10.os10_aaa
  - name: "Provision {{ ansible_network_os }} tasks"
    include_tasks: provision_os10.yaml
diff --git a/roles/os10_aaa/tasks/provision_os10.yaml b/roles/os10_aaa/tasks/provision_os10.yaml
@@ -5,13 +5,13 @@
    template:
       src: os10_aaa.j2
       dest: "{{ build_dir }}/aaa10_{{ hostname }}.conf.part"
-   when: (ansible_network_os is defined and ansible_network_os == "dellemc_networking.os10.os10") and ((os10_cfg_generate | default('False')) | bool)
+   when: (ansible_network_os is defined and ansible_network_os == "dellemc.os10.os10") and ((os10_cfg_generate | default('False')) | bool)
 #   notify: save config os10
    register: generate_output
 
  - name: "Provisioning AAA configuration for os10"
    os10_config:
       src: os10_aaa.j2
-   when: (ansible_network_os is defined and ansible_network_os == "dellemc_networking.os10.os10") 
+   when: (ansible_network_os is defined and ansible_network_os == "dellemc.os10.os10") 
 #   notify: save config os10
    register: output
diff --git a/roles/os10_aaa/tests/inventory.yaml b/roles/os10_aaa/tests/inventory.yaml
@@ -1,11 +1,11 @@
 ---
-spine1 ansible_host=10.11.182.25 ansible_network_os="dellemc_networking.os10.os10"
-spine2 ansible_host=10.16.151.220 ansible_network_os="dellemc_networking.os10.os10"
+spine1 ansible_host=10.11.182.25 ansible_network_os="dellemc.os10.os10"
+spine2 ansible_host=10.16.151.220 ansible_network_os="dellemc.os10.os10"
 
-leaf1 ansible_host=10.11.182.23 ansible_network_os="dellemc_networking.os10.os10"
-leaf2 ansible_host=10.11.182.16 ansible_network_os="dellemc_networking.os10.os10"
-leaf3 ansible_host=10.11.182.17 ansible_network_os="dellemc_networking.os10.os10"
-leaf4 ansible_host=10.16.148.79 ansible_network_os="dellemc_networking.os10.os10"
+leaf1 ansible_host=10.11.182.23 ansible_network_os="dellemc.os10.os10"
+leaf2 ansible_host=10.11.182.16 ansible_network_os="dellemc.os10.os10"
+leaf3 ansible_host=10.11.182.17 ansible_network_os="dellemc.os10.os10"
+leaf4 ansible_host=10.16.148.79 ansible_network_os="dellemc.os10.os10"
 
 [spine]
 spine1

diff --git a/roles/os10_aaa/tests/main.os10.yaml b/roles/os10_aaa/tests/main.os10.yaml
@@ -1,5 +1,5 @@
 ---
-# vars file for dellemc_networking.os10.os10_aaa,
+# vars file for dellemc.os10.os10_aaa,
 # below gives a sample configuration
 # Sample vars for OS10 device
 os10_aaa:

diff --git a/roles/os10_aaa/tests/test.yaml b/roles/os10_aaa/tests/test.yaml
@@ -2,4 +2,4 @@
 - hosts: datacenter
   connection: network_cli
   roles:
-    - dellemc_networking.os10.os10_aaa
+    - dellemc.os10.os10_aaa
diff --git a/roles/os10_aaa/vars/main.yml b/roles/os10_aaa/vars/main.yml
@@ -1 +1 @@
-# vars file for dellemc_networking.os10.os10_aaa
+# vars file for dellemc.os10.os10_aaa
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		# vars file for dellemc_networking.os10.os10_aaa
		# vars file for dellemc.os10.os10_aaa