From 028f908e523b44017c6b7f8444d6b2d11f56209e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20R=C3=B8dvand?= Date: Wed, 18 Oct 2023 08:18:45 +0200 Subject: [PATCH 1/3] Remove commented out test --- .../targets/v3.6/tasks/netbox_ip_address.yml | 135 +++++++++--------- 1 file changed, 65 insertions(+), 70 deletions(-) diff --git a/tests/integration/targets/v3.6/tasks/netbox_ip_address.yml b/tests/integration/targets/v3.6/tasks/netbox_ip_address.yml index 5693ba58a..3cda56d3c 100644 --- a/tests/integration/targets/v3.6/tasks/netbox_ip_address.yml +++ b/tests/integration/targets/v3.6/tasks/netbox_ip_address.yml @@ -211,81 +211,76 @@ state: new register: test_ten -### -# Bug 13876 in netbox-community/netbox -### - -#- name: "10 - ASSERT" -# assert: -# that: -# - test_ten is changed -# - test_ten['diff']['before']['state'] == "absent" -# - test_ten['diff']['after']['state'] == "present" -# - test_ten['msg'] == "ip_address 10.10.0.1/16 created" -# - test_ten['ip_address']['address'] == "10.10.0.1/16" -# - test_ten['ip_address']['family'] == 4 -# - test_ten['ip_address']['assigned_object_type'] == "dcim.interface" -# - test_ten['ip_address']['assigned_object_id'] == 4 - -#- name: "11 - Create IP address on GigabitEthernet2 - test100 - State: present" -# netbox.netbox.netbox_ip_address: -# netbox_url: http://localhost:32768 -# netbox_token: 0123456789abcdef0123456789abcdef01234567 -# data: -# family: 4 -# prefix: 192.168.100.0/24 -# assigned_object: -# name: GigabitEthernet2 -# device: test100 -# state: present -# register: test_eleven - -#- name: "11 - ASSERT" -# assert: -# that: -# - test_eleven is changed -# - test_eleven['diff']['before']['state'] == "absent" -# - test_eleven['diff']['after']['state'] == "present" -# - test_eleven['msg'] == "ip_address 192.168.100.2/24 created" -# - test_eleven['ip_address']['address'] == "192.168.100.2/24" +- name: "10 - ASSERT" + assert: + that: + - test_ten is changed + - test_ten['diff']['before']['state'] == "absent" + - test_ten['diff']['after']['state'] == "present" + - test_ten['msg'] == "ip_address 10.10.0.1/16 created" + - test_ten['ip_address']['address'] == "10.10.0.1/16" + - test_ten['ip_address']['family'] == 4 + - test_ten['ip_address']['assigned_object_type'] == "dcim.interface" + - test_ten['ip_address']['assigned_object_id'] == 4 + +- name: "11 - Create IP address on GigabitEthernet2 - test100 - State: present" + netbox.netbox.netbox_ip_address: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + family: 4 + prefix: 192.168.100.0/24 + assigned_object: + name: GigabitEthernet2 + device: test100 + state: present + register: test_eleven -#- name: "12 - Duplicate - 192.168.100.2/24 on interface" -# netbox.netbox.netbox_ip_address: -# netbox_url: http://localhost:32768 -# netbox_token: 0123456789abcdef0123456789abcdef01234567 -# data: -# address: 192.168.100.2/24 -# assigned_object: -# name: GigabitEthernet2 -# device: test100 -# state: present -# register: test_twelve +- name: "11 - ASSERT" + assert: + that: + - test_eleven is changed + - test_eleven['diff']['before']['state'] == "absent" + - test_eleven['diff']['after']['state'] == "present" + - test_eleven['msg'] == "ip_address 192.168.100.2/24 created" + - test_eleven['ip_address']['address'] == "192.168.100.2/24" -#- name: "12 - ASSERT" -# assert: -# that: -# - not test_twelve['changed'] -# - test_twelve['msg'] == "ip_address 192.168.100.2/24 already exists" -# - test_twelve['ip_address']['address'] == "192.168.100.2/24" -# - test_twelve['ip_address']['assigned_object_type'] == "dcim.interface" -# - test_twelve['ip_address']['assigned_object_id'] == 4 +- name: "12 - Duplicate - 192.168.100.2/24 on interface" + netbox.netbox.netbox_ip_address: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + address: 192.168.100.2/24 + assigned_object: + name: GigabitEthernet2 + device: test100 + state: present + register: test_twelve -#- name: "13 - Duplicate - 192.168.100.2/24" -# netbox.netbox.netbox_ip_address: -# netbox_url: http://localhost:32768 -# netbox_token: 0123456789abcdef0123456789abcdef01234567 -# data: -# address: 192.168.100.2/24 -# state: present -# register: test_thirteen +- name: "12 - ASSERT" + assert: + that: + - not test_twelve['changed'] + - test_twelve['msg'] == "ip_address 192.168.100.2/24 already exists" + - test_twelve['ip_address']['address'] == "192.168.100.2/24" + - test_twelve['ip_address']['assigned_object_type'] == "dcim.interface" + - test_twelve['ip_address']['assigned_object_id'] == 4 -#- name: "13 - ASSERT" -# assert: -# that: -# - not test_thirteen['changed'] -# - test_thirteen['msg'] == "ip_address 192.168.100.2/24 already exists" -# - test_thirteen['ip_address']['address'] == "192.168.100.2/24" +- name: "13 - Duplicate - 192.168.100.2/24" + netbox.netbox.netbox_ip_address: + netbox_url: http://localhost:32768 + netbox_token: 0123456789abcdef0123456789abcdef01234567 + data: + address: 192.168.100.2/24 + state: present + register: test_thirteen +- name: "13 - ASSERT" + assert: + that: + - not test_thirteen['changed'] + - test_thirteen['msg'] == "ip_address 192.168.100.2/24 already exists" + - test_thirteen['ip_address']['address'] == "192.168.100.2/24" - name: "14 - Create IP address on Eth0 - test100-vm - State: present" netbox.netbox.netbox_ip_address: From b4905376aa66868130448f26dcc7c377920e3376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20R=C3=B8dvand?= Date: Wed, 18 Oct 2023 08:58:54 +0200 Subject: [PATCH 2/3] Pin jinja dependency --- docs/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/requirements.txt b/docs/requirements.txt index 044772db1..4be2fc3a8 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,3 +1,4 @@ ansible antsibull==0.48.0 sphinx==3.4.2 +Jinja2<3.1 \ No newline at end of file From 7bdf72672aac2bbfd963160ea7f383f44450456d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20R=C3=B8dvand?= Date: Wed, 18 Oct 2023 09:04:48 +0200 Subject: [PATCH 3/3] Add sphinx_rtd_theme as dependency --- docs/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 4be2fc3a8..45d9327a5 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,5 @@ ansible antsibull==0.48.0 sphinx==3.4.2 -Jinja2<3.1 \ No newline at end of file +Jinja2<3.1 +sphinx_rtd_theme \ No newline at end of file