Skip to content

Commit b9f706e

Browse files
authored
docs: NetBox should be referred to as NetBox (#541)
This fixes all occurrences of "Netbox".
1 parent 073e687 commit b9f706e

File tree

147 files changed

+1079
-1079
lines changed

Some content is hidden

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

147 files changed

+1079
-1079
lines changed

.github/ISSUE_TEMPLATE/new-issue.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ Also test if the latest release, and master branch are affected too.
2525
###### Ansible:
2626
<!--- Ansible Version ansible --version -->
2727

28-
###### Netbox:
29-
<!--- Netbox Version -->
28+
###### NetBox:
29+
<!--- NetBox Version -->
3030

3131
###### Collection:
32-
<!--- Netbox Ansible Module Collection Version -->
32+
<!--- NetBox Ansible Module Collection Version -->
3333

3434
##### SUMMARY
3535
<!--- Explain the problem briefly -->

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
run: |
137137
docker container ls
138138
docker logs netbox-docker_netbox_1
139-
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
139+
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
140140
working-directory: /home/runner/.ansible/collections/ansible_collections/netbox/netbox
141141
- name: Pre-populate NetBox
142142
run: ./tests/integration/netbox-deploy.py

CHANGELOG.rst

+55-55
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
===========================
2-
Netbox.Netbox Release Notes
2+
NetBox.NetBox Release Notes
33
===========================
44

55
.. contents:: Topics
@@ -82,7 +82,7 @@ v3.1.0
8282
Release Summary
8383
---------------
8484

85-
This release should fix obvious broken changes between collection and Netbox 2.11, but there is most likely more. Please report as they're encountered.
85+
This release should fix obvious broken changes between collection and NetBox 2.11, but there is most likely more. Please report as they're encountered.
8686
**packages** is now a required Python package and is already included in Ansible 2.10, but anyone using Ansible 2.9 or below must manually pip install the library.
8787

8888

@@ -164,7 +164,7 @@ Bugfixes
164164
New Modules
165165
-----------
166166

167-
- netbox.netbox.netbox_route_target - Creates or removes route targets from Netbox
167+
- netbox.netbox.netbox_route_target - Creates or removes route targets from NetBox
168168

169169
v1.2.1
170170
======
@@ -212,7 +212,7 @@ Bugfixes
212212
New Modules
213213
-----------
214214

215-
- netbox.netbox.netbox_tag - Creates or removes tags from Netbox
215+
- netbox.netbox.netbox_tag - Creates or removes tags from NetBox
216216

217217
v1.1.0
218218
======
@@ -328,10 +328,10 @@ Bugfixes
328328
New Modules
329329
-----------
330330

331-
- netbox.netbox.netbox_cable - Create, update or delete cables within Netbox
332-
- netbox.netbox.netbox_device_bay_template - Create, update or delete device bay templates within Netbox
333-
- netbox.netbox.netbox_device_interface_template - Creates or removes interfaces on devices from Netbox
334-
- netbox.netbox.netbox_virtual_chassis - Create, update or delete virtual chassis within Netbox
331+
- netbox.netbox.netbox_cable - Create, update or delete cables within NetBox
332+
- netbox.netbox.netbox_device_bay_template - Create, update or delete device bay templates within NetBox
333+
- netbox.netbox.netbox_device_interface_template - Creates or removes interfaces on devices from NetBox
334+
- netbox.netbox.netbox_virtual_chassis - Create, update or delete virtual chassis within NetBox
335335

336336
v0.2.3
337337
======
@@ -355,20 +355,20 @@ Bugfixes
355355
New Modules
356356
-----------
357357

358-
- netbox.netbox.netbox_console_port - Create, update or delete console ports within Netbox
359-
- netbox.netbox.netbox_console_port_template - Create, update or delete console port templates within Netbox
360-
- netbox.netbox.netbox_console_server_port - Create, update or delete console server ports within Netbox
361-
- netbox.netbox.netbox_console_server_port_template - Create, update or delete console server port templates within Netbox
362-
- netbox.netbox.netbox_front_port - Create, update or delete front ports within Netbox
363-
- netbox.netbox.netbox_front_port_template - Create, update or delete front port templates within Netbox
364-
- netbox.netbox.netbox_power_feed - Create, update or delete power feeds within Netbox
365-
- netbox.netbox.netbox_power_outlet - Create, update or delete power outlets within Netbox
366-
- netbox.netbox.netbox_power_outlet_template - Create, update or delete power outlet templates within Netbox
367-
- netbox.netbox.netbox_power_panel - Create, update or delete power panels within Netbox
368-
- netbox.netbox.netbox_power_port - Create, update or delete power ports within Netbox
369-
- netbox.netbox.netbox_power_port_template - Create, update or delete power port templates within Netbox
370-
- netbox.netbox.netbox_rear_port - Create, update or delete rear ports within Netbox
371-
- netbox.netbox.netbox_rear_port_template - Create, update or delete rear port templates within Netbox
358+
- netbox.netbox.netbox_console_port - Create, update or delete console ports within NetBox
359+
- netbox.netbox.netbox_console_port_template - Create, update or delete console port templates within NetBox
360+
- netbox.netbox.netbox_console_server_port - Create, update or delete console server ports within NetBox
361+
- netbox.netbox.netbox_console_server_port_template - Create, update or delete console server port templates within NetBox
362+
- netbox.netbox.netbox_front_port - Create, update or delete front ports within NetBox
363+
- netbox.netbox.netbox_front_port_template - Create, update or delete front port templates within NetBox
364+
- netbox.netbox.netbox_power_feed - Create, update or delete power feeds within NetBox
365+
- netbox.netbox.netbox_power_outlet - Create, update or delete power outlets within NetBox
366+
- netbox.netbox.netbox_power_outlet_template - Create, update or delete power outlet templates within NetBox
367+
- netbox.netbox.netbox_power_panel - Create, update or delete power panels within NetBox
368+
- netbox.netbox.netbox_power_port - Create, update or delete power ports within NetBox
369+
- netbox.netbox.netbox_power_port_template - Create, update or delete power port templates within NetBox
370+
- netbox.netbox.netbox_rear_port - Create, update or delete rear ports within NetBox
371+
- netbox.netbox.netbox_rear_port_template - Create, update or delete rear port templates within NetBox
372372

373373
v0.2.2
374374
======
@@ -469,7 +469,7 @@ v0.1.7
469469
Minor Changes
470470
-------------
471471

472-
- Added fetching services for devices in Netbox Inventory Plugin (https://github.com/netbox-community/ansible_modules/issues/58)
472+
- Added fetching services for devices in NetBox Inventory Plugin (https://github.com/netbox-community/ansible_modules/issues/58)
473473
- Added option for interfaces and IP addresses of interfaces to be fetched via inventory plugin (https://github.com/netbox-community/ansible_modules/issues/60)
474474
- Change lookups to property for subclassing of inventory plugin (https://github.com/netbox-community/ansible_modules/issues/62)
475475

@@ -489,13 +489,13 @@ Minor Changes
489489
-------------
490490

491491
- Add dns_name to netbox_ip_address (https://github.com/netbox-community/ansible_modules/issues/84)
492-
- Add region and region_id to query_filter for Netbox Inventory plugin (https://github.com/netbox-community/ansible_modules/issues/83)
492+
- Add region and region_id to query_filter for NetBox Inventory plugin (https://github.com/netbox-community/ansible_modules/issues/83)
493493

494494
Bugfixes
495495
--------
496496

497497
- Fixed vlan searching with vlan_group for netbox_prefix (https://github.com/netbox-community/ansible_modules/issues/85)
498-
- Removed static choices from netbox_utils and now pulls the choices for each endpoint from the Netbox API at call time (https://github.com/netbox-community/ansible_modules/issues/67)
498+
- Removed static choices from netbox_utils and now pulls the choices for each endpoint from the NetBox API at call time (https://github.com/netbox-community/ansible_modules/issues/67)
499499

500500
v0.1.5
501501
======
@@ -506,14 +506,14 @@ Bugfixes
506506
- Add argument specs for every module to validate data passed in. Fixes some idempotency issues. POSSIBLE BREAKING CHANGE (https://github.com/netbox-community/ansible_modules/issues/68)
507507
- Allow name updates to manufacturers (https://github.com/netbox-community/ansible_modules/issues/76)
508508
- Builds slug for netbox_device_type from model which is now required and slug is optional. Model will be slugified if slug is not provided BREAKING CHANGE (https://github.com/netbox-community/ansible_modules/issues/77)
509-
- Fail module with proper exception when connection to Netbox API cannot be established (https://github.com/netbox-community/ansible_modules/issues/80)
509+
- Fail module with proper exception when connection to NetBox API cannot be established (https://github.com/netbox-community/ansible_modules/issues/80)
510510
- netbox_device_interface Lag no longer has to be a dictionary and the value of the key can be the name of the LAG (https://github.com/netbox-community/ansible_modules/issues/81)
511-
- netbox_ip_address If no address has no CIDR notation, it will convert it into a /32 and pass to Netbox. Fixes idempotency cidr notation is not provided (https://github.com/netbox-community/ansible_modules/issues/78)
511+
- netbox_ip_address If no address has no CIDR notation, it will convert it into a /32 and pass to NetBox. Fixes idempotency cidr notation is not provided (https://github.com/netbox-community/ansible_modules/issues/78)
512512

513513
New Modules
514514
-----------
515515

516-
- netbox.netbox.netbox_service - Creates or removes service from Netbox
516+
- netbox.netbox.netbox_service - Creates or removes service from NetBox
517517

518518
v0.1.3
519519
======
@@ -559,30 +559,30 @@ Breaking Changes / Porting Guide
559559
New Modules
560560
-----------
561561

562-
- netbox.netbox.netbox_aggregate - Creates or removes aggregates from Netbox
563-
- netbox.netbox.netbox_circuit - Create, update or delete circuits within Netbox
564-
- netbox.netbox.netbox_circuit_termination - Create, update or delete circuit terminations within Netbox
565-
- netbox.netbox.netbox_circuit_type - Create, update or delete circuit types within Netbox
566-
- netbox.netbox.netbox_cluster - Create, update or delete clusters within Netbox
567-
- netbox.netbox.netbox_cluster_group - Create, update or delete cluster groups within Netbox
568-
- netbox.netbox.netbox_cluster_type - Create, update or delete cluster types within Netbox
569-
- netbox.netbox.netbox_device_bay - Create, update or delete device bays within Netbox
570-
- netbox.netbox.netbox_device_role - Create, update or delete devices roles within Netbox
571-
- netbox.netbox.netbox_device_type - Create, update or delete device types within Netbox
572-
- netbox.netbox.netbox_inventory_item - Creates or removes inventory items from Netbox
573-
- netbox.netbox.netbox_ipam_role - Creates or removes ipam roles from Netbox
574-
- netbox.netbox.netbox_manufacturer - Create or delete manufacturers within Netbox
575-
- netbox.netbox.netbox_platform - Create or delete platforms within Netbox
576-
- netbox.netbox.netbox_provider - Create, update or delete providers within Netbox
577-
- netbox.netbox.netbox_rack - Create, update or delete racks within Netbox
578-
- netbox.netbox.netbox_rack_group - Create, update or delete racks groups within Netbox
579-
- netbox.netbox.netbox_rack_role - Create, update or delete racks roles within Netbox
580-
- netbox.netbox.netbox_region - Creates or removes regions from Netbox
581-
- netbox.netbox.netbox_rir - Create, update or delete RIRs within Netbox
582-
- netbox.netbox.netbox_tenant - Creates or removes tenants from Netbox
583-
- netbox.netbox.netbox_tenant_group - Creates or removes tenant groups from Netbox
584-
- netbox.netbox.netbox_virtual_machine - Create, update or delete virtual_machines within Netbox
585-
- netbox.netbox.netbox_vlan - Create, update or delete vlans within Netbox
586-
- netbox.netbox.netbox_vlan_group - Create, update or delete vlans groups within Netbox
587-
- netbox.netbox.netbox_vm_interface - Creates or removes interfaces from virtual machines in Netbox
588-
- netbox.netbox.netbox_vrf - Create, update or delete vrfs within Netbox
562+
- netbox.netbox.netbox_aggregate - Creates or removes aggregates from NetBox
563+
- netbox.netbox.netbox_circuit - Create, update or delete circuits within NetBox
564+
- netbox.netbox.netbox_circuit_termination - Create, update or delete circuit terminations within NetBox
565+
- netbox.netbox.netbox_circuit_type - Create, update or delete circuit types within NetBox
566+
- netbox.netbox.netbox_cluster - Create, update or delete clusters within NetBox
567+
- netbox.netbox.netbox_cluster_group - Create, update or delete cluster groups within NetBox
568+
- netbox.netbox.netbox_cluster_type - Create, update or delete cluster types within NetBox
569+
- netbox.netbox.netbox_device_bay - Create, update or delete device bays within NetBox
570+
- netbox.netbox.netbox_device_role - Create, update or delete devices roles within NetBox
571+
- netbox.netbox.netbox_device_type - Create, update or delete device types within NetBox
572+
- netbox.netbox.netbox_inventory_item - Creates or removes inventory items from NetBox
573+
- netbox.netbox.netbox_ipam_role - Creates or removes ipam roles from NetBox
574+
- netbox.netbox.netbox_manufacturer - Create or delete manufacturers within NetBox
575+
- netbox.netbox.netbox_platform - Create or delete platforms within NetBox
576+
- netbox.netbox.netbox_provider - Create, update or delete providers within NetBox
577+
- netbox.netbox.netbox_rack - Create, update or delete racks within NetBox
578+
- netbox.netbox.netbox_rack_group - Create, update or delete racks groups within NetBox
579+
- netbox.netbox.netbox_rack_role - Create, update or delete racks roles within NetBox
580+
- netbox.netbox.netbox_region - Creates or removes regions from NetBox
581+
- netbox.netbox.netbox_rir - Create, update or delete RIRs within NetBox
582+
- netbox.netbox.netbox_tenant - Creates or removes tenants from NetBox
583+
- netbox.netbox.netbox_tenant_group - Creates or removes tenant groups from NetBox
584+
- netbox.netbox.netbox_virtual_machine - Create, update or delete virtual_machines within NetBox
585+
- netbox.netbox.netbox_vlan - Create, update or delete vlans within NetBox
586+
- netbox.netbox.netbox_vlan_group - Create, update or delete vlans groups within NetBox
587+
- netbox.netbox.netbox_vm_interface - Creates or removes interfaces from virtual machines in NetBox
588+
- netbox.netbox.netbox_vrf - Create, update or delete vrfs within NetBox

CONTRIBUTING.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22

33
## Modules
44

5-
The structure of the Netbox modules attempts to follow the layout of the Netbox API by having a module_util for each application (`dcim, ipam, tenancy, etc`) that inherits from a base module (`NetboxModule - netbox_utils.py`) and then implements the specific endpoints within the correct application module.
5+
The structure of the NetBox modules attempts to follow the layout of the NetBox API by having a module_util for each application (`dcim, ipam, tenancy, etc`) that inherits from a base module (`NetboxModule - netbox_utils.py`) and then implements the specific endpoints within the correct application module.
66

77
e.g. Add logic for adding devices under netbox_dcim.py or ip addresses under netbox_ipam.py
88

99
In turn when creating the actual modules, we're just calling a single function and passing in the Ansible Module and the endpoint. This means all the logic is within the specific application's module_util module and a lot of the logic should be the same for most endpoints since it is a basic operation of using the desired state of the endpoint and then either making sure it exists, updating it if it does exist, or removing it. There may be some special logic for other endpoints, but it should be minimal.
1010

1111
(Ansible Module) netbox_{{ endpoint }} -> (Module Util) netbox_{{ application }} -> (Module Util) netbox_utils
1212

13-
These modules are built using the pynetbox Python library which allows you to interact with Netbox using objects. Most of this is abstracted away when creating more modules, but something to be aware of. The reasoning for using underscores within the endpoint names is so the endpoints work with pynetbox.
13+
These modules are built using the pynetbox Python library which allows you to interact with NetBox using objects. Most of this is abstracted away when creating more modules, but something to be aware of. The reasoning for using underscores within the endpoint names is so the endpoints work with pynetbox.
1414

15-
An example of connecting to a Netbox instance and then choosing the application, endpoint, and operation:
15+
An example of connecting to a NetBox instance and then choosing the application, endpoint, and operation:
1616

1717
```python
1818
import pynetbox
@@ -122,7 +122,7 @@ ENDPOINT_NAME_MAPPING = {
122122
}
123123
```
124124
125-
Log into your Netbox instance and navigate to `/api/docs` and searching for the **POST** documents for the given endpoint you're looking to create.
125+
Log into your NetBox instance and navigate to `/api/docs` and searching for the **POST** documents for the given endpoint you're looking to create.
126126
![POST Results](docs/media/postresults.PNG)
127127
The module should implement all available fields that are not the **id** or **readOnly** such as the **created, last_updated, device_count** in the example above.
128128
@@ -239,7 +239,7 @@ def _convert_identical_keys(self, data):
239239
"""
240240
Used to change non-clashing keys for each module into identical keys that are required
241241
to be passed to pynetbox
242-
ex. rack_role back into role to pass to Netbox
242+
ex. rack_role back into role to pass to NetBox
243243
Returns data
244244
:params data (dict): Data dictionary after _find_ids method ran
245245
"""
@@ -293,7 +293,7 @@ Copying an existing module that has close to the same options is typically the p
293293
```
294294
295295
- Check each test above to see which `test_data` it uses and edit the corresponding data.json file
296-
- Please add or update an existing play to test the new Netbox module for integration testing within `tests/integration/integration-tests.yml`. Make sure to test creation, duplicate, update (if possible), and deletion along with any other conditions that may want to be tested.
296+
- Please add or update an existing play to test the new NetBox module for integration testing within `tests/integration/integration-tests.yml`. Make sure to test creation, duplicate, update (if possible), and deletion along with any other conditions that may want to be tested.
297297
- Run `pytest -vv` to make sure all unit tests pass
298298
- Run `black .` within the base directory for black formatting as it's required for tests to pass
299299
- Run `ansible-lint integration-tests.yml` it's required for tests to pass
@@ -306,7 +306,7 @@ Integration tests are run by comparing `ansible-inventory --list` against known
306306
307307
When the inventory plugin is updated in a way that changes this output (or `netbox-deploy.py` is changed), the test data used for comparison will need to be updated. There is a script `./hacking/update_test_inventories.sh` to do this.
308308
309-
Run from the root project working directory, and make sure you have a clean test instance of Netbox set up with test data loaded into it from `./tests/integration/netbox-deploy.py`
309+
Run from the root project working directory, and make sure you have a clean test instance of NetBox set up with test data loaded into it from `./tests/integration/netbox-deploy.py`
310310
311311
```
312312
./hacking/update_test_inventories.sh
@@ -319,7 +319,7 @@ After running the script, to prevent introducing a regression you'll need to man
319319
320320
You can see the specific details of what happens in CI in `.travis.yml`. An overview of what you need to do is:
321321
322-
* Run a test instance of Netbox on port 32768. The `netbox-docker` project makes this easy.
322+
* Run a test instance of NetBox on port 32768. The `netbox-docker` project makes this easy.
323323
324324
```
325325
git clone [email protected]:netbox-community/netbox-docker.git

0 commit comments

Comments
 (0)