Skip to content

Commit de3ef6c

Browse files
rodvandrodvand
authored
Merge pull request #1319 from netbox-community/devel
Release 3.20
2 parents 434baf8 + 5fb2768 commit de3ef6c

File tree

243 files changed

+30840
-1587
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+30840
-1587
lines changed

‎.github/workflows/main.yml

+20-13
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,17 @@ jobs:
6262
runs-on: ubuntu-latest
6363
needs: unit_testing
6464
env:
65-
python-version: "3.10"
65+
python-version: "3.12"
6666
strategy:
6767
fail-fast: false
6868
matrix:
69-
include:
70-
- VERSION: "v3.6"
71-
NETBOX_DOCKER_VERSION: 2.7.0
69+
include:
7270
- VERSION: "v3.7"
7371
NETBOX_DOCKER_VERSION: 2.7.0
7472
- VERSION: "v4.0"
7573
NETBOX_DOCKER_VERSION: 2.9.1
74+
- VERSION: "v4.1"
75+
NETBOX_DOCKER_VERSION: 3.0.1
7676

7777
steps:
7878

@@ -86,7 +86,7 @@ jobs:
8686
cd netbox-docker
8787
git checkout ${{ matrix.NETBOX_DOCKER_VERSION }}
8888
cp $GITHUB_WORKSPACE/tests/netbox-docker/${{ matrix.VERSION }}/docker-compose.override.yml docker-compose.override.yml
89-
docker-compose up -d --quiet-pull netbox netbox-worker postgres redis redis-cache
89+
docker compose up -d --quiet-pull netbox netbox-worker postgres redis redis-cache
9090
docker container ls
9191
cd ..
9292
@@ -112,21 +112,28 @@ jobs:
112112
- name: Wait for NetBox to be available
113113
run: |
114114
docker container ls
115-
docker logs netbox-docker_netbox_1
116-
timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:32768)" != "200" ]]; do echo "waiting for NetBox"; sleep 5; done' || false
117-
working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
118-
#if: matrix.VERSION == 'v3.3'
115+
docker logs netbox-docker-netbox-1
116+
timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:32768/login/)" != "200" ]]; do echo "waiting for NetBox"; sleep 5; done' || false
117+
working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
119118

120119
- name: Pre-populate NetBox
121120
run: ./tests/integration/netbox-deploy.py
122121
working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
123122

124-
- name: Run integration tests
125-
# Run regression and integration tests
126-
# Run the inventory test first, in case any of the other tests modify the data.
123+
- name: Run inventory tests
124+
continue-on-error: true
127125
run: |
128126
ansible-test integration -v --color --coverage --python ${{ env.python-version }} inventory-${{ matrix.VERSION }}
129-
ansible-test integration -v --color --coverage --python ${{ env.python-version }} regression-${{ matrix.VERSION }}
127+
working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
128+
129+
- name: Run regression tests
130+
continue-on-error: true
131+
run: |
132+
ansible-test integration -v --color --coverage --python ${{ env.python-version }} regression-${{ matrix.VERSION }}
133+
working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
134+
135+
- name: Run integration tests
136+
run: |
130137
ansible-test integration -v --color --coverage --python ${{ env.python-version }} ${{ matrix.VERSION }}
131138
ansible-test coverage report --all --omit "tests/*,hacking/*,docs/*" --show-missing
132139
working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox

‎CHANGELOG.rst

+34
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,40 @@ NetBox.NetBox Release Notes
44

55
.. contents:: Topics
66

