From abeb9b7764de22605e8980321486d0a06e587593 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Tue, 28 Jan 2014 13:18:41 +0900 Subject: [PATCH] ofproto_v1_3_parser: have a default value for push_vlan ethertype As this would be 0x8100 in most cases, make it the default. Signed-off-by: YAMAMOTO Takashi Signed-off-by: FUJITA Tomonori --- ryu/ofproto/ofproto_v1_3_parser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ryu/ofproto/ofproto_v1_3_parser.py b/ryu/ofproto/ofproto_v1_3_parser.py index a18eccc8..32ea4cc7 100644 --- a/ryu/ofproto/ofproto_v1_3_parser.py +++ b/ryu/ofproto/ofproto_v1_3_parser.py @@ -21,6 +21,7 @@ from ryu.lib import addrconv from ryu.lib import mac from ryu import utils from ofproto_parser import StringifyMixin, MsgBase, msg_pack_into, msg_str_attr +from . import ether from . import ofproto_parser from . import ofproto_common from . import ofproto_v1_3 @@ -2852,10 +2853,10 @@ class OFPActionPushVlan(OFPAction): ================ ====================================================== Attribute Description ================ ====================================================== - ethertype Ether type + ethertype Ether type. The default is 802.1Q. (0x8100) ================ ====================================================== """ - def __init__(self, ethertype, type_=None, len_=None): + def __init__(self, ethertype=ether.ETH_TYPE_8021Q, type_=None, len_=None): super(OFPActionPushVlan, self).__init__() self.ethertype = ethertype