mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-04 16:25:17 +00:00
Code Issues Releases Wiki Activity

netdev-dummy: Add --len option for netdev-dummy/receive command

Browse Source 
Currently, there is no way to specify the packet size when injecting
a packet via "netdev-dummy/receive" with a flow specification. Thus
far, packet size is not important for testing OVS features, but it
becomes useful in writing unit tests for the future patches.

Signed-off-by: Andy Zhou <azhou@ovn.org>
Acked-by: Jarno Rajahalme <jarno@ovn.org>
This commit is contained in:
Andy Zhou
2017-01-18 02:30:26 -08:00
parent df3487c4b2
commit d8ada2368c
1 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
lib/netdev-dummy.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2010, 2011, 2012, 2013, 2015, 2016 Nicira, Inc. * Copyright (c) 2010, 2011, 2012, 2013, 2015, 2016, 2017 Nicira, Inc.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -1433,7 +1433,15 @@ pkt_list_delete(struct ovs_list *l)
} }
static struct dp_packet * static struct dp_packet *
eth_from_packet_or_flow(const char *s) eth_from_packet(const char *s)
{
struct dp_packet *packet;
eth_from_hex(s, &packet);
return packet;
}
static struct dp_packet *
eth_from_flow(const char *s)
{ {
enum odp_key_fitness fitness; enum odp_key_fitness fitness;
struct dp_packet *packet; struct dp_packet *packet;
@@ -1441,10 +1449,6 @@ eth_from_packet_or_flow(const char *s)
struct flow flow; struct flow flow;
int error; int error;
if (!eth_from_hex(s, &packet)) {
return packet;
}
/* Convert string to datapath key. /* Convert string to datapath key.
* *
* It would actually be nicer to parse an OpenFlow-like flow key here, but * It would actually be nicer to parse an OpenFlow-like flow key here, but
@@ -1540,10 +1544,24 @@ netdev_dummy_receive(struct unixctl_conn *conn,
for (i = k; i < argc; i++) { for (i = k; i < argc; i++) {
struct dp_packet *packet; struct dp_packet *packet;
packet = eth_from_packet_or_flow(argv[i]); /* Try to parse 'argv[i]' as packet in hex. */
packet = eth_from_packet(argv[i]);
if (!packet) { if (!packet) {
unixctl_command_reply_error(conn, "bad packet syntax"); /* Try parse 'argv[i]' as odp flow. */
goto exit; packet = eth_from_flow(argv[i]);
if (!packet) {
unixctl_command_reply_error(conn, "bad packet or flow syntax");
goto exit;
}
/* Parse optional --len argument immediately follows a 'flow'. */
if (argc >= i + 2 && !strcmp(argv[i + 1], "--len")) {
int packet_size = strtol(argv[i + 2], NULL, 10);
dp_packet_set_size(packet, packet_size);
i+=2;
}
} }
netdev_dummy_queue_packet(dummy_dev, packet, rx_qid); netdev_dummy_queue_packet(dummy_dev, packet, rx_qid);
@@ -1757,7 +1775,7 @@ void
netdev_dummy_register(enum dummy_level level) netdev_dummy_register(enum dummy_level level)
{ {
unixctl_command_register("netdev-dummy/receive", unixctl_command_register("netdev-dummy/receive",
"name [--qid queue_id] packet|flow...", "name [--qid queue_id] packet|flow [--len packet_len]",
2, INT_MAX, netdev_dummy_receive, NULL); 2, INT_MAX, netdev_dummy_receive, NULL);
unixctl_command_register("netdev-dummy/set-admin-state", unixctl_command_register("netdev-dummy/set-admin-state",
"[netdev] up|down", 1, 2, "[netdev] up|down", 1, 2,