summaryrefslogtreecommitdiff
path: root/tests/test-flows.c
diff options
context:
space:
mode:
Diffstat (limited to 'tests/test-flows.c')
-rw-r--r--tests/test-flows.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/test-flows.c b/tests/test-flows.c
index 33417e021..a4d7c09e0 100644
--- a/tests/test-flows.c
+++ b/tests/test-flows.c
@@ -56,7 +56,7 @@ main(int argc OVS_UNUSED, char *argv[])
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
struct ofp10_match extracted_match;
- struct cls_rule rule;
+ struct match match;
struct flow flow;
n++;
@@ -69,8 +69,8 @@ main(int argc OVS_UNUSED, char *argv[])
}
flow_extract(packet, 0, 0, 1, &flow);
- cls_rule_init_exact(&flow, 0, &rule);
- ofputil_cls_rule_to_ofp10_match(&rule, &extracted_match);
+ match_init_exact(&match, &flow);
+ ofputil_match_to_ofp10_match(&match, &extracted_match);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
char *exp_s = ofp10_match_to_string(&expected_match, 2);
@@ -80,7 +80,7 @@ main(int argc OVS_UNUSED, char *argv[])
printf("Packet:\n");
ofp_print_packet(stdout, packet->data, packet->size);
ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
- cls_rule_print(&rule);
+ match_print(&match);
printf("Expected flow:\n%s\n", exp_s);
printf("Actually extracted flow:\n%s\n", got_s);
ovs_hex_dump(stdout, &expected_match, sizeof expected_match, 0, false);