7+
v3.20.0
8+
=======
9+
10+
Minor Changes
11+
-------------
12+
13+
- Add ``facility`` to ``location`` (https://github.com/netbox-community/ansible_modules/issues/1280)
14+
- Add ``related_object_type`` to ``netbox_custom_filed`` (https://github.com/netbox-community/ansible_modules/issues/1268)
15+
- Add ``status`` to ``location`` (https://github.com/netbox-community/ansible_modules/issues/1279)
16+
- Add `description` to `netbox_cluster_group` module (https://github.com/netbox-community/ansible_modules/issues/1276)
17+
- Add `serial` to `netbox_virtual_machine` module (https://github.com/netbox-community/ansible_modules/issues/1309)
18+
- Add `status` to `netbox_cluster` (https://github.com/netbox-community/ansible_modules/issues/1275)
19+
- Add `vid_ranges` to `netbox_vlan_group` module (https://github.com/netbox-community/ansible_modules/issues/1307)
20+
- Add ability to rename variables set on the host by ``netbox.netbox.nb_inventory`` through configuration.
21+
- Added option `hostname_field` to ``nb_inventory`` to be able to set the inventory hostname from a field in custom_fields
22+
- Adjust tests for various modules
23+
- Fix the form_factor option on netbox_rack
24+
- Update CI for NetBox 4.1
25+
26+
Bugfixes
27+
--------
28+
29+
- If `fetch_all` is `false`, prefix lookup depends on site lookup, so move it to secondary lookup (https://github.com/netbox-community/ansible_modules/issues/733)
30+
31+
New Modules
32+
-----------
33+
34+
- netbox.netbox.netbox_permission - Creates or removes permissions from NetBox
35+
- netbox.netbox.netbox_token - Creates or removes tokens from NetBox
36+
- netbox.netbox.netbox_tunnel - Create, update or delete tunnels within NetBox
37+
- netbox.netbox.netbox_tunnel_group - Create, update or delete tunnel groups within NetBox
38+
- netbox.netbox.netbox_user - Creates or removes users from NetBox
39+
- netbox.netbox.netbox_user_group - Creates or removes user groups from NetBox
40+
741
v3.19.1
842
=======
943

‎changelogs/changelog.yaml

+52
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,58 @@ releases:
763763
- netbox_virtual_machine - Change vCPU to float from int (to reflect NetBox
764764
3.0) [#605](https://github.com/netbox-community/ansible_modules/pull/605)
765765
release_date: '2021-10-18'
766+
3.20.0:
767+
changes:
768+
bugfixes:
769+
- If `fetch_all` is `false`, prefix lookup depends on site lookup, so move it
770+
to secondary lookup (https://github.com/netbox-community/ansible_modules/issues/733)
771+
minor_changes:
772+
- Add ``facility`` to ``location`` (https://github.com/netbox-community/ansible_modules/issues/1280)
773+
- Add ``related_object_type`` to ``netbox_custom_filed`` (https://github.com/netbox-community/ansible_modules/issues/1268)
774+
- Add ``status`` to ``location`` (https://github.com/netbox-community/ansible_modules/issues/1279)
775+
- Add `description` to `netbox_cluster_group` module (https://github.com/netbox-community/ansible_modules/issues/1276)
776+
- Add `serial` to `netbox_virtual_machine` module (https://github.com/netbox-community/ansible_modules/issues/1309)
777+
- Add `status` to `netbox_cluster` (https://github.com/netbox-community/ansible_modules/issues/1275)
778+
- Add `vid_ranges` to `netbox_vlan_group` module (https://github.com/netbox-community/ansible_modules/issues/1307)
779+
- Add ability to rename variables set on the host by ``netbox.netbox.nb_inventory``
780+
through configuration.
781+
- Added option `hostname_field` to ``nb_inventory`` to be able to set the inventory
782+
hostname from a field in custom_fields
783+
- Adjust tests for various modules
784+
- Fix the form_factor option on netbox_rack
785+
- Update CI for NetBox 4.1
786+
fragments:
787+
- 1273-ability-to-rename-host-inventory-vars.yml
788+
- 1275-feature-netbox_cluster-adds-status-field.yml
789+
- 1276-feature-netbox_cluster_group-adds-description-field.yml
790+
- 1281_move_prefix_lookup_to_secondary.yml
791+
- 1307-feature-netbox_vlan_group-add-vid_ranges.yml
792+
- 1309-feature-add-serial-number-to-vm.yml
793+
- 1312-add-hostname_field-option.yml
794+
- 41_updates.yml
795+
- ci_netbox41.yml
796+
- fix_issue_1268.yml
797+
- fix_issues_1279_1280.yml
798+
modules:
799+
- description: Creates or removes permissions from NetBox
800+
name: netbox_permission
801+
namespace: ''
802+
- description: Creates or removes tokens from NetBox
803+
name: netbox_token
804+
namespace: ''
805+
- description: Create, update or delete tunnels within NetBox
806+
name: netbox_tunnel
807+
namespace: ''
808+
- description: Create, update or delete tunnel groups within NetBox
809+
name: netbox_tunnel_group
810+
namespace: ''
811+
- description: Creates or removes users from NetBox
812+
name: netbox_user
813+
namespace: ''
814+
- description: Creates or removes user groups from NetBox
815+
name: netbox_user_group
816+
namespace: ''
817+
release_date: '2024-09-12'
766818
3.3.0:
767819
changes:
768820
minor_changes:

‎docs/conf.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
author = "Mikhail Yohman <@FragmentedPacket>"
2828

2929
# The full version, including alpha/beta/rc tags
30-
release = "3.19.1"
30+
release = "3.20.0"
3131

3232

3333
# -- General configuration ---------------------------------------------------

‎docs/plugins/environment_variables.rst

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
21
:orphan:
32

43
.. meta::
5-
:antsibull-docs: 2.11.0
4+
:antsibull-docs: 2.13.1
65

76
.. _list_of_collection_env_vars:
87

‎docs/plugins/index.rst

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
2-
31
.. meta::
4-
:antsibull-docs: 2.11.0
2+
:antsibull-docs: 2.13.1
53

64

75
.. _plugins_in_netbox.netbox:
86

97
Netbox.Netbox
108
=============
119

12-
Collection version 3.19.1
10+
Collection version 3.20.0
1311

1412
.. contents::
1513
:local:
@@ -98,6 +96,7 @@ Modules
9896
* :ansplugin:`netbox_module module <netbox.netbox.netbox_module#module>` -- Create, update or delete module within NetBox
9997
* :ansplugin:`netbox_module_bay module <netbox.netbox.netbox_module_bay#module>` -- Create, update or delete module bay within NetBox
10098
* :ansplugin:`netbox_module_type module <netbox.netbox.netbox_module_type#module>` -- Create, update or delete module types within NetBox
99+
* :ansplugin:`netbox_permission module <netbox.netbox.netbox_permission#module>` -- Creates or removes permissions from NetBox
101100
* :ansplugin:`netbox_platform module <netbox.netbox.netbox_platform#module>` -- Create or delete platforms within NetBox
102101
* :ansplugin:`netbox_power_feed module <netbox.netbox.netbox_power_feed#module>` -- Create, update or delete power feeds within NetBox
103102
* :ansplugin:`netbox_power_outlet module <netbox.netbox.netbox_power_outlet#module>` -- Create, update or delete power outlets within NetBox
@@ -123,6 +122,11 @@ Modules
123122
* :ansplugin:`netbox_tag module <netbox.netbox.netbox_tag#module>` -- Creates or removes tags from NetBox
124123
* :ansplugin:`netbox_tenant module <netbox.netbox.netbox_tenant#module>` -- Creates or removes tenants from NetBox
125124
* :ansplugin:`netbox_tenant_group module <netbox.netbox.netbox_tenant_group#module>` -- Creates or removes tenant groups from NetBox
125+
* :ansplugin:`netbox_token module <netbox.netbox.netbox_token#module>` -- Creates or removes tokens from NetBox
126+
* :ansplugin:`netbox_tunnel module <netbox.netbox.netbox_tunnel#module>` -- Create, update or delete tunnels within NetBox
127+
* :ansplugin:`netbox_tunnel_group module <netbox.netbox.netbox_tunnel_group#module>` -- Create, update or delete tunnel groups within NetBox
128+
* :ansplugin:`netbox_user module <netbox.netbox.netbox_user#module>` -- Creates or removes users from NetBox
129+
* :ansplugin:`netbox_user_group module <netbox.netbox.netbox_user_group#module>` -- Creates or removes user groups from NetBox
126130
* :ansplugin:`netbox_virtual_chassis module <netbox.netbox.netbox_virtual_chassis#module>` -- Create, update or delete virtual chassis within NetBox
127131
* :ansplugin:`netbox_virtual_disk module <netbox.netbox.netbox_virtual_disk#module>` -- Creates or removes disks from virtual machines in NetBox
128132
* :ansplugin:`netbox_virtual_machine module <netbox.netbox.netbox_virtual_machine#module>` -- Create, update or delete virtual\_machines within NetBox
@@ -184,6 +188,7 @@ Modules
184188
netbox_module_module
185189
netbox_module_bay_module
186190
netbox_module_type_module
191+
netbox_permission_module
187192
netbox_platform_module
188193
netbox_power_feed_module
189194
netbox_power_outlet_module
@@ -209,6 +214,11 @@ Modules
209214
netbox_tag_module
210215
netbox_tenant_module
211216
netbox_tenant_group_module
217+
netbox_token_module
218+
netbox_tunnel_module
219+
netbox_tunnel_group_module
220+
netbox_user_module
221+
netbox_user_group_module
212222
netbox_virtual_chassis_module
213223
netbox_virtual_disk_module
214224
netbox_virtual_machine_module
@@ -244,5 +254,3 @@ Lookup Plugins
244254
:hidden:
245255

246256
nb_lookup_lookup
247-
248-

0 commit comments

Comments
 (0)