From c6dc415b5fc1294f8c3a738224f5a3ba1dcdd1ff Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Thu, 9 Dec 2021 10:58:35 -0500 Subject: [PATCH 01/31] [Venom] Change Venom version to 1.0.0 --- addons/vagrant/inventory/group_vars/pfservers/venom.yml | 2 +- addons/vagrant/inventory/group_vars/service_venom/venom.yml | 2 +- addons/vagrant/playbooks/nodes/pre_prov/venom.yml | 2 +- t/venom/install-venom.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/vagrant/inventory/group_vars/pfservers/venom.yml b/addons/vagrant/inventory/group_vars/pfservers/venom.yml index bd17712863e8..faea4637daf5 100644 --- a/addons/vagrant/inventory/group_vars/pfservers/venom.yml +++ b/addons/vagrant/inventory/group_vars/pfservers/venom.yml @@ -1,4 +1,4 @@ --- -venom__version: 'v1.0.0-rc.7' +venom__version: 'v1.0.0' venom_dir: '/usr/local/pf/t/venom' diff --git a/addons/vagrant/inventory/group_vars/service_venom/venom.yml b/addons/vagrant/inventory/group_vars/service_venom/venom.yml index a65873013211..10778c6430b3 100644 --- a/addons/vagrant/inventory/group_vars/service_venom/venom.yml +++ b/addons/vagrant/inventory/group_vars/service_venom/venom.yml @@ -1,5 +1,5 @@ --- -venom__version: 'v1.0.0-rc.7' +venom__version: 'v1.0.0' venom_dir: '/usr/local/pf/t/venom' diff --git a/addons/vagrant/playbooks/nodes/pre_prov/venom.yml b/addons/vagrant/playbooks/nodes/pre_prov/venom.yml index 01e31a955f6e..b5ed693c0a0c 100644 --- a/addons/vagrant/playbooks/nodes/pre_prov/venom.yml +++ b/addons/vagrant/playbooks/nodes/pre_prov/venom.yml @@ -7,7 +7,7 @@ - inverse_inc.utils vars: - venom__version: 'v1.0.0-rc.7' + venom__version: 'v1.0.0' roles: - role: venom diff --git a/t/venom/install-venom.sh b/t/venom/install-venom.sh index 30e2e7ad0651..64773cb7af55 100755 --- a/t/venom/install-venom.sh +++ b/t/venom/install-venom.sh @@ -5,7 +5,7 @@ VENOM_BIN_PATH=/usr/bin VENOM_BINARY=venom ROOTUSER_NAME=root VENOM_LATEST_URL=https://api.github.com/repos/ovh/venom/releases/latest -VENOM_DEFAULT_VERSION="1.0.0-rc.7" +VENOM_DEFAULT_VERSION="1.0.0" VENOM_INSTALL_VERSION=${VENOM_VERSION:-${VENOM_DEFAULT_VERSION}} VENOM_LATEST_VERSION="" VENOM_INSTALLED_VERSION="" From e89555d5ca1c90935dcebbd9dafd35a5f8236cc4 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Mon, 13 Dec 2021 23:25:40 -0500 Subject: [PATCH 02/31] Add test for multi executor --- t/venom/lib/customA.yml | 15 ++++++++++ t/venom/lib/customB.yml | 9 ++++++ .../test_getlogintoken/15_testcBcA.yml | 28 +++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 t/venom/lib/customA.yml create mode 100644 t/venom/lib/customB.yml create mode 100644 t/venom/test_suites/test_getlogintoken/15_testcBcA.yml diff --git a/t/venom/lib/customA.yml b/t/venom/lib/customA.yml new file mode 100644 index 000000000000..448adb94e2cf --- /dev/null +++ b/t/venom/lib/customA.yml @@ -0,0 +1,15 @@ +executor: customA +input: + myArg: "world2" +steps: +- script: customB + myWord: "{{.input.myArg}}" + vars: + content: + from: foobarB +- script: echo "hello {{.content}}" + assertions: + - result.code ShouldEqual 0 + - result.systemout ShouldContainSubstring "{{.content}}" +output: + foobarA: "{{.result.systemout}}" diff --git a/t/venom/lib/customB.yml b/t/venom/lib/customB.yml new file mode 100644 index 000000000000..d58d17b1b74a --- /dev/null +++ b/t/venom/lib/customB.yml @@ -0,0 +1,9 @@ +executor: customB +input: + myWord: "world" +steps: +- script: echo "{{.input.myWord}}" + assertions: + - result.code ShouldEqual 0 +output: + foobarB: "{{.result.systemout}}" diff --git a/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml b/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml new file mode 100644 index 000000000000..f3439ac1c726 --- /dev/null +++ b/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml @@ -0,0 +1,28 @@ +testcases: +- name: customB_default + steps: + - type: customB + assertions: + - foobarB ShouldContainSubstring world + +- name: customB_custom + steps: + - type: customB + myWord: "universe" + assertions: + - foobarB ShouldContainSubstring universe + +- name: customA_default + steps: + - type: customA + assertions: + - foobarA ShouldContainSubstring world2 + - foobarA ShouldContainSubstring hello + +- name: customA_custom + steps: + - type: customA + myArg: "universe" + assertions: + - foobarA ShouldContainSubstring universe + - foobarA ShouldContainSubstring hello From 7b4901c2a2e255737e04be48e953e5ef9467ce2b Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 14 Dec 2021 15:29:41 -0500 Subject: [PATCH 03/31] [Venom] Add initial override --- t/venom/lib/customC.yml | 14 +++++++++++ .../test_getlogintoken/00_testsuite.yml | 24 +++++++++++++++++++ 2 files changed, 38 insertions(+) create mode 100644 t/venom/lib/customC.yml create mode 100644 t/venom/test_suites/test_getlogintoken/00_testsuite.yml diff --git a/t/venom/lib/customC.yml b/t/venom/lib/customC.yml new file mode 100644 index 000000000000..ab56f675a1cf --- /dev/null +++ b/t/venom/lib/customC.yml @@ -0,0 +1,14 @@ +executor: customC +input: + myarg: { + "name": "default", + "surname": "default2" + } +steps: +- script: echo "{{.inputi.myarg.name}}" > t.log +- script: echo "{\"hello\":\"{{.input.myarg.name}} and {{.input.myarg.surname}}\"}" + assertions: + - result.code ShouldEqual 0 +output: + systemout: "{{.result.systemout}}" + systemoutjson.hello: "{{.result.systemoutjson.hello}}" diff --git a/t/venom/test_suites/test_getlogintoken/00_testsuite.yml b/t/venom/test_suites/test_getlogintoken/00_testsuite.yml new file mode 100644 index 000000000000..8004b79946aa --- /dev/null +++ b/t/venom/test_suites/test_getlogintoken/00_testsuite.yml @@ -0,0 +1,24 @@ +name: testsuite with a user executor +testcases: +- name: customC_default + steps: + - type: customC + info: + - result of customC is {{.result.systemoutjson.hello}} + assertions: + - result.systemoutjson.hello ShouldContainSubstring default + - result.systemoutjson.hello ShouldContainSubstring default2 + + +- name: customC_over + steps: + - type: customC + myarg: { + "name": "world", + "surname": "universe" + } + info: + - result of customC is {{.result.systemoutjson.hello}} + assertions: + - result.systemoutjson.hello ShouldContainSubstring world + - result.systemoutjson.hello ShouldContainSubstring universe From 251f19ccafeb2ab1728d82abc425b64aa642833b Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:24:26 -0500 Subject: [PATCH 04/31] [Venom] Fix issue with customB --- t/venom/lib/customA.yml | 4 ++-- t/venom/lib/customB.yml | 5 +++-- t/venom/test_suites/test_getlogintoken/15_testcBcA.yml | 8 ++++---- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/t/venom/lib/customA.yml b/t/venom/lib/customA.yml index 448adb94e2cf..389c294e7b4b 100644 --- a/t/venom/lib/customA.yml +++ b/t/venom/lib/customA.yml @@ -6,10 +6,10 @@ steps: myWord: "{{.input.myArg}}" vars: content: - from: foobarB + from: result.foobarb - script: echo "hello {{.content}}" assertions: - result.code ShouldEqual 0 - - result.systemout ShouldContainSubstring "{{.content}}" + - result.systemout ShouldContainSubstring "{{.input.myArg}}" output: foobarA: "{{.result.systemout}}" diff --git a/t/venom/lib/customB.yml b/t/venom/lib/customB.yml index d58d17b1b74a..cd284cbb4d9d 100644 --- a/t/venom/lib/customB.yml +++ b/t/venom/lib/customB.yml @@ -2,8 +2,9 @@ executor: customB input: myWord: "world" steps: -- script: echo "{{.input.myWord}}" +- script: echo "{\"hi\":\"{{.input.myWord}}\"}" assertions: - result.code ShouldEqual 0 + - result.systemout ShouldContainSubstring "{{.input.myWord}}" output: - foobarB: "{{.result.systemout}}" + foobarB: "{{.result.systemoutjson.hi}}" diff --git a/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml b/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml index f3439ac1c726..e0375fcbef7f 100644 --- a/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml +++ b/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml @@ -3,21 +3,21 @@ testcases: steps: - type: customB assertions: - - foobarB ShouldContainSubstring world + - result.foobarb ShouldContainSubstring world - name: customB_custom steps: - type: customB myWord: "universe" assertions: - - foobarB ShouldContainSubstring universe + - result.foobarb ShouldContainSubstring universe - name: customA_default steps: - type: customA assertions: - - foobarA ShouldContainSubstring world2 - - foobarA ShouldContainSubstring hello + - result.foobara ShouldContainSubstring world2 + - result.foobara ShouldContainSubstring hello - name: customA_custom steps: From 7805d72477a0cfee2f6946fa6e7b35919c35d646 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 14 Dec 2021 16:36:49 -0500 Subject: [PATCH 05/31] [Venom] Fix issue with customB A and the testcases --- t/venom/lib/customA.yml | 2 +- t/venom/lib/customB.yml | 4 ++-- t/venom/test_suites/test_getlogintoken/15_testcBcA.yml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/venom/lib/customA.yml b/t/venom/lib/customA.yml index 389c294e7b4b..959565050894 100644 --- a/t/venom/lib/customA.yml +++ b/t/venom/lib/customA.yml @@ -2,7 +2,7 @@ executor: customA input: myArg: "world2" steps: -- script: customB +- type: customB myWord: "{{.input.myArg}}" vars: content: diff --git a/t/venom/lib/customB.yml b/t/venom/lib/customB.yml index cd284cbb4d9d..18c352fed5ef 100644 --- a/t/venom/lib/customB.yml +++ b/t/venom/lib/customB.yml @@ -2,9 +2,9 @@ executor: customB input: myWord: "world" steps: -- script: echo "{\"hi\":\"{{.input.myWord}}\"}" +- script: echo "{{.input.myWord}}" assertions: - result.code ShouldEqual 0 - result.systemout ShouldContainSubstring "{{.input.myWord}}" output: - foobarB: "{{.result.systemoutjson.hi}}" + foobarB: "{{.result.systemout}}" diff --git a/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml b/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml index e0375fcbef7f..19f3ee0e5b1c 100644 --- a/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml +++ b/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml @@ -24,5 +24,5 @@ testcases: - type: customA myArg: "universe" assertions: - - foobarA ShouldContainSubstring universe - - foobarA ShouldContainSubstring hello + - result.foobara ShouldContainSubstring universe + - result.foobara ShouldContainSubstring hello From b9e2e3da5cd8e8051238a8c4cc766e94794bd643 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:52:05 -0500 Subject: [PATCH 06/31] [Venom] add executor in executor for delete_node --- t/venom/lib/delete_node.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/t/venom/lib/delete_node.yml b/t/venom/lib/delete_node.yml index 762853213ae5..4d555a04d068 100644 --- a/t/venom/lib/delete_node.yml +++ b/t/venom/lib/delete_node.yml @@ -2,15 +2,19 @@ executor: delete_node input: mac_address: {} mac_address_url_encoded: {} - token: {} steps: + # Get token + - type: get_login_token + vars: + token: + from: result.token # delete_node - type: http method: DELETE url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.input.mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.input.token}}" + "Authorization": "{{.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -22,7 +26,7 @@ steps: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.input.mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.input.token}}" + "Authorization": "{{.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 404 From 44aff17481184f3251b8bcee8b858966d93da4af Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:53:20 -0500 Subject: [PATCH 07/31] [Venom] Add delete with executors in executors --- .../captive_portal/teardown/15_delete_node01.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/t/venom/test_suites/captive_portal/teardown/15_delete_node01.yml b/t/venom/test_suites/captive_portal/teardown/15_delete_node01.yml index 44eb36854409..176d3d503d96 100644 --- a/t/venom/test_suites/captive_portal/teardown/15_delete_node01.yml +++ b/t/venom/test_suites/captive_portal/teardown/15_delete_node01.yml @@ -1,13 +1,7 @@ name: Delete node01 testcases: -# temp, can be simplified with Venom 1.0.0 due to https://github.com/ovh/venom/pull/452 -- name: get_login_token - steps: - - type: get_login_token - - name: delete_node01 steps: - type: delete_node mac_address: "{{.node01_ens7_mac_address}}" mac_address_url_encoded: "{{.node01_ens7_mac_address_url_encoded}}" - token: "{{.get_login_token.json.result.token}}" From b3051d00a050cf06b85672a3ea064abda9309b8f Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 14 Dec 2021 17:54:37 -0500 Subject: [PATCH 08/31] [Venom] Add node cleanup as executors --- t/venom/lib/node_disable_cleanup.yml | 5 ++++ t/venom/lib/node_enable_cleanup.yml | 5 ++++ t/venom/lib/node_task_cleanup.yml | 42 ++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) create mode 100644 t/venom/lib/node_disable_cleanup.yml create mode 100644 t/venom/lib/node_enable_cleanup.yml create mode 100644 t/venom/lib/node_task_cleanup.yml diff --git a/t/venom/lib/node_disable_cleanup.yml b/t/venom/lib/node_disable_cleanup.yml new file mode 100644 index 000000000000..b6193afd97fa --- /dev/null +++ b/t/venom/lib/node_disable_cleanup.yml @@ -0,0 +1,5 @@ +executor: enable_node_cleanup + +steps: +- type: node_task_cleanup + status: "disable" diff --git a/t/venom/lib/node_enable_cleanup.yml b/t/venom/lib/node_enable_cleanup.yml new file mode 100644 index 000000000000..7d6ed42b9a20 --- /dev/null +++ b/t/venom/lib/node_enable_cleanup.yml @@ -0,0 +1,5 @@ +executor: enable_node_cleanup + +steps: +- type: node_task_cleanup + status: "enable" diff --git a/t/venom/lib/node_task_cleanup.yml b/t/venom/lib/node_task_cleanup.yml new file mode 100644 index 000000000000..bca83b2548ba --- /dev/null +++ b/t/venom/lib/node_task_cleanup.yml @@ -0,0 +1,42 @@ +executor: node_task_cleanup +input: + status: "enabled" + interval: "{{.node_cleanup.delete_window.interval}}" + unit: "{{.node_cleanup.delete_window.unit}}" + +steps: +- type: get_login_token + vars: + token: + from: result.token + +- type: http + method: PATCH + url: '{{.pfserver_webadmin_url}}/api/v1/config/maintenance_task/node_cleanup' + ignore_verify_ssl: true + body: >- + { + "status": "{{.input.status}}" + } + headers: + "Authorization": "{{.token}}" + "Content-Type": "application/json" + assertions: + - result.statuscode ShouldEqual 200 + +- type: http + method: PATCH + url: '{{.pfserver_webadmin_url}}/api/v1/config/maintenance_task/node_cleanup' + ignore_verify_ssl: true + body: >- + { + "delete_window": { + "interval": "{{.input.interval}}", + "unit": "{{.input.unit}}" + } + } + headers: + "Authorization": "{{.token}}" + "Content-Type": "application/json" + assertions: + - result.statuscode ShouldEqual 200 From 51198095b96ea24a86cf00f1a208b8cdccac1320 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Thu, 16 Dec 2021 11:54:16 -0500 Subject: [PATCH 09/31] [Venom] Add test_venom and customD example --- t/venom/Makefile | 5 ++++ t/venom/lib/customD.yml | 12 ++++++++ .../test_venom/playbooks/configure.yml | 10 +++++++ .../scenarios/test_venom/playbooks/rsync.yml | 18 +++++++++++ .../test_venom/playbooks/run_tests.yml | 30 +++++++++++++++++++ t/venom/scenarios/test_venom/site.yml | 10 +++++++ .../00_testsuite.yml | 0 .../15_testcBcA.yml | 16 ++++++++++ 8 files changed, 101 insertions(+) create mode 100644 t/venom/lib/customD.yml create mode 100644 t/venom/scenarios/test_venom/playbooks/configure.yml create mode 100644 t/venom/scenarios/test_venom/playbooks/rsync.yml create mode 100644 t/venom/scenarios/test_venom/playbooks/run_tests.yml create mode 100644 t/venom/scenarios/test_venom/site.yml rename t/venom/test_suites/{test_getlogintoken => test_venom}/00_testsuite.yml (100%) rename t/venom/test_suites/{test_getlogintoken => test_venom}/15_testcBcA.yml (63%) diff --git a/t/venom/Makefile b/t/venom/Makefile index 72e54d45b471..3b43a77cd5d2 100644 --- a/t/venom/Makefile +++ b/t/venom/Makefile @@ -164,3 +164,8 @@ example_deb11: SCENARIOS_TO_RUN=example \ $(MAKE_TARGET) +test_deb11: + make \ + PF_VM_NAME=pfdeb11$(DEV_ENV) \ + SCENARIOS_TO_RUN=test_venom\ + $(MAKE_TARGET) diff --git a/t/venom/lib/customD.yml b/t/venom/lib/customD.yml new file mode 100644 index 000000000000..1b34cde7a80b --- /dev/null +++ b/t/venom/lib/customD.yml @@ -0,0 +1,12 @@ +executor: customD +input: + myArg: "world2" +steps: +- type: customB + myWord: "{{.input.myArg}}" +- script: echo "hello {{.result.foobarb}}" + assertions: + - result.code ShouldEqual 0 + - result.systemout ShouldContainSubstring "{{.input.myArg}}" +output: + foobard: "{{.result.systemout}}" diff --git a/t/venom/scenarios/test_venom/playbooks/configure.yml b/t/venom/scenarios/test_venom/playbooks/configure.yml new file mode 100644 index 000000000000..69c4dd51e53a --- /dev/null +++ b/t/venom/scenarios/test_venom/playbooks/configure.yml @@ -0,0 +1,10 @@ +--- +- hosts: pfservers + name: configure Golang environment for unit tests + become: True + collections: + - inverse_inc.packetfence + + roles: + - role: packetfence_go + tags: go diff --git a/t/venom/scenarios/test_venom/playbooks/rsync.yml b/t/venom/scenarios/test_venom/playbooks/rsync.yml new file mode 100644 index 000000000000..a592f83c0c79 --- /dev/null +++ b/t/venom/scenarios/test_venom/playbooks/rsync.yml @@ -0,0 +1,18 @@ +--- +- hosts: pfservers, service_venom, nodes + name: Rsync Git repository t/venom with /usr/local/pf/t/venom (localdev only) + become: True + + tasks: + - name: Synchronize Git repository t/venom with /usr/local/pf/t/venom + ansible.posix.synchronize: + # src is provided through test-wrapper.sh + # as $PWD/venom (no leading slash) + src: "{{ lookup('env', 'VENOM_ROOT_DIR') }}" + dest: '/usr/local/pf/t/' + archive: yes + delete: yes + # exclude files dynamically generated by Ansible + rsync_opts: + - "--exclude=vars/local.yml" + diff --git a/t/venom/scenarios/test_venom/playbooks/run_tests.yml b/t/venom/scenarios/test_venom/playbooks/run_tests.yml new file mode 100644 index 000000000000..90ec3e695b25 --- /dev/null +++ b/t/venom/scenarios/test_venom/playbooks/run_tests.yml @@ -0,0 +1,30 @@ +--- +- hosts: pfservers + name: Run example tests + become: True + + vars: + # put your test suites to try here + test_suites: + - test_venom + + tasks: + - name: Run Venom testsuites + command: '{{ venom_dir }}/venom-wrapper.sh {{ venom_dir }}/test_suites/{{ item }}' + args: + chdir: '{{ venom_dir }}' + loop: '{{ test_suites }}' + vars: + venom_wrapper_args: + # temp, overcome two Venom issues: + # - tap: https://github.com/ovh/venom/issues/428 + # - when running test suite one by one, previous logs and results are overriden + # Venom will create one directory per test suite to store results + VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + + # add inventory__group_environment to Ansible environment + # useful to make env vars available for Venom + environment: '{{ inventory__group_environment | d({}) + | combine(venom_wrapper_args | d({})) }}' + + diff --git a/t/venom/scenarios/test_venom/site.yml b/t/venom/scenarios/test_venom/site.yml new file mode 100644 index 000000000000..7442a70f6840 --- /dev/null +++ b/t/venom/scenarios/test_venom/site.yml @@ -0,0 +1,10 @@ +--- +# - import_playbook: playbooks/provision.yml + +# rsync before tests when doing local development +- import_playbook: playbooks/rsync.yml + when: lookup("env", "CI") != 'true' + +#- import_playbook: playbooks/configure.yml + +- import_playbook: playbooks/run_tests.yml diff --git a/t/venom/test_suites/test_getlogintoken/00_testsuite.yml b/t/venom/test_suites/test_venom/00_testsuite.yml similarity index 100% rename from t/venom/test_suites/test_getlogintoken/00_testsuite.yml rename to t/venom/test_suites/test_venom/00_testsuite.yml diff --git a/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml b/t/venom/test_suites/test_venom/15_testcBcA.yml similarity index 63% rename from t/venom/test_suites/test_getlogintoken/15_testcBcA.yml rename to t/venom/test_suites/test_venom/15_testcBcA.yml index 19f3ee0e5b1c..d9f0c1dbae0e 100644 --- a/t/venom/test_suites/test_getlogintoken/15_testcBcA.yml +++ b/t/venom/test_suites/test_venom/15_testcBcA.yml @@ -26,3 +26,19 @@ testcases: assertions: - result.foobara ShouldContainSubstring universe - result.foobara ShouldContainSubstring hello + +- name: customD_default + steps: + - type: customD + assertions: + - result.foobard ShouldContainSubstring world2 + - result.foobard ShouldContainSubstring hello + +- name: customD_custom + steps: + - type: customD + myArg: "universe" + assertions: + - result.foobard ShouldContainSubstring universe + - result.foobard ShouldContainSubstring hello + From fb57ad6ea3726a12eb4361a428a9497a26420bd8 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Fri, 17 Dec 2021 17:34:45 -0500 Subject: [PATCH 10/31] [Venom] v1.0.0 Add executors --- t/venom/lib/check_host_internet_access.yml | 11 +++++++ t/venom/lib/check_internet_access.yml | 12 +++++++ t/venom/lib/haproxy_admin_restart.yml | 7 ++++ t/venom/lib/haproxy_admin_restart_api.yml | 19 +++++++++++ t/venom/lib/node_delete.yml | 33 +++++++++++++++++++ t/venom/lib/pf_api_service_action.yml | 21 ++++++++++++ t/venom/lib/pf_api_service_disable.yml | 7 ++++ t/venom/lib/pf_api_service_enable.yml | 7 ++++ t/venom/lib/pf_api_service_restart.yml | 7 ++++ t/venom/lib/pf_api_service_start.yml | 7 ++++ t/venom/lib/pf_api_service_status.yml | 9 +++++ t/venom/lib/systemctl_service_restart.yml | 18 ++++++++++ .../common/check_internet_access.yml | 13 +++----- 13 files changed, 162 insertions(+), 9 deletions(-) create mode 100644 t/venom/lib/check_host_internet_access.yml create mode 100644 t/venom/lib/check_internet_access.yml create mode 100644 t/venom/lib/haproxy_admin_restart.yml create mode 100644 t/venom/lib/haproxy_admin_restart_api.yml create mode 100644 t/venom/lib/node_delete.yml create mode 100644 t/venom/lib/pf_api_service_action.yml create mode 100644 t/venom/lib/pf_api_service_disable.yml create mode 100644 t/venom/lib/pf_api_service_enable.yml create mode 100644 t/venom/lib/pf_api_service_restart.yml create mode 100644 t/venom/lib/pf_api_service_start.yml create mode 100644 t/venom/lib/pf_api_service_status.yml create mode 100644 t/venom/lib/systemctl_service_restart.yml diff --git a/t/venom/lib/check_host_internet_access.yml b/t/venom/lib/check_host_internet_access.yml new file mode 100644 index 000000000000..6e9fe3985564 --- /dev/null +++ b/t/venom/lib/check_host_internet_access.yml @@ -0,0 +1,11 @@ +executor: check_host_internet_access +input: + host: "{{.node01_mgmt_ip}}" + user: "{{.ssh_user}}" +steps: + - type: ssh + host: '{{.input.host}}' + user: '{{.input.user}}' + command: | + cd /usr/local/pf/t/venom ; \ + sudo /usr/local/pf/t/venom/venom-wrapper.sh test_suite//common/check_internet_access.yml diff --git a/t/venom/lib/check_internet_access.yml b/t/venom/lib/check_internet_access.yml new file mode 100644 index 000000000000..6e2058f18b37 --- /dev/null +++ b/t/venom/lib/check_internet_access.yml @@ -0,0 +1,12 @@ +executor: check_internet_access +input: + url: '{{.network_detection_url}}' +steps: + - type: http + method: GET + url: '{{.input.url}}' + assertions: + - result.statuscode ShouldEqual 200 + # retry to let node get IP by DHCP + retry: 6 + delay: 10 diff --git a/t/venom/lib/haproxy_admin_restart.yml b/t/venom/lib/haproxy_admin_restart.yml new file mode 100644 index 000000000000..cad23d2069a1 --- /dev/null +++ b/t/venom/lib/haproxy_admin_restart.yml @@ -0,0 +1,7 @@ +executor: haproxy-admin_restart +input: + myarg: {} +steps: +# service restarted by hand because using API cause Venom failure (EOF) +- type: restart_systemctl_service + service: packetfence-haproxy-admin diff --git a/t/venom/lib/haproxy_admin_restart_api.yml b/t/venom/lib/haproxy_admin_restart_api.yml new file mode 100644 index 000000000000..95bf0681a02f --- /dev/null +++ b/t/venom/lib/haproxy_admin_restart_api.yml @@ -0,0 +1,19 @@ +executor: haproxy-admini_restart_api +input: + myArg: {} +# service restarted by hand because using API cause Venom failure (EOF) +steps: +- type: get_login_token + +- type: http + method: POST + url: '{{.pfserver_webadmin_url}}/api/v1/service/haproxy-admin/restart' + ignore_verify_ssl: true + headers: + "Authorization": "{{.result.token}}" + "Content-Type": "application/json" + assertions: + - result.statuscode ShouldEqual 200 + +- type: sleep + time_to_sleep: 5 diff --git a/t/venom/lib/node_delete.yml b/t/venom/lib/node_delete.yml new file mode 100644 index 000000000000..4d555a04d068 --- /dev/null +++ b/t/venom/lib/node_delete.yml @@ -0,0 +1,33 @@ +executor: delete_node +input: + mac_address: {} + mac_address_url_encoded: {} +steps: + # Get token + - type: get_login_token + vars: + token: + from: result.token + # delete_node + - type: http + method: DELETE + url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.input.mac_address_url_encoded}}' + ignore_verify_ssl: true + headers: + "Authorization": "{{.token}}" + "Content-Type": "application/json" + assertions: + - result.statuscode ShouldEqual 200 + - result.bodyjson.message ShouldEqual "Deleted {{.input.mac_address}} successfully" + + # check node deleted + - type: http + method: GET + url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.input.mac_address_url_encoded}}' + ignore_verify_ssl: true + headers: + "Authorization": "{{.token}}" + "Content-Type": "application/json" + assertions: + - result.statuscode ShouldEqual 404 + - result.bodyjson.message ShouldEqual "Unable to get resource with this identifier" diff --git a/t/venom/lib/pf_api_service_action.yml b/t/venom/lib/pf_api_service_action.yml new file mode 100644 index 000000000000..3d08ded1c338 --- /dev/null +++ b/t/venom/lib/pf_api_service_action.yml @@ -0,0 +1,21 @@ +executor: pf_api_service_action +input: + service: {} + action: {} +steps: +- type: get_login_token + +- type: http + method: POST + url: '{{.pfserver_webadmin_url}}/api/v1/service/{{.input.service}}/{{.input.action}}' + ignore_verify_ssl: true + headers: + "Authorization": "{{.result.token}}" + "Content-Type": "application/json" + assertions: + - result.statuscode ShouldEqual 200 + output: + postjson: "{{.result.bodyjson}}" + +- type: sleep + time_to_sleep: 5 diff --git a/t/venom/lib/pf_api_service_disable.yml b/t/venom/lib/pf_api_service_disable.yml new file mode 100644 index 000000000000..4f470fd699d8 --- /dev/null +++ b/t/venom/lib/pf_api_service_disable.yml @@ -0,0 +1,7 @@ +executor: pf_api_service_disable +input: + service: {} +steps: +- type: pf_api_service_action + service: "{{.input.service}}" + action: "disable" diff --git a/t/venom/lib/pf_api_service_enable.yml b/t/venom/lib/pf_api_service_enable.yml new file mode 100644 index 000000000000..9acf8a864088 --- /dev/null +++ b/t/venom/lib/pf_api_service_enable.yml @@ -0,0 +1,7 @@ +executor: pf_api_service_enable +input: + service: {} +steps: +- type: pf_api_service_action + service: "{{.input.service}}" + action: "enable" diff --git a/t/venom/lib/pf_api_service_restart.yml b/t/venom/lib/pf_api_service_restart.yml new file mode 100644 index 000000000000..ccb262cf8bbd --- /dev/null +++ b/t/venom/lib/pf_api_service_restart.yml @@ -0,0 +1,7 @@ +executor: pf_api_service_restart +input: + service: {} +steps: +- type: pf_api_service_action + service: "{{.input.service}}" + action: "restart" diff --git a/t/venom/lib/pf_api_service_start.yml b/t/venom/lib/pf_api_service_start.yml new file mode 100644 index 000000000000..9178d12f8b94 --- /dev/null +++ b/t/venom/lib/pf_api_service_start.yml @@ -0,0 +1,7 @@ +executor: pf_api_service_start +input: + service: {} +steps: +- type: pf_api_service_action + service: "{{.input.service}}" + action: "start" diff --git a/t/venom/lib/pf_api_service_status.yml b/t/venom/lib/pf_api_service_status.yml new file mode 100644 index 000000000000..538d3b69410a --- /dev/null +++ b/t/venom/lib/pf_api_service_status.yml @@ -0,0 +1,9 @@ +executor: pf_api_service_status +input: + service: {} +steps: +- type: pf_api_service_action + service: "{{.input.service}}" + action: "status" + output: + postjson: "{{.result.postjson}}" diff --git a/t/venom/lib/systemctl_service_restart.yml b/t/venom/lib/systemctl_service_restart.yml new file mode 100644 index 000000000000..f30cb5e262f5 --- /dev/null +++ b/t/venom/lib/systemctl_service_restart.yml @@ -0,0 +1,18 @@ +executor: systemctl_service_restart +input: + service: {} +steps: +# service restarted by hand because using API cause Venom failure (EOF) +- type: systemctl_service + unit_commands: restart + service: "{{.input.service}}" + +# let service restarts +- type: sleep + time_to_sleep: 5 + +- type: systemctl_service + unit_commands: status + service: "{{.input.service}}" + assertions: + - result.systemout ShouldContainSubstring active (running) diff --git a/t/venom/test_suites/common/check_internet_access.yml b/t/venom/test_suites/common/check_internet_access.yml index 691185557283..f016a8c74285 100644 --- a/t/venom/test_suites/common/check_internet_access.yml +++ b/t/venom/test_suites/common/check_internet_access.yml @@ -1,10 +1,5 @@ -name: Check Internet access on node01 +name: Check Internet access testcases: - - name: check_internet_access_on_node01 - steps: - - type: ssh - host: '{{.node01_mgmt_ip}}' - user: '{{.ssh_user}}' - command: | - cd /usr/local/pf/t/venom ; \ - sudo /usr/local/pf/t/venom/venom-wrapper.sh {{.nodes_test_suite_dir}}/common/check_internet_access.yml +- name: check_internet_access + steps: + - type: check_internet_access From 17441978d6a722ac734fd87ffcf169a2edcdb6ad Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Mon, 20 Dec 2021 14:16:43 -0500 Subject: [PATCH 11/31] [Venom] Upgrade Venom version --- addons/vagrant/inventory/group_vars/pfservers/venom.yml | 2 +- addons/vagrant/inventory/group_vars/service_venom/venom.yml | 2 +- addons/vagrant/playbooks/nodes/pre_prov/venom.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/vagrant/inventory/group_vars/pfservers/venom.yml b/addons/vagrant/inventory/group_vars/pfservers/venom.yml index faea4637daf5..817db666ba0c 100644 --- a/addons/vagrant/inventory/group_vars/pfservers/venom.yml +++ b/addons/vagrant/inventory/group_vars/pfservers/venom.yml @@ -1,4 +1,4 @@ --- -venom__version: 'v1.0.0' +venom__version: 'v1.0.1' venom_dir: '/usr/local/pf/t/venom' diff --git a/addons/vagrant/inventory/group_vars/service_venom/venom.yml b/addons/vagrant/inventory/group_vars/service_venom/venom.yml index 10778c6430b3..7eeffe5523fa 100644 --- a/addons/vagrant/inventory/group_vars/service_venom/venom.yml +++ b/addons/vagrant/inventory/group_vars/service_venom/venom.yml @@ -1,5 +1,5 @@ --- -venom__version: 'v1.0.0' +venom__version: 'v1.0.1' venom_dir: '/usr/local/pf/t/venom' diff --git a/addons/vagrant/playbooks/nodes/pre_prov/venom.yml b/addons/vagrant/playbooks/nodes/pre_prov/venom.yml index b5ed693c0a0c..98ce963bb7ec 100644 --- a/addons/vagrant/playbooks/nodes/pre_prov/venom.yml +++ b/addons/vagrant/playbooks/nodes/pre_prov/venom.yml @@ -7,7 +7,7 @@ - inverse_inc.utils vars: - venom__version: 'v1.0.0' + venom__version: 'v1.0.1' roles: - role: venom From 921df5b647020dbc166da7d98c255610a1349e4b Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 21 Dec 2021 16:36:50 -0500 Subject: [PATCH 12/31] [Venom] Test how to share value between results --- t/venom/test_suites/test_venom/15_testcBcA.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/t/venom/test_suites/test_venom/15_testcBcA.yml b/t/venom/test_suites/test_venom/15_testcBcA.yml index d9f0c1dbae0e..9e661111bfd8 100644 --- a/t/venom/test_suites/test_venom/15_testcBcA.yml +++ b/t/venom/test_suites/test_venom/15_testcBcA.yml @@ -42,3 +42,18 @@ testcases: - result.foobard ShouldContainSubstring universe - result.foobard ShouldContainSubstring hello +- name: customE_custom + steps: + - type: customD + myArg: "{{.customD_custom.result.foobard}}" + assertions: + - result.foobard ShouldContainSubstring universe + - result.foobard ShouldContainSubstring hello + +- name: customF_custom + steps: + - type: customD + myArg: "{{.customD_custom.json.result.foobard}}" + assertions: + - result.foobard ShouldContainSubstring universe + - result.foobard ShouldContainSubstring hello From 00a7da4925aa9ab3810d13658f6c4d1d4b230593 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:44:38 -0500 Subject: [PATCH 13/31] [Venom] tests on extrating var from multiple tests --- t/venom/lib/customE.yml | 20 +++++++++++++++++++ .../test_suites/test_venom/15_testcBcA.yml | 9 +++++++++ 2 files changed, 29 insertions(+) create mode 100644 t/venom/lib/customE.yml diff --git a/t/venom/lib/customE.yml b/t/venom/lib/customE.yml new file mode 100644 index 000000000000..8b950f075021 --- /dev/null +++ b/t/venom/lib/customE.yml @@ -0,0 +1,20 @@ +executor: customE +input: + myArg: "world2" +steps: +- type: customB + myWord: "{{.input.myArg}}" + vars: + varCustomB: + from: result.foobarb +- script: echo "hello {{.varCustomB}}" + assertions: + - result.code ShouldEqual 0 + - result.systemout ShouldContainSubstring "{{.input.myArg}}" +- script: echo "hello you {{.varCustomB}}" + assertions: + - result.code ShouldEqual 0 + - result.systemout ShouldContainSubstring "{{.input.myArg}}" +output: + foobarb: "{{.varCustomB}}" + foobare: "{{.result.systemout}}" diff --git a/t/venom/test_suites/test_venom/15_testcBcA.yml b/t/venom/test_suites/test_venom/15_testcBcA.yml index 9e661111bfd8..5c352d0c2a40 100644 --- a/t/venom/test_suites/test_venom/15_testcBcA.yml +++ b/t/venom/test_suites/test_venom/15_testcBcA.yml @@ -57,3 +57,12 @@ testcases: assertions: - result.foobard ShouldContainSubstring universe - result.foobard ShouldContainSubstring hello + +- name: customG_custom + steps: + - type: customE + myArg: "{{.customD_custom.json.result.foobard}}" + assertions: + - result.foobare ShouldContainSubstring universe + - result.foobare ShouldContainSubstring you + - result.foobarb ShouldContainSubstring hello From ffc6db05d4a3068a0f354101caaa1b9426105132 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:49:12 -0500 Subject: [PATCH 14/31] [Venom] Test multisuite: extract from suite --- t/venom/lib/foobarcustommultisteps.yml | 11 +++++++++++ t/venom/test_suites/test_venom/20_testVenom.yml | 8 ++++++++ 2 files changed, 19 insertions(+) create mode 100644 t/venom/lib/foobarcustommultisteps.yml create mode 100644 t/venom/test_suites/test_venom/20_testVenom.yml diff --git a/t/venom/lib/foobarcustommultisteps.yml b/t/venom/lib/foobarcustommultisteps.yml new file mode 100644 index 000000000000..661dc15783ae --- /dev/null +++ b/t/venom/lib/foobarcustommultisteps.yml @@ -0,0 +1,11 @@ +executor: foobarcustommultisteps +input: {} +steps: +- script: echo "hello" + vars: + content: + from: result.systemout +- script: echo "{{.content}} world" +output: + foobar: "{{.result.systemout}}" + content: "{{.content}}" diff --git a/t/venom/test_suites/test_venom/20_testVenom.yml b/t/venom/test_suites/test_venom/20_testVenom.yml new file mode 100644 index 000000000000..a432ee92535b --- /dev/null +++ b/t/venom/test_suites/test_venom/20_testVenom.yml @@ -0,0 +1,8 @@ +name: testsuite with a user executor in custom dir which has multiple steps +testcases: +- name: testfoobar multisteps custom + steps: + - type: foobarcustommultisteps + assertions: + - result.foobar ShouldEqual "hello world" + - result.content ShouldEqual "hello" From 2e74298fd1a7d499bab2596bea70964d31cca6a5 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 21 Dec 2021 18:59:57 -0500 Subject: [PATCH 15/31] [Venom] export data from multisteps --- t/venom/lib/customE.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/venom/lib/customE.yml b/t/venom/lib/customE.yml index 8b950f075021..20b5ae4d3ed7 100644 --- a/t/venom/lib/customE.yml +++ b/t/venom/lib/customE.yml @@ -16,5 +16,5 @@ steps: - result.code ShouldEqual 0 - result.systemout ShouldContainSubstring "{{.input.myArg}}" output: - foobarb: "{{.varCustomB}}" + foobarb: "{{.varcustomb}}" foobare: "{{.result.systemout}}" From 1dcd51ae0739c085edf0826708e597644cc88f5c Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:15:14 -0500 Subject: [PATCH 16/31] [Venom] add test to extract var from multisteps example with venom --- t/venom/lib/foobarcustommultisteps.yml | 2 +- t/venom/test_suites/test_venom/20_testVenom.yml | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/t/venom/lib/foobarcustommultisteps.yml b/t/venom/lib/foobarcustommultisteps.yml index 661dc15783ae..04822215e2fc 100644 --- a/t/venom/lib/foobarcustommultisteps.yml +++ b/t/venom/lib/foobarcustommultisteps.yml @@ -8,4 +8,4 @@ steps: - script: echo "{{.content}} world" output: foobar: "{{.result.systemout}}" - content: "{{.content}}" + contento: "{{.content}}" diff --git a/t/venom/test_suites/test_venom/20_testVenom.yml b/t/venom/test_suites/test_venom/20_testVenom.yml index a432ee92535b..7ead2d9f8a72 100644 --- a/t/venom/test_suites/test_venom/20_testVenom.yml +++ b/t/venom/test_suites/test_venom/20_testVenom.yml @@ -5,4 +5,11 @@ testcases: - type: foobarcustommultisteps assertions: - result.foobar ShouldEqual "hello world" - - result.content ShouldEqual "hello" + - result.contento ShouldEqual "hello" + +- name: testfoobar multisteps custom + steps: + - type: foobarcustommultisteps + assertions: + - result.foobar ShouldEqual "hello world" + - content ShouldEqual "hello" From 5e956301dc7323d206721b0c0c2815203dbacb50 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:17:01 -0500 Subject: [PATCH 17/31] [Venom] Add failling test to extract data from multisteps --- t/venom/test_suites/test_venom/15_testcBcA.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/t/venom/test_suites/test_venom/15_testcBcA.yml b/t/venom/test_suites/test_venom/15_testcBcA.yml index 5c352d0c2a40..bdd26a9d25a8 100644 --- a/t/venom/test_suites/test_venom/15_testcBcA.yml +++ b/t/venom/test_suites/test_venom/15_testcBcA.yml @@ -66,3 +66,14 @@ testcases: - result.foobare ShouldContainSubstring universe - result.foobare ShouldContainSubstring you - result.foobarb ShouldContainSubstring hello + +# This will fails, the variable varcustomb is in the executor and can not be called outside +# +- name: customH_custom + steps: + - type: customE + myArg: "{{.customD_custom.result.foobard}}" + assertions: + - varcustomb ShouldContainSubstring hello + - custome.varcustomb ShouldContainSubstring hello + - result.custome.varcustomb ShouldContainSubstring hello From 425810a8f87401d8bbdebec7befb3bf0266f5040 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:23:00 -0500 Subject: [PATCH 18/31] [Venom] Change venom version on install script --- t/venom/install-venom.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/venom/install-venom.sh b/t/venom/install-venom.sh index 64773cb7af55..9881ffa3ad85 100755 --- a/t/venom/install-venom.sh +++ b/t/venom/install-venom.sh @@ -5,7 +5,7 @@ VENOM_BIN_PATH=/usr/bin VENOM_BINARY=venom ROOTUSER_NAME=root VENOM_LATEST_URL=https://api.github.com/repos/ovh/venom/releases/latest -VENOM_DEFAULT_VERSION="1.0.0" +VENOM_DEFAULT_VERSION="1.0.1" VENOM_INSTALL_VERSION=${VENOM_VERSION:-${VENOM_DEFAULT_VERSION}} VENOM_LATEST_VERSION="" VENOM_INSTALLED_VERSION="" From 8647fbfd6d2e3d4fc188d620b63d79848d085df8 Mon Sep 17 00:00:00 2001 From: JeGoi <13801368+JeGoi@users.noreply.github.com> Date: Tue, 21 Dec 2021 19:24:08 -0500 Subject: [PATCH 19/31] Update t/venom/lib/customC.yml Co-authored-by: Nicolas Quiniou-Briand --- t/venom/lib/customC.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/venom/lib/customC.yml b/t/venom/lib/customC.yml index ab56f675a1cf..f3d8b5efcab7 100644 --- a/t/venom/lib/customC.yml +++ b/t/venom/lib/customC.yml @@ -5,7 +5,7 @@ input: "surname": "default2" } steps: -- script: echo "{{.inputi.myarg.name}}" > t.log +- script: echo "{{.input.myarg.name}}" > t.log - script: echo "{\"hello\":\"{{.input.myarg.name}} and {{.input.myarg.surname}}\"}" assertions: - result.code ShouldEqual 0 From dfa2f4007e6c9ddca158d01ffbeba805783b718f Mon Sep 17 00:00:00 2001 From: nqb Date: Wed, 22 Dec 2021 06:55:22 +0100 Subject: [PATCH 20/31] remove tap workaround --- t/venom/.venomrc | 2 +- t/venom/scenarios/captive_portal/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/configurator/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/dot1x_eap_peap/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/dot1x_eap_tls/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/example/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/export_import/playbooks/run_tests.yml | 8 +++----- .../fingerbank_invalid_db/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/mac_auth/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/template/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/test_venom/playbooks/run_tests.yml | 5 ++--- t/venom/scenarios/unit_tests/playbooks/run_tests.yml | 5 ++--- .../captive_portal/locales/00_check_locales_on_portal.yml | 2 +- .../wired_dot1x_eap_tls_scep/75_run_sscep_on_node01.yml | 2 +- t/venom/venom-wrapper.sh | 2 +- 15 files changed, 27 insertions(+), 39 deletions(-) diff --git a/t/venom/.venomrc b/t/venom/.venomrc index aa21ffdc6c34..fb5ecf85524f 100644 --- a/t/venom/.venomrc +++ b/t/venom/.venomrc @@ -2,7 +2,7 @@ variables_files: - vars/all.yml - vars/local.yml stop_on_failure: true -#format: tap +format: tap output_dir: results lib_dir: lib verbosity: 1 diff --git a/t/venom/scenarios/captive_portal/playbooks/run_tests.yml b/t/venom/scenarios/captive_portal/playbooks/run_tests.yml index 6eca2b502769..bcbbc2b99277 100644 --- a/t/venom/scenarios/captive_portal/playbooks/run_tests.yml +++ b/t/venom/scenarios/captive_portal/playbooks/run_tests.yml @@ -20,11 +20,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/configurator/playbooks/run_tests.yml b/t/venom/scenarios/configurator/playbooks/run_tests.yml index 6fb8d27598c9..e72f4f261260 100644 --- a/t/venom/scenarios/configurator/playbooks/run_tests.yml +++ b/t/venom/scenarios/configurator/playbooks/run_tests.yml @@ -15,11 +15,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/dot1x_eap_peap/playbooks/run_tests.yml b/t/venom/scenarios/dot1x_eap_peap/playbooks/run_tests.yml index 627e366acd5f..1ff9ce4d6760 100644 --- a/t/venom/scenarios/dot1x_eap_peap/playbooks/run_tests.yml +++ b/t/venom/scenarios/dot1x_eap_peap/playbooks/run_tests.yml @@ -21,11 +21,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/dot1x_eap_tls/playbooks/run_tests.yml b/t/venom/scenarios/dot1x_eap_tls/playbooks/run_tests.yml index e8e3d1d3b549..7938f7be01f9 100644 --- a/t/venom/scenarios/dot1x_eap_tls/playbooks/run_tests.yml +++ b/t/venom/scenarios/dot1x_eap_tls/playbooks/run_tests.yml @@ -21,11 +21,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/example/playbooks/run_tests.yml b/t/venom/scenarios/example/playbooks/run_tests.yml index bd99f41ba6b9..bfbac7e5887e 100644 --- a/t/venom/scenarios/example/playbooks/run_tests.yml +++ b/t/venom/scenarios/example/playbooks/run_tests.yml @@ -16,11 +16,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/export_import/playbooks/run_tests.yml b/t/venom/scenarios/export_import/playbooks/run_tests.yml index e97e0a82c72d..7a8ea405f0b0 100644 --- a/t/venom/scenarios/export_import/playbooks/run_tests.yml +++ b/t/venom/scenarios/export_import/playbooks/run_tests.yml @@ -21,11 +21,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom @@ -50,10 +49,9 @@ vars: venom_wrapper_args: # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/fingerbank_invalid_db/playbooks/run_tests.yml b/t/venom/scenarios/fingerbank_invalid_db/playbooks/run_tests.yml index df4f86612147..cb61e7711cf8 100644 --- a/t/venom/scenarios/fingerbank_invalid_db/playbooks/run_tests.yml +++ b/t/venom/scenarios/fingerbank_invalid_db/playbooks/run_tests.yml @@ -53,11 +53,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/mac_auth/playbooks/run_tests.yml b/t/venom/scenarios/mac_auth/playbooks/run_tests.yml index a423ad0bcdcb..72ce0366f304 100644 --- a/t/venom/scenarios/mac_auth/playbooks/run_tests.yml +++ b/t/venom/scenarios/mac_auth/playbooks/run_tests.yml @@ -21,11 +21,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/template/playbooks/run_tests.yml b/t/venom/scenarios/template/playbooks/run_tests.yml index eb4b8184494f..dea9ee3dca99 100644 --- a/t/venom/scenarios/template/playbooks/run_tests.yml +++ b/t/venom/scenarios/template/playbooks/run_tests.yml @@ -18,11 +18,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/test_venom/playbooks/run_tests.yml b/t/venom/scenarios/test_venom/playbooks/run_tests.yml index 90ec3e695b25..e9c31ba92ea5 100644 --- a/t/venom/scenarios/test_venom/playbooks/run_tests.yml +++ b/t/venom/scenarios/test_venom/playbooks/run_tests.yml @@ -16,11 +16,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/scenarios/unit_tests/playbooks/run_tests.yml b/t/venom/scenarios/unit_tests/playbooks/run_tests.yml index 3229004c643c..ca82c76fd888 100644 --- a/t/venom/scenarios/unit_tests/playbooks/run_tests.yml +++ b/t/venom/scenarios/unit_tests/playbooks/run_tests.yml @@ -28,11 +28,10 @@ loop: '{{ test_suites }}' vars: venom_wrapper_args: - # temp, overcome two Venom issues: - # - tap: https://github.com/ovh/venom/issues/428 + # temp, overcome Venom issue: # - when running test suite one by one, previous logs and results are overriden # Venom will create one directory per test suite to store results - VENOM_COMMON_FLAGS: '--format=tap --output-dir={{ venom_dir }}/results/{{ item }}' + VENOM_COMMON_FLAGS: '--output-dir={{ venom_dir }}/results/{{ item }}' # add inventory__group_environment to Ansible environment # useful to make env vars available for Venom diff --git a/t/venom/test_suites/captive_portal/locales/00_check_locales_on_portal.yml b/t/venom/test_suites/captive_portal/locales/00_check_locales_on_portal.yml index 3469179dba0f..5a2dd726f972 100644 --- a/t/venom/test_suites/captive_portal/locales/00_check_locales_on_portal.yml +++ b/t/venom/test_suites/captive_portal/locales/00_check_locales_on_portal.yml @@ -7,5 +7,5 @@ testcases: user: '{{.ssh_user}}' command: | cd /usr/local/pf/t/venom ; \ - sudo VENOM_COMMON_FLAGS='--format=tap --var configurator.interfaces.reg.ip={{.configurator.interfaces.reg.ip}}' \ + sudo VENOM_COMMON_FLAGS='--var configurator.interfaces.reg.ip={{.configurator.interfaces.reg.ip}}' \ /usr/local/pf/t/venom/venom-wrapper.sh {{.nodes_test_suite_dir}}/captive_portal/{{.venom.testcase}}.yml diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/75_run_sscep_on_node01.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/75_run_sscep_on_node01.yml index 7e2534c8fa2e..72da2f1957bc 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/75_run_sscep_on_node01.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/75_run_sscep_on_node01.yml @@ -7,4 +7,4 @@ testcases: user: '{{.ssh_user}}' command: | cd /usr/local/pf/t/venom ; \ - sudo VENOM_COMMON_FLAGS='--format=tap --var pfserver_mgmt_ip={{.pfserver_mgmt_ip}}' /usr/local/pf/t/venom/venom-wrapper.sh {{.nodes_test_suite_dir}}/wired_dot1x_eap_tls/{{.venom.testcase}}.yml + sudo VENOM_COMMON_FLAGS='--var pfserver_mgmt_ip={{.pfserver_mgmt_ip}}' /usr/local/pf/t/venom/venom-wrapper.sh {{.nodes_test_suite_dir}}/wired_dot1x_eap_tls/{{.venom.testcase}}.yml diff --git a/t/venom/venom-wrapper.sh b/t/venom/venom-wrapper.sh index aaaa04081151..59f7b2c09c6c 100755 --- a/t/venom/venom-wrapper.sh +++ b/t/venom/venom-wrapper.sh @@ -27,7 +27,7 @@ configure_and_check() { VENOM_ROOT_DIR=$(readlink -e $(dirname ${BASH_SOURCE[0]})) VENOM_BINARY="${VENOM_BINARY:-`which venom`}" # temp, overcome tap issue: https://github.com/ovh/venom/issues/428 - VENOM_COMMON_FLAGS="${VENOM_COMMON_FLAGS:---format=tap}" + VENOM_COMMON_FLAGS="${VENOM_COMMON_FLAGS:-}" VENOM_EXIT_FLAGS="${VENOM_EXIT_FLAGS:-}" echo -e "Using venom using following variables:" From 3b5eaf7507ab2b49abc90915d226a307819a6824 Mon Sep 17 00:00:00 2001 From: nqb Date: Wed, 22 Dec 2021 07:08:57 +0100 Subject: [PATCH 21/31] sort test suites when argument is a directory only take YAML files at first level take symlinks --- t/venom/venom-wrapper.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/t/venom/venom-wrapper.sh b/t/venom/venom-wrapper.sh index 59f7b2c09c6c..f3cbfb84dc94 100755 --- a/t/venom/venom-wrapper.sh +++ b/t/venom/venom-wrapper.sh @@ -18,7 +18,8 @@ log_subsection() { # script usage definition usage() { echo "Usage: $(basename $0) []" - echo "If you want to run all test suites in subdirectories, use " + echo "A test suite can be a directory or a YAML file" + echo "When a directory is passed, this script will sort alphabetically all test suites files in it" } @@ -26,7 +27,6 @@ configure_and_check() { # paths VENOM_ROOT_DIR=$(readlink -e $(dirname ${BASH_SOURCE[0]})) VENOM_BINARY="${VENOM_BINARY:-`which venom`}" - # temp, overcome tap issue: https://github.com/ovh/venom/issues/428 VENOM_COMMON_FLAGS="${VENOM_COMMON_FLAGS:-}" VENOM_EXIT_FLAGS="${VENOM_EXIT_FLAGS:-}" @@ -43,7 +43,20 @@ die_on_error() { run_test_suites() { local test_suites=$(readlink -e ${@:-.}) log_section "Running Venom test suite ${test_suites}" - CMD="${VENOM_BINARY} run ${VENOM_COMMON_FLAGS} ${VENOM_EXIT_FLAGS} ${test_suites}" + + # empty array + test_suites_files=() + for test_suite in ${test_suites}; do + # if it's a directory, we sort alphabetically files in it + if [ -d "${test_suite}" ]; then + sorted_files=$(find ${test_suite} -maxdepth 1 -type f,l -name "*.yml" | sort) + test_suites_files+=($sorted_files) + else + test_suites_files+=($test_suite) + fi + done + + CMD="${VENOM_BINARY} run ${VENOM_COMMON_FLAGS} ${VENOM_EXIT_FLAGS} ${test_suites_files[@]}" ${CMD} || die_on_error } From c6f9de9b30ec974480946747a5a2c5081ced1e5a Mon Sep 17 00:00:00 2001 From: Nicolas Quiniou-Briand Date: Wed, 22 Dec 2021 08:32:24 +0100 Subject: [PATCH 22/31] Update t/venom/test_suites/test_venom/20_testVenom.yml --- t/venom/test_suites/test_venom/20_testVenom.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/venom/test_suites/test_venom/20_testVenom.yml b/t/venom/test_suites/test_venom/20_testVenom.yml index 7ead2d9f8a72..3ad1fc8ac540 100644 --- a/t/venom/test_suites/test_venom/20_testVenom.yml +++ b/t/venom/test_suites/test_venom/20_testVenom.yml @@ -12,4 +12,4 @@ testcases: - type: foobarcustommultisteps assertions: - result.foobar ShouldEqual "hello world" - - content ShouldEqual "hello" + - content ShouldBeEmpty From a9c236c04e56a460962d7c152c99ac56f96bfa33 Mon Sep 17 00:00:00 2001 From: nqb Date: Wed, 22 Dec 2021 08:35:31 +0100 Subject: [PATCH 23/31] adjust Venom tests --- t/venom/test_suites/test_venom/15_testcBcA.yml | 9 +++++---- t/venom/test_suites/test_venom/20_testVenom.yml | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/t/venom/test_suites/test_venom/15_testcBcA.yml b/t/venom/test_suites/test_venom/15_testcBcA.yml index bdd26a9d25a8..d4d3a198a8fc 100644 --- a/t/venom/test_suites/test_venom/15_testcBcA.yml +++ b/t/venom/test_suites/test_venom/15_testcBcA.yml @@ -67,13 +67,14 @@ testcases: - result.foobare ShouldContainSubstring you - result.foobarb ShouldContainSubstring hello -# This will fails, the variable varcustomb is in the executor and can not be called outside +# Variable varcustomb is in the executor and can not be called outside +# We don't expect output to contain substrings # - name: customH_custom steps: - type: customE myArg: "{{.customD_custom.result.foobard}}" assertions: - - varcustomb ShouldContainSubstring hello - - custome.varcustomb ShouldContainSubstring hello - - result.custome.varcustomb ShouldContainSubstring hello + - varcustomb ShouldNotContainSubstring hello + - custome.varcustomb ShouldNotContainSubstring hello + - result.custome.varcustomb ShouldNotContainSubstring hello diff --git a/t/venom/test_suites/test_venom/20_testVenom.yml b/t/venom/test_suites/test_venom/20_testVenom.yml index 3ad1fc8ac540..d1358eee9c9c 100644 --- a/t/venom/test_suites/test_venom/20_testVenom.yml +++ b/t/venom/test_suites/test_venom/20_testVenom.yml @@ -7,6 +7,7 @@ testcases: - result.foobar ShouldEqual "hello world" - result.contento ShouldEqual "hello" +# content is not visible outside executor - name: testfoobar multisteps custom steps: - type: foobarcustommultisteps From 45e11d9bfc6c3834a3682adf469f9bd48e56c22b Mon Sep 17 00:00:00 2001 From: nqb Date: Wed, 22 Dec 2021 08:40:18 +0100 Subject: [PATCH 24/31] remove useless '.json' in variable --- .../05_modify_access_durations.yml | 2 +- .../10_create_roles.yml | 8 ++++---- .../15_create_network_devices.yml | 8 ++++---- .../20_configure_snat_interface.yml | 2 +- .../00_create_production_network.yml | 2 +- .../05_forge_dhcp_request_to_create.yml | 4 ++-- .../10_forge_dhcp_request_to_update.yml | 6 +++--- .../teardown/00_delete_node11.yml | 2 +- .../teardown/05_delete_production_network.yml | 2 +- .../00_forge_dhcp_request_to_create.yml | 4 ++-- .../10_forge_dhcp_request_to_update.yml | 6 +++--- .../teardown/00_delete_node10.yml | 2 +- .../00_backup_db_and_restore.yml | 4 ++-- .../teardown/00_teardown.yml | 2 +- .../10_create_connection_profile.yml | 2 +- .../captive_portal/25_check_radius_audit_log.yml | 4 ++-- .../teardown/30_delete_connection_profile.yml | 2 +- .../test_suites/common/check_node01_deleted.yml | 2 +- .../common/check_offline_status_node01.yml | 2 +- .../common/check_offline_status_wireless01.yml | 2 +- .../common/check_wireless01_deleted.yml | 2 +- t/venom/test_suites/common/delete_node01.yml | 2 +- t/venom/test_suites/common/delete_wireless01.yml | 2 +- .../common/disable_node_cleanup_task.yml | 4 ++-- .../common/enable_node_cleanup_task.yml | 4 ++-- t/venom/test_suites/common/fix_permissions.yml | 2 +- t/venom/test_suites/common/perform_checkup.yml | 2 +- .../common/restart_haproxy_portal.yml | 2 +- .../common/restart_iptables_service.yml | 2 +- .../common/restart_pfcron_service.yml | 2 +- .../common/restart_pfdhcp_service.yml | 2 +- .../common/restart_pfdhcplistener_service.yml | 2 +- t/venom/test_suites/common/restart_pfdns.yml | 2 +- .../test_suites/common/restart_pfdns_service.yml | 2 +- .../common/restart_radius_services.yml | 4 ++-- t/venom/test_suites/common/unreg_node01.yml | 2 +- t/venom/test_suites/common/unreg_wireless01.yml | 2 +- .../fingerbank_proxy/setup_proxy/setup_proxy.yml | 2 +- .../setup_proxy/teardown/teardown.yml | 2 +- .../global_config/00_create_roles.yml | 10 +++++----- .../global_config/05_modify_access_durations.yml | 2 +- .../global_config/10_create_access_levels.yml | 2 +- .../global_config/15_create_network_devices.yml | 8 ++++---- .../20_configure_snat_interface.yml | 2 +- .../test_suites/global_teardown/00_teardown.yml | 10 +++++----- .../00_forge_dhcp_request_to_create.yml | 4 ++-- .../teardown/teardown.yml | 2 +- .../wired_dot1x_eap_peap/05_join_domain.yml | 8 ++++---- .../wired_dot1x_eap_peap/07_create_realms.yml | 8 ++++---- .../15_create_and_test_ad_machine_source.yml | 4 ++-- .../20_create_and_test_ad_user_source.yml | 4 ++-- .../25_create_connection_profile.yml | 2 +- .../55_check_radius_audit_log.yml | 4 ++-- .../60_check_autoregister_node.yml | 2 +- .../teardown/15_check_unregistered_node.yml | 2 +- .../teardown/90_teardown.yml | 16 ++++++++-------- .../wired_dot1x_eap_tls_manual/05_create_pki.yml | 14 +++++++------- .../10_enable_ocsp.yml | 4 ++-- .../45_create_eaptls_source.yml | 2 +- .../50_create_connection_profile.yml | 2 +- .../91_check_radius_audit_log.yml | 4 ++-- .../95_check_autoregister_node.yml | 2 +- .../teardown/15_check_unregistered_node.yml | 2 +- .../teardown/90_teardown.yml | 8 ++++---- .../wired_dot1x_eap_tls_scep/05_create_pki.yml | 12 ++++++------ .../wired_dot1x_eap_tls_scep/10_enable_ocsp.yml | 4 ++-- .../45_create_eaptls_source.yml | 2 +- .../50_create_connection_profile.yml | 2 +- .../91_check_radius_audit_log.yml | 4 ++-- .../95_check_autoregister_node.yml | 2 +- .../teardown/15_check_unregistered_node.yml | 2 +- .../teardown/90_teardown.yml | 8 ++++---- .../wired_mac_auth/05_create_node01.yml | 4 ++-- .../10_create_connection_profile.yml | 2 +- .../wired_mac_auth/25_check_radius_audit_log.yml | 4 ++-- .../teardown/30_delete_connection_profile.yml | 2 +- .../wireless_dot1x_eap_peap/05_join_domain.yml | 8 ++++---- .../wireless_dot1x_eap_peap/07_create_realms.yml | 8 ++++---- .../15_create_and_test_ad_machine_source.yml | 4 ++-- .../20_create_and_test_ad_user_source.yml | 4 ++-- .../25_create_connection_profile.yml | 2 +- .../50_check_radius_audit_log.yml | 4 ++-- .../55_check_autoregister_node.yml | 2 +- .../teardown/15_check_unregistered_node.yml | 2 +- .../teardown/90_teardown.yml | 16 ++++++++-------- .../00_enable_wireless01_cleanup_task.yml | 4 ++-- .../wireless_mac_auth/05_create_wireless01.yml | 4 ++-- .../10_create_connection_profile.yml | 2 +- .../25_check_radius_audit_log.yml | 4 ++-- .../teardown/30_delete_connection_profile.yml | 2 +- 90 files changed, 177 insertions(+), 177 deletions(-) diff --git a/t/venom/pfservers/global_config_multi_tenant/05_modify_access_durations.yml b/t/venom/pfservers/global_config_multi_tenant/05_modify_access_durations.yml index 15c6c41c49bf..69293743ae6e 100644 --- a/t/venom/pfservers/global_config_multi_tenant/05_modify_access_durations.yml +++ b/t/venom/pfservers/global_config_multi_tenant/05_modify_access_durations.yml @@ -17,7 +17,7 @@ testcases: "default_access_duration": "{{.access_duration.default_choice}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: diff --git a/t/venom/pfservers/global_config_multi_tenant/10_create_roles.yml b/t/venom/pfservers/global_config_multi_tenant/10_create_roles.yml index 8d3ae42e1e22..751a86a3e11e 100644 --- a/t/venom/pfservers/global_config_multi_tenant/10_create_roles.yml +++ b/t/venom/pfservers/global_config_multi_tenant/10_create_roles.yml @@ -17,7 +17,7 @@ testcases: "notes":"{{.eap_peap.roles.ad_user.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: @@ -36,7 +36,7 @@ testcases: "notes":"{{.eap_peap.roles.ad_machine.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: @@ -55,7 +55,7 @@ testcases: "notes":"{{.mac_auth.roles.headless_device.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: @@ -74,7 +74,7 @@ testcases: "notes":"{{.wired_dot1x_eap_tls_manual.roles.dot1x_eap_tls.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: diff --git a/t/venom/pfservers/global_config_multi_tenant/15_create_network_devices.yml b/t/venom/pfservers/global_config_multi_tenant/15_create_network_devices.yml index bd7bb867d145..1fec6c9caf8f 100644 --- a/t/venom/pfservers/global_config_multi_tenant/15_create_network_devices.yml +++ b/t/venom/pfservers/global_config_multi_tenant/15_create_network_devices.yml @@ -120,7 +120,7 @@ testcases: "wsUser": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: @@ -143,7 +143,7 @@ testcases: "description": "{{.cumulus_switch.description}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: @@ -261,7 +261,7 @@ testcases: "wsUser": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: @@ -281,7 +281,7 @@ testcases: "description": "{{.wireless_switch.description}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: diff --git a/t/venom/pfservers/global_config_multi_tenant/20_configure_snat_interface.yml b/t/venom/pfservers/global_config_multi_tenant/20_configure_snat_interface.yml index 43f73645f3ef..032b2195dd31 100644 --- a/t/venom/pfservers/global_config_multi_tenant/20_configure_snat_interface.yml +++ b/t/venom/pfservers/global_config_multi_tenant/20_configure_snat_interface.yml @@ -24,7 +24,7 @@ testcases: "interfaceSNAT":"{{.get_name_of_dhcp_listener_int.dhcp_listener_interface}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: diff --git a/t/venom/pfservers/pfdhcplistener_multi_tenant/00_create_production_network.yml b/t/venom/pfservers/pfdhcplistener_multi_tenant/00_create_production_network.yml index e22377282621..6b4f7fde18ef 100644 --- a/t/venom/pfservers/pfdhcplistener_multi_tenant/00_create_production_network.yml +++ b/t/venom/pfservers/pfdhcplistener_multi_tenant/00_create_production_network.yml @@ -18,7 +18,7 @@ testcases: "id": "{{.pfdhcplistener_multi_tenant.production_network.subnet}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: diff --git a/t/venom/pfservers/pfdhcplistener_multi_tenant/05_forge_dhcp_request_to_create.yml b/t/venom/pfservers/pfdhcplistener_multi_tenant/05_forge_dhcp_request_to_create.yml index 7ac3e1c8e96a..d644efd84c1f 100644 --- a/t/venom/pfservers/pfdhcplistener_multi_tenant/05_forge_dhcp_request_to_create.yml +++ b/t/venom/pfservers/pfdhcplistener_multi_tenant/05_forge_dhcp_request_to_create.yml @@ -22,7 +22,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_multi_tenant.nodes.node11.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.tenant.id}}" assertions: @@ -38,7 +38,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/ip4logs/open/{{.pfdhcplistener_multi_tenant.nodes.node11.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.tenant.id}}" assertions: diff --git a/t/venom/pfservers/pfdhcplistener_multi_tenant/10_forge_dhcp_request_to_update.yml b/t/venom/pfservers/pfdhcplistener_multi_tenant/10_forge_dhcp_request_to_update.yml index 9b66c463258c..8e3f8effd362 100644 --- a/t/venom/pfservers/pfdhcplistener_multi_tenant/10_forge_dhcp_request_to_update.yml +++ b/t/venom/pfservers/pfdhcplistener_multi_tenant/10_forge_dhcp_request_to_update.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_multi_tenant.nodes.node11.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.tenant.id}}" assertions: @@ -40,7 +40,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_multi_tenant.nodes.node11.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.tenant.id}}" assertions: @@ -55,7 +55,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/ip4logs/open/{{.pfdhcplistener_multi_tenant.nodes.node11.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.tenant.id}}" assertions: diff --git a/t/venom/pfservers/pfdhcplistener_multi_tenant/teardown/00_delete_node11.yml b/t/venom/pfservers/pfdhcplistener_multi_tenant/teardown/00_delete_node11.yml index 36a3cafc6cb7..71dc561b4383 100644 --- a/t/venom/pfservers/pfdhcplistener_multi_tenant/teardown/00_delete_node11.yml +++ b/t/venom/pfservers/pfdhcplistener_multi_tenant/teardown/00_delete_node11.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_multi_tenant.nodes.node11.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.tenant.id}}" assertions: diff --git a/t/venom/pfservers/pfdhcplistener_multi_tenant/teardown/05_delete_production_network.yml b/t/venom/pfservers/pfdhcplistener_multi_tenant/teardown/05_delete_production_network.yml index dd061a46f45b..b9abe38c2692 100644 --- a/t/venom/pfservers/pfdhcplistener_multi_tenant/teardown/05_delete_production_network.yml +++ b/t/venom/pfservers/pfdhcplistener_multi_tenant/teardown/05_delete_production_network.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/routed_network/{{.pfdhcplistener_multi_tenant.production_network.subnet}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" "X-PacketFence-Tenant-Id": "{{.global_config_multi_tenant.global_tenant.id}}" assertions: diff --git a/t/venom/pfservers/pfdhcplistener_single_tenant/00_forge_dhcp_request_to_create.yml b/t/venom/pfservers/pfdhcplistener_single_tenant/00_forge_dhcp_request_to_create.yml index 99c9f0a76d7b..175571977b46 100644 --- a/t/venom/pfservers/pfdhcplistener_single_tenant/00_forge_dhcp_request_to_create.yml +++ b/t/venom/pfservers/pfdhcplistener_single_tenant/00_forge_dhcp_request_to_create.yml @@ -22,7 +22,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_single_tenant.nodes.node10.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -37,7 +37,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/ip4logs/open/{{.pfdhcplistener_single_tenant.nodes.node10.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/pfservers/pfdhcplistener_single_tenant/10_forge_dhcp_request_to_update.yml b/t/venom/pfservers/pfdhcplistener_single_tenant/10_forge_dhcp_request_to_update.yml index 0ed21e96eb41..30610357afba 100644 --- a/t/venom/pfservers/pfdhcplistener_single_tenant/10_forge_dhcp_request_to_update.yml +++ b/t/venom/pfservers/pfdhcplistener_single_tenant/10_forge_dhcp_request_to_update.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_single_tenant.nodes.node10.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -39,7 +39,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_single_tenant.nodes.node10.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -53,7 +53,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/ip4logs/open/{{.pfdhcplistener_single_tenant.nodes.node10.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/pfservers/pfdhcplistener_single_tenant/teardown/00_delete_node10.yml b/t/venom/pfservers/pfdhcplistener_single_tenant/teardown/00_delete_node10.yml index 278c2af4c857..9dce5b8093a8 100644 --- a/t/venom/pfservers/pfdhcplistener_single_tenant/teardown/00_delete_node10.yml +++ b/t/venom/pfservers/pfdhcplistener_single_tenant/teardown/00_delete_node10.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_single_tenant.nodes.node10.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/backup_db_and_restore/00_backup_db_and_restore.yml b/t/venom/test_suites/backup_db_and_restore/00_backup_db_and_restore.yml index 61264a1a8444..ea1c18641602 100644 --- a/t/venom/test_suites/backup_db_and_restore/00_backup_db_and_restore.yml +++ b/t/venom/test_suites/backup_db_and_restore/00_backup_db_and_restore.yml @@ -15,7 +15,7 @@ testcases: "pid": "{{.backup_db_and_restore.user}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -97,7 +97,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/backup_db_and_restore/teardown/00_teardown.yml b/t/venom/test_suites/backup_db_and_restore/teardown/00_teardown.yml index c9d094ac27a9..55f71bf1623c 100644 --- a/t/venom/test_suites/backup_db_and_restore/teardown/00_teardown.yml +++ b/t/venom/test_suites/backup_db_and_restore/teardown/00_teardown.yml @@ -16,7 +16,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/user/{{.backup_db_and_restore.user}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/captive_portal/10_create_connection_profile.yml b/t/venom/test_suites/captive_portal/10_create_connection_profile.yml index b50cb33e81e3..3b743b3e75f5 100644 --- a/t/venom/test_suites/captive_portal/10_create_connection_profile.yml +++ b/t/venom/test_suites/captive_portal/10_create_connection_profile.yml @@ -60,7 +60,7 @@ testcases: "vlan_pool_technique": "username_hash" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/captive_portal/25_check_radius_audit_log.yml b/t/venom/test_suites/captive_portal/25_check_radius_audit_log.yml index 700fd49f62c2..b4f20f3617a9 100644 --- a/t/venom/test_suites/captive_portal/25_check_radius_audit_log.yml +++ b/t/venom/test_suites/captive_portal/25_check_radius_audit_log.yml @@ -79,7 +79,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/radius_audit_log/{{.get_id_of_radius_audit_log_entry.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/captive_portal/teardown/30_delete_connection_profile.yml b/t/venom/test_suites/captive_portal/teardown/30_delete_connection_profile.yml index e6e06b4e3c2c..25dec6b1ac34 100644 --- a/t/venom/test_suites/captive_portal/teardown/30_delete_connection_profile.yml +++ b/t/venom/test_suites/captive_portal/teardown/30_delete_connection_profile.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/connection_profile/{{.captive_portal.profiles.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/check_node01_deleted.yml b/t/venom/test_suites/common/check_node01_deleted.yml index f15531c44196..1d656efe0a0a 100644 --- a/t/venom/test_suites/common/check_node01_deleted.yml +++ b/t/venom/test_suites/common/check_node01_deleted.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.node01_ens7_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 404 diff --git a/t/venom/test_suites/common/check_offline_status_node01.yml b/t/venom/test_suites/common/check_offline_status_node01.yml index 994424b0a502..5646c520d64b 100644 --- a/t/venom/test_suites/common/check_offline_status_node01.yml +++ b/t/venom/test_suites/common/check_offline_status_node01.yml @@ -34,7 +34,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/check_offline_status_wireless01.yml b/t/venom/test_suites/common/check_offline_status_wireless01.yml index 1d50105594f7..b7b109c139ea 100644 --- a/t/venom/test_suites/common/check_offline_status_wireless01.yml +++ b/t/venom/test_suites/common/check_offline_status_wireless01.yml @@ -34,7 +34,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/check_wireless01_deleted.yml b/t/venom/test_suites/common/check_wireless01_deleted.yml index f1a42b4ecce7..9b72f1add8a3 100644 --- a/t/venom/test_suites/common/check_wireless01_deleted.yml +++ b/t/venom/test_suites/common/check_wireless01_deleted.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.wireless01_wlan1_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 404 diff --git a/t/venom/test_suites/common/delete_node01.yml b/t/venom/test_suites/common/delete_node01.yml index d3d48f6bebf2..b5fd1625e9ed 100644 --- a/t/venom/test_suites/common/delete_node01.yml +++ b/t/venom/test_suites/common/delete_node01.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.node01_ens7_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/delete_wireless01.yml b/t/venom/test_suites/common/delete_wireless01.yml index feee2c472ec7..22c0080bc749 100644 --- a/t/venom/test_suites/common/delete_wireless01.yml +++ b/t/venom/test_suites/common/delete_wireless01.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.wireless01_wlan1_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/disable_node_cleanup_task.yml b/t/venom/test_suites/common/disable_node_cleanup_task.yml index faa5629fc986..6feb7cc28422 100644 --- a/t/venom/test_suites/common/disable_node_cleanup_task.yml +++ b/t/venom/test_suites/common/disable_node_cleanup_task.yml @@ -15,7 +15,7 @@ testcases: "status": "disabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -34,7 +34,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/enable_node_cleanup_task.yml b/t/venom/test_suites/common/enable_node_cleanup_task.yml index fa04a4079ae5..c044897b6b2c 100644 --- a/t/venom/test_suites/common/enable_node_cleanup_task.yml +++ b/t/venom/test_suites/common/enable_node_cleanup_task.yml @@ -15,7 +15,7 @@ testcases: "status": "enabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -34,7 +34,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/fix_permissions.yml b/t/venom/test_suites/common/fix_permissions.yml index 0ba95a8f3d4e..a7913b2b968a 100644 --- a/t/venom/test_suites/common/fix_permissions.yml +++ b/t/venom/test_suites/common/fix_permissions.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/fix_permissions' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/perform_checkup.yml b/t/venom/test_suites/common/perform_checkup.yml index 5ac43948863b..7845dff6156e 100644 --- a/t/venom/test_suites/common/perform_checkup.yml +++ b/t/venom/test_suites/common/perform_checkup.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/checkup' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/restart_haproxy_portal.yml b/t/venom/test_suites/common/restart_haproxy_portal.yml index b5022fb9e8d8..8bff9087723f 100644 --- a/t/venom/test_suites/common/restart_haproxy_portal.yml +++ b/t/venom/test_suites/common/restart_haproxy_portal.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/haproxy-portal/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/restart_iptables_service.yml b/t/venom/test_suites/common/restart_iptables_service.yml index 62235fe65b3b..b608c6e2234c 100644 --- a/t/venom/test_suites/common/restart_iptables_service.yml +++ b/t/venom/test_suites/common/restart_iptables_service.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/iptables/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/restart_pfcron_service.yml b/t/venom/test_suites/common/restart_pfcron_service.yml index 7627d0745d10..e76a57483714 100644 --- a/t/venom/test_suites/common/restart_pfcron_service.yml +++ b/t/venom/test_suites/common/restart_pfcron_service.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/pfcron/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/restart_pfdhcp_service.yml b/t/venom/test_suites/common/restart_pfdhcp_service.yml index 255fee4cd329..8b3cec82804f 100644 --- a/t/venom/test_suites/common/restart_pfdhcp_service.yml +++ b/t/venom/test_suites/common/restart_pfdhcp_service.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/pfdhcp/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/restart_pfdhcplistener_service.yml b/t/venom/test_suites/common/restart_pfdhcplistener_service.yml index f0becaae6adb..d9c00b1f15ea 100644 --- a/t/venom/test_suites/common/restart_pfdhcplistener_service.yml +++ b/t/venom/test_suites/common/restart_pfdhcplistener_service.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/pfdhcplistener/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/restart_pfdns.yml b/t/venom/test_suites/common/restart_pfdns.yml index 74c58bbd78e7..2475b9cc96ab 100644 --- a/t/venom/test_suites/common/restart_pfdns.yml +++ b/t/venom/test_suites/common/restart_pfdns.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/pfdns/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/restart_pfdns_service.yml b/t/venom/test_suites/common/restart_pfdns_service.yml index 74c58bbd78e7..2475b9cc96ab 100644 --- a/t/venom/test_suites/common/restart_pfdns_service.yml +++ b/t/venom/test_suites/common/restart_pfdns_service.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/pfdns/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/restart_radius_services.yml b/t/venom/test_suites/common/restart_radius_services.yml index ecff399158c1..8dbc968ab0b1 100644 --- a/t/venom/test_suites/common/restart_radius_services.yml +++ b/t/venom/test_suites/common/restart_radius_services.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/radiusd-auth/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -21,7 +21,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/service/pfacct/restart' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/unreg_node01.yml b/t/venom/test_suites/common/unreg_node01.yml index abc500efad06..a444e04ebe9c 100644 --- a/t/venom/test_suites/common/unreg_node01.yml +++ b/t/venom/test_suites/common/unreg_node01.yml @@ -15,7 +15,7 @@ testcases: "status": "unreg" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/common/unreg_wireless01.yml b/t/venom/test_suites/common/unreg_wireless01.yml index 811acbea1780..cbcae1bba6de 100644 --- a/t/venom/test_suites/common/unreg_wireless01.yml +++ b/t/venom/test_suites/common/unreg_wireless01.yml @@ -15,7 +15,7 @@ testcases: "status": "unreg" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/fingerbank_proxy/setup_proxy/setup_proxy.yml b/t/venom/test_suites/fingerbank_proxy/setup_proxy/setup_proxy.yml index 65daa5125226..859aebd1d995 100644 --- a/t/venom/test_suites/fingerbank_proxy/setup_proxy/setup_proxy.yml +++ b/t/venom/test_suites/fingerbank_proxy/setup_proxy/setup_proxy.yml @@ -18,7 +18,7 @@ testcases: "verify_ssl": "disabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/fingerbank_proxy/setup_proxy/teardown/teardown.yml b/t/venom/test_suites/fingerbank_proxy/setup_proxy/teardown/teardown.yml index 4cb06f63fcc8..b9e0d3b63340 100644 --- a/t/venom/test_suites/fingerbank_proxy/setup_proxy/teardown/teardown.yml +++ b/t/venom/test_suites/fingerbank_proxy/setup_proxy/teardown/teardown.yml @@ -18,7 +18,7 @@ testcases: "verify_ssl": "enabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/global_config/00_create_roles.yml b/t/venom/test_suites/global_config/00_create_roles.yml index 7f0c9447f703..1f92c851a9a6 100644 --- a/t/venom/test_suites/global_config/00_create_roles.yml +++ b/t/venom/test_suites/global_config/00_create_roles.yml @@ -17,7 +17,7 @@ testcases: "notes":"{{.eap_peap.roles.ad_user.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -35,7 +35,7 @@ testcases: "notes":"{{.eap_peap.roles.ad_machine.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -53,7 +53,7 @@ testcases: "notes":"{{.mac_auth.roles.headless_device.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -71,7 +71,7 @@ testcases: "notes":"{{.wired_dot1x_eap_tls_manual.roles.dot1x_eap_tls.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -89,7 +89,7 @@ testcases: "notes":"{{.wired_dot1x_eap_tls_scep.roles.dot1x_eap_tls.notes}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/global_config/05_modify_access_durations.yml b/t/venom/test_suites/global_config/05_modify_access_durations.yml index 13ff7410d89f..e8181e5ce41d 100644 --- a/t/venom/test_suites/global_config/05_modify_access_durations.yml +++ b/t/venom/test_suites/global_config/05_modify_access_durations.yml @@ -17,7 +17,7 @@ testcases: "default_access_duration": "{{.access_duration.default_choice}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/global_config/10_create_access_levels.yml b/t/venom/test_suites/global_config/10_create_access_levels.yml index dc96844f3d00..adbc552225d8 100644 --- a/t/venom/test_suites/global_config/10_create_access_levels.yml +++ b/t/venom/test_suites/global_config/10_create_access_levels.yml @@ -43,7 +43,7 @@ testcases: "id": "{{.access_level_user_and_node.id}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/global_config/15_create_network_devices.yml b/t/venom/test_suites/global_config/15_create_network_devices.yml index 1aec59ce68ac..f95111ef8397 100644 --- a/t/venom/test_suites/global_config/15_create_network_devices.yml +++ b/t/venom/test_suites/global_config/15_create_network_devices.yml @@ -123,7 +123,7 @@ testcases: "wsUser": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -141,7 +141,7 @@ testcases: "description": "{{.cumulus_switch.description}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -257,7 +257,7 @@ testcases: "wsUser": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -275,7 +275,7 @@ testcases: "description": "{{.wireless_switch.description}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/global_config/20_configure_snat_interface.yml b/t/venom/test_suites/global_config/20_configure_snat_interface.yml index ce94f27e89a3..e32c22caed1e 100644 --- a/t/venom/test_suites/global_config/20_configure_snat_interface.yml +++ b/t/venom/test_suites/global_config/20_configure_snat_interface.yml @@ -24,7 +24,7 @@ testcases: "interfaceSNAT":"{{.get_name_of_dhcp_listener_int.dhcp_listener_interface}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/global_teardown/00_teardown.yml b/t/venom/test_suites/global_teardown/00_teardown.yml index d2f851d0ab93..3c616a9fd533 100644 --- a/t/venom/test_suites/global_teardown/00_teardown.yml +++ b/t/venom/test_suites/global_teardown/00_teardown.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/admin_role/{{.access_level_user_and_node.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -23,7 +23,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/switch/{{.cumulus_switch.id1}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -35,7 +35,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/switch_group/{{.cumulus_switch_group.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -47,7 +47,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/switch/{{.wireless_switch.id1}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -59,7 +59,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/switch_group/{{.wireless_switch_group.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/pfdhcplistener_single_tenant/00_forge_dhcp_request_to_create.yml b/t/venom/test_suites/pfdhcplistener_single_tenant/00_forge_dhcp_request_to_create.yml index 823c8f78a4ca..34a81658bb9d 100644 --- a/t/venom/test_suites/pfdhcplistener_single_tenant/00_forge_dhcp_request_to_create.yml +++ b/t/venom/test_suites/pfdhcplistener_single_tenant/00_forge_dhcp_request_to_create.yml @@ -22,7 +22,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.pfdhcplistener_single_tenant.nodes.node10.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -37,7 +37,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/ip4logs/open/{{.pfdhcplistener_single_tenant.nodes.node10.mac_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/pfdhcplistener_single_tenant/teardown/teardown.yml b/t/venom/test_suites/pfdhcplistener_single_tenant/teardown/teardown.yml index 1adcd51a7f57..3ea4f3748e68 100644 --- a/t/venom/test_suites/pfdhcplistener_single_tenant/teardown/teardown.yml +++ b/t/venom/test_suites/pfdhcplistener_single_tenant/teardown/teardown.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/ip4log/{{.pfdhcplistener_single_tenant.nodes.node10.first_ip}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/05_join_domain.yml b/t/venom/test_suites/wired_dot1x_eap_peap/05_join_domain.yml index 41c223c42f90..688cdc44d06e 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/05_join_domain.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/05_join_domain.yml @@ -34,7 +34,7 @@ testcases: "workgroup": "{{.ad_domain_upper}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -52,7 +52,7 @@ testcases: "password": "{{.ad_domain_admin_password}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 202 @@ -65,7 +65,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/pfqueue/task/{{.join_domain.task_id}}/status/poll' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -83,7 +83,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/domain/{{.ad_domain_id}}/test_join' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/07_create_realms.yml b/t/venom/test_suites/wired_dot1x_eap_peap/07_create_realms.yml index 42c963e287dc..3bc8006fa038 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/07_create_realms.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/07_create_realms.yml @@ -33,7 +33,7 @@ testcases: "radius_strip_username": "enabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -65,7 +65,7 @@ testcases: "radius_strip_username": "enabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -81,7 +81,7 @@ testcases: "domain": "{{.ad_domain_id}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: "domain": "{{.ad_domain_id}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/15_create_and_test_ad_machine_source.yml b/t/venom/test_suites/wired_dot1x_eap_peap/15_create_and_test_ad_machine_source.yml index 80d46e889c4b..719856e92c85 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/15_create_and_test_ad_machine_source.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/15_create_and_test_ad_machine_source.yml @@ -60,7 +60,7 @@ testcases: "write_timeout": 5 } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -95,7 +95,7 @@ testcases: "write_timeout": 5 } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/20_create_and_test_ad_user_source.yml b/t/venom/test_suites/wired_dot1x_eap_peap/20_create_and_test_ad_user_source.yml index 64307de983ad..dbb254e82f89 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/20_create_and_test_ad_user_source.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/20_create_and_test_ad_user_source.yml @@ -60,7 +60,7 @@ testcases: "write_timeout": 5 } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -95,7 +95,7 @@ testcases: "write_timeout": 5 } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/25_create_connection_profile.yml b/t/venom/test_suites/wired_dot1x_eap_peap/25_create_connection_profile.yml index fc009a2df6bf..2c5d9ae82296 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/25_create_connection_profile.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/25_create_connection_profile.yml @@ -62,7 +62,7 @@ testcases: "vlan_pool_technique": "username_hash" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/55_check_radius_audit_log.yml b/t/venom/test_suites/wired_dot1x_eap_peap/55_check_radius_audit_log.yml index 45dfbcd4bd14..dd56b0d28ee7 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/55_check_radius_audit_log.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/55_check_radius_audit_log.yml @@ -79,7 +79,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/radius_audit_log/{{.get_id_of_radius_audit_log_entry.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/60_check_autoregister_node.yml b/t/venom/test_suites/wired_dot1x_eap_peap/60_check_autoregister_node.yml index 0d856fcae701..f90a838f4808 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/60_check_autoregister_node.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/60_check_autoregister_node.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.node01_ens7_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/teardown/15_check_unregistered_node.yml b/t/venom/test_suites/wired_dot1x_eap_peap/teardown/15_check_unregistered_node.yml index a805a6621edf..ea21ddc6234f 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/teardown/15_check_unregistered_node.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/teardown/15_check_unregistered_node.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.node01_ens7_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/teardown/90_teardown.yml b/t/venom/test_suites/wired_dot1x_eap_peap/teardown/90_teardown.yml index 88f0d2149991..3a5857f95a0a 100644 --- a/t/venom/test_suites/wired_dot1x_eap_peap/teardown/90_teardown.yml +++ b/t/venom/test_suites/wired_dot1x_eap_peap/teardown/90_teardown.yml @@ -15,7 +15,7 @@ testcases: "domain": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -29,7 +29,7 @@ testcases: "domain": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -41,7 +41,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/realm/{{.ad_domain_upper}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -51,7 +51,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/realm/{{.ad_dns_domain}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -63,7 +63,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/domain/{{.ad_domain_id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -75,7 +75,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/connection_profile/{{.dot1x_eap_peap.profiles.wired.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -87,7 +87,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/source/{{.dot1x_eap_peap.sources.ad_user.name}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -97,7 +97,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/source/{{.dot1x_eap_peap.sources.ad_machine.name}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/05_create_pki.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/05_create_pki.yml index 7cd1f2366518..bae458b16067 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/05_create_pki.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/05_create_pki.yml @@ -28,7 +28,7 @@ testcases: "ocsp_url": "{{.wired_dot1x_eap_tls_manual.certs.ocsp_url}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -61,7 +61,7 @@ testcases: "ocsp_url": "{{.wired_dot1x_eap_tls_manual.certs.ocsp_url}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -84,7 +84,7 @@ testcases: "ip_addresses": "{{.wired_dot1x_eap_tls_manual.certs.radius.ip_addresses}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -168,7 +168,7 @@ testcases: "ocsp_url": "{{.wired_dot1x_eap_tls_manual.certs.ocsp_url}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -191,7 +191,7 @@ testcases: "ip_addresses": "{{.wired_dot1x_eap_tls_manual.certs.http.ip_addresses}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -281,7 +281,7 @@ testcases: "scep_days_before_renewal": "{{.wired_dot1x_eap_tls_manual.certs.user.scep_days_before_renewal}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -302,7 +302,7 @@ testcases: "mail": "{{.wired_dot1x_eap_tls_manual.certs.user.mail}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/10_enable_ocsp.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/10_enable_ocsp.yml index 7cab8860dcda..9a2f804bdb07 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/10_enable_ocsp.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/10_enable_ocsp.yml @@ -21,7 +21,7 @@ testcases: "ocsp_use_nonce": "{{.wired_dot1x_eap_tls_manual.ocsp.use_nonce}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -38,7 +38,7 @@ testcases: "ocsp": "{{.wired_dot1x_eap_tls_manual.ocsp.id}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/45_create_eaptls_source.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/45_create_eaptls_source.yml index 7fb00c3fc52c..774a407e1199 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/45_create_eaptls_source.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/45_create_eaptls_source.yml @@ -44,7 +44,7 @@ testcases: "type": "EAPTLS" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/50_create_connection_profile.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/50_create_connection_profile.yml index cbeabf737910..522ab9fce227 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/50_create_connection_profile.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/50_create_connection_profile.yml @@ -61,7 +61,7 @@ testcases: "vlan_pool_technique": "username_hash" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/91_check_radius_audit_log.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/91_check_radius_audit_log.yml index a4f4152a5e9b..d0260b606051 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/91_check_radius_audit_log.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/91_check_radius_audit_log.yml @@ -79,7 +79,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/radius_audit_log/{{.get_id_of_radius_audit_log_entry.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/95_check_autoregister_node.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/95_check_autoregister_node.yml index 894f6672ea45..01da450882b4 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/95_check_autoregister_node.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/95_check_autoregister_node.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.node01_ens7_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/teardown/15_check_unregistered_node.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/teardown/15_check_unregistered_node.yml index a805a6621edf..ea21ddc6234f 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/teardown/15_check_unregistered_node.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/teardown/15_check_unregistered_node.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.node01_ens7_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/teardown/90_teardown.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/teardown/90_teardown.yml index e537554be66b..996bf4f26ab7 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/teardown/90_teardown.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/teardown/90_teardown.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/connection_profile/{{.wired_dot1x_eap_tls_manual.profiles.wired.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -23,7 +23,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/source/{{.wired_dot1x_eap_tls_manual.sources.eaptls.name}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -41,7 +41,7 @@ testcases: "ocsp": "default" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -53,7 +53,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/radiusd/ocsp_profile/{{.wired_dot1x_eap_tls_manual.ocsp.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/05_create_pki.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/05_create_pki.yml index 735adf6dc5a0..665f52e14010 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/05_create_pki.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/05_create_pki.yml @@ -28,7 +28,7 @@ testcases: "ocsp_url": "{{.wired_dot1x_eap_tls_scep.certs.ocsp_url}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -61,7 +61,7 @@ testcases: "ocsp_url": "{{.wired_dot1x_eap_tls_scep.certs.ocsp_url}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -84,7 +84,7 @@ testcases: "ip_addresses": "{{.wired_dot1x_eap_tls_scep.certs.radius.ip_addresses}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -168,7 +168,7 @@ testcases: "ocsp_url": "{{.wired_dot1x_eap_tls_scep.certs.ocsp_url}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -191,7 +191,7 @@ testcases: "ip_addresses": "{{.wired_dot1x_eap_tls_scep.certs.http.ip_addresses}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -281,7 +281,7 @@ testcases: "scep_days_before_renewal": "{{.wired_dot1x_eap_tls_scep.certs.user.scep_days_before_renewal}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/10_enable_ocsp.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/10_enable_ocsp.yml index 1840d314a107..454c39c4570d 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/10_enable_ocsp.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/10_enable_ocsp.yml @@ -21,7 +21,7 @@ testcases: "ocsp_use_nonce": "{{.wired_dot1x_eap_tls_scep.ocsp.use_nonce}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -38,7 +38,7 @@ testcases: "ocsp": "{{.wired_dot1x_eap_tls_scep.ocsp.id}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/45_create_eaptls_source.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/45_create_eaptls_source.yml index e6a22859a07f..39e51c84e846 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/45_create_eaptls_source.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/45_create_eaptls_source.yml @@ -44,7 +44,7 @@ testcases: "type": "EAPTLS" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/50_create_connection_profile.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/50_create_connection_profile.yml index a26cc9ef81ef..7f14a560e48a 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/50_create_connection_profile.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/50_create_connection_profile.yml @@ -61,7 +61,7 @@ testcases: "vlan_pool_technique": "username_hash" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/91_check_radius_audit_log.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/91_check_radius_audit_log.yml index 742b0da1e4e8..d7791d0ce160 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/91_check_radius_audit_log.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/91_check_radius_audit_log.yml @@ -79,7 +79,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/radius_audit_log/{{.get_id_of_radius_audit_log_entry.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/95_check_autoregister_node.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/95_check_autoregister_node.yml index 94c271d80f88..8aa72bb31fb8 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/95_check_autoregister_node.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/95_check_autoregister_node.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.node01_ens7_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/teardown/15_check_unregistered_node.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/teardown/15_check_unregistered_node.yml index a805a6621edf..ea21ddc6234f 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/teardown/15_check_unregistered_node.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/teardown/15_check_unregistered_node.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.node01_ens7_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/teardown/90_teardown.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/teardown/90_teardown.yml index 69871706cada..d66e8ef670dc 100644 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/teardown/90_teardown.yml +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/teardown/90_teardown.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/connection_profile/{{.wired_dot1x_eap_tls_scep.profiles.wired.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -23,7 +23,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/source/{{.wired_dot1x_eap_tls_scep.sources.eaptls.name}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -41,7 +41,7 @@ testcases: "ocsp": "default" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -53,7 +53,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/radiusd/ocsp_profile/{{.wired_dot1x_eap_tls_scep.ocsp.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_mac_auth/05_create_node01.yml b/t/venom/test_suites/wired_mac_auth/05_create_node01.yml index 8c886e548a7b..229554e3067a 100644 --- a/t/venom/test_suites/wired_mac_auth/05_create_node01.yml +++ b/t/venom/test_suites/wired_mac_auth/05_create_node01.yml @@ -34,7 +34,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -59,7 +59,7 @@ testcases: "unregdate": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wired_mac_auth/10_create_connection_profile.yml b/t/venom/test_suites/wired_mac_auth/10_create_connection_profile.yml index d750e8c77a0d..fb10f0fddd48 100644 --- a/t/venom/test_suites/wired_mac_auth/10_create_connection_profile.yml +++ b/t/venom/test_suites/wired_mac_auth/10_create_connection_profile.yml @@ -55,7 +55,7 @@ testcases: "vlan_pool_technique": "username_hash" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wired_mac_auth/25_check_radius_audit_log.yml b/t/venom/test_suites/wired_mac_auth/25_check_radius_audit_log.yml index a1afdeaca6c4..25f51a8c924d 100644 --- a/t/venom/test_suites/wired_mac_auth/25_check_radius_audit_log.yml +++ b/t/venom/test_suites/wired_mac_auth/25_check_radius_audit_log.yml @@ -79,7 +79,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/radius_audit_log/{{.get_id_of_radius_audit_log_entry.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wired_mac_auth/teardown/30_delete_connection_profile.yml b/t/venom/test_suites/wired_mac_auth/teardown/30_delete_connection_profile.yml index 9f0e2c8745e3..b3d259e9eec0 100644 --- a/t/venom/test_suites/wired_mac_auth/teardown/30_delete_connection_profile.yml +++ b/t/venom/test_suites/wired_mac_auth/teardown/30_delete_connection_profile.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/connection_profile/{{.wired_mac_auth.profiles.wired.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/05_join_domain.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/05_join_domain.yml index 41c223c42f90..688cdc44d06e 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/05_join_domain.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/05_join_domain.yml @@ -34,7 +34,7 @@ testcases: "workgroup": "{{.ad_domain_upper}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -52,7 +52,7 @@ testcases: "password": "{{.ad_domain_admin_password}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 202 @@ -65,7 +65,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/pfqueue/task/{{.join_domain.task_id}}/status/poll' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -83,7 +83,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/domain/{{.ad_domain_id}}/test_join' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/07_create_realms.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/07_create_realms.yml index 42c963e287dc..3bc8006fa038 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/07_create_realms.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/07_create_realms.yml @@ -33,7 +33,7 @@ testcases: "radius_strip_username": "enabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -65,7 +65,7 @@ testcases: "radius_strip_username": "enabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -81,7 +81,7 @@ testcases: "domain": "{{.ad_domain_id}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: "domain": "{{.ad_domain_id}}" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/15_create_and_test_ad_machine_source.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/15_create_and_test_ad_machine_source.yml index e8724a2cdc65..032163644821 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/15_create_and_test_ad_machine_source.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/15_create_and_test_ad_machine_source.yml @@ -60,7 +60,7 @@ testcases: "write_timeout": 5 } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -95,7 +95,7 @@ testcases: "write_timeout": 5 } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/20_create_and_test_ad_user_source.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/20_create_and_test_ad_user_source.yml index 8921df43622a..307a94dcecdb 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/20_create_and_test_ad_user_source.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/20_create_and_test_ad_user_source.yml @@ -60,7 +60,7 @@ testcases: "write_timeout": 5 } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 @@ -95,7 +95,7 @@ testcases: "write_timeout": 5 } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/25_create_connection_profile.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/25_create_connection_profile.yml index e849cae06523..38cc7069959c 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/25_create_connection_profile.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/25_create_connection_profile.yml @@ -62,7 +62,7 @@ testcases: "vlan_pool_technique": "username_hash" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/50_check_radius_audit_log.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/50_check_radius_audit_log.yml index 4892164e3c5c..f9cd762644fc 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/50_check_radius_audit_log.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/50_check_radius_audit_log.yml @@ -79,7 +79,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/radius_audit_log/{{.get_id_of_radius_audit_log_entry.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/55_check_autoregister_node.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/55_check_autoregister_node.yml index 592e6e429b06..5779e30f0334 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/55_check_autoregister_node.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/55_check_autoregister_node.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.wireless01_wlan1_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/teardown/15_check_unregistered_node.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/teardown/15_check_unregistered_node.yml index 52f47ac133e7..5a077707651d 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/teardown/15_check_unregistered_node.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/teardown/15_check_unregistered_node.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/node/{{.wireless01_wlan1_mac_address_url_encoded}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_dot1x_eap_peap/teardown/90_teardown.yml b/t/venom/test_suites/wireless_dot1x_eap_peap/teardown/90_teardown.yml index 29d094ece05f..1ef39380e6f2 100644 --- a/t/venom/test_suites/wireless_dot1x_eap_peap/teardown/90_teardown.yml +++ b/t/venom/test_suites/wireless_dot1x_eap_peap/teardown/90_teardown.yml @@ -15,7 +15,7 @@ testcases: "domain": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -29,7 +29,7 @@ testcases: "domain": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -41,7 +41,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/realm/{{.ad_domain_upper}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -51,7 +51,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/realm/{{.ad_dns_domain}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -63,7 +63,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/domain/{{.ad_domain_id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -75,7 +75,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/connection_profile/{{.wireless_dot1x_eap_peap.profiles.wireless.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -87,7 +87,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/source/{{.wireless_dot1x_eap_peap.sources.ad_user.name}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -97,7 +97,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/source/{{.wireless_dot1x_eap_peap.sources.ad_machine.name}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_mac_auth/00_enable_wireless01_cleanup_task.yml b/t/venom/test_suites/wireless_mac_auth/00_enable_wireless01_cleanup_task.yml index fa04a4079ae5..c044897b6b2c 100644 --- a/t/venom/test_suites/wireless_mac_auth/00_enable_wireless01_cleanup_task.yml +++ b/t/venom/test_suites/wireless_mac_auth/00_enable_wireless01_cleanup_task.yml @@ -15,7 +15,7 @@ testcases: "status": "enabled" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -34,7 +34,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_mac_auth/05_create_wireless01.yml b/t/venom/test_suites/wireless_mac_auth/05_create_wireless01.yml index 515016b6503f..f0b22ca4191e 100644 --- a/t/venom/test_suites/wireless_mac_auth/05_create_wireless01.yml +++ b/t/venom/test_suites/wireless_mac_auth/05_create_wireless01.yml @@ -34,7 +34,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -59,7 +59,7 @@ testcases: "unregdate": null } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wireless_mac_auth/10_create_connection_profile.yml b/t/venom/test_suites/wireless_mac_auth/10_create_connection_profile.yml index 4379cd4bba9b..166afd3dab11 100644 --- a/t/venom/test_suites/wireless_mac_auth/10_create_connection_profile.yml +++ b/t/venom/test_suites/wireless_mac_auth/10_create_connection_profile.yml @@ -55,7 +55,7 @@ testcases: "vlan_pool_technique": "username_hash" } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 201 diff --git a/t/venom/test_suites/wireless_mac_auth/25_check_radius_audit_log.yml b/t/venom/test_suites/wireless_mac_auth/25_check_radius_audit_log.yml index 8f4a3462bd00..6fd96de39525 100644 --- a/t/venom/test_suites/wireless_mac_auth/25_check_radius_audit_log.yml +++ b/t/venom/test_suites/wireless_mac_auth/25_check_radius_audit_log.yml @@ -79,7 +79,7 @@ testcases: } } headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 @@ -95,7 +95,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/radius_audit_log/{{.get_id_of_radius_audit_log_entry.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 diff --git a/t/venom/test_suites/wireless_mac_auth/teardown/30_delete_connection_profile.yml b/t/venom/test_suites/wireless_mac_auth/teardown/30_delete_connection_profile.yml index 40c6c3e0084c..1c4f8fd78f30 100644 --- a/t/venom/test_suites/wireless_mac_auth/teardown/30_delete_connection_profile.yml +++ b/t/venom/test_suites/wireless_mac_auth/teardown/30_delete_connection_profile.yml @@ -11,7 +11,7 @@ testcases: url: '{{.pfserver_webadmin_url}}/api/v1/config/connection_profile/{{.wireless_mac_auth.profiles.wireless.id}}' ignore_verify_ssl: true headers: - "Authorization": "{{.get_login_token.json.result.token}}" + "Authorization": "{{.get_login_token.result.token}}" "Content-Type": "application/json" assertions: - result.statuscode ShouldEqual 200 From 549a9bcba2b1af9a99435346c433afd2c679027c Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Wed, 22 Dec 2021 10:51:09 -0500 Subject: [PATCH 25/31] [Venom] Add absolute paths --- t/venom/vars/all.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/t/venom/vars/all.yml b/t/venom/vars/all.yml index cadfad23dc39..6adda6592319 100644 --- a/t/venom/vars/all.yml +++ b/t/venom/vars/all.yml @@ -3,8 +3,10 @@ # Global variables ################################################################################ # Variables assigned based on environment variables -switch_test_suite_dir: /usr/local/pf/t/venom/switches -nodes_test_suite_dir: /usr/local/pf/t/venom/test_suites/nodes +venom_dir: /usr/local/pf/t/venom +test_suites_dir: '{{.venom_dir}}/test_suites' +switch_test_suite_dir: '{{.venom_dir}}/switches' +nodes_test_suite_dir: '{{.test_suites_dir}}/nodes' # ssh executor variables ssh_user: vagrant From ae9b1c0f383e21a4db5aef45450bb6dd10a28f9b Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Wed, 22 Dec 2021 12:56:41 -0500 Subject: [PATCH 26/31] [Venom] fix issue with testing internet access from node1 --- t/venom/lib/check_host_internet_access.yml | 5 +++-- t/venom/test_suites/common/check_internet_access.yml | 2 +- .../wired_dot1x_eap_peap/70_check_internet_access.yml | 1 - .../wired_dot1x_eap_peap/70_node1_check_internet_access.yml | 5 +++++ .../wired_dot1x_eap_tls_manual/99_check_internet_access.yml | 1 - .../99_node1_check_internet_access.yml | 5 +++++ .../wired_dot1x_eap_tls_scep/99_check_internet_access.yml | 1 - .../99_node1_check_internet_access.yml | 5 +++++ .../test_suites/wired_mac_auth/40_check_internet_access.yml | 6 +++++- 9 files changed, 24 insertions(+), 7 deletions(-) delete mode 120000 t/venom/test_suites/wired_dot1x_eap_peap/70_check_internet_access.yml create mode 100644 t/venom/test_suites/wired_dot1x_eap_peap/70_node1_check_internet_access.yml delete mode 120000 t/venom/test_suites/wired_dot1x_eap_tls_manual/99_check_internet_access.yml create mode 100644 t/venom/test_suites/wired_dot1x_eap_tls_manual/99_node1_check_internet_access.yml delete mode 120000 t/venom/test_suites/wired_dot1x_eap_tls_scep/99_check_internet_access.yml create mode 100644 t/venom/test_suites/wired_dot1x_eap_tls_scep/99_node1_check_internet_access.yml mode change 120000 => 100644 t/venom/test_suites/wired_mac_auth/40_check_internet_access.yml diff --git a/t/venom/lib/check_host_internet_access.yml b/t/venom/lib/check_host_internet_access.yml index 6e9fe3985564..c5a0b8e34eda 100644 --- a/t/venom/lib/check_host_internet_access.yml +++ b/t/venom/lib/check_host_internet_access.yml @@ -1,4 +1,5 @@ executor: check_host_internet_access +# By default it will use the node1 input: host: "{{.node01_mgmt_ip}}" user: "{{.ssh_user}}" @@ -7,5 +8,5 @@ steps: host: '{{.input.host}}' user: '{{.input.user}}' command: | - cd /usr/local/pf/t/venom ; \ - sudo /usr/local/pf/t/venom/venom-wrapper.sh test_suite//common/check_internet_access.yml + cd '{{.venom_dir}}' ; \ + sudo '{{.venom_dir}}/venom-wrapper.sh' '{{.test_suites_dir}}/common/check_internet_access.yml' diff --git a/t/venom/test_suites/common/check_internet_access.yml b/t/venom/test_suites/common/check_internet_access.yml index f016a8c74285..8a87a9af9606 100644 --- a/t/venom/test_suites/common/check_internet_access.yml +++ b/t/venom/test_suites/common/check_internet_access.yml @@ -1,4 +1,4 @@ -name: Check Internet access +name: Check access internet testcases: - name: check_internet_access steps: diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/70_check_internet_access.yml b/t/venom/test_suites/wired_dot1x_eap_peap/70_check_internet_access.yml deleted file mode 120000 index f77d3de5caae..000000000000 --- a/t/venom/test_suites/wired_dot1x_eap_peap/70_check_internet_access.yml +++ /dev/null @@ -1 +0,0 @@ -../common/check_internet_access.yml \ No newline at end of file diff --git a/t/venom/test_suites/wired_dot1x_eap_peap/70_node1_check_internet_access.yml b/t/venom/test_suites/wired_dot1x_eap_peap/70_node1_check_internet_access.yml new file mode 100644 index 000000000000..b8c1434f6d75 --- /dev/null +++ b/t/venom/test_suites/wired_dot1x_eap_peap/70_node1_check_internet_access.yml @@ -0,0 +1,5 @@ +name: Check access internet on node01 +testcases: +- name: check_host_internet_access + steps: + - type: check_host_internet_access diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/99_check_internet_access.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/99_check_internet_access.yml deleted file mode 120000 index f77d3de5caae..000000000000 --- a/t/venom/test_suites/wired_dot1x_eap_tls_manual/99_check_internet_access.yml +++ /dev/null @@ -1 +0,0 @@ -../common/check_internet_access.yml \ No newline at end of file diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_manual/99_node1_check_internet_access.yml b/t/venom/test_suites/wired_dot1x_eap_tls_manual/99_node1_check_internet_access.yml new file mode 100644 index 000000000000..b8c1434f6d75 --- /dev/null +++ b/t/venom/test_suites/wired_dot1x_eap_tls_manual/99_node1_check_internet_access.yml @@ -0,0 +1,5 @@ +name: Check access internet on node01 +testcases: +- name: check_host_internet_access + steps: + - type: check_host_internet_access diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/99_check_internet_access.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/99_check_internet_access.yml deleted file mode 120000 index f77d3de5caae..000000000000 --- a/t/venom/test_suites/wired_dot1x_eap_tls_scep/99_check_internet_access.yml +++ /dev/null @@ -1 +0,0 @@ -../common/check_internet_access.yml \ No newline at end of file diff --git a/t/venom/test_suites/wired_dot1x_eap_tls_scep/99_node1_check_internet_access.yml b/t/venom/test_suites/wired_dot1x_eap_tls_scep/99_node1_check_internet_access.yml new file mode 100644 index 000000000000..b8c1434f6d75 --- /dev/null +++ b/t/venom/test_suites/wired_dot1x_eap_tls_scep/99_node1_check_internet_access.yml @@ -0,0 +1,5 @@ +name: Check access internet on node01 +testcases: +- name: check_host_internet_access + steps: + - type: check_host_internet_access diff --git a/t/venom/test_suites/wired_mac_auth/40_check_internet_access.yml b/t/venom/test_suites/wired_mac_auth/40_check_internet_access.yml deleted file mode 120000 index f77d3de5caae..000000000000 --- a/t/venom/test_suites/wired_mac_auth/40_check_internet_access.yml +++ /dev/null @@ -1 +0,0 @@ -../common/check_internet_access.yml \ No newline at end of file diff --git a/t/venom/test_suites/wired_mac_auth/40_check_internet_access.yml b/t/venom/test_suites/wired_mac_auth/40_check_internet_access.yml new file mode 100644 index 000000000000..b8c1434f6d75 --- /dev/null +++ b/t/venom/test_suites/wired_mac_auth/40_check_internet_access.yml @@ -0,0 +1,5 @@ +name: Check access internet on node01 +testcases: +- name: check_host_internet_access + steps: + - type: check_host_internet_access From e3edfe9a1c964414fb2c888e235b976e8a99aff0 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:19:11 -0500 Subject: [PATCH 27/31] [Venom] Fix issue when restart unit with test only --- .../inventory/group_vars/localdev/packetfence_install.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml b/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml index 73cc5fa4550e..c037adfb97df 100644 --- a/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml +++ b/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml @@ -1,5 +1,8 @@ --- packetfence_install__centos_release_rpm: "http://packetfence.org/downloads/PacketFence/RHEL8/packetfence-release-{{ pf_minor_release }}.el8.noarch.rpm" +packetfence_install__centos: + repos: + - packetfence-branches # override to installed test files packetfence_install__centos_packages: From ff0c71e9c8a24da7a02fbe39d55e5a5d642c348f Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Wed, 22 Dec 2021 14:37:06 -0500 Subject: [PATCH 28/31] [Venom] Add sleeping time after restart from API --- t/venom/lib/pf_api_service_disable.yml | 3 +++ t/venom/lib/pf_api_service_enable.yml | 3 +++ t/venom/lib/pf_api_service_restart.yml | 3 +++ t/venom/lib/pf_api_service_start.yml | 3 +++ 4 files changed, 12 insertions(+) diff --git a/t/venom/lib/pf_api_service_disable.yml b/t/venom/lib/pf_api_service_disable.yml index 4f470fd699d8..3f5eebc829c9 100644 --- a/t/venom/lib/pf_api_service_disable.yml +++ b/t/venom/lib/pf_api_service_disable.yml @@ -5,3 +5,6 @@ steps: - type: pf_api_service_action service: "{{.input.service}}" action: "disable" + +- type: sleep + time_to_sleep: 5 diff --git a/t/venom/lib/pf_api_service_enable.yml b/t/venom/lib/pf_api_service_enable.yml index 9acf8a864088..e5363f500d52 100644 --- a/t/venom/lib/pf_api_service_enable.yml +++ b/t/venom/lib/pf_api_service_enable.yml @@ -5,3 +5,6 @@ steps: - type: pf_api_service_action service: "{{.input.service}}" action: "enable" + +- type: sleep + time_to_sleep: 5 diff --git a/t/venom/lib/pf_api_service_restart.yml b/t/venom/lib/pf_api_service_restart.yml index ccb262cf8bbd..ddf281e642d2 100644 --- a/t/venom/lib/pf_api_service_restart.yml +++ b/t/venom/lib/pf_api_service_restart.yml @@ -5,3 +5,6 @@ steps: - type: pf_api_service_action service: "{{.input.service}}" action: "restart" + +- type: sleep + time_to_sleep: 5 diff --git a/t/venom/lib/pf_api_service_start.yml b/t/venom/lib/pf_api_service_start.yml index 9178d12f8b94..652ce717257d 100644 --- a/t/venom/lib/pf_api_service_start.yml +++ b/t/venom/lib/pf_api_service_start.yml @@ -5,3 +5,6 @@ steps: - type: pf_api_service_action service: "{{.input.service}}" action: "start" + +- type: sleep + time_to_sleep: 5 From a35a415fe09052e1793058c3fea26c4667c381fd Mon Sep 17 00:00:00 2001 From: nqb Date: Wed, 22 Dec 2021 21:50:04 +0100 Subject: [PATCH 29/31] use syntax compatible with EL8 and Debian 11 --- t/venom/venom-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/venom/venom-wrapper.sh b/t/venom/venom-wrapper.sh index f3cbfb84dc94..21ac2d1ee413 100755 --- a/t/venom/venom-wrapper.sh +++ b/t/venom/venom-wrapper.sh @@ -49,7 +49,7 @@ run_test_suites() { for test_suite in ${test_suites}; do # if it's a directory, we sort alphabetically files in it if [ -d "${test_suite}" ]; then - sorted_files=$(find ${test_suite} -maxdepth 1 -type f,l -name "*.yml" | sort) + sorted_files=$(find ${test_suite} -maxdepth 1 \( -type f -or -type l \) -and -name "*.yml" | sort) test_suites_files+=($sorted_files) else test_suites_files+=($test_suite) From 6524a295aa72d6428f4b1bf0b3403575a47eba41 Mon Sep 17 00:00:00 2001 From: jegoi <13801368+JeGoi@users.noreply.github.com> Date: Wed, 22 Dec 2021 16:26:20 -0500 Subject: [PATCH 30/31] [Venom] Revert modification for run_tests --- .../inventory/group_vars/localdev/packetfence_install.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml b/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml index c037adfb97df..73cc5fa4550e 100644 --- a/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml +++ b/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml @@ -1,8 +1,5 @@ --- packetfence_install__centos_release_rpm: "http://packetfence.org/downloads/PacketFence/RHEL8/packetfence-release-{{ pf_minor_release }}.el8.noarch.rpm" -packetfence_install__centos: - repos: - - packetfence-branches # override to installed test files packetfence_install__centos_packages: From 774fb22ffba4c011a22dfa09ec6a1521d4e76209 Mon Sep 17 00:00:00 2001 From: nqb Date: Wed, 22 Dec 2021 22:36:30 +0100 Subject: [PATCH 31/31] enforce default role values when role is not part of the play --- .../inventory/group_vars/localdev/packetfence_install.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml b/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml index 73cc5fa4550e..2498f3f7a0d2 100644 --- a/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml +++ b/addons/vagrant/inventory/group_vars/localdev/packetfence_install.yml @@ -1,6 +1,11 @@ --- packetfence_install__centos_release_rpm: "http://packetfence.org/downloads/PacketFence/RHEL8/packetfence-release-{{ pf_minor_release }}.el8.noarch.rpm" +# in localdev environment: we install from official repositories +packetfence_install__centos: + repos: + - packetfence + # override to installed test files packetfence_install__centos_packages: - packetfence