Merge pull request #183 from nautobot/develop

Merge Develop -> Main for Release v4.2.0
nautobot · Dec 20, 2022 · 861bd65 · 861bd65
2 parents 9ef6976 + 5d3c443
commit 861bd65
Show file tree

Hide file tree

Showing 75 changed files with 2,095 additions and 1,498 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -42,31 +42,31 @@ jobs:
   integration:
     runs-on: "ubuntu-20.04"
     strategy:
-      fail-fast: true
+      fail-fast: false
       matrix:
         # Need to check what is needed for the integration step
         # python-version: ["3.6", "3.7", "3.8", "3.9"]
         # nautobot-version: ["1.0.3", "1.1.1"]
         # ansible-release: ["base", "core"]
         include:
-          - python-version: "3.7"
-            nautobot-version: "1.1.6"
-            ansible-release: "base" # Ansible 2.10
           - python-version: "3.8"
-            nautobot-version: "1.2"
+            nautobot-version: "1.3"
+            ansible-release: "base"  # Ansible 2.10
+          - python-version: "3.8"
+            nautobot-version: "1.3"
             ansible-release: "2.11"
           - python-version: "3.8"
-            nautobot-version: "1.2"
+            nautobot-version: "1.3"
             ansible-release: "2.9"
           - python-version: "3.8"
-            nautobot-version: "1.3"
+            nautobot-version: "1.4"
             ansible-release: "2.10"
-          - python-version: "3.8"
-            nautobot-version: "1.3"
-            ansible-release: "2.12"
           - python-version: "3.8"
             nautobot-version: "1.4"
             ansible-release: "2.12"
+          # - python-version: "3.8"
+          #   nautobot-version: "1.5"
+          #   ansible-release: "2.12"
     env:
       INVOKE_NAUTOBOT_ANSIBLE_PYTHON_VER: "${{ matrix.python-version }}"
       INVOKE_NAUTOBOT_ANSIBLE_NAUTOBOT_VER: "${{ matrix.nautobot-version }}"

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,21 @@ networktocode.nautobot Release Notes
 
 .. contents:: Topics
 
+v4.2.0
+======
+
+Release Summary
+---------------
+
+Update missing keys on module updates.
+
+Bugfixes
+--------
+
+- (#171) Add provider_network to circuit_termination module
+- (#172) Add description to manufacturer
+- (#171) Drop testing for Python 3.6 & Python 3.7 (may still work, just no longer tested)
+- (#171) Adds provider_networks to lookup plugin filter
 
 v4.1.1
 ======

diff --git a/changelogs/changelog.yaml b/changelogs/changelog.yaml
@@ -348,3 +348,9 @@ releases:
       bugfixes:
         - (#163) Fix bad filter params due to `STRICT_FILTERING` being enabled in Nautobot 1.4.
       release_summary: "Fix incorrect filter parameters"
+
+  4.2.0:
+    changes:
+      minor_changes:
+        - (#171) Add provider_network to circuit_termination module
+        - (#172) Add description to manufacturer
diff --git a/docs/plugins/aggregate_module.rst b/docs/plugins/aggregate_module.rst
@@ -18,8 +18,7 @@
 .. role:: ansible-option-versionadded
 .. role:: ansible-option-aliases
 .. role:: ansible-option-choices
-.. role:: ansible-option-choices-entry
-.. role:: ansible-option-default
+.. role:: ansible-option-choices-default-mark
 .. role:: ansible-option-default-bold
 .. role:: ansible-option-configuration
 .. role:: ansible-option-returned-bold
@@ -43,7 +42,7 @@ networktocode.nautobot.aggregate module -- Creates or removes aggregates from Na
 .. Collection note
 
 .. note::
-    This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 4.1.1).
+    This module is part of the `networktocode.nautobot collection <https://galaxy.ansible.com/networktocode/nautobot>`_ (version 4.2.0).
 
     To install it, use: :code:`ansible-galaxy collection install networktocode.nautobot`.
     You need further requirements to be able to use this module,
@@ -53,7 +52,9 @@ networktocode.nautobot.aggregate module -- Creates or removes aggregates from Na
 
 .. version_added
 
-.. versionadded:: 1.0.0 of networktocode.nautobot
+.. rst-class:: ansible-version-added
+
+New in networktocode.nautobot 1.0.0
 
 .. contents::
    :local:
@@ -123,7 +124,7 @@ Parameters
 
       :ansible-option-type:`string`
 
-      :ansible-option-versionadded:`added in 4.1.0 of networktocode.nautobot`
+      :ansible-option-versionadded:`added in networktocode.nautobot 4.1.0`
 
 
       .. raw:: html
@@ -160,7 +161,7 @@ Parameters
 
       :ansible-option-type:`dictionary`
 
-      :ansible-option-versionadded:`added in 3.0.0 of networktocode.nautobot`
+      :ansible-option-versionadded:`added in networktocode.nautobot 3.0.0`
 
 
       .. raw:: html
@@ -197,7 +198,7 @@ Parameters
 
       :ansible-option-type:`string`
 
-      :ansible-option-versionadded:`added in 3.0.0 of networktocode.nautobot`
+      :ansible-option-versionadded:`added in networktocode.nautobot 3.0.0`
 
 
       .. raw:: html
@@ -234,7 +235,7 @@ Parameters
 
       :ansible-option-type:`string`
 
-      :ansible-option-versionadded:`added in 3.0.0 of networktocode.nautobot`
+      :ansible-option-versionadded:`added in networktocode.nautobot 3.0.0`
 
 
       .. raw:: html
@@ -271,7 +272,7 @@ Parameters
 
       :ansible-option-type:`any` / :ansible-option-required:`required`
 
-      :ansible-option-versionadded:`added in 3.0.0 of networktocode.nautobot`
+      :ansible-option-versionadded:`added in networktocode.nautobot 3.0.0`
 
 
       .. raw:: html
@@ -308,7 +309,7 @@ Parameters
 
       :ansible-option-type:`list` / :ansible-option-elements:`elements=string`
 
-      :ansible-option-versionadded:`added in 3.0.0 of networktocode.nautobot`
+      :ansible-option-versionadded:`added in networktocode.nautobot 3.0.0`
 
 
       .. raw:: html
@@ -349,7 +350,7 @@ Parameters
 
       :ansible-option-type:`any`
 
-      :ansible-option-versionadded:`added in 3.0.0 of networktocode.nautobot`
+      :ansible-option-versionadded:`added in networktocode.nautobot 3.0.0`
 
 
       .. raw:: html
@@ -401,8 +402,9 @@ Parameters
 
       :ansible-option-choices:`Choices:`
 
-      - :ansible-option-default-bold:`present` :ansible-option-default:`← (default)`
-      - :ansible-option-choices-entry:`absent`
+      - :ansible-option-choices-entry-default:`"present"` :ansible-option-choices-default-mark:`← (default)`
+      - :ansible-option-choices-entry:`"absent"`
+
 
       .. raw:: html
 
@@ -427,7 +429,7 @@ Parameters
 
       :ansible-option-type:`list` / :ansible-option-elements:`elements=any`
 
-      :ansible-option-versionadded:`added in 3.0.0 of networktocode.nautobot`
+      :ansible-option-versionadded:`added in networktocode.nautobot 3.0.0`
 
 
       .. raw:: html
@@ -545,7 +547,7 @@ Parameters
 
       .. rst-class:: ansible-option-line
 
-      :ansible-option-default-bold:`Default:` :ansible-option-default:`"true"`
+      :ansible-option-default-bold:`Default:` :ansible-option-default:`true`
 
       .. raw:: html