diff options
| author | YAMAMOTO Takashi <yamamoto@valinux.co.jp> | 2013-08-26 14:34:34 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2013-08-26 15:04:46 +0900 |
| commit | bae19f1edf6dd8d5166ef5acbdf80df6bb9f0a60 (patch) | |
| tree | c9943e38313b3a7e5552a696f4fcd1fe2d613676 | |
| parent | 7847a7cc8f6bc1e4ac3ef28122e1b077e44c01b8 (diff) | |
of10: use text address for OFPPhyPort.hw_addr and OFPPortMod.hw_addr
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_0_parser.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ryu/ofproto/ofproto_v1_0_parser.py b/ryu/ofproto/ofproto_v1_0_parser.py index 3fae86d9..e1951c8b 100644 --- a/ryu/ofproto/ofproto_v1_0_parser.py +++ b/ryu/ofproto/ofproto_v1_0_parser.py @@ -18,6 +18,7 @@ import struct import binascii from ofproto_parser import StringifyMixin, MsgBase, msg_pack_into, msg_str_attr +from ryu.lib import addrconv from ryu.lib import mac from . import ofproto_parser from . import ofproto_v1_0 @@ -86,6 +87,9 @@ class OFPPhyPort(ofproto_parser.namedtuple('OFPPhyPort', ( def parser(cls, buf, offset): port = struct.unpack_from(ofproto_v1_0.OFP_PHY_PORT_PACK_STR, buf, offset) + i = cls._fields.index('hw_addr') + port = list(port) + port[i] = addrconv.mac.bin_to_text(port[i]) return cls(*port) @@ -2109,7 +2113,7 @@ class OFPPortMod(MsgBase): def _serialize_body(self): msg_pack_into(ofproto_v1_0.OFP_PORT_MOD_PACK_STR, self.buf, ofproto_v1_0.OFP_HEADER_SIZE, - self.port_no, self.hw_addr, + self.port_no, addrconv.mac.text_to_bin(self.hw_addr), self.config, self.mask, self.advertise) |