Skip to content

Fixed acltb test failure due to conflict with the acl input test #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oleksandrivantsiv merged 1 commit into from
Apr 27, 2017
Merged

Fixed acltb test failure due to conflict with the acl input test #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ansible/roles/test/tasks/acltb_cleanup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
test_expect_file: acltb_expect_messages.txt
match_file: loganalyzer_common_match.txt
ignore_file: loganalyzer_common_ignore.txt
tests_location: "{{ 'roles/test/tasks' }}"

# Separate set_fact is required to be able to use 'testname' fact.
- set_fact:
Expand Down Expand Up @@ -62,6 +61,8 @@
- "{{ acltb_configs }}"

- include: roles/test/files/tools/loganalyzer/loganalyzer_init.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"

- block:
- name: Apply ACL delete configuration
Expand All @@ -70,6 +71,8 @@
- "{{ acltb_configs }}"
always:
- include: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"

# Output content of result files to ansible console
- shell: cat {{ test_out_dir }}/*
Expand All @@ -85,3 +88,5 @@
when: errors_found.stdout != "0"

- include: roles/test/files/tools/loganalyzer/loganalyzer_end.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"
7 changes: 6 additions & 1 deletion ansible/roles/test/tasks/acltb_configure.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
test_expect_file: acltb_expect_messages.txt
match_file: loganalyzer_common_match.txt
ignore_file: loganalyzer_common_ignore.txt
tests_location: "{{ 'roles/test/tasks' }}"

# Separate set_fact is required to be able to use 'testname' fact.
- set_fact:
Expand Down Expand Up @@ -57,6 +56,8 @@
- "{{ acltb_configs }}"

- include: roles/test/files/tools/loganalyzer/loganalyzer_init.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"

- block:
- name: Apply ACL configuration
Expand All @@ -65,6 +66,8 @@
- "{{ acltb_configs }}"
always:
- include: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"

# Output content of result files to ansible console
- shell: cat {{ test_out_dir }}/*
Expand All @@ -80,3 +83,5 @@
when: errors_found.stdout != "0"

- include: roles/test/files/tools/loganalyzer/loganalyzer_end.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"
7 changes: 6 additions & 1 deletion ansible/roles/test/tasks/acltb_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
test_expect_file: acltb_expect_messages.txt
match_file: loganalyzer_common_match.txt
ignore_file: loganalyzer_common_ignore.txt
tests_location: "{{ 'roles/test/tasks' }}"

# Separate set_fact is required to be able to use 'testname' fact.
- set_fact:
Expand All @@ -62,6 +61,8 @@
delegate_to: "{{ ptf_host }}"

- include: roles/test/files/tools/loganalyzer/loganalyzer_init.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"

# Run the ACL PTF test
- block:
Expand All @@ -79,6 +80,8 @@

always:
- include: roles/test/files/tools/loganalyzer/loganalyzer_analyze.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"

# Output content of result files to ansible console
- shell: cat {{ test_out_dir }}/*
Expand All @@ -94,3 +97,5 @@
when: errors_found.stdout != "0"

- include: roles/test/files/tools/loganalyzer/loganalyzer_end.yml
vars:
tests_location: "{{ 'roles/test/tasks' }}"