On Wed, Jan 29, 2014 at 01:57:16PM +0900, FUJITA Tomonori wrote: > 0x8847 (MPLS) for PUSH_MPLS > 0x0800 (IP) for POP_MPLS > > Signed-off-by: FUJITA Tomonori <[email protected]>
Reviewed-by: Simon Horman <[email protected]> > --- > ryu/ofproto/ofproto_v1_4_parser.py | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/ryu/ofproto/ofproto_v1_4_parser.py > b/ryu/ofproto/ofproto_v1_4_parser.py > index 4980d03..38ae25a 100644 > --- a/ryu/ofproto/ofproto_v1_4_parser.py > +++ b/ryu/ofproto/ofproto_v1_4_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_4 as ofproto > @@ -3583,7 +3584,7 @@ class OFPActionPushMpls(OFPAction): > ethertype Ether type > ================ ====================================================== > """ > - def __init__(self, ethertype, type_=None, len_=None): > + def __init__(self, ethertype=ether.ETH_TYPE_MPLS, type_=None, len_=None): > super(OFPActionPushMpls, self).__init__() > self.ethertype = ethertype > > @@ -3624,7 +3625,7 @@ class OFPActionPopMpls(OFPAction): > > This action pops the MPLS header from the packet. > """ > - def __init__(self, ethertype, type_=None, len_=None): > + def __init__(self, ethertype=ether.ETH_TYPE_IP, type_=None, len_=None): > super(OFPActionPopMpls, self).__init__() > self.ethertype = ethertype > > -- > 1.8.3.4 (Apple Git-47) > > > ------------------------------------------------------------------------------ > WatchGuard Dimension instantly turns raw network data into actionable > security intelligence. It gives you real-time visual feedback on key > security issues and trends. Skip the complicated setup - simply import > a virtual appliance and go from zero to informed in seconds. > http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk > _______________________________________________ > Ryu-devel mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/ryu-devel > ------------------------------------------------------------------------------ WatchGuard Dimension instantly turns raw network data into actionable security intelligence. It gives you real-time visual feedback on key security issues and trends. Skip the complicated setup - simply import a virtual appliance and go from zero to informed in seconds. http://pubads.g.doubleclick.net/gampad/clk?id=123612991&iu=/4140/ostg.clktrk _______________________________________________ Ryu-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/ryu-devel
