Fixing validate-modules errors + any other testing issues that need to be taken care of (#225)

Author: FragmentedPacket

.travis.yml

@@ -10,38 +10,21 @@ env:
   global:
     - COLLECTION_NAMESPACE: netbox
     - COLLECTION_NAME: netbox
-    - COLLECTION_VERSION: 0.2.2
+    - COLLECTION_VERSION: 0.2.3
     - secure: "tE6GtwrRU+Kjobx/94xqR2MqM20pHCnrLcHgPzIHA3npdwuA+GjCBiBLTkEEQM4fUWIfzUTyjSr9bZErm1PTI1GcIRdniTgJ3ZzSSkE7tgeYALB/7xsusB57SlmbBQm2SGwU558uWZ3NHEsi0WTgD8GKZo77OpGX72FZKsVXOz6k2wve51sOtoSVjgCsvWTmZHx4ynGdiA5wFkZfaEcjXECahKtunW+MlB5kpJzkVeLRUEXFMhWlsIYiA5nj8OI/X3Nk9ugh1ribENX9LrjpgrqQ9YariZ8G6py1ONuKZIn2g7xs5kNQ3qL6HL6N7SoUxiwH16CfSyugFaYiMfaxQ4NUVGGRHS4vSGbNIf+gLHcYvP40miI1f/+pntCzqygZMhW73FX2o+KH2OGv09khOl8k1nDg2/XvW0kCc/FU6l+Jp5wCC8H9X2uiULtQpRqts5TzIonlPEzGIpfGFgJ5m54Emhv9gjG1Z5OOyL/qae1Wr+L/uhiFafcglZYh8NHEMWCUCkeqFqR2kDmUMtdgYLD7Q7NdwlL/PSVVs1l7UPiQHlnecQKEHN7CvR3eKByTEmkCKafRYh/JQ9rBt9sZc7aAPVu+w3wWUwbHS4o4vVnmyXvJb1PeJSiuynF7CBo4Qd6qj4YwX8gLK6PylGyaMOp169u6xw1mo5/CX0pJ3x4="
 
 jobs:
   include:
-    # Previous release of Netbox, latest release of Ansible
-    - name: "Python 3.6 - Netbox 2.6 - Latest PyPi Ansible"
-      python: 3.6
-      env: PYTHON_VER=3.6 VERSION=v2.6 INTEGRATION_TESTS=v2.6
-      install:
-        - cd ..
-        # Setup netbox container for integration testing
-        - git clone https://github.com/FragmentedPacket/netbox-docker.git
-        - cd netbox-docker
-        - docker-compose pull
-        - docker-compose up -d
-        - cd ..
-        # setuptools <46.1.3 has issues with ansible-test executables https://github.com/ansible/ansible/issues/68963
-        - pip install -U pip "setuptools>=46.1.3"
-        # coverage 5.0 is not compatible with ansible-test https://github.com/ansible/ansible/issues/65907
-        - pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
-        - pip install pynetbox cryptography codecov jmespath jsondiff ansible
-
     - name: "Python 3.6 - Netbox 2.7 - Latest PyPi Ansible"
       python: 3.6
       env:
-      - PYTHON_VER=3.6 VERSION=v2.7 INTEGRATION_TESTS=latest
+        - PYTHON_VER=3.6 VERSION=v2.7 INTEGRATION_TESTS=latest
       install:
         - cd ..
         # Setup netbox container for integration testing
         - git clone https://github.com/netbox-community/netbox-docker.git
         - cd netbox-docker
+        - sed -i 's/SKIP_STARTUP_SCRIPTS=false/SKIP_STARTUP_SCRIPTS=true/' env/netbox.env
         - docker-compose pull
         - docker-compose up -d
         - cd ..
@@ -55,7 +38,7 @@ jobs:
     - name: "Python 3.7 - Netbox 2.8 - Latest PyPi Ansible"
       python: 3.7
       env:
-      - PYTHON_VER=3.7 VERSION=v2.8 INTEGRATION_TESTS=latest
+        - PYTHON_VER=3.7 VERSION=v2.8 INTEGRATION_TESTS=latest
       install:
         - cd ..
         # Setup netbox container for integration testing
@@ -110,15 +93,13 @@ before_script:
   - chmod +x tests/integration/targets/inventory/compare_inventory_json.py
 
 script:
-
   # Check python syntax
   - black . --check --diff
 
   # Sanity tests
   # --requirements - install pip packages as necessary
   # Skip pep8 as we use black instead
-  # Skip validate-modules until the issues can be resolved #180
-  - ansible-test sanity -v --requirements --python $PYTHON_VER --skip-test pep8 --skip-test validate-modules
+  - ansible-test sanity -v --requirements --python $PYTHON_VER --skip-test pep8
 
   # Unit tests, with code coverage
   - ansible-test units -v --coverage --python $PYTHON_VER

galaxy.yml

@@ -9,7 +9,7 @@ namespace: netbox
 name: netbox
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 0.2.2
+version: 0.2.3
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
@@ -68,8 +68,8 @@ issues: https://github.com/netbox-community/ansible_modules/issues
 # https://github.com/ansible/ansible/issues/67543
 # https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#ignoring-files-and-folders
 build_ignore:
-- venv
-- ansible_collections
-- tests/output
-- .pytest_cache
-- .vscode
+  - venv
+  - ansible_collections
+  - tests/output
+  - .pytest_cache
+  - .vscode

plugins/module_utils/netbox_circuits.py

@@ -5,18 +5,11 @@
 
 __metaclass__ = type
 
-# This should just be temporary once 2.9 is relased and tested we can remove this
-try:
-    from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
-        NetboxModule,
-        ENDPOINT_NAME_MAPPING,
-        SLUG_REQUIRED,
-    )
-except ImportError:
-    import sys
-
-    sys.path.append(".")
-    from netbox_utils import NetboxModule, ENDPOINT_NAME_MAPPING, SLUG_REQUIRED
+from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
+    NetboxModule,
+    ENDPOINT_NAME_MAPPING,
+    SLUG_REQUIRED,
+)
 
 
 NB_PROVIDERS = "providers"

