Simon Hunt

GUI - Added example requestTraffic and showTraffic events; updated test addLink events.

- commented out using 'alert' for logic errors (console warn only now).

Change-Id: I3a48107c5707fd41d8e69ae7c1a980e498651c4b
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000000000000007/4-of:0000000000000006/1",
"type": "direct",
"online": true,
"linkWidth": 2,
"src": "of:0000000000000007",
"srcPort": "4",
......
{
"event": "showTraffic",
"sid":63,
"payload": {
"paths": [
{
"class": "primary",
"traffic": false,
"links": [
"1E:10:D9:A2:84:E2/-1/0-of:0000000000000003/1",
"of:0000000000000003/4-of:0000000000000002/1",
"of:0000000000000002/4-of:0000000000000001/1",
"of:0000000000000001/2-of:0000000000000006/4",
"of:0000000000000006/2-of:0000000000000008/4",
"of:0000000000000008/3-9E:0B:E0:38:98:DE/-1/0"
],
"labels": [
"",
"",
"",
"",
"",
""
]
},
{
"class": "primary",
"traffic": false,
"links": [
"9E:0B:E0:38:98:DE/-1/0-of:0000000000000008/3",
"of:0000000000000008/4-of:0000000000000006/2",
"of:0000000000000006/4-of:0000000000000001/2",
"of:0000000000000001/1-of:0000000000000002/4",
"of:0000000000000002/1-of:0000000000000003/4",
"of:0000000000000003/1-1E:10:D9:A2:84:E2/-1/0"
],
"labels": [
"",
"",
"",
"",
"",
""
]
}
]
}
}
{
"event": "showTraffic",
"sid": 227,
"payload": {
"paths": [
{
"class": "primary animated",
"traffic": true,
"links": [
"02:D7:91:9F:4B:E8/-1/0-of:0000000000000004/1",
"of:0000000000000004/4-of:0000000000000002/2",
"of:0000000000000002/4-of:0000000000000001/1",
"of:0000000000000001/2-of:0000000000000006/4",
"of:0000000000000006/2-of:0000000000000008/4",
"of:0000000000000008/3-9E:0B:E0:38:98:DE/-1/0"
],
"labels": [
"",
"Load{rate=98, latest=37898}",
"",
"",
"",
"Load{rate=98, latest=38080}"
]
},
{
"class": "primary animated",
"traffic": true,
"links": [
"9E:0B:E0:38:98:DE/-1/0-of:0000000000000008/3",
"of:0000000000000008/4-of:0000000000000006/2",
"of:0000000000000006/4-of:0000000000000001/2",
"of:0000000000000001/1-of:0000000000000002/4",
"of:0000000000000002/2-of:0000000000000004/4",
"of:0000000000000004/1-02:D7:91:9F:4B:E8/-1/0"
],
"labels": [
"",
"",
"Load{rate=98, latest=38178}",
"",
"Load{rate=98, latest=37898}",
"Load{rate=98, latest=37898}"
]
},
{
"class": "primary animated",
"traffic": true,
"links": [
"1E:10:D9:A2:84:E2/-1/0-of:0000000000000003/1",
"of:0000000000000003/4-of:0000000000000002/1",
"of:0000000000000002/4-of:0000000000000001/1",
"of:0000000000000001/2-of:0000000000000006/4",
"of:0000000000000006/2-of:0000000000000008/4",
"of:0000000000000008/3-9E:0B:E0:38:98:DE/-1/0"
],
"labels": [
"",
"",
"",
"",
"",
"Load{rate=98, latest=38080}"
]
},
{
"class": "primary animated",
"traffic": true,
"links": [
"9E:0B:E0:38:98:DE/-1/0-of:0000000000000008/3",
"of:0000000000000008/4-of:0000000000000006/2",
"of:0000000000000006/4-of:0000000000000001/2",
"of:0000000000000001/1-of:0000000000000002/4",
"of:0000000000000002/1-of:0000000000000003/4",
"of:0000000000000003/1-1E:10:D9:A2:84:E2/-1/0"
],
"labels": [
"",
"",
"Load{rate=98, latest=38178}",
"",
"",
""
]
}
]
}
}
......@@ -6,6 +6,7 @@
"of:0000000000000007",
"of:000000000000000c",
"of:000000000000000a"
]
],
"hover": ""
}
}
......
......@@ -7,6 +7,7 @@
"22:BA:28:81:FD:45/-1",
"BA:91:F6:8E:B6:B6/-1",
"06:E2:E6:F7:03:12/-1"
]
],
"hover": ""
}
}
......
......@@ -7,6 +7,7 @@
"86:C3:7B:90:79:CD/-1",
"7E:D2:EE:0F:12:4A/-1",
"of:000000000000000c"
]
],
"hover": ""
}
}
......
{
"event": "requestTraffic",
"sid": 48,
"payload": {
"ids": [],
"hover": "9E:0B:E0:38:98:DE/-1"
}
}
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff0003/4-of:0000ffffffffff03/1",
"type": "direct",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff0003",
"srcPort": "4",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff08/4-of:0000ffffffffff03/1",
"type": "direct",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff08",
"srcPort": "4",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff0003/9-of:0000ffffffff0007/2",
"type": "direct",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff0003",
"srcPort": "9",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff0008/2-of:0000ffffffff0003/1",
"type": "direct",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff0008",
"srcPort": "2",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff0008/4-of:0000ffffffff0007/1",
"type": "direct",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff0008",
"srcPort": "4",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff0008/4-of:0000ffffffffff08/1",
"type": "direct",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff0008",
"srcPort": "4",
......
......@@ -526,7 +526,7 @@
function logicError(msg) {
// TODO, report logic error to server, via websock, so it can be logged
network.view.alert('Logic Error:\n\n' + msg);
//network.view.alert('Logic Error:\n\n' + msg);
console.warn(msg);
}
......