Test framework: StringIO fixes for Python3 - vpp

diff options

author	Ole Troan <ot@cisco.com>	2018-12-06 17:35:12 +0100
committer	Neale Ranns <nranns@cisco.com>	2018-12-10 08:01:56 +0000
commit	7f99183a20d60cd5c648cc23d7a2f30a594a215b (patch)
tree	bb3934aab296ce5fa531bfc5ab47921a113ffd26 /test/test_pppoe.py
parent	521a8d7df423a0b5aaf259d49ca9230705bc25ee (diff)

Test framework: StringIO fixes for Python3

Add 2/3 support to binarytomac and mactobinary and move to vpp_mac.py Change-Id: I3dc7e4a24486aee22140c781aae7e44e58935877 Signed-off-by: Ole Troan <ot@cisco.com>

Diffstat (limited to 'test/test_pppoe.py')

-rw-r--r--

test/test_pppoe.py

1 files changed, 2 insertions, 2 deletions

/*--------------------------------------------------------------------------- * Copyright (c) 2009-2014 Cisco and/or its affiliates. * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at: * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. *--------------------------------------------------------------------------- */ /* * IPv4 and IPv6 Fragmentation Nodes * * A packet sent to those nodes require the following * buffer attributes to be set: * ip_frag.header_offset : * Where to find the IPv4 (or IPv6) header in the packet. Previous * bytes are left untouched and copied in every fragment. The fragments * are then appended. This option is used for fragmented packets * that are encapsulated. * ip_frag.mtu : * Maximum size of IP packets, header included, but ignoring * the 'ip_frag.header_offset' copied bytes. * ip_frag.next_index : * One of ip_frag_next_t, indicating to which exit node the fragments * should be sent to. * */ #ifndef IP_FRAG_H #define IP_FRAG_H #include <vnet/vnet.h> #define IP_FRAG_FLAG_IP4_HEADER 0x01 //Encapsulating IPv4 header #define IP_FRAG_FLAG_IP6_HEADER 0x02 //Encapsulating IPv6 header #define IP4_FRAG_NODE_NAME "ip4-frag" #define IP6_FRAG_NODE_NAME "ip6-frag" extern vlib_node_registration_t ip4_frag_node; extern vlib_node_registration_t ip6_frag_node; typedef enum { IP_FRAG_NEXT_IP_REWRITE, IP_FRAG_NEXT_IP_REWRITE_MIDCHAIN, IP_FRAG_NEXT_IP4_LOOKUP, IP_FRAG_NEXT_IP6_LOOKUP, IP_FRAG_NEXT_ICMP_ERROR, IP_FRAG_NEXT_DROP, IP_FRAG_N_NEXT } ip_frag_next_t; #define foreach_ip_frag_error \ /* Must be first. */ \ _(NONE, "packet fragmented") \ _(SMALL_PACKET, "packet smaller than MTU") \ _(FRAGMENT_SENT, "number of sent fragments") \ _(CANT_FRAGMENT_HEADER, "can't fragment header") \ _(DONT_FRAGMENT_SET, "can't fragment this packet") \ _(MALFORMED, "malformed packet") \ _(MEMORY, "could not allocate buffer") \ _(UNKNOWN, "unknown error") typedef enum { #define _(sym,str) IP_FRAG_ERROR_##sym, foreach_ip_frag_error #undef _ IP_FRAG_N_ERROR, } ip_frag_error_t; void ip_frag_set_vnet_buffer (vlib_buffer_t * b, u16 mtu, u8 next_index, u8 flags); extern ip_frag_error_t ip4_frag_do_fragment (vlib_main_t * vm, u32 from_bi, u16 mtu, u16 encapsize, u32 ** buffer); extern ip_frag_error_t ip6_frag_do_fragment (vlib_main_t * vm, u32 from_bi, u16 mtu, u16 encapsize, u32 ** buffer); #endif /* ifndef IP_FRAG_H */ /* * fd.io coding-style-patch-verification: ON * * Local Variables: * eval: (c-set-style "gnu") * End: */


context:
space:
mode: