mirrors/ryu
1
0
Fork 0
mirror of https://github.com/faucetsdn/ryu.git synced 2026-01-27 11:31:55 +01:00
Code Issues Projects Releases Wiki Activity

lib/ofctl_v1_4: Fix json format of queue_desc_reply

Browse Source 
Signed-off-by: Minoru TAKAHASHI <takahashi.minoru7@gmail.com>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
This commit is contained in:
Minoru TAKAHASHI 2016-03-25 16:58:27 +09:00 committed by FUJITA Tomonori
parent 5246068fe8
commit 61306439db
2 changed files with 56 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ryu/lib/ofctl_v1_4.py
View File

@ -415,9 +415,8 @@ def get_queue_desc_stats(dp, waiters, port_no=None, queue_id=None):
send_stats_request(dp, stats, waiters, msgs)
configs = []
for config in msgs:
queue_list = []
for queue in config.body:
for msg in msgs:
for queue in msg.body:
q = queue.to_jsondict()[queue.__class__.__name__]
prop_list = []
for prop in queue.properties:
@ -426,9 +425,7 @@ def get_queue_desc_stats(dp, waiters, port_no=None, queue_id=None):
p['type'] = t if t != prop.type else 'UNKNOWN'
prop_list.append(p)
q['properties'] = prop_list
queue_list.append(q)
c = {'body': queue_list}
configs.append(c)
configs.append(q)
configs = {str(dp.id): configs}
return configs

110
ryu/tests/unit/lib/ofctl_json/of14/5-64-ofp_queue_desc_reply.packet.json
View File

@ -1,65 +1,61 @@
{
"1": [
{
"body": [
"len": 32,
"port_no": 7,
"properties": [
{
"len": 32,
"port_no": 7,
"properties": [
{
"data": [],
"exp_type": 0,
"experimenter": 101,
"length": 12,
"type": "EXPERIMENTER"
}
],
"queue_id": 0
},
{
"len": 88,
"port_no": 8,
"properties": [
{
"length": 8,
"rate": 300,
"type": "MIN_RATE"
},
{
"length": 8,
"rate": 900,
"type": "MAX_RATE"
},
{
"data": [],
"exp_type": 0,
"experimenter": 101,
"length": 12,
"type": "EXPERIMENTER"
},
{
"data": [
1
],
"exp_type": 1,
"experimenter": 101,
"length": 16,
"type": "EXPERIMENTER"
},
{
"data": [
1,
2
],
"exp_type": 2,
"experimenter": 101,
"length": 20,
"type": "EXPERIMENTER"
}
],
"queue_id": 1
"data": [],
"exp_type": 0,
"experimenter": 101,
"length": 12,
"type": "EXPERIMENTER"
}
]
],
"queue_id": 0
},
{
"len": 88,
"port_no": 8,
"properties": [
{
"length": 8,
"rate": 300,
"type": "MIN_RATE"
},
{
"length": 8,
"rate": 900,
"type": "MAX_RATE"
},
{
"data": [],
"exp_type": 0,
"experimenter": 101,
"length": 12,
"type": "EXPERIMENTER"
},
{
"data": [
1
],
"exp_type": 1,
"experimenter": 101,
"length": 16,
"type": "EXPERIMENTER"
},
{
"data": [
1,
2
],
"exp_type": 2,
"experimenter": 101,
"length": 20,
"type": "EXPERIMENTER"
}
],
"queue_id": 1
}
]
}