Skip to content

Update CRM test to handle acl counter on different platforms. #983

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
prsunny merged 2 commits into from
Jul 2, 2019
Merged

Update CRM test to handle acl counter on different platforms. #983

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
972f7e5
Update CRM test to handle acl counter on different platforms.
iris00522 Jul 1, 2019
7a7d576
Add test case : Verify "crm_stats_acl_counter_available" counter was …
iris00522 Jul 2, 2019
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
10 changes: 9 additions & 1 deletion ansible/roles/test/tasks/crm/crm_test_acl_counter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
- name: Copy ACL JSON config to switch.
copy: src=roles/test/tasks/crm/acl.json dest=/tmp

- name: Get original "crm_stats_acl_counter_available" counter value
command: docker exec -i database redis-cli -n 2 HGET {{acl_tbl_key}} crm_stats_acl_counter_available
register: out
- set_fact: original_crm_stats_acl_counter_available={{out.stdout}}

- name: Add ACL
command: acl-loader update full /tmp/acl.json
become: yes
Expand Down Expand Up @@ -76,4 +81,7 @@
assert: {that: "{{new_crm_stats_acl_counter_used|int - crm_stats_acl_counter_used|int == 0}}"}

- name: Verify "crm_stats_acl_counter_available" counter was incremented
assert: {that: "{{new_crm_stats_acl_counter_available|int - crm_stats_acl_counter_available|int == 0}}"}
assert: {that: "{{new_crm_stats_acl_counter_available|int - crm_stats_acl_counter_available|int >= 0}}"}
Copy link
Contributor

@prsunny prsunny Jul 1, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agree that this is different for certain platforms. But we may want this to be counted properly. How about checking the available counter before add, after add and after delete? Essentially the number of resources that was taken during add, the same must be released after delete leaving this check as it is.

Copy link
Contributor Author

@iris00522 iris00522 Jul 2, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@prsunny
I add the test case to check the available counter before add and after delete.
Please review again.


- name: Verify "crm_stats_acl_counter_available" counter was equal to original value
assert: {that: "{{original_crm_stats_acl_counter_available|int - new_crm_stats_acl_counter_available|int == 0}}"}