Merge pull request #573 from ryanmerolle/devel

CI Fix

Author: jeremystretch

.github/workflows/main.yml

@@ -49,8 +49,11 @@ jobs:
             VERSION: "v2.10"
             INTEGRATION_TESTS: "v2.10"
           - python-version: 3.6
-            VERSION: "latest"
-            INTEGRATION_TESTS: "latest"
+            VERSION: "v2.11"
+            INTEGRATION_TESTS: "v2.11"
+          #- python-version: 3.6
+          #  VERSION: "v3.0"
+          #  INTEGRATION_TESTS: "v3.0"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -70,31 +73,54 @@ jobs:
           version: '3.4'
           services:
             netbox:
+              image: netboxcommunity/netbox:v2.10
               ports:
                 - 32768:8080
           EOF
           docker-compose up -d --quiet-pull
           docker container ls
           cd ..
         if: matrix.VERSION == 'v2.10'
-      - name: Clone & Start netbox-docker containers - latest
+      - name: Clone & Start netbox-docker containers - 2.11
         env:
           VERSION: ${{ matrix.VERSION }}
         run: |
           cd ..
           git clone https://github.com/netbox-community/netbox-docker.git
           cd netbox-docker
+          git checkout 1.2.0
           tee docker-compose.override.yml <<EOF
           version: '3.4'
           services:
             netbox:
+              image: netboxcommunity/netbox:v2.11
               ports:
                 - 32768:8080
           EOF
           docker-compose up -d --quiet-pull
           docker container ls
           cd ..
-        if: matrix.VERSION == 'latest'
+        if: matrix.VERSION == 'v2.11'
+      - name: Clone & Start netbox-docker containers - 3.0
+        env:
+          VERSION: ${{ matrix.VERSION }}
+        run: |
+          cd ..
+          git clone https://github.com/netbox-community/netbox-docker.git
+          cd netbox-docker
+          git checkout 1.3.1
+          tee docker-compose.override.yml <<EOF
+          version: '3.4'
+          services:
+            netbox:
+              image: netboxcommunity/netbox:v3.0
+              ports:
+                - 32768:8080
+          EOF
+          docker-compose up -d --quiet-pull
+          docker container ls
+          cd ..
+        if: matrix.VERSION == 'v3.0'
       - name: Install and configure Poetry
         uses: snok/install-poetry@v1.1.1
         with:

docs/getting_started/contributing/modules/new_module.rst

@@ -150,6 +150,7 @@ Now we need to update the ``DOCUMENTATION`` variable to match the module we're c
             - Any tags that the device may need to be associated with
           required: false
           type: list
+          elements: raw
         custom_fields:
           description:
             - must exist in Netbox
@@ -282,7 +283,7 @@ Let's move onto the ``main()`` function in the module and take a look at the req
                       name=dict(required=True, type="str"),
                       tenant=dict(required=False, type="raw"),
                       description=dict(required=False, type="str"),
-                      tags=dict(required=False, type="list"),
+                      tags=dict(required=False, type="list", elements="raw"),
                       custom_fields=dict(required=False, type="dict"),
                   ),
               ),

plugins/module_utils/netbox_utils.py

@@ -542,7 +542,8 @@ def _connect_netbox_api(self, url, token, ssl_verify, cert):
         try:
             session = requests.Session()
             session.verify = ssl_verify
-            session.cert = tuple(i for i in cert)
+            if cert:
+                session.cert = tuple(i for i in cert)
             nb = pynetbox.api(url, token=token)
             nb.http_session = session
             try:

plugins/modules/netbox_aggregate.py

@@ -38,6 +38,11 @@
       - "The token created within Netbox to authorize API access"
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     description:
       - "Defines the aggregate configuration"
@@ -68,6 +73,7 @@
           - "Any tags that the aggregate may need to be associated with"
         required: false
         type: list
+        elements: raw
       custom_fields:
         description:
           - "must exist in Netbox"
@@ -170,7 +176,7 @@ def main():
                     rir=dict(required=False, type="raw"),
                     date_added=dict(required=False, type="str"),
                     description=dict(required=False, type="str"),
-                    tags=dict(required=False, type="list"),
+                    tags=dict(required=False, type="list", elements="raw"),
                     custom_fields=dict(required=False, type="dict"),
                 ),
             ),

plugins/modules/netbox_cable.py

@@ -39,6 +39,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     type: dict
     required: true
@@ -150,7 +155,7 @@
           - Any tags that the cable may need to be associated with
         required: false
         type: list
