projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bridge: Always wait for MAC learning table and ports.
[openvswitch]
/
tests
/
test-flows.c
diff --git
a/tests/test-flows.c
b/tests/test-flows.c
index 6e0b773670db02ef7597186d3e4f996f8fca5e00..2edfa35fe53588f5cc93159fd0c3970406390a66 100644
(file)
--- a/
tests/test-flows.c
+++ b/
tests/test-flows.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2009 Nicira Networks.
+ * Copyright (c) 2009
, 2010
Nicira Networks.
*
* 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,10
+19,12
@@
#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 "ofp-util.h"
#include "pcap.h"
#include "util.h"
#include "vlog.h"
#include "pcap.h"
#include "util.h"
#include "vlog.h"
@@
-31,7
+33,7
@@
#include <assert.h>
int
#include <assert.h>
int
-main(int argc UNUSED, char *argv[])
+main(int argc
OVS_
UNUSED, char *argv[])
{
struct ofp_match expected_match;
FILE *flows, *pcap;
{
struct ofp_match expected_match;
FILE *flows, *pcap;
@@
-39,8
+41,6
@@
main(int argc UNUSED, char *argv[])
int n = 0, errors = 0;
set_program_name(argv[0]);
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");
@@
-56,7
+56,8
@@
main(int argc UNUSED, char *argv[])
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
struct ofp_match extracted_match;
while (fread(&expected_match, sizeof expected_match, 1, flows)) {
struct ofpbuf *packet;
struct ofp_match extracted_match;
- flow_t flow;
+ struct cls_rule rule;
+ struct flow flow;
n++;
n++;
@@
-67,8
+68,10
@@
main(int argc UNUSED, char *argv[])
ovs_fatal(retval, "error reading pcap file");
}
ovs_fatal(retval, "error reading pcap file");
}
- flow_extract(packet, 1, &flow);
- flow_to_match(&flow, 0, &extracted_match);
+ flow_extract(packet, 0, 1, &flow);
+ cls_rule_init_exact(&flow, 0, &rule);
+ ofputil_cls_rule_to_match(&rule, NXFF_OPENFLOW10, &extracted_match,
+ 0, NULL);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
char *exp_s = ofp_match_to_string(&expected_match, 2);
if (memcmp(&expected_match, &extracted_match, sizeof expected_match)) {
char *exp_s = ofp_match_to_string(&expected_match, 2);
@@
-77,6
+80,7
@@
main(int argc UNUSED, char *argv[])
printf("mismatch on packet #%d (1-based).\n", n);
printf("Packet:\n");
ofp_print_packet(stdout, packet->data, packet->size, packet->size);
printf("mismatch on packet #%d (1-based).\n", n);
printf("Packet:\n");
ofp_print_packet(stdout, packet->data, packet->size, packet->size);
+ ovs_hex_dump(stdout, packet->data, packet->size, 0, true);
printf("Expected flow:\n%s\n", exp_s);
printf("Actually extracted flow:\n%s\n", got_s);
printf("\n");
printf("Expected flow:\n%s\n", exp_s);
printf("Actually extracted flow:\n%s\n", got_s);
printf("\n");