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

[vstest/acl table] Fix ports field in acl table creation #2030

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion tests/test_acl_portchannel.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def create_acl_table(self, dvs, table_name, ports):
tbl = swsscommon.Table(self.cdb, "ACL_TABLE")
fvs = swsscommon.FieldValuePairs([("POLICY_DESC", "LAG_ACL_TEST"),
("TYPE", "L3"),
("PORTS", ports)])
("PORTS@", ports)])
tbl.set(table_name, fvs)
time.sleep(1)

Expand Down
4 changes: 2 additions & 2 deletions tests/test_crm.py
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ def test_CrmAcl(self, dvs, testlog):

# create ACL table
ttbl = swsscommon.Table(db, "ACL_TABLE")
fvs = swsscommon.FieldValuePairs([("policy_desc", "test"), ("type", "L3"), ("ports", ",".join(bind_ports))])
fvs = swsscommon.FieldValuePairs([("policy_desc", "test"), ("type", "L3"), ("ports@", ",".join(bind_ports))])
ttbl.set("test", fvs)

# create ACL rule
Expand Down Expand Up @@ -687,7 +687,7 @@ def test_CrmAclGroup(self, dvs, testlog):

# create ACL table
tbl = swsscommon.Table(db, "ACL_TABLE")
fvs = swsscommon.FieldValuePairs([("policy_desc", "testv6"), ("type", "L3V6"), ("ports", ",".join(bind_ports))])
fvs = swsscommon.FieldValuePairs([("policy_desc", "testv6"), ("type", "L3V6"), ("ports@", ",".join(bind_ports))])
tbl.set("test-aclv6", fvs)

time.sleep(2)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_mirror.py
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ def create_acl_table(self, table, interfaces):
tbl = swsscommon.Table(self.cdb, "ACL_TABLE")
fvs = swsscommon.FieldValuePairs([("policy_desc", "mirror_test"),
("type", "mirror"),
("ports", ",".join(interfaces))])
("ports@", ",".join(interfaces))])
tbl.set(table, fvs)
time.sleep(1)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_mirror_ipv6_combined.py
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def create_acl_table(self, table, interfaces, type):
tbl = swsscommon.Table(self.cdb, "ACL_TABLE")
fvs = swsscommon.FieldValuePairs([("policy_desc", "mirror_test"),
("type", type),
("ports", ",".join(interfaces))])
("ports@", ",".join(interfaces))])
tbl.set(table, fvs)
time.sleep(1)

Expand Down
2 changes: 1 addition & 1 deletion tests/test_mirror_ipv6_separate.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def get_mirror_session_state(self, name):
def create_acl_table(self, table, interfaces, type, stage=None):
attrs = [("policy_desc", "mirror_test"),
("type", type),
("ports", ",".join(interfaces))]
("ports@", ",".join(interfaces))]
if stage:
attrs.append(("stage", stage))

Expand Down
2 changes: 1 addition & 1 deletion tests/test_mirror_policer.py
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def create_acl_table(self, table, interfaces):
tbl = swsscommon.Table(self.cdb, "ACL_TABLE")
fvs = swsscommon.FieldValuePairs([("policy_desc", "mirror_test"),
("type", "mirror"),
("ports", ",".join(interfaces))])
("ports@", ",".join(interfaces))])
tbl.set(table, fvs)
time.sleep(1)

Expand Down