Skip to content
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.

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

Add drop cache when change nodes state #1947

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 3 additions & 2 deletions src/assisted_test_infra/test_infra/controllers/iptables.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@ def insert(self) -> None:
utils.run_command(insert_rule, shell=True)

def delete(self) -> None:
if self._does_rule_exist():
delete_rule = self._build_command_string(IpTableCommandOption.DELETE)
delete_rule = self._build_command_string(IpTableCommandOption.DELETE)
# delete duplicate rules - iptable deletes only first hit
while self._does_rule_exist():
log.info(f"Removing iptable rule: {delete_rule}")
utils.run_command(delete_rule, shell=True)
16 changes: 13 additions & 3 deletions src/tests/base_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -648,9 +648,19 @@ def set_iptables_rules_for_nodes(
log.info(f"Given node ips: {given_node_ips}")

for _rule in iptables_rules:
_rule.add_sources(given_node_ips)
rules.append(_rule)
_rule.insert()
if not given_node_ips:
# in case a rule without given_node_ips
rules.append(_rule)
_rule.insert()
continue
for source in given_node_ips:
# iptables check broken for list of sources
# copy base rule and add a single source.
copy_rule = deepcopy(_rule)
copy_rule.add_sources([source])
log.info(f"Adding rule with source: {copy_rule}")
rules.append(copy_rule)
copy_rule.insert()

yield set_iptables_rules_for_nodes
log.info("---TEARDOWN iptables ---")
Expand Down