projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: New function follow_symlinks().
[openvswitch]
/
tests
/
test-multipath.c
diff --git
a/tests/test-multipath.c
b/tests/test-multipath.c
index 483eb3db598054212b0886803d3a282e5e352767..8a355677d607b1ffe22fea374b8d483fd63ae9cd 100644
(file)
--- a/
tests/test-multipath.c
+++ b/
tests/test-multipath.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2010 Nicira, Inc.
+ * Copyright (c) 2010
, 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.
@@
-25,6
+25,7
@@
#include <stdlib.h>
#include "flow.h"
#include <stdlib.h>
#include "flow.h"
+#include "ofp-actions.h"
#include "random.h"
#include "util.h"
#include "random.h"
#include "util.h"
@@
-32,7
+33,7
@@
int
main(int argc, char *argv[])
{
enum { MP_MAX_LINKS = 63 };
main(int argc, char *argv[])
{
enum { MP_MAX_LINKS = 63 };
- struct
nx_action
_multipath mp;
+ struct
ofpact
_multipath mp;
bool ok = true;
int n;
bool ok = true;
int n;
@@
-60,11
+61,11
@@
main(int argc, char *argv[])
random_bytes(&flow, sizeof flow);
random_bytes(&flow, sizeof flow);
- mp.max_link =
htons(n - 1)
;
+ mp.max_link =
n - 1
;
multipath_execute(&mp, &flow);
old_link = flow.regs[0];
multipath_execute(&mp, &flow);
old_link = flow.regs[0];
- mp.max_link =
htons(n)
;
+ mp.max_link =
n
;
multipath_execute(&mp, &flow);
new_link = flow.regs[0];
multipath_execute(&mp, &flow);
new_link = flow.regs[0];
@@
-91,7
+92,7
@@
main(int argc, char *argv[])
"stddev/expected=%.4f\n",
n, n + 1, disruption, perfect, distribution);
"stddev/expected=%.4f\n",
n, n + 1, disruption, perfect, distribution);
- switch (
ntohs(mp.algorithm)
) {
+ switch (
mp.algorithm
) {
case NX_MP_ALG_MODULO_N:
if (disruption < (n < 2 ? .25 : .5)) {
fprintf(stderr, "%d -> %d: disruption=%.2f < .5\n",
case NX_MP_ALG_MODULO_N:
if (disruption < (n < 2 ? .25 : .5)) {
fprintf(stderr, "%d -> %d: disruption=%.2f < .5\n",