X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tests%2Ftest-odp.c;h=268a10518749801910d531b64c06da327e7cf655;hb=2c57a420432de88b8a6f9ee54642c3841577ad7b;hp=dd80766f7c155249b36ca519cb8399bb32ef78da;hpb=8706009e555bb9fa04a5679e4be2c7c67506802b;p=sliver-openvswitch.git diff --git a/tests/test-odp.c b/tests/test-odp.c index dd80766f7..268a10518 100644 --- a/tests/test-odp.c +++ b/tests/test-odp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2012 Nicira, Inc. + * Copyright (c) 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ parse_keys(void) struct ds in; ds_init(&in); - vlog_set_levels_from_string("odp_util:console:dbg"); + vlog_set_levels_from_string_assert("odp_util:console:dbg"); while (!ds_get_test_line(&in, stdin)) { enum odp_key_fitness fitness; struct ofpbuf odp_key; @@ -70,7 +70,7 @@ parse_keys(void) /* Convert cls_rule back to odp_key. */ ofpbuf_uninit(&odp_key); ofpbuf_init(&odp_key, 0); - odp_flow_key_from_flow(&odp_key, &flow); + odp_flow_key_from_flow(&odp_key, &flow, flow.in_port); if (odp_key.size > ODPUTIL_FLOW_KEY_BYTES) { printf ("too long: %zu > %d\n", @@ -98,7 +98,7 @@ parse_actions(void) struct ds in; ds_init(&in); - vlog_set_levels_from_string("odp_util:console:dbg"); + vlog_set_levels_from_string_assert("odp_util:console:dbg"); while (!ds_get_test_line(&in, stdin)) { struct ofpbuf odp_actions; struct ds out;