summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2014-01-28 13:18:40 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2014-01-28 14:42:37 +0900
commit578f8e1c977143ee77a14abef85f42637a58b501 (patch)
tree1a5d7dd9f3fad28cae3ca0748493df6e3d551dc4
parente08ac471d44db84666c0b0f2fd1b270db5dde025 (diff)
ofproto_v1_2_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 <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/ofproto/ofproto_v1_2_parser.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py
index 3a413008..f592e799 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_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_v1_2
@@ -1350,10 +1351,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