Merge "Fix H236 and remove exclusion"

2026-05-07 22:03:09 +00:00 · 2020-03-04 22:22:02 +00:00
parent 4b27e9bafd 9d29e8c847
commit fba0eda1d8
66 changed files with 3 additions and 68 deletions
--- a/plugins/inventory/openstack.py
+++ b/plugins/inventory/openstack.py
@@ -6,7 +6,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type

 DOCUMENTATION = '''
 ---
--- a/plugins/modules/os_auth.py
+++ b/plugins/modules/os_auth.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_client_config.py
+++ b/plugins/modules/os_client_config.py
@@ -5,7 +5,6 @@


 from __future__ import absolute_import, division, print_function
-__metaclass__ = type

 ANSIBLE_METADATA = {'metadata_version': '1.1',
                    'status': ['preview'],
--- a/plugins/modules/os_coe_cluster.py
+++ b/plugins/modules/os_coe_cluster.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_coe_cluster_template.py
+++ b/plugins/modules/os_coe_cluster_template.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_flavor_info.py
+++ b/plugins/modules/os_flavor_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_floating_ip.py
+++ b/plugins/modules/os_floating_ip.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_group.py
+++ b/plugins/modules/os_group.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_group_info.py
+++ b/plugins/modules/os_group_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_image.py
+++ b/plugins/modules/os_image.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 # TODO(mordred): we need to support "location"(v1) and "locations"(v2)
--- a/plugins/modules/os_image_info.py
+++ b/plugins/modules/os_image_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_ironic.py
+++ b/plugins/modules/os_ironic.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_ironic_inspect.py
+++ b/plugins/modules/os_ironic_inspect.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_ironic_node.py
+++ b/plugins/modules/os_ironic_node.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_keypair.py
+++ b/plugins/modules/os_keypair.py
@@ -6,7 +6,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_keystone_domain.py
+++ b/plugins/modules/os_keystone_domain.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_keystone_domain_info.py
+++ b/plugins/modules/os_keystone_domain_info.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_keystone_endpoint.py
+++ b/plugins/modules/os_keystone_endpoint.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_keystone_role.py
+++ b/plugins/modules/os_keystone_role.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_keystone_service.py
+++ b/plugins/modules/os_keystone_service.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_listener.py
+++ b/plugins/modules/os_listener.py
@@ -5,7 +5,6 @@

 from __future__ import absolute_import, division, print_function

-__metaclass__ = type

 ANSIBLE_METADATA = {'metadata_version': '1.1',
                    'status': ['preview'],
--- a/plugins/modules/os_loadbalancer.py
+++ b/plugins/modules/os_loadbalancer.py
@@ -5,7 +5,6 @@

 from __future__ import absolute_import, division, print_function

-__metaclass__ = type

 ANSIBLE_METADATA = {'metadata_version': '1.1',
                    'status': ['preview'],
--- a/plugins/modules/os_member.py
+++ b/plugins/modules/os_member.py
@@ -5,7 +5,6 @@

 from __future__ import absolute_import, division, print_function

-__metaclass__ = type

 ANSIBLE_METADATA = {'metadata_version': '1.1',
                    'status': ['preview'],
--- a/plugins/modules/os_network.py
+++ b/plugins/modules/os_network.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_networks_info.py
+++ b/plugins/modules/os_networks_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_nova_flavor.py
+++ b/plugins/modules/os_nova_flavor.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_nova_host_aggregate.py
+++ b/plugins/modules/os_nova_host_aggregate.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_object.py
+++ b/plugins/modules/os_object.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_pool.py
+++ b/plugins/modules/os_pool.py
@@ -5,7 +5,6 @@

 from __future__ import absolute_import, division, print_function

-__metaclass__ = type

 ANSIBLE_METADATA = {'metadata_version': '1.1',
                    'status': ['preview'],
--- a/plugins/modules/os_port.py
+++ b/plugins/modules/os_port.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_port_info.py
+++ b/plugins/modules/os_port_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_project.py
+++ b/plugins/modules/os_project.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_project_access.py
+++ b/plugins/modules/os_project_access.py
@@ -14,7 +14,6 @@
 # along with this software.  If not, see <http://www.gnu.org/licenses/>.

 from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type

 ANSIBLE_METADATA = {'metadata_version': '1.1',
                    'status': ['preview'],
--- a/plugins/modules/os_project_info.py
+++ b/plugins/modules/os_project_info.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_quota.py
+++ b/plugins/modules/os_quota.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_recordset.py
+++ b/plugins/modules/os_recordset.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_router.py
+++ b/plugins/modules/os_router.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_routers_info.py
+++ b/plugins/modules/os_routers_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_security_group.py
+++ b/plugins/modules/os_security_group.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_security_group_rule.py
+++ b/plugins/modules/os_security_group_rule.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_server.py
+++ b/plugins/modules/os_server.py
@@ -8,7 +8,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_server_action.py
+++ b/plugins/modules/os_server_action.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_server_group.py
+++ b/plugins/modules/os_server_group.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_server_info.py
+++ b/plugins/modules/os_server_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_server_metadata.py
+++ b/plugins/modules/os_server_metadata.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'status': ['preview'],
--- a/plugins/modules/os_server_volume.py
+++ b/plugins/modules/os_server_volume.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_stack.py
+++ b/plugins/modules/os_stack.py
@@ -6,7 +6,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_subnet.py
+++ b/plugins/modules/os_subnet.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_subnets_info.py
+++ b/plugins/modules/os_subnets_info.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_user.py
+++ b/plugins/modules/os_user.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_user_group.py
+++ b/plugins/modules/os_user_group.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_user_info.py
+++ b/plugins/modules/os_user_info.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_user_role.py
+++ b/plugins/modules/os_user_role.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_volume.py
+++ b/plugins/modules/os_volume.py
@@ -4,7 +4,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',
--- a/plugins/modules/os_volume_snapshot.py
+++ b/plugins/modules/os_volume_snapshot.py
@@ -5,7 +5,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'status': ['preview'],
--- a/plugins/modules/os_zone.py
+++ b/plugins/modules/os_zone.py
@@ -3,7 +3,6 @@
 # GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

 from __future__ import absolute_import, division, print_function
-__metaclass__ = type


 ANSIBLE_METADATA = {'metadata_version': '1.1',