summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathaniel Case <this.is@nathanielca.se>2020-06-24 03:07:29 -0400
committerGitHub <noreply@github.com>2020-06-24 07:07:29 +0000
commit5bf1112c8c015bff6f54d4b17a3571f665381e1e (patch)
treec7d7e56324d876e4367f1a66352b525ff0963474
parentb10796ee6a798d9cf27945a775794a3f4ab0100f (diff)
downloadvyos.vyos-5bf1112c8c015bff6f54d4b17a3571f665381e1e.tar.gz
vyos.vyos-5bf1112c8c015bff6f54d4b17a3571f665381e1e.zip
Clean up boilerplate ignores (#54)
Clean up boilerplate ignores Reviewed-by: https://github.com/apps/ansible-zuul
-rw-r--r--plugins/doc_fragments/vyos.py3
-rw-r--r--plugins/module_utils/network/vyos/vyos.py3
-rw-r--r--plugins/modules/vyos_banner.py3
-rw-r--r--plugins/modules/vyos_command.py3
-rw-r--r--plugins/modules/vyos_config.py3
-rw-r--r--plugins/modules/vyos_facts.py3
-rw-r--r--plugins/modules/vyos_logging.py3
-rw-r--r--plugins/modules/vyos_system.py3
-rw-r--r--plugins/modules/vyos_user.py3
-rw-r--r--tests/sanity/ignore-2.9.txt26
-rw-r--r--tests/unit/mock/path.py3
-rw-r--r--tests/unit/mock/yaml_helper.py3
-rw-r--r--tests/unit/modules/conftest.py3
-rw-r--r--tests/unit/modules/utils.py3
14 files changed, 39 insertions, 26 deletions
diff --git a/plugins/doc_fragments/vyos.py b/plugins/doc_fragments/vyos.py
index 094963f..952c81d 100644
--- a/plugins/doc_fragments/vyos.py
+++ b/plugins/doc_fragments/vyos.py
@@ -1,4 +1,7 @@
# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
# Copyright: (c) 2015, Peter Sprygada <psprygada@ansible.com>
# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
diff --git a/plugins/module_utils/network/vyos/vyos.py b/plugins/module_utils/network/vyos/vyos.py
index 908395a..7257b85 100644
--- a/plugins/module_utils/network/vyos/vyos.py
+++ b/plugins/module_utils/network/vyos/vyos.py
@@ -25,6 +25,9 @@
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
import json
from ansible.module_utils._text import to_text
diff --git a/plugins/modules/vyos_banner.py b/plugins/modules/vyos_banner.py
index aa0bd5c..50cc6ee 100644
--- a/plugins/modules/vyos_banner.py
+++ b/plugins/modules/vyos_banner.py
@@ -1,5 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
# (c) 2017, Ansible by Red Hat, inc
#
diff --git a/plugins/modules/vyos_command.py b/plugins/modules/vyos_command.py
index eec4344..03f476c 100644
--- a/plugins/modules/vyos_command.py
+++ b/plugins/modules/vyos_command.py
@@ -15,6 +15,9 @@
# 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
DOCUMENTATION = """
diff --git a/plugins/modules/vyos_config.py b/plugins/modules/vyos_config.py
index baa63f3..a945d6a 100644
--- a/plugins/modules/vyos_config.py
+++ b/plugins/modules/vyos_config.py
@@ -15,6 +15,9 @@
# 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
DOCUMENTATION = """
diff --git a/plugins/modules/vyos_facts.py b/plugins/modules/vyos_facts.py
index 7521a3b..b878c23 100644
--- a/plugins/modules/vyos_facts.py
+++ b/plugins/modules/vyos_facts.py
@@ -3,6 +3,9 @@
# Copyright 2019 Red Hat
# 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
"""
The module file for vyos_facts
"""
diff --git a/plugins/modules/vyos_logging.py b/plugins/modules/vyos_logging.py
index 8732647..7b5d214 100644
--- a/plugins/modules/vyos_logging.py
+++ b/plugins/modules/vyos_logging.py
@@ -1,5 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
# (c) 2017, Ansible by Red Hat, inc
#
diff --git a/plugins/modules/vyos_system.py b/plugins/modules/vyos_system.py
index 53b04c8..220d1ff 100644
--- a/plugins/modules/vyos_system.py
+++ b/plugins/modules/vyos_system.py
@@ -16,6 +16,9 @@
# 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
DOCUMENTATION = """
diff --git a/plugins/modules/vyos_user.py b/plugins/modules/vyos_user.py
index d788a99..58532eb 100644
--- a/plugins/modules/vyos_user.py
+++ b/plugins/modules/vyos_user.py
@@ -1,5 +1,8 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
# (c) 2017, Ansible by Red Hat, inc
#
diff --git a/tests/sanity/ignore-2.9.txt b/tests/sanity/ignore-2.9.txt
index 86c7f86..527fc32 100644
--- a/tests/sanity/ignore-2.9.txt
+++ b/tests/sanity/ignore-2.9.txt
@@ -1,22 +1,12 @@
plugins/action/vyos.py action-plugin-docs # base class for deprecated network platform modules using `connection: local`
-plugins/doc_fragments/vyos.py future-import-boilerplate
-plugins/doc_fragments/vyos.py metaclass-boilerplate
-plugins/modules/vyos_banner.py future-import-boilerplate
-plugins/modules/vyos_banner.py metaclass-boilerplate
plugins/modules/vyos_banner.py validate-modules:doc-default-does-not-match-spec
plugins/modules/vyos_banner.py validate-modules:doc-missing-type
-plugins/modules/vyos_command.py future-import-boilerplate
-plugins/modules/vyos_command.py metaclass-boilerplate
plugins/modules/vyos_command.py validate-modules:doc-default-does-not-match-spec
plugins/modules/vyos_command.py validate-modules:doc-missing-type
plugins/modules/vyos_command.py validate-modules:parameter-type-not-in-doc
-plugins/modules/vyos_config.py future-import-boilerplate
-plugins/modules/vyos_config.py metaclass-boilerplate
plugins/modules/vyos_config.py validate-modules:doc-default-does-not-match-spec
plugins/modules/vyos_config.py validate-modules:doc-missing-type
plugins/modules/vyos_config.py validate-modules:parameter-type-not-in-doc
-plugins/modules/vyos_facts.py future-import-boilerplate
-plugins/modules/vyos_facts.py metaclass-boilerplate
plugins/modules/vyos_facts.py validate-modules:doc-default-does-not-match-spec
plugins/modules/vyos_facts.py validate-modules:parameter-type-not-in-doc
plugins/modules/vyos_firewall_global.py validate-modules:doc-choices-do-not-match-spec
@@ -54,8 +44,6 @@ plugins/modules/vyos_lldp_interface.py validate-modules:undocumented-parameter
plugins/modules/vyos_lldp.py validate-modules:deprecation-mismatch
plugins/modules/vyos_lldp.py validate-modules:doc-default-does-not-match-spec
plugins/modules/vyos_lldp.py validate-modules:invalid-documentation
-plugins/modules/vyos_logging.py future-import-boilerplate
-plugins/modules/vyos_logging.py metaclass-boilerplate
plugins/modules/vyos_logging.py validate-modules:doc-choices-do-not-match-spec
plugins/modules/vyos_logging.py validate-modules:doc-default-does-not-match-spec
plugins/modules/vyos_logging.py validate-modules:doc-missing-type
@@ -72,12 +60,8 @@ plugins/modules/vyos_static_route.py validate-modules:invalid-documentation
plugins/modules/vyos_static_route.py validate-modules:missing-suboption-docs
plugins/modules/vyos_static_route.py validate-modules:parameter-type-not-in-doc
plugins/modules/vyos_static_route.py validate-modules:undocumented-parameter
-plugins/modules/vyos_system.py future-import-boilerplate
-plugins/modules/vyos_system.py metaclass-boilerplate
plugins/modules/vyos_system.py validate-modules:doc-default-does-not-match-spec
plugins/modules/vyos_system.py validate-modules:parameter-type-not-in-doc
-plugins/modules/vyos_user.py future-import-boilerplate
-plugins/modules/vyos_user.py metaclass-boilerplate
plugins/modules/vyos_user.py validate-modules:doc-choices-do-not-match-spec
plugins/modules/vyos_user.py validate-modules:doc-default-does-not-match-spec
plugins/modules/vyos_user.py validate-modules:doc-missing-type
@@ -90,13 +74,3 @@ plugins/modules/vyos_vlan.py validate-modules:doc-missing-type
plugins/modules/vyos_vlan.py validate-modules:missing-suboption-docs
plugins/modules/vyos_vlan.py validate-modules:parameter-type-not-in-doc
plugins/modules/vyos_vlan.py validate-modules:undocumented-parameter
-plugins/module_utils/network/vyos/vyos.py future-import-boilerplate
-plugins/module_utils/network/vyos/vyos.py metaclass-boilerplate
-tests/unit/mock/path.py future-import-boilerplate
-tests/unit/mock/path.py metaclass-boilerplate
-tests/unit/mock/yaml_helper.py future-import-boilerplate
-tests/unit/mock/yaml_helper.py metaclass-boilerplate
-tests/unit/modules/conftest.py future-import-boilerplate
-tests/unit/modules/conftest.py metaclass-boilerplate
-tests/unit/modules/utils.py future-import-boilerplate
-tests/unit/modules/utils.py metaclass-boilerplate
diff --git a/tests/unit/mock/path.py b/tests/unit/mock/path.py
index aea8ba1..74b02be 100644
--- a/tests/unit/mock/path.py
+++ b/tests/unit/mock/path.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
from ansible_collections.vyos.vyos.tests.unit.compat.mock import MagicMock
from ansible.utils.path import unfrackpath
diff --git a/tests/unit/mock/yaml_helper.py b/tests/unit/mock/yaml_helper.py
index 1a945f1..5df30aa 100644
--- a/tests/unit/mock/yaml_helper.py
+++ b/tests/unit/mock/yaml_helper.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
import io
import yaml
diff --git a/tests/unit/modules/conftest.py b/tests/unit/modules/conftest.py
index ac56c9c..e19a1e0 100644
--- a/tests/unit/modules/conftest.py
+++ b/tests/unit/modules/conftest.py
@@ -1,5 +1,8 @@
# Copyright (c) 2017 Ansible Project
# 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
import json
diff --git a/tests/unit/modules/utils.py b/tests/unit/modules/utils.py
index 2c9c602..90023ce 100644
--- a/tests/unit/modules/utils.py
+++ b/tests/unit/modules/utils.py
@@ -1,3 +1,6 @@
+from __future__ import absolute_import, division, print_function
+
+__metaclass__ = type
import json
from ansible_collections.vyos.vyos.tests.unit.compat import unittest