From 8244d4f24bce0b197011f7790cf5a0b05f172465 Mon Sep 17 00:00:00 2001 From: "watanabe.fumitaka" Date: Thu, 6 Feb 2014 17:10:23 +0900 Subject: sw test tool: fix wrong instruction(write metadata) value of test files The value of instruction(write metadata) of the test file is wrong. In the table-miss test of of13/match/02_METADATA* test files, metadata=255 or 240(mask=0xf0) is specified as match. In order to make it table-miss, it needed to write metadata except 255. Signed-off-by: WATANABE Fumitaka Signed-off-by: FUJITA Tomonori --- ryu/tests/switch/of13/match/02_METADATA.json | 4 ++-- ryu/tests/switch/of13/match/02_METADATA_Mask.json | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ryu/tests/switch/of13/match/02_METADATA.json b/ryu/tests/switch/of13/match/02_METADATA.json index 1927147e..af59632d 100644 --- a/ryu/tests/switch/of13/match/02_METADATA.json +++ b/ryu/tests/switch/of13/match/02_METADATA.json @@ -594,7 +594,7 @@ ] }, { - "description":"ethernet/arp-->'actions=write_metadata:255/0xffffffff,goto_table:1','table_id:1,metadata=255,actions=output:2'", + "description":"ethernet/arp-->'actions=write_metadata:155/0xffffffff,goto_table:1','table_id:1,metadata=255,actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -607,7 +607,7 @@ "instructions":[ { "OFPInstructionWriteMetadata":{ - "metadata":255, + "metadata":155, "metadata_mask":4294967295 } }, diff --git a/ryu/tests/switch/of13/match/02_METADATA_Mask.json b/ryu/tests/switch/of13/match/02_METADATA_Mask.json index 44e20613..385df50e 100644 --- a/ryu/tests/switch/of13/match/02_METADATA_Mask.json +++ b/ryu/tests/switch/of13/match/02_METADATA_Mask.json @@ -154,7 +154,7 @@ ] }, { - "description":"ethernet/ipv4/tcp-->'actions=write_metadata:255/0xffffffff,goto_table:1','table_id:1,metadata=240(mask=0xfffffff0),actions=output:2'", + "description":"ethernet/ipv4/tcp-->'actions=write_metadata:155/0xffffffff,goto_table:1','table_id:1,metadata=240(mask=0xfffffff0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -167,7 +167,7 @@ "instructions":[ { "OFPInstructionWriteMetadata":{ - "metadata":255, + "metadata":155, "metadata_mask":4294967295 } }, @@ -380,7 +380,7 @@ ] }, { - "description":"ethernet/ipv6/tcp-->'actions=write_metadata:255/0xffffffff,goto_table:1','table_id:1,metadata=240(mask=0xfffffff0),actions=output:2'", + "description":"ethernet/ipv6/tcp-->'actions=write_metadata:155/0xffffffff,goto_table:1','table_id:1,metadata=240(mask=0xfffffff0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -393,7 +393,7 @@ "instructions":[ { "OFPInstructionWriteMetadata":{ - "metadata":255, + "metadata":155, "metadata_mask":4294967295 } }, @@ -602,7 +602,7 @@ ] }, { - "description":"ethernet/arp-->'actions=write_metadata:255/0xffffffff,goto_table:1','table_id:1,metadata=240(mask=0xfffffff0),actions=output:2'", + "description":"ethernet/arp-->'actions=write_metadata:155/0xffffffff,goto_table:1','table_id:1,metadata=240(mask=0xfffffff0),actions=output:2'", "prerequisite":[ { "OFPFlowMod":{ @@ -615,7 +615,7 @@ "instructions":[ { "OFPInstructionWriteMetadata":{ - "metadata":255, + "metadata":155, "metadata_mask":4294967295 } }, -- cgit v1.2.3