summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYAMAMOTO Takashi <yamamoto@valinux.co.jp>2013-09-04 16:04:38 +0900
committerFUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>2013-09-14 08:01:34 +0900
commit31f8a21d37ee0301ee57b216b024104851583e6e (patch)
treea1780fadb97d42492a4281bc7c5f56cdc4d92efb
parent35f7c1230d1faa49b899b2cc822c870849fa954e (diff)
packet_data_generator: use utf-8 in table name and port name
actually uses non-ascii characters in some places. Signed-off-by: YAMAMOTO Takashi <yamamoto@valinux.co.jp> Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
-rw-r--r--ryu/tests/packet_data_generator/src/x3.erl4
-rw-r--r--ryu/tests/packet_data_generator/src/x4.erl4
2 files changed, 4 insertions, 4 deletions
diff --git a/ryu/tests/packet_data_generator/src/x3.erl b/ryu/tests/packet_data_generator/src/x3.erl
index 41065908..0ac6f2df 100644
--- a/ryu/tests/packet_data_generator/src/x3.erl
+++ b/ryu/tests/packet_data_generator/src/x3.erl
@@ -279,7 +279,7 @@ x() ->
flags = [],
stats =
[#ofp_table_stats{
- table_id = 0,name = <<"Flow Table 0x00">>,
+ table_id = 0,name = <<"\xe7\xa7\x81\xe3\x81\xae\xe3\x83\x86\xe3\x83\xbc\xe3\x83\x96\xe3\x83\xab">>, % "my table" in japanese, utf-8
match =
[in_port,metadata,eth_dst,eth_src,eth_type,vlan_vid,
vlan_pcp,ip_dscp,ip_ecn,ip_proto,ipv4_src,ipv4_dst,tcp_src,
@@ -8511,7 +8511,7 @@ x() ->
reason = add,
desc = #ofp_port{
port_no = 7,hw_addr = <<"\362\v\244\320?p">>,
- name = <<"Port7">>,
+ name = <<"\xe7\xa7\x81\xe3\x81\xae\xe3\x83\x9d\xe3\x83\xbc\xe3\x83\x88">>, % "my port" in japanese, utf-8
config = [],
state = [live],
curr = ['100mb_fd',copper,autoneg],
diff --git a/ryu/tests/packet_data_generator/src/x4.erl b/ryu/tests/packet_data_generator/src/x4.erl
index 55b0182c..86694dd1 100644
--- a/ryu/tests/packet_data_generator/src/x4.erl
+++ b/ryu/tests/packet_data_generator/src/x4.erl
@@ -338,7 +338,7 @@ x() ->
reason = add,
desc = #ofp_port{
port_no = 7,hw_addr = <<"\362\v\244\320?p">>,
- name = <<"Port7">>,
+ name = <<"\xe7\xa7\x81\xe3\x81\xae\xe3\x83\x9d\xe3\x83\xbc\xe3\x83\x88">>, % "my port" in japanese, utf-8
config = [],
state = [live],
curr = ['100mb_fd',copper,autoneg],
@@ -1394,7 +1394,7 @@ x() ->
flags = [more],
body =
[#ofp_table_features{
- table_id = 0,name = <<"Flow Table 0x00">>,
+ table_id = 0,name = <<"\xe7\xa7\x81\xe3\x81\xae\xe3\x83\x86\xe3\x83\xbc\xe3\x83\x96\xe3\x83\xab">>, % "my table" in japanese, utf-8
metadata_match = <<"\377\377\377\377\377\377\377\377">>,
metadata_write = <<"\377\377\377\377\377\377\377\377">>,max_entries = 16777216,
properties =