Merge pull request #772 from netbox-community/devel

Release 3.7.0

Author: rodvand

.github/workflows/main.yml

@@ -54,6 +54,9 @@ jobs:
           - python-version: 3.8
             VERSION: "v3.1"
             INTEGRATION_TESTS: "v3.1"
+          - python-version: 3.8
+            VERSION: "v3.2"
+            INTEGRATION_TESTS: "v3.2"
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
@@ -122,6 +125,26 @@ jobs:
           docker container ls
           cd ..
         if: matrix.VERSION == 'v3.1'
+      - name: Clone & Start netbox-docker containers - 3.2
+        env:
+          VERSION: ${{ matrix.VERSION }}
+        run: |
+          cd ..
+          git clone https://github.com/netbox-community/netbox-docker.git
+          cd netbox-docker
+          git checkout 1.6.1
+          tee docker-compose.override.yml <<EOF
+          version: '3.4'
+          services:
+            netbox:
+              image: netboxcommunity/netbox:v3.2
+              ports:
+                - 32768:8080
+          EOF
+          docker-compose up -d --quiet-pull
+          docker container ls
+          cd ..
+        if: matrix.VERSION == 'v3.2'
       - name: Install and configure Poetry
         uses: snok/[email protected]
         with:

.github/workflows/release.yml

@@ -9,12 +9,7 @@ jobs:
     steps:
       - name: Checkout repo
         uses: actions/checkout@v2
-      - name: Set up Python 3.8
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.8
-      - name: Install ansible-core to deploy collection
-        run: pip install ansible-core
+
       - name: Build and Deploy Collection
         uses: artis3n/ansible_galaxy_collection@v2
         with:

CHANGELOG.rst

@@ -5,6 +5,23 @@ NetBox.NetBox Release Notes
 .. contents:: Topics
 
 
