mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-05-08 13:56:09 +02:00
Code Issues Projects Releases Wiki Activity

sw test tool: Enable parsing a new 'ingress' format

Browse Source 
The format is for sending packets continuously.

Signed-off-by: WATANABE Fumitaka <watanabe.fumitaka1@gmail.com>
Signed-off-by: Yuichi Ito <ito.yuichi0@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Yuichi Ito 2014-03-28 13:18:48 +09:00 committed by FUJITA Tomonori
parent f9f88f4409
commit 3b7b40d9a6
1 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ryu/tests/switch/tester.py
View File

@ -82,6 +82,10 @@ TARGET_RECEIVE_PORT = 1
INTERVAL = 1 # sec
WAIT_TIMER = 3 # sec
# Default settings for 'ingress: packets'
DEFAULT_DURATION_TIME = 30
DEFAULT_PKTPS = 1000
# Test file format.
KEY_DESC = 'description'
KEY_PREREQ = 'prerequisite'
@ -92,6 +96,10 @@ KEY_INGRESS = 'ingress'
KEY_EGRESS = 'egress'
KEY_PKT_IN = 'PACKET_IN'
KEY_TBL_MISS = 'table-miss'
KEY_PACKETS = 'packets'
KEY_DATA = 'data'
KEY_PKTPS = 'pktps'
KEY_DURATION_TIME = 'duration_time'
# Test state.
STATE_INIT_FLOW = 0
@ -1012,7 +1020,18 @@ class Test(stringify.StringifyMixin):
# parse 'ingress'
if not KEY_INGRESS in test:
raise ValueError('a test requires "%s" field.' % KEY_INGRESS)
test_pkt[KEY_INGRESS] = __test_pkt_from_json(test[KEY_INGRESS])
if isinstance(test[KEY_INGRESS], list):
test_pkt[KEY_INGRESS] = __test_pkt_from_json(test[KEY_INGRESS])
elif isinstance(test[KEY_INGRESS], dict):
test_pkt[KEY_PACKETS] = {
KEY_DATA: __test_pkt_from_json(
test[KEY_INGRESS][KEY_PACKETS][KEY_DATA]),
KEY_DURATION_TIME: test[KEY_INGRESS][KEY_PACKETS].get(
KEY_DURATION_TIME, DEFAULT_DURATION_TIME),
KEY_PKTPS: test[KEY_INGRESS][KEY_PACKETS].get(
KEY_PKTPS, DEFAULT_PKTPS)}
else:
raise ValueError('invalid format: "%s" field' % KEY_INGRESS)
# parse 'egress' or 'PACKET_IN' or 'table-miss'
if KEY_EGRESS in test:
test_pkt[KEY_EGRESS] = __test_pkt_from_json(test[KEY_EGRESS])