Fixes #583: Move to Ansible-core for CI tests (#591)

* Update modules and CI to satisfy ansible-core 2.11 ansible-test requirements

Author: rodvand

.github/workflows/release.yml

@@ -13,8 +13,8 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.6
-      - name: Install ansible-base to deploy collection
-        run: pip install ansible-base
+      - name: Install ansible-core to deploy collection
+        run: pip install ansible-core
       - name: Build and Deploy Collection
         uses: artis3n/ansible_galaxy_collection@v2
         with:

plugins/lookup/nb_lookup.py

@@ -19,9 +19,22 @@
 from ansible.plugins.lookup import LookupBase
 from ansible.parsing.splitter import parse_kv, split_args
 from ansible.utils.display import Display
+from ansible.module_utils.six import raise_from
+
+try:
+    import pynetbox
+except ImportError as imp_exc:
+    PYNETBOX_LIBRARY_IMPORT_ERROR = imp_exc
+else:
+    PYNETBOX_LIBRARY_IMPORT_ERROR = None
+
+try:
+    import requests
+except ImportError as imp_exc:
+    REQUESTS_LIBRARY_IMPORT_ERROR = imp_exc
+else:
+    REQUESTS_LIBRARY_IMPORT_ERROR = None
 
-import pynetbox
-import requests
 
 __metaclass__ = type
 
