summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-09-02 15:06:01 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-09-02 19:41:37 +0900
commit1db25c979cc4e78d224042856dc6acef7bd30a05 (patch)
treec56178b5313b2b599ac78a07801a4d18ddf0a203
parent36075035506d29db82a8d3817ca358ea429d1349 (diff)
of12: make OFPPacketOut.actions_len visible to users
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.py11
1 files changed, 5 insertions, 6 deletions
diff --git a/ryu/ofproto/ofproto_v1_2_parser.py b/ryu/ofproto/ofproto_v1_2_parser.py
index 66e26604..9464ed81 100644
--- a/ryu/ofproto/ofproto_v1_2_parser.py
+++ b/ryu/ofproto/ofproto_v1_2_parser.py
@@ -776,8 +776,7 @@ class OFPPacketOut(MsgBase):
datapath.send_msg(req)
"""
def __init__(self, datapath, buffer_id=None, in_port=None, actions=None,
- data=None):
-
+ data=None, actions_len=None):
# The in_port field is the ingress port that must be associated
# with the packet for OpenFlow processing.
assert in_port is not None
@@ -785,17 +784,17 @@ class OFPPacketOut(MsgBase):
super(OFPPacketOut, self).__init__(datapath)
self.buffer_id = buffer_id
self.in_port = in_port
- self._actions_len = 0
+ self.actions_len = 0
self.actions = actions
self.data = data
def _serialize_body(self):
- self._actions_len = 0
+ self.actions_len = 0
offset = ofproto_v1_2.OFP_PACKET_OUT_SIZE
for a in self.actions:
a.serialize(self.buf, offset)
offset += a.len
- self._actions_len += a.len
+ self.actions_len += a.len
if self.data is not None:
assert self.buffer_id == 0xffffffff
@@ -803,7 +802,7 @@ class OFPPacketOut(MsgBase):
msg_pack_into(ofproto_v1_2.OFP_PACKET_OUT_PACK_STR,
self.buf, ofproto_v1_2.OFP_HEADER_SIZE,
- self.buffer_id, self.in_port, self._actions_len)
+ self.buffer_id, self.in_port, self.actions_len)
@_set_msg_type(ofproto_v1_2.OFPT_FLOW_MOD)