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
Prepare for post-2.2.0 (2.2.90).
[sliver-openvswitch.git]
/
tests
/
test-flows.c
diff --git
a/tests/test-flows.c
b/tests/test-flows.c
index
451ca1a
..
522fa44
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, 2013, 2014 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.
@@
-19,28
+19,29
@@
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
+#include "classifier.h"
#include "openflow/openflow.h"
#include "timeval.h"
#include "ofpbuf.h"
#include "ofp-print.h"
#include "openflow/openflow.h"
#include "timeval.h"
#include "ofpbuf.h"
#include "ofp-print.h"
-#include "pcap.h"
+#include "ofp-util.h"
+#include "pcap-file.h"
#include "util.h"
#include "vlog.h"
#include "util.h"
#include "vlog.h"
+#include "ovstest.h"
#undef NDEBUG
#include <assert.h>
#undef NDEBUG
#include <assert.h>
-int
-
main(int argc OVS_UNUSED, char *argv[]
)
+static void
+
test_flows_main(int argc OVS_UNUSED, char *argv[] OVS_UNUSED
)
{
{
- struct ofp_match expected_match;
+ struct ofp
10
_match expected_match;
FILE *flows, *pcap;
int retval;
int n = 0, errors = 0;
set_program_name(argv[0]);
FILE *flows, *pcap;
int retval;
int n = 0, errors = 0;
set_program_name(argv[0]);
- time_init();
- vlog_init();
flows = stdin;
pcap = fdopen(3, "rb");
flows = stdin;
pcap = fdopen(3, "rb");
@@
-48,37
+49,44
@@
main(int argc OVS_UNUSED, char *argv[])
ovs_fatal(errno, "failed to open fd 3 for reading");
}
ovs_fatal(errno, "failed to open fd 3 for reading");
}
- retval = pcap_read_header(pcap);
+ retval =
ovs_
pcap_read_header(pcap);
if (retval) {
ovs_fatal(retval > 0 ? retval : 0, "reading pcap header failed");
}
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
if (retval) {
ovs_fatal(retval > 0 ? retval : 0, "reading pcap header failed");
}
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
- struct ofp_match extracted_match;
-
flow_t flow
;
-
+ struct ofp
10
_match extracted_match;
+
struct match match
;
+ struct flow flow;
n++;
n++;
- retval =
pcap_read(pcap, &packet
);
+ retval =
ovs_pcap_read(pcap, &packet, NULL
);
if (retval == EOF) {
ovs_fatal(0, "unexpected end of file reading pcap file");
} else if (retval) {
ovs_fatal(retval, "error reading pcap file");
}
if (retval == EOF) {
ovs_fatal(0, "unexpected end of file reading pcap file");
} else if (retval) {
ovs_fatal(retval, "error reading pcap file");
}
- flow_extract(packet, 1, &flow);
- flow_to_match(&flow, 0, &extracted_match);
+ flow_extract(packet, NULL, &flow);
+ flow.in_port.ofp_port = u16_to_ofp(1);
+
+ match_wc_init(&match, &flow);
+ ofputil_match_to_ofp10_match(&match, &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, ofpbuf_data(packet), ofpbuf_size(packet));
+ ovs_hex_dump(stdout, ofpbuf_data(packet), ofpbuf_size(packet), 0, true);
+ match_print(&match);
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);
@@
-87,6
+95,7
@@
main(int argc OVS_UNUSED, char *argv[])
ofpbuf_delete(packet);
}
printf("checked %d packets, %d errors\n", n, errors);
ofpbuf_delete(packet);
}
printf("checked %d packets, %d errors\n", n, errors);
-
return errors != 0
;
+
exit(errors != 0)
;
}
}
+OVSTEST_REGISTER("test-flows", test_flows_main);