openstack
/
deb-ryu
Code Issues Proposed changes

packet_data_generator3/gen: Add some NXAction packets 

This patch adds the following test packet.
 - NXActionController
 - NXActionFinTimeout
 - NXActionNote

Signed-off-by: Shinpei Muraoka <shinpei.muraoka@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Shinpei Muraoka 2016-06-06 09:48:15 +09:00 committed by FUJITA Tomonori
parent 7ca8690557
commit 7b562c3700
7 changed files with 163 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ryu/tests/packet_data/of13/ovs-ofctl-of13-action_controller.packet Normal file
View File

Binary file not shown.

BIN
ryu/tests/packet_data/of13/ovs-ofctl-of13-action_fintimeout.packet Normal file
View File

Binary file not shown.

BIN
ryu/tests/packet_data/of13/ovs-ofctl-of13-action_note.packet Normal file
View File

Binary file not shown.

15
ryu/tests/packet_data_generator3/gen.py
View File

@ -130,6 +130,21 @@ MESSAGES = [
'importance=39032'] +
['dl_type=0x86dd'] +
['actions=ct(commit,nat(dst=2001:1::1-2001:1::ffff)'])},
{'name': 'action_note',
'versions': [4],
'cmd': 'add-flow',
'args': (['priority=100'] +
['actions=note:04.05.06.07.00.00'])},
{'name': 'action_controller',
'versions': [4],
'cmd': 'add-flow',
'args': (['priority=100'] +
['actions=controller(reason=packet_out,max_len=1024,id=1)'])},
{'name': 'action_fintimeout',
'versions': [4],
'cmd': 'add-flow',
'args': (['priority=100,tcp'] +
['actions=fin_timeout(idle_timeout=30,hard_timeout=60)'])},
]
buf = []

43
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_controller.packet.json Normal file
View File

@ -0,0 +1,43 @@
{
"OFPFlowMod": {
"buffer_id": 4294967295,
"command": 0,
"cookie": 0,
"cookie_mask": 0,
"flags": 0,
"hard_timeout": 0,
"idle_timeout": 0,
"instructions": [
{
"OFPInstructionActions": {
"actions": [
{
"NXActionController": {
"controller_id": 1,
"experimenter": 8992,
"len": 16,
"max_len": 1024,
"reason": 5,
"subtype": 20,
"type": 65535
}
}
],
"len": 24,
"type": 4
}
}
],
"match": {
"OFPMatch": {
"length": 4,
"oxm_fields": [],
"type": 1
}
},
"out_group": 4294967295,
"out_port": 4294967295,
"priority": 100,
"table_id": 0
}
}

57
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_fintimeout.packet.json Normal file
View File

@ -0,0 +1,57 @@
{
"OFPFlowMod": {
"buffer_id": 4294967295,
"command": 0,
"cookie": 0,
"cookie_mask": 0,
"flags": 0,
"hard_timeout": 0,
"idle_timeout": 0,
"instructions": [
{
"OFPInstructionActions": {
"actions": [
{
"NXActionFinTimeout": {
"experimenter": 8992,
"fin_hard_timeout": 60,
"fin_idle_timeout": 30,
"len": 16,
"subtype": 19,
"type": 65535
}
}
],
"len": 24,
"type": 4
}
}
],
"match": {
"OFPMatch": {
"length": 15,
"oxm_fields": [
{
"OXMTlv": {
"field": "eth_type",
"mask": null,
"value": 2048
}
},
{
"OXMTlv": {
"field": "ip_proto",
"mask": null,
"value": 6
}
}
],
"type": 1
}
},
"out_group": 4294967295,
"out_port": 4294967295,
"priority": 100,
"table_id": 0
}
}

48
ryu/tests/unit/ofproto/json/of13/ovs-ofctl-of13-action_note.packet.json Normal file
View File

@ -0,0 +1,48 @@
{
"OFPFlowMod": {
"buffer_id": 4294967295,
"command": 0,
"cookie": 0,
"cookie_mask": 0,
"flags": 0,
"hard_timeout": 0,
"idle_timeout": 0,
"instructions": [
{
"OFPInstructionActions": {
"actions": [
{
"NXActionNote": {
"experimenter": 8992,
"len": 16,
"note": [
4,
5,
6,
7,
0,
0
],
"subtype": 8,
"type": 65535
}
}
],
"len": 24,
"type": 4
}
}
],
"match": {
"OFPMatch": {
"length": 4,
"oxm_fields": [],
"type": 1
}
},
"out_group": 4294967295,
"out_port": 4294967295,
"priority": 100,
"table_id": 0
}
}