Skip to content

New Testcase - No stale entry when replacing ACL #523

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

Closed
Anandaraj-Maharajan wants to merge 1 commit into from
Closed

New Testcase - No stale entry when replacing ACL #523

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
64 changes: 62 additions & 2 deletions ansible/roles/test/tasks/acl/acltb_test_rules_part_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
},
"ip": {
"config": {
"source-ip-address": "10.0.0.2/32"
"source-ip-address": "21.0.0.0/8"
}
}
},
Expand All @@ -31,7 +31,7 @@
},
"ip": {
"config": {
"destination-ip-address": "192.168.0.16/32"
"destination-ip-address": "104.146.32.0/19"
}
}
},
Expand All @@ -50,6 +50,66 @@
}
}
},
"4": {
"actions": {
"config": {
"forwarding-action": "ACCEPT"
}
},
"config": {
"sequence-id": 4
},
"ip": {
"config": {
"source-ip-address": "23.103.0.0/18"
}
}
},
"5": {
"actions": {
"config": {
"forwarding-action": "ACCEPT"
}
},
"config": {
"sequence-id": 5
},
"ip": {
"config": {
"source-ip-address": "104.44.94.0/23"
}
}
},
"6": {
"actions": {
"config": {
"forwarding-action": "ACCEPT"
}
},
"config": {
"sequence-id": 6
},
"ip": {
"config": {
"destination-ip-address": "100.64.0.0/10"
}
}
},
"7": {
"actions": {
"config": {
"forwarding-action": "ACCEPT"
}
},
"config": {
"sequence-id": 7
},
"ip": {
"config": {
"destination-ip-address": "172.16.0.0/12"
}
}
},
"13": {
"actions": {
"config": {
Expand Down
92 changes: 90 additions & 2 deletions ansible/roles/test/tasks/acltb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
copy: src=roles/test/files/ptftests
dest=/root
delegate_to: "{{ ptf_host }}"

- name: Run the test
include: ptf_runner.yml
vars:
Expand All @@ -82,12 +82,100 @@
errors_expected: false
include: roles/test/tasks/run_command_with_log_analyzer.yml

- name: Apply part 2 of ACL rules.
- name: Apply part 2 of ACL rules
vars:
command_to_run: "acl-loader update incremental /tmp/acltb_test_rules_part_2.json"
errors_expected: false
include: roles/test/tasks/run_command_with_log_analyzer.yml

- name: Get ACL entry keys in ConfDB
command: bash -c "docker exec -i database redis-cli --raw -n 4 KEYS '*ACL_RULE*'"
register: keys
- set_fact: acl_tbl_confdb_keys={{keys.stdout.split()}}

- name: Collect ConfDB ACL entries based on the ACL entry keys
command: bash -c "docker exec -i database redis-cli -n 4 HGETALL '{{item}}'"
register: confDBentries
with_items: "{{acl_tbl_confdb_keys}}"

- name: Extract the stdout values and store in a register
set_fact:
rule: "{{item.stdout}}"
with_items: "{{confDBentries.results}}"
register: rules

- name: Make a list of rules with qualifiers & actions
set_fact:
acl: "{{ rules.results | map(attribute='ansible_facts.rule') | list }}"

- name: Join the acl entries for comparison
set_fact:
entries: "{{acl | join(' ')}}"

- name: Verify the acltb_test_rules_part_1 are not present in ConfDB
assert:
that:
- "'FORWARD\nSRC_IP\n21.0.0.0/8' not in entries"
- "'FORWARD\nDST_IP\n104.146.32.0/19' not in entries"
- "'FORWARD\nSRC_IP\n23.103.0.0/18' not in entries"
- "'FORWARD\nSRC_IP\n104.44.94.0/23' not in entries"
- "'FORWARD\nDST_IP\n100.64.0.0/10' not in entries"
- "'FORWARD\nDST_IP\n172.16.0.0/12' not in entries"
msg: Mismatch in ACL loaded via acl-loader JSON file Vs ConfDB

- name: Get ACL entry keys in ASICDB
command: bash -c "docker exec -i database redis-cli --raw -n 1 KEYS '*SAI_OBJECT_TYPE_ACL_ENTRY*'"
register: mask
- set_fact: acl_tbl_asicdb_keys={{mask.stdout.split()}}

- name: Collect ASICDB ACL entries based on the ACL entry keys
command: bash -c "docker exec -i database redis-cli -n 1 HGETALL {{item}}"
register: asicDBentries
with_items: "{{acl_tbl_asicdb_keys}}"

- name: Extract the stdout values and store in a register
set_fact:
rule: "{{item.stdout}}"
with_items: "{{asicDBentries.results}}"
register: rules

- name: Make a list of rules with qualifiers & actions
set_fact:
acl: "{{ rules.results | map(attribute='ansible_facts.rule') | list }}"

- name: Join the acl entries for comparison
set_fact:
entries: "{{acl | join(' ')}}"

- name: Verify the acltb_test_rules_part_1 are not present in ASICDB
assert:
that:
- >
"'SAI_ACL_ENTRY_ATTR_FIELD_SRC_IP\n21.0.0.0&mask:255.0.0.0\n
SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION\nSAI_PACKET_ACTION_FORWARD'
not in entries"
- >
"'SAI_ACL_ENTRY_ATTR_FIELD_DST_IP\n104.146.32.0&mask:255.255.224.0\n
SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION\nSAI_PACKET_ACTION_FORWARD'
not in entries"
- >
"'SAI_ACL_ENTRY_ATTR_FIELD_SRC_IP\n23.103.0.0&mask:255.255.192.0\n
SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION\nSAI_PACKET_ACTION_FORWARD'
not in entries"
- >
"'SAI_ACL_ENTRY_ATTR_FIELD_SRC_IP\n104.44.94.0&mask:255.255.254.0\n
SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION\nSAI_PACKET_ACTION_FORWARD'
not in entries"
- >
"'SAI_ACL_ENTRY_ATTR_FIELD_DST_IP\n100.64.0.0&mask:255.192.0.0\n
SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION\nSAI_PACKET_ACTION_FORWARD'
not in entries"
- >
"'SAI_ACL_ENTRY_ATTR_FIELD_DST_IP\n172.16.0.0&mask:255.240.0.0\n
SAI_ACL_ENTRY_ATTR_ACTION_PACKET_ACTION\nSAI_PACKET_ACTION_FORWARD'
not in entries"
msg: Mismatch in ACL loaded via acl-loader JSON file Vs ASICDB

- name: Run the test
include: ptf_runner.yml
vars:
Expand Down