홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
58c6d6eb 1 parent a68be819

GUI -- Clean up local test events. 

Change-Id: I112ccb2db65a8190ff03c274717abf9735084e81
Inline Side-by-side
Showing 71 changed files with 228 additions and 127 deletions
{
"event": "updateInstance",
"payload": {
"id": "192.168.56.101",
"ip": "192.168.56.101",
"online": true,
"uiAttached": true,
"switches": 4,
"labels": [
"192.168.56.101",
"192.168.56.101"
]
}
}
{
"event": "updateInstance",
"payload": {
"id": "onos-master",
"ip": "192.168.0.7",
"online": false,
"uiAttached": false,
"switches": 300,
"labels": [
"onos-master",
"192.168.0.7"
]
}
}
......@@ -7,6 +7,7 @@
"lastAuto": 29
},
"description": [
"Press 'S' to load initial events."
"Press '=' to load initial events.",
"Press '-' to fire further events."
]
}
......
......@@ -2,7 +2,10 @@
"event": "updateInstance",
"payload": {
"id": "onos-3",
"ip": "192.168.3.3",
"online": true,
"uiAttached": false,
"switches": 2,
"labels": [
"onos-3",
"192.168.3.3"
......
......@@ -2,7 +2,10 @@
"event": "updateInstance",
"payload": {
"id": "onos-3",
"ip": "192.168.3.3",
"online": false,
"uiAttached": false,
"switches": 2,
"labels": [
"onos-3",
"192.168.3.3"
......
......@@ -2,7 +2,10 @@
"event": "addInstance",
"payload": {
"id": "192.168.56.101",
"ip": "192.168.56.101",
"online": true,
"uiAttached": false,
"switches": 2,
"labels": [
"192.168.56.101",
"127.0.0.1"
......
......@@ -2,7 +2,10 @@
"event": "addInstance",
"payload": {
"id": "onos-2",
"ip": "192.168.2.2",
"online": true,
"uiAttached": true,
"switches": 1,
"labels": [
"onos-2",
"192.168.2.2"
......
......@@ -2,7 +2,10 @@
"event": "addInstance",
"payload": {
"id": "onos-3",
"ip": "192.168.3.3",
"online": false,
"uiAttached": false,
"switches": 2,
"labels": [
"onos-3",
"192.168.3.3"
......
......@@ -4,7 +4,7 @@
"id": "of:0000ffffffff0003",
"type": "switch",
"online": true,
"master": "local",
"master": "192.168.56.101",
"labels": [
"0000ffffffff0003",
"FF:FF:FF:FF:00:03",
......
......@@ -4,7 +4,7 @@
"id": "of:0000ffffffffff03",
"type": "roadm",
"online": true,
"master": "local",
"master": "192.168.56.101",
"labels": [
"0000ffffffffff03",
"FF:FF:FF:FF:FF:03",
......
......@@ -7,10 +7,10 @@
"lastAuto": 17
},
"description": [
"Visualizing ONOS instances.",
"Press 'I' to show instance pane.",
"Press 'H' to show hosts.",
"",
"Press 'S' to load initial events.",
"",
"Press spacebar to complete the scenario..."
"Press '=' to load initial events.",
"Press '-' to fire further events."
]
}
......
......@@ -2,7 +2,10 @@
"event": "addInstance",
"payload": {
"id": "local",
"ip": "127.0.0.1",
"online": true,
"uiAttached": true,
"switches": 43,
"labels": [
"local",
"127.0.0.1"
......
......@@ -6,9 +6,9 @@
"online": true,
"master": "local",
"labels": [
"0000ffffffff0003",
"FF:FF:FF:FF:00:03",
"sw-3"
"",
"sw-3",
"0000ffffffff0003"
],
"metaUi": {
"x": 282,
......
......@@ -6,9 +6,9 @@
"online": true,
"master": "local",
"labels": [
"0000ffffffff0007",
"FF:FF:FF:FF:00:07",
"sw-7"
"",
"sw-7",
"0000ffffffff0007"
],
"metaUi": {
"x": 530,
......
......@@ -6,9 +6,9 @@
"online": true,
"master": "local",
"labels": [
"0000ffffffff0008",
"FF:FF:FF:FF:00:08",
"sw-8"
"",
"sw-8",
"0000ffffffff0008"
],
"metaUi": {
"x": 734,
......
......@@ -7,10 +7,9 @@
"lastAuto": 13
},
"description": [
"Develop link event handling.",
"Press 'H' to show hosts.",
"",
"Press 'S' to load initial events.",
"",
"Press spacebar to complete the scenario..."
"Press '=' to load initial events.",
"Press '-' to fire further events."
]
}
......
......@@ -8,6 +8,10 @@
"lastAuto": 0
},
"description": [
"Press 'H' to show hosts.",
"",
"Press '-' to fire further events.",
"",
"1. add device [8] (offline)",
"2. add device [3] (offline)",
"3. update device [8] (online, label3 change)",
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff04",
"FF:FF:FF:FF:FF:04",
"?"
"",
"opt-4",
"0000ffffffffff04"
],
"metaUi": {
"x": 322,
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff000A",
"FF:FF:FF:FF:00:0A",
"?"
"",
"sw-A",
"0000ffffffff000A"
],
"metaUi": {
"x": 832,
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff0001",
"FF:FF:FF:FF:00:01",
"?"
"",
"sw-1",
"0000ffffffff0001"
],
"metaUi": {
"x": 167,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff01",
"FF:FF:FF:FF:FF:01",
"?"
"",
"opt-1",
"0000ffffffffff01"
],
"metaUi": {
"x": 227,
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff0004",
"FF:FF:FF:FF:00:04",
"?"
"",
"sw-4",
"0000ffffffff0004"
],
"metaUi": {
"x": 317,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff0A",
"FF:FF:FF:FF:FF:0A",
"?"
"",
"opt-A",
"0000ffffffffff0A"
],
"metaUi": {
"x": 840,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff09",
"FF:FF:FF:FF:FF:09",
"?"
"",
"opt-9",
"0000ffffffffff09"
],
"metaUi": {
"x": 1010,
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff02/20-of:0000ffffffffff05/10",
"type": "optical",
"online": true,
"linkWidth": 4,
"src": "of:0000ffffffffff02",
"srcPort": "20",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff000A/2-of:0000ffffffffff0A/1",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff000A",
"srcPort": "2",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff03/10-of:0000ffffffffff02/10",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff03",
"srcPort": "10",
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff08",
"FF:FF:FF:FF:FF:08",
"?"
"",
"opt-B",
"0000ffffffffff08"
],
"metaUi": {
"x": 539,
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff07/21-of:0000ffffffffff05/20",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff07",
"srcPort": "21",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff0001/2-of:0000ffffffffff01/1",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff0001",
"srcPort": "2",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff09/20-of:0000ffffffffff0A/20",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff09",
"srcPort": "20",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20",
"type": "optical",
"online": true,
"linkWidth": 4,
"src": "of:0000ffffffffff07",
"srcPort": "30",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff02/10-of:0000ffffffffff01/10",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff02",
"srcPort": "10",
......
......@@ -2,12 +2,13 @@
"event": "addLink",
"payload": {
"id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff04",
"srcPort": "27",
"dst": "of:0000ffffffffff08",
"dstPort": "10",
"type": "optical",
"linkWidth": 2,
"props" : {
"BW": "30 G"
}
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff0003/2-of:0000ffffffffff03/1",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff0003",
"srcPort": "2",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff09/1-of:0000ffffffff0009/2",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff09",
"srcPort": "1",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff03/30-of:0000ffffffffff04/10",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff03",
"srcPort": "30",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff07/20-of:0000ffffffffff09/10",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff07",
"srcPort": "20",
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff03",
"FF:FF:FF:FF:FF:03",
"?"
"",
"opt-3",
"0000ffffffffff03"
],
"metaUi": {
"x": 95,
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30",
"type": "optical",
"online": true,
"linkWidth": 4,
"src": "of:0000ffffffffff0A",
"srcPort": "10",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffff0004/2-of:0000ffffffffff04/1",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffff0004",
"srcPort": "2",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff07/1-of:0000ffffffff0007/2",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff07",
"srcPort": "1",
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff06",
"FF:FF:FF:FF:FF:06",
"?"
"",
"opt-6",
"0000ffffffffff06"
],
"metaUi": {
"x": 336,
......
......@@ -2,12 +2,13 @@
"event": "addLink",
"payload": {
"id": "of:0000ffffffffff06/20-of:0000ffffffffff05/30",
"type": "optical",
"online": true,
"linkWidth": 4,
"src": "of:0000ffffffffff06",
"srcPort": "20",
"dst": "of:0000ffffffffff05",
"dstPort": "30",
"type": "optical",
"linkWidth": 4,
"props" : {
"BW": "70 G"
}
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff03/20-of:0000ffffffffff06/10",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff03",
"srcPort": "20",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10",
"type": "optical",
"online": true,
"linkWidth": 4,
"src": "of:0000ffffffffff06",
"srcPort": "30",
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": false,
"labels": [
"0000ffffffffff08",
"FF:FF:FF:FF:FF:08",
"?"
"",
"opt-8",
"0000ffffffffff08"
],
"metaUi": {
"x": 539,
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff07/30-of:0000ffffffffff08/20",
"type": "optical",
"online": false,
"linkWidth": 4,
"src": "of:0000ffffffffff07",
"srcPort": "30",
......
......@@ -2,12 +2,13 @@
"event": "removeLink",
"payload": {
"id": "of:0000ffffffffff04/27-of:0000ffffffffff08/10",
"type": "optical",
"online": false,
"linkWidth": 2,
"src": "of:0000ffffffffff04",
"srcPort": "27",
"dst": "of:0000ffffffffff08",
"dstPort": "10",
"type": "optical",
"linkWidth": 2,
"props" : {
"BW": "30 G"
}
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff0007",
"FF:FF:FF:FF:00:07",
"?"
"",
"sw-7",
"0000ffffffff0007"
],
"metaUi": {
"x": 890,
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff0A/10-of:0000ffffffffff08/30",
"type": "optical",
"online": false,
"linkWidth": 4,
"src": "of:0000ffffffffff0A",
"srcPort": "10",
......
......@@ -3,6 +3,7 @@
"payload": {
"id": "of:0000ffffffffff06/30-of:0000ffffffffff08/10",
"type": "optical",
"online": false,
"linkWidth": 4,
"src": "of:0000ffffffffff06",
"srcPort": "30",
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff0009",
"FF:FF:FF:FF:00:09",
"?"
"",
"sw-9",
"0000ffffffff0009"
],
"metaUi": {
"x": 1004,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff02",
"FF:FF:FF:FF:FF:02",
"?"
"",
"opt-2",
"0000ffffffffff02"
],
"metaUi": {
"x": 211,
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff0003",
"FF:FF:FF:FF:00:03",
"?"
"",
"sw-3",
"0000ffffffff0003"
],
"metaUi": {
"x": 114,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff07",
"FF:FF:FF:FF:FF:07",
"?"
"",
"opt-7",
"0000ffffffffff07"
],
"metaUi": {
"x": 925,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": false,
"labels": [
"0000ffffffffff06",
"FF:FF:FF:FF:FF:06",
"?"
"",
"opt-6",
"0000ffffffffff06"
],
"metaUi": {
"x": 336,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff05",
"FF:FF:FF:FF:FF:05",
"?"
"",
"opt-5",
"0000ffffffffff05"
],
"metaUi": {
"x": 539,
......
......@@ -11,9 +11,8 @@
"Loads 16 devices (10 optical, 6 packet)",
" and their associated links.",
"",
"Press 'S' to load initial events.",
"",
"Press spacebar to complete the scenario...",
"Press '=' to load initial events.",
"Press '-' to fire further events...",
" * 4 events - device online, add 3 links",
" * 5 events - device offline, remove 4 links"
]
......
......@@ -2,7 +2,7 @@
"event": "addLink",
"payload": {
"id": "of:0000ffffffffff08/4-of:0000ffffffffff03/1",
"type": "direct",
"type": "optical",
"online": true,
"linkWidth": 2,
"src": "of:0000ffffffffff08",
......
......@@ -4,21 +4,28 @@
"payload": {
"paths": [
{
"intentId": "0x4321",
"class": "primary",
"links": [
"0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
"0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
],
"class": "primary"
"labels": [
"20 bytes",
"20 bytes"
]
},
{
"intentId": "0xbab3",
"class": "primary optical",
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1",
"of:0000ffffffff0008/4-of:0000ffffffffff08/1",
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
"class": "primary optical"
"labels": [
"24 bytes",
"some bits",
"foo bars"
]
}
]
}
......
......@@ -4,21 +4,28 @@
"payload": {
"paths": [
{
"intentId": "0x4321",
"class": "secondary",
"links": [
"0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
"0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
],
"class": "secondary"
"labels": [
"35 bytes",
"35 bytes"
]
},
{
"intentId": "0xbab3",
"class": "secondary optical",
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1",
"of:0000ffffffff0008/4-of:0000ffffffffff08/1",
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
"class": "secondary optical"
"labels": [
"24 bytes",
"some bits",
"foo bars"
]
}
]
}
......
......@@ -4,21 +4,30 @@
"payload": {
"paths": [
{
"intentId": "0x4321",
"class": "animated",
"traffic": true,
"links": [
"0E:2A:69:30:13:86/-1/0-of:0000ffffffff0003/101",
"0E:2A:69:30:13:aa/-1/0-of:0000ffffffff0008/101"
],
"class": "animated"
"labels": [
"47 bytes",
"47 bytes"
]
},
{
"intentId": "0xbab3",
"class": "animated optical",
"traffic": true,
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1",
"of:0000ffffffff0008/4-of:0000ffffffffff08/1",
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
"class": "animated optical"
"labels": [
"24 bytes",
"some bits",
"foo bars"
]
}
]
}
......
......@@ -4,46 +4,52 @@
"payload": {
"paths": [
{
"intentId": "0x1234",
"class": "primary",
"traffic": false,
"links": [
"of:0000ffffffff0008/2-of:0000ffffffff0003/1"
],
"class": "primary"
"labels": [""]
},
{
"intentId": "0x4321",
"class": "secondary",
"traffic": false,
"links": [
"of:0000ffffffff0003/9-of:0000ffffffff0007/2"
],
"class": "secondary"
"labels": [""]
},
{
"intentId": "0xbabe",
"class": "animated",
"traffic": true,
"links": [
"of:0000ffffffff0008/4-of:0000ffffffff0007/1"
],
"class": "animated"
"labels": [""]
},
{
"intentId": "0xbab1",
"class": "primary optical",
"traffic": false,
"links": [
"of:0000ffffffff0008/4-of:0000ffffffffff08/1"
],
"class": "primary optical"
"labels": [""]
},
{
"intentId": "0xbab2",
"class": "secondary optical",
"traffic": false,
"links": [
"of:0000ffffffff0003/4-of:0000ffffffffff03/1"
],
"class": "secondary optical"
"labels": [""]
},
{
"intentId": "0xbab3",
"class": "animated optical",
"traffic": true,
"links": [
"of:0000ffffffffff08/4-of:0000ffffffffff03/1"
],
"class": "animated optical"
"labels": [""]
}
]
}
......
......@@ -2,7 +2,6 @@
"event": "showTraffic",
"sid": 1,
"payload": {
"paths": [
]
"paths": []
}
}
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff0008",
"FF:FF:FF:FF:00:08",
"sw-8"
"",
"sw-8",
"0000ffffffff0008"
],
"metaUi": {
"x": 734,
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff0003",
"FF:FF:FF:FF:00:03",
"sw-3"
"",
"sw-3",
"0000ffffffff0003"
],
"metaUi": {
"x": 282,
......
......@@ -5,9 +5,9 @@
"type": "switch",
"online": true,
"labels": [
"0000ffffffff0007",
"FF:FF:FF:FF:00:07",
"sw-7"
"",
"sw-7",
"0000ffffffff0007"
],
"metaUi": {
"x": 530,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff08",
"FF:FF:FF:FF:FF:08",
"opt-8"
"",
"opt-8",
"0000ffffffffff08"
],
"metaUi": {
"x": 734,
......
......@@ -5,9 +5,9 @@
"type": "roadm",
"online": true,
"labels": [
"0000ffffffffff03",
"FF:FF:FF:FF:FF:03",
"opt-3"
"",
"opt-3",
"0000ffffffffff03"
],
"metaUi": {
"x": 282,
......
......@@ -9,8 +9,9 @@
"description": [
"Figure out primary, secondary and animated link visualizations.",
"",
"Press 'S' to load initial events.",
"Press 'H' to show hosts.",
"",
"Press spacebar to complete the scenario..."
"Press '=' to load initial events.",
"Press '-' to fire further events."
]
}
......