Renamed the Modules from dnos* -> dellos*, updated copyright, removed… (#17617)

* Renamed the Modules from dnos* -> dellos*, updated copyright, removed dnos6_template

* Addressed @gundalow comments

13 files changed, 49 insertions, 43 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0bd9340f2..6332ed4d46 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -66,20 +66,19 @@ Ansible Changes By Release
 - cloudstack
   * cs_router
   * cs_snapshot_policy
-- dnos6
-  * dnos6_command
-  * dnos6_template
-  * dnos6_config
-- dnos9
-  * dnos9_command
-  * dnos9_config
-  * dnos9_template
-  * dnos9_facts
-- dnos10
-  * dnos10_command
-  * dnos10_config
-  * dnos10_template
-  * dnos10_facts
+- dellos6
+  * dellos6_command
+  * dellos6_config
+- dellos9
+  * dellos9_command
+  * dellos9_config
+  * dellos9_facts
+  * dellos9_template
+- dellos10
+  * dellos10_command
+  * dellos10_config
+  * dellos10_facts
+  * dellos10_template
 - exoscale:
   * exo_dns_domain
   * exo_dns_record
diff --git a/lib/ansible/module_utils/dnos10.py b/lib/ansible/module_utils/dellos10.py
index 7ca9448d21..12c11cfe93 100644
--- a/lib/ansible/module_utils/dnos10.py
+++ b/lib/ansible/module_utils/dellos10.py
@@ -1,3 +1,8 @@
+#
+# (c) 2015 Peter Sprygada, <psprygada@ansible.com>
+#
+# Copyright (c) 2016 Dell Inc.
+#
 # This code is part of Ansible, but is an independent component.
 # This particular file snippet, and this file snippet only, is BSD licensed.
 # Modules you write using this snippet, which is embedded dynamically by Ansible
diff --git a/lib/ansible/module_utils/dnos6.py b/lib/ansible/module_utils/dellos6.py
index 9b5e95ea46..1351feddfc 100644
--- a/lib/ansible/module_utils/dnos6.py
+++ b/lib/ansible/module_utils/dellos6.py
@@ -1,3 +1,8 @@
+#
+# (c) 2015 Peter Sprygada, <psprygada@ansible.com>
+#
+# Copyright (c) 2016 Dell Inc.
+#
 # This code is part of Ansible, but is an independent component.
 # This particular file snippet, and this file snippet only, is BSD licensed.
 # Modules you write using this snippet, which is embedded dynamically by Ansible
diff --git a/lib/ansible/module_utils/dnos9.py b/lib/ansible/module_utils/dellos9.py
index 85b431a5a4..536dd2a92a 100755
--- a/lib/ansible/module_utils/dnos9.py
+++ b/lib/ansible/module_utils/dellos9.py
@@ -1,3 +1,8 @@
+#
+# (c) 2015 Peter Sprygada, <psprygada@ansible.com>
+#
+# Copyright (c) 2016 Dell Inc.
+#
 # This code is part of Ansible, but is an independent component.
 # This particular file snippet, and this file snippet only, is BSD licensed.
 # Modules you write using this snippet, which is embedded dynamically by Ansible
diff --git a/lib/ansible/plugins/action/dnos6_config.py b/lib/ansible/plugins/action/dellos10_config.py
index ffcb0f057f..ffcb0f057f 100644
--- a/lib/ansible/plugins/action/dnos6_config.py
+++ b/lib/ansible/plugins/action/dellos10_config.py
diff --git a/lib/ansible/plugins/action/dnos6_template.py b/lib/ansible/plugins/action/dellos10_template.py
index 5334b644d3..5334b644d3 100644
--- a/lib/ansible/plugins/action/dnos6_template.py
+++ b/lib/ansible/plugins/action/dellos10_template.py
diff --git a/lib/ansible/plugins/action/dnos9_config.py b/lib/ansible/plugins/action/dellos6_config.py
index ffcb0f057f..ffcb0f057f 100644
--- a/lib/ansible/plugins/action/dnos9_config.py
+++ b/lib/ansible/plugins/action/dellos6_config.py
diff --git a/lib/ansible/plugins/action/dnos10_config.py b/lib/ansible/plugins/action/dellos9_config.py
index 13bcd55345..ffcb0f057f 100644
--- a/lib/ansible/plugins/action/dnos10_config.py
+++ b/lib/ansible/plugins/action/dellos9_config.py
@@ -1,4 +1,6 @@
 #
+# Copyright 2015 Peter Sprygada <psprygada@ansible.com>
+#
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify
diff --git a/lib/ansible/plugins/action/dnos9_template.py b/lib/ansible/plugins/action/dellos9_template.py
index 5334b644d3..5334b644d3 100644
--- a/lib/ansible/plugins/action/dnos9_template.py
+++ b/lib/ansible/plugins/action/dellos9_template.py
diff --git a/lib/ansible/plugins/action/dnos10_template.py b/lib/ansible/plugins/action/dnos10_template.py
deleted file mode 100644
index cf62929525..0000000000
--- a/lib/ansible/plugins/action/dnos10_template.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# This file is part of Ansible
-#
-# Ansible is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Ansible is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
-#
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-from ansible.plugins.action import ActionBase
-from ansible.plugins.action.net_template import ActionModule as NetActionModule
-
-class ActionModule(NetActionModule, ActionBase):
-    pass
-
-
diff --git a/lib/ansible/utils/module_docs_fragments/dnos10.py b/lib/ansible/utils/module_docs_fragments/dellos10.py
index 567de5fa82..cfd8376876 100644
--- a/lib/ansible/utils/module_docs_fragments/dnos10.py
+++ b/lib/ansible/utils/module_docs_fragments/dellos10.py
@@ -1,4 +1,9 @@
-# This file is part of Ansible #
+#
+# (c) 2015, Peter Sprygada <psprygada@ansible.com>
+#
+# Copyright (c) 2016 Dell Inc.
+#
+# This file is part of Ansible 
 # Ansible is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
@@ -59,7 +64,7 @@ options:
     default: 10
   provider:
     description:
-      - Convenience method that allows all M(dnos10) arguments to be passed as
+      - Convenience method that allows all M(dellos10) arguments to be passed as
         a dict object.  All constraints (required, choices, etc) must be
         met either by individual arguments or values in this dict.
     required: false
diff --git a/lib/ansible/utils/module_docs_fragments/dnos9.py b/lib/ansible/utils/module_docs_fragments/dellos6.py
index 9df9d121ff..dd9944b995 100755..100644
--- a/lib/ansible/utils/module_docs_fragments/dnos9.py
+++ b/lib/ansible/utils/module_docs_fragments/dellos6.py
@@ -1,3 +1,8 @@
+#
+# (c) 2015, Peter Sprygada <psprygada@ansible.com>
+#
+# Copyright (c) 2016 Dell Inc.
+#
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify
@@ -77,7 +82,7 @@ options:
     default: 10
   provider:
     description:
-      - Convenience method that allows all M(dnos9) arguments to be passed as
+      - Convenience method that allows all M(dellos6) arguments to be passed as
         a dict object.  All constraints (required, choices, etc) must be
         met either by individual arguments or values in this dict.
     required: false
diff --git a/lib/ansible/utils/module_docs_fragments/dnos6.py b/lib/ansible/utils/module_docs_fragments/dellos9.py
index 28d732add3..66aa12825c 100644..100755
--- a/lib/ansible/utils/module_docs_fragments/dnos6.py
+++ b/lib/ansible/utils/module_docs_fragments/dellos9.py
@@ -1,3 +1,8 @@
+#
+# (c) 2015, Peter Sprygada <psprygada@ansible.com>
+#
+# Copyright (c) 2016 Dell Inc.
+#
 # This file is part of Ansible
 #
 # Ansible is free software: you can redistribute it and/or modify
@@ -77,7 +82,7 @@ options:
     default: 10
   provider:
     description:
-      - Convenience method that allows all M(dnos6) arguments to be passed as
+      - Convenience method that allows all M(dellos9) arguments to be passed as
         a dict object.  All constraints (required, choices, etc) must be
         met either by individual arguments or values in this dict.
     required: false