+v3.7.0
+======
+
+Minor Changes
+-------------
+
+- Add meta information for use in Execution Environments [#753](https://github.com/netbox-community/ansible_modules/pull/753)
+- Multiple modules - add new parameters added in NetBox 3.2 [#768](https://github.com/netbox-community/ansible_modules/pull/768)
+- nb_inventory - Add site_group as an option [#755](https://github.com/netbox-community/ansible_modules/pull/755)
+- netbox_front_port and netbox_rear_port - Add label as parameter [#766](https://github.com/netbox-community/ansible_modules/pull/766)
+
+Bugfixes
+--------
+
+- netbox_contact_group - Fix field description [#762](https://github.com/netbox-community/ansible_modules/pull/762)
+- netbox_rack - Add location as a query parameter for uniqueness check [#751](https://github.com/netbox-community/ansible_modules/pull/751)
+
 v3.6.0
 ======
 

README.md

@@ -14,8 +14,8 @@ To keep the code simple, we only officially support the two latest releases of N
 - NetBox 2.11+ or the two latest NetBox releases
 - Python 3.8+
 - Python modules:
-  - `pynetbox 5.0.4+`, `pynetbox 6.4.0` if using 3.1 features
-  - `packages` if using Ansible < 2.10, as it's included in Ansible 2.10+
+  - `pynetbox 5.0.4+`, `pynetbox 6.4.0+` if using 3.1 features
+  - `packaging` if using Ansible < 2.10, as it's included in Ansible 2.10+
 - Ansible 2.10+
 - NetBox write-enabled token when using modules or read-only token for `nb_lookup/nb_inventory`
 

changelogs/changelog.yaml

@@ -676,3 +676,16 @@ releases:
         name: netbox_webhook
         namespace: ''
     release_date: '2022-02-27'
+  3.7.0:
+    changes:
+      minor_changes:
+        - Multiple modules - add new parameters added in NetBox 3.2 [#768](https://github.com/netbox-community/ansible_modules/pull/768)
+        - netbox_front_port and netbox_rear_port - Add label as parameter [#766](https://github.com/netbox-community/ansible_modules/pull/766)
+        - nb_inventory - Add site_group as an option [#755](https://github.com/netbox-community/ansible_modules/pull/755)
+        - Add meta information for use in Execution Environments [#753](https://github.com/netbox-community/ansible_modules/pull/753)
+      bugfixes:
+        - netbox_rack - Add location as a query parameter for uniqueness check [#751](https://github.com/netbox-community/ansible_modules/pull/751)
+        - netbox_contact_group - Fix field description [#762](https://github.com/netbox-community/ansible_modules/pull/762)
+      trivial:
+        - Updated CI to test against NetBox 3.2 [#759](https://github.com/netbox-community/ansible_modules/pull/759)
+    release_date: '2022-04-18'

docs/conf.py

@@ -27,7 +27,7 @@
 author = "Mikhail Yohman <@FragmentedPacket>"
 
 # The full version, including alpha/beta/rc tags
-release = "3.6.0"
+release = "3.7.0"
 
 
 # -- General configuration ---------------------------------------------------

docs/plugins/index.rst

@@ -5,7 +5,30 @@
 Netbox.Netbox
 =============
 
-Collection version 3.6.0
+Collection version 3.7.0
+
+.. contents::
+   :local:
+   :depth: 1
+
+Description
+-----------
+
+This is a collection of NetBox Ansible modules
+
+**Authors:**
+
+* Mikhail Yohman <[email protected]>
+* Martin Rødvand <[email protected]>
+
+.. raw:: html
+
+  <p class="ansible-links">
+    <a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
+    <a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
+  </p>
+
+
 
 .. toctree::
     :maxdepth: 1

docs/plugins/nb_inventory_inventory.rst

@@ -42,7 +42,7 @@ netbox.netbox.nb_inventory inventory -- NetBox inventory source
 .. Collection note
 
 .. note::
-    This inventory plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
+    This inventory plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
 
     You might already have this collection installed if you are using the ``ansible`` package.
     It is not included in ``ansible-core``.
@@ -1077,6 +1077,7 @@ Parameters
       - :ansible-option-choices-entry:`platforms`
       - :ansible-option-choices-entry:`platform`
       - :ansible-option-choices-entry:`region`
+      - :ansible-option-choices-entry:`site\_group`
       - :ansible-option-choices-entry:`cluster`
       - :ansible-option-choices-entry:`cluster\_type`
       - :ansible-option-choices-entry:`cluster\_group`
@@ -2427,6 +2428,20 @@ Authors
 - Douglas Heriot (@DouglasHeriot)
 
 
+.. hint::
+    Configuration entries for each entry type have a low to high priority order. For example, a variable that is lower in the list will override a variable that is higher up.
+
+.. Extra links
+
+Collection links
+~~~~~~~~~~~~~~~~
+
+.. raw:: html
+
+  <p class="ansible-links">
+    <a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
+    <a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
+  </p>
 
 .. Parsing errors
 

docs/plugins/nb_lookup_lookup.rst

@@ -42,7 +42,7 @@ netbox.netbox.nb_lookup lookup -- Queries and returns elements from NetBox
 .. Collection note
 
 .. note::
-    This lookup plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
+    This lookup plugin is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
 
     You might already have this collection installed if you are using the ``ansible`` package.
     It is not included in ``ansible-core``.
@@ -54,7 +54,7 @@ netbox.netbox.nb_lookup lookup -- Queries and returns elements from NetBox
 
 .. version_added
 
-.. versionadded:: 2.9 of netbox.netbox
+.. versionadded:: 0.1.0 of netbox.netbox
 
 .. contents::
    :local:
@@ -598,6 +598,20 @@ Authors
 - Chris Mills (@cpmills1975)
 
 
+.. hint::
+    Configuration entries for each entry type have a low to high priority order. For example, a variable that is lower in the list will override a variable that is higher up.
+
+.. Extra links
+
+Collection links
+~~~~~~~~~~~~~~~~
+
+.. raw:: html
+
+  <p class="ansible-links">
+    <a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
+    <a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
+  </p>
 
 .. Parsing errors
 

docs/plugins/netbox_aggregate_module.rst

@@ -42,7 +42,7 @@ netbox.netbox.netbox_aggregate module -- Creates or removes aggregates from NetB
 .. Collection note
 
 .. note::
-    This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.6.0).
+    This module is part of the `netbox.netbox collection <https://galaxy.ansible.com/netbox/netbox>`_ (version 3.7.0).
 
     You might already have this collection installed if you are using the ``ansible`` package.
     It is not included in ``ansible-core``.
@@ -735,5 +735,17 @@ Authors
 
 
 
+.. Extra links
+
+Collection links
+~~~~~~~~~~~~~~~~
+
+.. raw:: html
+
+  <p class="ansible-links">
+    <a href="https://github.com/netbox-community/ansible_modules/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
+    <a href="https://github.com/netbox-community/ansible_modules" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
+  </p>
+
 .. Parsing errors