-        elements: str
+        elements: raw
   state:
     description:
       - Use C(present) or C(absent) for adding or removing.
@@ -335,7 +340,7 @@ def main():
                     length_unit=dict(
                         required=False, choices=["m", "cm", "ft", "in"], type="str"
                     ),
-                    tags=dict(required=False, type="list", elements="str"),
+                    tags=dict(required=False, type="list", elements="raw"),
                 ),
             ),
         )

plugins/modules/netbox_circuit.py

@@ -38,6 +38,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     type: dict
     required: true
@@ -94,6 +99,7 @@
           - Any tags that the device may need to be associated with
         required: false
         type: list
+        elements: raw
       custom_fields:
         description:
           - must exist in Netbox
@@ -204,7 +210,7 @@ def main():
                     commit_rate=dict(required=False, type="int"),
                     description=dict(required=False, type="str"),
                     comments=dict(required=False, type="str"),
-                    tags=dict(required=False, type="list"),
+                    tags=dict(required=False, type="list", elements="raw"),
                     custom_fields=dict(required=False, type="dict"),
                 ),
             ),

plugins/modules/netbox_circuit_termination.py

@@ -38,6 +38,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     required: true
     type: dict

plugins/modules/netbox_circuit_type.py

@@ -38,6 +38,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     required: true
     type: dict

plugins/modules/netbox_cluster.py

@@ -38,6 +38,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     required: true
     type: dict
@@ -79,6 +84,7 @@
           - Any tags that the cluster may need to be associated with
         required: false
         type: list
+        elements: raw
       custom_fields:
         description:
           - must exist in Netbox
@@ -191,7 +197,7 @@ def main():
                     site=dict(required=False, type="raw"),
                     tenant=dict(required=False, type="raw"),
                     comments=dict(required=False, type="str"),
-                    tags=dict(required=False, type="list"),
+                    tags=dict(required=False, type="list", elements="raw"),
                     custom_fields=dict(required=False, type="dict"),
                 ),
             ),

plugins/modules/netbox_cluster_group.py

@@ -38,6 +38,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     required: true
     type: dict

plugins/modules/netbox_cluster_type.py

@@ -38,6 +38,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     required: true
     type: dict

plugins/modules/netbox_console_port.py

@@ -39,6 +39,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     type: dict
     required: true
@@ -84,6 +89,7 @@
           - Any tags that the console port may need to be associated with
         required: false
         type: list
+        elements: raw
   state:
     description:
       - Use C(present) or C(absent) for adding or removing.
@@ -197,7 +203,7 @@ def main():
                         type="str",
                     ),
                     description=dict(required=False, type="str"),
-                    tags=dict(required=False, type="list"),
+                    tags=dict(required=False, type="list", elements="raw"),
                 ),
             ),
         )

plugins/modules/netbox_console_port_template.py

@@ -39,6 +39,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     type: dict
     required: true

plugins/modules/netbox_console_server_port.py

@@ -39,6 +39,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     type: dict
     required: true
@@ -84,6 +89,7 @@
           - Any tags that the console server port may need to be associated with
         required: false
         type: list
+        elements: raw
   state:
     description:
       - Use C(present) or C(absent) for adding or removing.
@@ -197,7 +203,7 @@ def main():
                         type="str",
                     ),
                     description=dict(required=False, type="str"),
-                    tags=dict(required=False, type="list"),
+                    tags=dict(required=False, type="list", elements="raw"),
                 ),
             ),
         )

plugins/modules/netbox_console_server_port_template.py

@@ -39,6 +39,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     type: dict
     required: true

plugins/modules/netbox_device.py

@@ -40,6 +40,11 @@
       - The token created within Netbox to authorize API access
     required: true
     type: str
+  cert:
+    description:
+      - Certificate path
+    required: false
+    type: raw
   data:
     description:
       - Defines the device configuration
@@ -149,6 +154,7 @@
           - Any tags that the device may need to be associated with
         required: false
         type: list
+        elements: raw
       custom_fields:
         description:
           - must exist in Netbox
@@ -303,7 +309,7 @@ def main():
                     vc_position=dict(required=False, type="int"),
                     vc_priority=dict(required=False, type="int"),
                     comments=dict(required=False, type="str"),
-                    tags=dict(required=False, type="list"),
+                    tags=dict(required=False, type="list", elements="raw"),
                     local_context_data=dict(required=False, type="dict"),
                     custom_fields=dict(required=False, type="dict"),
                 ),