git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make the location of the database separately configurable.
[sliver-openvswitch.git]
/
tests
/
test-flows.c
diff --git
a/tests/test-flows.c
b/tests/test-flows.c
index
2edfa35
..
33417e0
100644
(file)
--- a/
tests/test-flows.c
+++ b/
tests/test-flows.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009, 2010
Nicira Networks
.
+ * Copyright (c) 2009, 2010
, 2011, 2012 Nicira, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-35,7
+35,7
@@
int
main(int argc OVS_UNUSED, char *argv[])
{
int
main(int argc OVS_UNUSED, char *argv[])
{
- struct ofp_match expected_match;
+ struct ofp
10
_match expected_match;
FILE *flows, *pcap;
int retval;
int n = 0, errors = 0;
FILE *flows, *pcap;
int retval;
int n = 0, errors = 0;
@@
-55,7
+55,7
@@
main(int argc OVS_UNUSED, char *argv[])
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
- struct ofp_match extracted_match;
+ struct ofp
10
_match extracted_match;
struct cls_rule rule;
struct flow flow;
struct cls_rule rule;
struct flow flow;
@@
-68,21
+68,23
@@
main(int argc OVS_UNUSED, char *argv[])
ovs_fatal(retval, "error reading pcap file");
}
ovs_fatal(retval, "error reading pcap file");
}
- flow_extract(packet, 0, 1, &flow);
+ flow_extract(packet, 0,
0,
1, &flow);
cls_rule_init_exact(&flow, 0, &rule);
cls_rule_init_exact(&flow, 0, &rule);
- ofputil_cls_rule_to_match(&rule, NXFF_OPENFLOW10, &extracted_match,
- 0, NULL);
+ ofputil_cls_rule_to_ofp10_match(&rule, &extracted_match);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
- char *exp_s = ofp_match_to_string(&expected_match, 2);
- char *got_s = ofp_match_to_string(&extracted_match, 2);
+ char *exp_s = ofp
10
_match_to_string(&expected_match, 2);
+ char *got_s = ofp
10
_match_to_string(&extracted_match, 2);
errors++;
printf("mismatch on packet #%d (1-based).\n", n);
printf("Packet:\n");
errors++;
printf("mismatch on packet #%d (1-based).\n", n);
printf("Packet:\n");
- ofp_print_packet(stdout, packet->data, packet->size
, packet->size
);
+ ofp_print_packet(stdout, packet->data, packet->size);
ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
+ cls_rule_print(&rule);
printf("Expected flow:\n%s\n", exp_s);
printf("Actually extracted flow:\n%s\n", got_s);
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);
+ ovs_hex_dump(stdout, &extracted_match, sizeof extracted_match, 0, false);
printf("\n");
free(exp_s);
free(got_s);
printf("\n");
free(exp_s);
free(got_s);