@@ -296,6 +309,17 @@ class LookupModule(LookupBase):
     """
 
     def run(self, terms, variables=None, **kwargs):
+        if PYNETBOX_LIBRARY_IMPORT_ERROR:
+            raise_from(
+                AnsibleError("pynetbox must be installed to use this plugin"),
+                PYNETBOX_LIBRARY_IMPORT_ERROR,
+            )
+
+        if REQUESTS_LIBRARY_IMPORT_ERROR:
+            raise_from(
+                AnsibleError("requests must be installed to use this plugin"),
+                REQUESTS_LIBRARY_IMPORT_ERROR,
+            )
 
         netbox_api_token = (
             kwargs.get("token")

plugins/module_utils/netbox_utils.py

@@ -833,7 +833,7 @@ def _fetch_choice_value(self, search, endpoint):
                 msg="Failed to fetch endpoint choices to validate against. This requires a write-enabled token. Make sure the token is write-enabled. If looking to fetch only information, use either the inventory or lookup plugin."
             )
 
-        choices = [x for x in chain.from_iterable(endpoint_choices.values())]
+        choices = list(chain.from_iterable(endpoint_choices.values()))
 
         for item in choices:
             if item["display_name"].lower() == search.lower():

plugins/modules/netbox_device_interface.py

@@ -64,13 +64,13 @@
         required: false
         type: str
       form_factor:
-        description:
-          - |
-            Form factor of the interface:
-            ex. 1000Base-T (1GE), Virtual, 10GBASE-T (10GE)
-            This has to be specified exactly as what is found within UI
-        required: false
-        type: raw
+         description:
+           - |
+             Form factor of the interface:
+             ex. 1000Base-T (1GE), Virtual, 10GBASE-T (10GE)
+             This has to be specified exactly as what is found within UI
+         required: false
+         type: raw
       type:
         description:
           - |
@@ -299,7 +299,10 @@ def main():
                     device=dict(required=False, type="raw"),
                     name=dict(required=True, type="str"),
                     form_factor=dict(
-                        required=False, type="raw", removed_in_version="0.3.0"
+                        required=False,
+                        type="raw",
+                        removed_in_version="4.0.0",
+                        removed_from_collection="netbox.netbox",
                     ),
                     label=dict(required=False, type="str"),
                     type=dict(required=False, type="str"),

plugins/modules/netbox_ip_address.py

@@ -51,14 +51,14 @@
       - Defines the IP address configuration
     suboptions:
       family:
-        description:
-          - (DEPRECATED) - NetBox now handles determining the IP family natively.
-          - Specifies with address family the IP address belongs to
-        choices:
-          - 4
-          - 6
-        required: false
-        type: int
+         description:
+           - (DEPRECATED) - NetBox now handles determining the IP family natively.
+           - Specifies with address family the IP address belongs to
+         choices:
+           - 4
+           - 6
+         required: false
+         type: int
       address:
         description:
           - Required if state is C(present)
@@ -227,7 +227,6 @@
         netbox_url: http://netbox.local
         netbox_token: thisIsMyToken
         data:
-          family: 4
           address: 192.168.1.20
           vrf: Test
           tenant: Test Tenant
@@ -242,7 +241,6 @@
         netbox_url: http://netbox.local
         netbox_token: thisIsMyToken
         data:
-          family: 4
           address: 192.168.1.30
           vrf: Test
           nat_inside:
@@ -323,13 +321,14 @@ def main():
                 type="dict",
                 required=True,
                 options=dict(
+                    address=dict(required=False, type="str"),
                     family=dict(
                         required=False,
                         type="int",
                         choices=[4, 6],
-                        removed_in_version="0.3.0",
+                        removed_in_version="4.0.0",
+                        removed_from_collection="netbox.netbox",
                     ),
-                    address=dict(required=False, type="str"),
                     prefix=dict(required=False, type="raw"),
                     vrf=dict(required=False, type="raw"),
                     tenant=dict(required=False, type="raw"),

poetry.lock

@@ -7,7 +7,7 @@ license = "GPLv3"
 
 [tool.poetry.dependencies]
 python = "^3.6"
-ansible-base = "^2.10.0"
+ansible-core = "^2.11.0"
 black = "19.10b0"
 codecov = "*"
 coverage = "^4.0"
@@ -23,7 +23,7 @@ pyyaml = "*"
 mock = "^4.0.2"
 antsibull = "^0.25.0"
 importlib-metadata = "1.7.0"
-pylint = "^2.6.0"
+pylint = "^2.8.0"
 packaging = "^20.9"
 
 [tool.poetry.dev-dependencies]

pyproject.toml

@@ -21,7 +21,6 @@
       - test_one['diff']['before']['state'] == "absent"
       - test_one['diff']['after']['state'] == "present"
       - test_one['aggregate']['prefix'] == "10.0.0.0/8"
-      - test_one['aggregate']['family'] == 4
       - test_one['aggregate']['rir'] == 1
       - test_one['msg'] == "aggregate 10.0.0.0/8 created"
 
@@ -39,7 +38,6 @@
     that:
       - not test_two['changed']
       - test_two['aggregate']['prefix'] == "10.0.0.0/8"
-      - test_two['aggregate']['family'] == 4
       - test_two['aggregate']['rir'] == 1
       - test_two['msg'] == "aggregate 10.0.0.0/8 already exists"
 
@@ -65,7 +63,6 @@
       - test_three['diff']['after']['description'] == "Test Description"
       - test_three['diff']['after']['tags'][0] == 4
       - test_three['aggregate']['prefix'] == "10.0.0.0/8"
-      - test_three['aggregate']['family'] == 4
       - test_three['aggregate']['rir'] == 1
       - test_three['aggregate']['date_added'] == "1989-01-18"
       - test_three['aggregate']['description'] == "Test Description"
@@ -86,7 +83,6 @@
     that:
       - test_four is changed
       - test_four['aggregate']['prefix'] == "10.0.0.0/8"
-      - test_four['aggregate']['family'] == 4
       - test_four['aggregate']['rir'] == 1
       - test_four['aggregate']['date_added'] == "1989-01-18"
       - test_four['aggregate']['description'] == "Test Description"
@@ -110,6 +106,5 @@
       - test_five['diff']['before']['state'] == "absent"
       - test_five['diff']['after']['state'] == "present"
       - test_five['aggregate']['prefix'] == "2001::/32"
-      - test_five['aggregate']['family'] == 6
       - test_five['aggregate']['rir'] == 1
       - test_five['msg'] == "aggregate 2001::/32 created"