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
ofproto: Inline trivial functions.
[sliver-openvswitch.git]
/
tests
/
test-bundle.c
diff --git
a/tests/test-bundle.c
b/tests/test-bundle.c
index
c475991
..
9a65839
100644
(file)
--- a/
tests/test-bundle.c
+++ b/
tests/test-bundle.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2011, 2012 Nicira, Inc.
+/* Copyright (c) 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.
@@
-23,15
+23,15
@@
#include "flow.h"
#include "ofp-actions.h"
#include "ofpbuf.h"
#include "flow.h"
#include "ofp-actions.h"
#include "ofpbuf.h"
-#include "random.h"
#include "util.h"
#include "util.h"
+#include "ovstest.h"
#define N_FLOWS 50000
#define MAX_SLAVES 8 /* Maximum supported by this test framework. */
struct slave {
#define N_FLOWS 50000
#define MAX_SLAVES 8 /* Maximum supported by this test framework. */
struct slave {
-
uint16
_t slave_id;
+
ofp_port
_t slave_id;
bool enabled;
size_t flow_count;
bool enabled;
size_t flow_count;
@@
-43,7
+43,7
@@
struct slave_group {
};
static struct slave *
};
static struct slave *
-slave_lookup(struct slave_group *sg,
uint16
_t slave_id)
+slave_lookup(struct slave_group *sg,
ofp_port
_t slave_id)
{
size_t i;
{
size_t i;
@@
-57,7
+57,7
@@
slave_lookup(struct slave_group *sg, uint16_t slave_id)
}
static bool
}
static bool
-slave_enabled_cb(
uint16
_t slave_id, void *aux)
+slave_enabled_cb(
ofp_port
_t slave_id, void *aux)
{
struct slave *slave;
{
struct slave *slave;
@@
-71,10
+71,15
@@
parse_bundle_actions(char *actions)
struct ofpact_bundle *bundle;
struct ofpbuf ofpacts;
struct ofpact *action;
struct ofpact_bundle *bundle;
struct ofpbuf ofpacts;
struct ofpact *action;
+ char *error;
ofpbuf_init(&ofpacts, 0);
ofpbuf_init(&ofpacts, 0);
- bundle_parse_load(actions, &ofpacts);
- action = ofpacts.data;
+ error = bundle_parse_load(actions, &ofpacts);
+ if (error) {
+ ovs_fatal(0, "%s", error);
+ }
+
+ action = ofpbuf_data(&ofpacts);
bundle = ofpact_get_BUNDLE(xmemdup(action, action->len));
ofpbuf_uninit(&ofpacts);
bundle = ofpact_get_BUNDLE(xmemdup(action, action->len));
ofpbuf_uninit(&ofpacts);
@@
-100,8
+105,8
@@
mask_str(uint8_t mask, size_t n_bits)
return str;
}
return str;
}
-int
-main(int argc, char *argv[])
+static void
+
test_bundle_
main(int argc, char *argv[])
{
bool ok = true;
struct ofpact_bundle *bundle;
{
bool ok = true;
struct ofpact_bundle *bundle;
@@
-111,7
+116,6
@@
main(int argc, char *argv[])
int old_active;
set_program_name(argv[0]);
int old_active;
set_program_name(argv[0]);
- random_init();
if (argc != 2) {
ovs_fatal(0, "usage: %s bundle_action", program_name);
if (argc != 2) {
ovs_fatal(0, "usage: %s bundle_action", program_name);
@@
-122,7
+126,7
@@
main(int argc, char *argv[])
/* Generate 'slaves' array. */
sg.n_slaves = 0;
for (i = 0; i < bundle->n_slaves; i++) {
/* Generate 'slaves' array. */
sg.n_slaves = 0;
for (i = 0; i < bundle->n_slaves; i++) {
-
uint16
_t slave_id = bundle->slaves[i];
+
ofp_port
_t slave_id = bundle->slaves[i];
if (slave_lookup(&sg, slave_id)) {
ovs_fatal(0, "Redundant slaves are not supported. ");
if (slave_lookup(&sg, slave_id)) {
ovs_fatal(0, "Redundant slaves are not supported. ");
@@
-135,10
+139,8
@@
main(int argc, char *argv[])
/* Generate flows. */
flows = xmalloc(N_FLOWS * sizeof *flows);
for (i = 0; i < N_FLOWS; i++) {
/* Generate flows. */
flows = xmalloc(N_FLOWS * sizeof *flows);
for (i = 0; i < N_FLOWS; i++) {
- random_bytes(&flows[i], sizeof flows[i]);
- memset(flows[i].zeros, 0, sizeof flows[i].zeros);
- flows[i].mpls_depth = 0;
- flows[i].regs[0] = OFPP_NONE;
+ flow_random_hash_fields(&flows[i]);
+ flows[i].regs[0] = ofp_to_u16(OFPP_NONE);
}
/* Cycles through each possible liveness permutation for the given
}
/* Cycles through each possible liveness permutation for the given
@@
-186,13
+188,13
@@
main(int argc, char *argv[])
changed = 0;
for (j = 0; j < N_FLOWS; j++) {
struct flow *flow = &flows[j];
changed = 0;
for (j = 0; j < N_FLOWS; j++) {
struct flow *flow = &flows[j];
-
uint16
_t old_slave_id, ofp_port;
+
ofp_port
_t old_slave_id, ofp_port;
struct flow_wildcards wc;
struct flow_wildcards wc;
- old_slave_id =
flow->regs[0]
;
+ old_slave_id =
u16_to_ofp(flow->regs[0])
;
ofp_port = bundle_execute(bundle, flow, &wc, slave_enabled_cb,
&sg);
ofp_port = bundle_execute(bundle, flow, &wc, slave_enabled_cb,
&sg);
- flow->regs[0] = ofp_
port
;
+ flow->regs[0] = ofp_
to_u16(ofp_port)
;
if (ofp_port != OFPP_NONE) {
slave_lookup(&sg, ofp_port)->flow_count++;
if (ofp_port != OFPP_NONE) {
slave_lookup(&sg, ofp_port)->flow_count++;
@@
-263,5
+265,7
@@
main(int argc, char *argv[])
free(bundle);
free(flows);
free(bundle);
free(flows);
-
return ok ? 0 : 1
;
+
exit(ok ? 0 : 1)
;
}
}
+
+OVSTEST_REGISTER("test-bundle", test_bundle_main);