plugins/module_utils/netbox_dcim.py

@@ -9,17 +9,11 @@
 import traceback
 from ansible.module_utils.basic import missing_required_lib
 
-try:
-    from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
-        NetboxModule,
-        ENDPOINT_NAME_MAPPING,
-        SLUG_REQUIRED,
-    )
-except ImportError:
-    import sys
-
-    sys.path.append(".")
-    from netbox_utils import NetboxModule, ENDPOINT_NAME_MAPPING, SLUG_REQUIRED
+from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
+    NetboxModule,
+    ENDPOINT_NAME_MAPPING,
+    SLUG_REQUIRED,
+)
 
 
 NB_DEVICE_BAYS = "device_bays"

plugins/module_utils/netbox_extras.py

@@ -5,17 +5,10 @@
 
 __metaclass__ = type
 
-# This should just be temporary once 2.9 is relased and tested we can remove this
-try:
-    from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
-        NetboxModule,
-        ENDPOINT_NAME_MAPPING,
-    )
-except ImportError:
-    import sys
-
-    sys.path.append(".")
-    from netbox_utils import NetboxModule, ENDPOINT_NAME_MAPPING
+from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
+    NetboxModule,
+    ENDPOINT_NAME_MAPPING,
+)
 
 
 class NetboxExtrasModule(NetboxModule):

plugins/module_utils/netbox_ipam.py

@@ -11,17 +11,11 @@
 from ansible.module_utils._text import to_text
 from ansible.module_utils.basic import missing_required_lib
 
-try:
-    from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
-        NetboxModule,
-        ENDPOINT_NAME_MAPPING,
-        SLUG_REQUIRED,
-    )
-except ImportError:
-    import sys
-
-    sys.path.append(".")
-    from netbox_utils import NetboxModule, ENDPOINT_NAME_MAPPING, SLUG_REQUIRED
+from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
+    NetboxModule,
+    ENDPOINT_NAME_MAPPING,
+    SLUG_REQUIRED,
+)
 
 
 NB_AGGREGATES = "aggregates"

plugins/module_utils/netbox_secrets.py

@@ -5,17 +5,10 @@
 
 __metaclass__ = type
 
-# This should just be temporary once 2.9 is relased and tested we can remove this
-try:
-    from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
-        NetboxModule,
-        ENDPOINT_NAME_MAPPING,
-    )
-except ImportError:
-    import sys
-
-    sys.path.append(".")
-    from netbox_utils import NetboxModule, ENDPOINT_NAME_MAPPING
+from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
+    NetboxModule,
+    ENDPOINT_NAME_MAPPING,
+)
 
 
 class NetboxSecretsModule(NetboxModule):

plugins/module_utils/netbox_tenancy.py

@@ -5,18 +5,11 @@
 
 __metaclass__ = type
 
-# This should just be temporary once 2.9 is relased and tested we can remove this
-try:
-    from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
-        NetboxModule,
-        ENDPOINT_NAME_MAPPING,
-        SLUG_REQUIRED,
-    )
-except ImportError:
-    import sys
-
-    sys.path.append(".")
-    from netbox_utils import NetboxModule, ENDPOINT_NAME_MAPPING, SLUG_REQUIRED
+from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
+    NetboxModule,
+    ENDPOINT_NAME_MAPPING,
+    SLUG_REQUIRED,
+)
 
 
 NB_TENANTS = "tenants"

plugins/module_utils/netbox_utils.py

@@ -12,7 +12,9 @@
 import re
 from itertools import chain
 from ansible_collections.ansible.netcommon.plugins.module_utils.compat import ipaddress
-from ansible.module_utils._text import to_text
+
+# from ansible.module_utils._text import to_text
+from ansible.module_utils.common.text.converters import to_text
 
 # from ._text import to_native
 from ansible.module_utils._text import to_native
@@ -777,7 +779,6 @@ def __init__(
             add_file_common_args=False,
             supports_check_mode=supports_check_mode,
             required_if=required_if,
-            required_by=None,
         )
 
     def _check_required_if(self, spec, param=None):

plugins/module_utils/netbox_virtualization.py

@@ -5,18 +5,11 @@
 
 __metaclass__ = type
 
-# This should just be temporary once 2.9 is relased and tested we can remove this
-try:
-    from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
-        NetboxModule,
-        ENDPOINT_NAME_MAPPING,
-        SLUG_REQUIRED,
-    )
-except ImportError:
-    import sys
-
-    sys.path.append(".")
-    from netbox_utils import NetboxModule, ENDPOINT_NAME_MAPPING
+from ansible_collections.netbox.netbox.plugins.module_utils.netbox_utils import (
+    NetboxModule,
+    ENDPOINT_NAME_MAPPING,
+    SLUG_REQUIRED,
+)
 
 
 NB_VIRTUAL_MACHINES = "virtual_machines"