From 91e54cda62a88dc942dceef1b53e0783906a01f9 Mon Sep 17 00:00:00 2001 From: YAMADA Hideki Date: Thu, 26 Sep 2013 10:31:21 +0900 Subject: [PATCH] tests/integrated: fix mac address format This fix following error. $ ./run_tests.sh -i (...) ryu-manager: hub: uncaught exception: Traceback (most recent call last): ryu-manager: File "/home/hideki/git/ryu/ryu/lib/hub.py", line 48, in _launch ryu-manager: func(*args, **kwargs) ryu-manager: File "/home/hideki/git/ryu/ryu/base/app_manager.py", line 110, in _event_loop ryu-manager: handler(ev) ryu-manager: File "/home/hideki/git/ryu/ryu/tests/integrated/test_request_reply_v12.py", line 996, in echo_replay_handler ryu-manager: self.run_verify(ev) ryu-manager: File "/home/hideki/git/ryu/ryu/tests/integrated/test_request_reply_v12.py", line 78, in run_verify ryu-manager: self.start_next_test(dp) ryu-manager: File "/home/hideki/git/ryu/ryu/tests/integrated/test_request_reply_v12.py", line 56, in start_next_test ryu-manager: getattr(self, t)(dp) ryu-manager: File "/home/hideki/git/ryu/ryu/tests/integrated/test_request_reply_v12.py", line 203, in test_error_reply ryu-manager: dp.send_msg(m) ryu-manager: File "/home/hideki/git/ryu/ryu/controller/controller.py", line 220, in send_msg ryu-manager: msg.serialize() ryu-manager: File "/home/hideki/git/ryu/ryu/ofproto/ofproto_parser.py", line 194, in serialize ryu-manager: self._serialize_body() ryu-manager: File "/home/hideki/git/ryu/ryu/ofproto/ofproto_v1_2_parser.py", line 1754, in _serialize_body ryu-manager: self.port_no, addrconv.mac.text_to_bin(self.hw_addr), ryu-manager: File "/home/hideki/git/ryu/ryu/lib/addrconv.py", line 27, in text_to_bin ryu-manager: return self._addr(text, **self._addr_kwargs).packed ryu-manager: File "/home/hideki/git/ryu/.venv/local/lib/python2.7/site-packages/netaddr/eui/__init__.py", line 376, in __init__ ryu-manager: self.value = addr ryu-manager: File "/home/hideki/git/ryu/.venv/local/lib/python2.7/site-packages/netaddr/eui/__init__.py", line 434, in _set_value ryu-manager: % (value, self._module.version)) ryu-manager: AddrFormatError: address '\xff\xff\xff\xff\xff\xff' is not an EUIv48 Signed-off-by: YAMADA Hideki Signed-off-by: FUJITA Tomonori --- ryu/tests/integrated/test_request_reply_v12.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ryu/tests/integrated/test_request_reply_v12.py b/ryu/tests/integrated/test_request_reply_v12.py index 65f273bc..e3223e6b 100644 --- a/ryu/tests/integrated/test_request_reply_v12.py +++ b/ryu/tests/integrated/test_request_reply_v12.py @@ -199,7 +199,8 @@ class RunTest(tester.TestFlowBase): port_no = max(ports) + 1 self._verify = dp.ofproto.OFPT_ERROR - m = dp.ofproto_parser.OFPPortMod(dp, port_no, '\xff' * 6, 0, 0, 0) + m = dp.ofproto_parser.OFPPortMod( + dp, port_no, 'ff:ff:ff:ff:ff:ff', 0, 0, 0) dp.send_msg(m) # Test for reply value