홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
16582df9 1 parent e4cebafa

Fixed GUI labels for nodes and fixed a few GPS coordinates. 

Change-Id: I3fd03e8551febaead4f81dc6d0e80a689cf6ee14
Expand all
Inline Side-by-side
Showing 5 changed files with 62 additions and 56 deletions
This diff is collapsed. Click to expand it.
...@@ -2,33 +2,33 @@ ...@@ -2,33 +2,33 @@
2 "devices" : [ 2 "devices" : [
3 { 3 {
4 "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM", 4 "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
5 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM1", 5 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
6 - "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 }, 6 + "annotations": { "name": "ROADM1", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
7 "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" } ] 7 "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" } ]
8 }, 8 },
9 { 9 {
10 "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM", 10 "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
11 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM2", 11 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
12 - "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 }, 12 + "annotations": { "name": "ROADM2", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
13 "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" } ] 13 "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" } ]
14 }, 14 },
15 { 15 {
16 "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM", 16 "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
17 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM3", 17 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
18 - "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 }, 18 + "annotations": { "name": "ROADM3", "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
19 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ] 19 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
20 }, 20 },
21 21
22 { 22 {
23 "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH", 23 "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
24 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1", 24 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
25 - "annotations": { "latitude": 37.6, "longitude": -122.3 }, 25 + "annotations": { "name": "ROUTER1", "latitude": 37.6, "longitude": -122.3 },
26 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 26 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
27 }, 27 },
28 { 28 {
29 "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH", 29 "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH",
30 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER2", 30 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
31 - "annotations": { "latitude": 37.3, "longitude": -121.9 }, 31 + "annotations": { "name": "ROUTER2", "latitude": 37.3, "longitude": -121.9 },
32 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 32 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
33 } 33 }
34 ], 34 ],
......
...@@ -2,40 +2,40 @@ ...@@ -2,40 +2,40 @@
2 "devices" : [ 2 "devices" : [
3 { 3 {
4 "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM", 4 "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
5 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SFO-W10", 5 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
6 - "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 }, 6 + "annotations": { "name": "SFO-W10", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
7 "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, 7 "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" },
8 { "port": 20, "speed": 0, "type": "FIBER" }, 8 { "port": 20, "speed": 0, "type": "FIBER" },
9 { "port": 50, "speed":100000, "type": "FIBER" } ] 9 { "port": 50, "speed":100000, "type": "FIBER" } ]
10 }, 10 },
11 { 11 {
12 "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM", 12 "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
13 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SJC-W10", 13 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
14 - "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 }, 14 + "annotations": { "name": "SJC-W10", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
15 "ports": [ { "port": 20, "speed": 100000, "type": "FIBER" }, 15 "ports": [ { "port": 20, "speed": 100000, "type": "FIBER" },
16 { "port": 30, "speed": 0, "type": "FIBER" }, 16 { "port": 30, "speed": 0, "type": "FIBER" },
17 { "port": 50, "speed": 0, "type": "FIBER" } ] 17 { "port": 50, "speed": 0, "type": "FIBER" } ]
18 }, 18 },
19 { 19 {
20 "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM", 20 "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
21 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "LAX-W10", 21 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
22 - "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 0 }, 22 + "annotations": { "name": "LAX-W10", "latitude": 33.9, "longitude": -118.4, "optical.regens": 0 },
23 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, 23 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" },
24 { "port": 50, "speed": 0, "type": "FIBER" }, 24 { "port": 50, "speed": 0, "type": "FIBER" },
25 { "port": 20, "speed": 0, "type": "FIBER" } ] 25 { "port": 20, "speed": 0, "type": "FIBER" } ]
26 }, 26 },
27 { 27 {
28 "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type": "ROADM", 28 "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type": "ROADM",
29 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "SDG-W10", 29 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
30 - "annotations": { "latitude": 32.8, "longitude": -117.1, "optical.regens": 3 }, 30 + "annotations": { "name": "SDG-W10", "latitude": 32.8, "longitude": -117.1, "optical.regens": 3 },
31 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, 31 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" },
32 { "port":50, "speed": 0, "type": "FIBER" }, 32 { "port":50, "speed": 0, "type": "FIBER" },
33 { "port":20, "speed": 0, "type": "FIBER" }] 33 { "port":20, "speed": 0, "type": "FIBER" }]
34 }, 34 },
35 { 35 {
36 "uri": "of:0000ffffffffff05", "mac": "ffffffffffff05", "type": "ROADM", 36 "uri": "of:0000ffffffffff05", "mac": "ffffffffffff05", "type": "ROADM",
37 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "MSP-M10", 37 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
38 - "annotations": { "latitude": 44.8, "longitude": -93.1, "optical.regens": 3 }, 38 + "annotations": { "name": "MSP-M10", "latitude": 44.8, "longitude": -93.1, "optical.regens": 3 },
39 "ports": [ { "port": 20, "speed": 0, "type": "FIBER" }, 39 "ports": [ { "port": 20, "speed": 0, "type": "FIBER" },
40 { "port": 30, "speed": 0, "type": "FIBER" }, 40 { "port": 30, "speed": 0, "type": "FIBER" },
41 { "port": 40, "speed": 0, "type": "FIBER" }, 41 { "port": 40, "speed": 0, "type": "FIBER" },
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
43 }, 43 },
44 { 44 {
45 "uri": "of:0000ffffffffff06", "mac": "ffffffffffff06", "type": "ROADM", 45 "uri": "of:0000ffffffffff06", "mac": "ffffffffffff06", "type": "ROADM",
46 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "DFW-M10", 46 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
47 - "annotations": { "latitude": 32.8, "longitude": -97.1, "optical.regens": 3 }, 47 + "annotations": { "name": "DFW-M10", "latitude": 32.8, "longitude": -97.1, "optical.regens": 3 },
48 "ports": [ { "port": 10, "speed": 0, "type": "FIBER" }, 48 "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
49 { "port": 20, "speed": 0, "type": "FIBER" }, 49 { "port": 20, "speed": 0, "type": "FIBER" },
50 { "port": 30, "speed": 0, "type": "FIBER" }, 50 { "port": 30, "speed": 0, "type": "FIBER" },
...@@ -53,8 +53,8 @@ ...@@ -53,8 +53,8 @@
53 }, 53 },
54 { 54 {
55 "uri": "of:0000ffffffffff07", "mac": "ffffffffffff07", "type": "ROADM", 55 "uri": "of:0000ffffffffff07", "mac": "ffffffffffff07", "type": "ROADM",
56 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "CHG-N10", 56 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
57 - "annotations": { "latitude": 41.8, "longitude": -120.1, "optical.regens": 3 }, 57 + "annotations": { "name": "CHG-N10", "latitude": 41.8, "longitude": -87.6, "optical.regens": 3 },
58 "ports": [ { "port": 10, "speed": 0, "type": "FIBER" }, 58 "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
59 { "port": 20, "speed": 0, "type": "FIBER" }, 59 { "port": 20, "speed": 0, "type": "FIBER" },
60 { "port": 30, "speed": 0, "type": "FIBER" }, 60 { "port": 30, "speed": 0, "type": "FIBER" },
...@@ -62,62 +62,62 @@ ...@@ -62,62 +62,62 @@
62 }, 62 },
63 { 63 {
64 "uri": "of:0000ffffffffff08", "mac": "ffffffffffff08", "type": "ROADM", 64 "uri": "of:0000ffffffffff08", "mac": "ffffffffffff08", "type": "ROADM",
65 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "IAD-M10", 65 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
66 - "annotations": { "latitude": 38.8, "longitude": -77.1, "optical.regens": 3 }, 66 + "annotations": { "name": "IAD-M10", "latitude": 38.8, "longitude": -77.1, "optical.regens": 3 },
67 "ports": [ { "port": 20, "speed": 0, "type": "FIBER" }, 67 "ports": [ { "port": 20, "speed": 0, "type": "FIBER" },
68 { "port": 30, "speed": 0, "type": "FIBER" }, 68 { "port": 30, "speed": 0, "type": "FIBER" },
69 { "port": 50, "speed": 0, "type": "FIBER" }] 69 { "port": 50, "speed": 0, "type": "FIBER" }]
70 }, 70 },
71 { 71 {
72 "uri": "of:0000ffffffffff09", "mac": "ffffffffffff09", "type": "ROADM", 72 "uri": "of:0000ffffffffff09", "mac": "ffffffffffff09", "type": "ROADM",
73 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "JFK-M10", 73 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
74 - "annotations": { "latitude": 40.8, "longitude": -73.1, "optical.regens": 0 }, 74 + "annotations": { "name": "JFK-M10", "latitude": 40.8, "longitude": -73.1, "optical.regens": 0 },
75 "ports": [ { "port": 10, "speed": 0, "type": "FIBER" }, 75 "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
76 { "port": 20, "speed": 0, "type": "FIBER" }, 76 { "port": 20, "speed": 0, "type": "FIBER" },
77 { "port": 50, "speed": 0, "type": "FIBER" }] 77 { "port": 50, "speed": 0, "type": "FIBER" }]
78 }, 78 },
79 { 79 {
80 "uri": "of:0000ffffffffff0A", "mac": "ffffffffffff0A", "type": "ROADM", 80 "uri": "of:0000ffffffffff0A", "mac": "ffffffffffff0A", "type": "ROADM",
81 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ATL-S10", 81 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
82 - "annotations": { "latitude": 33.8, "longitude": -84.1, "optical.regens": 0 }, 82 + "annotations": { "name": "ATL-S10", "latitude": 33.8, "longitude": -84.1, "optical.regens": 0 },
83 "ports": [ { "port": 10, "speed": 0, "type": "FIBER" }, 83 "ports": [ { "port": 10, "speed": 0, "type": "FIBER" },
84 { "port": 20, "speed": 0, "type": "FIBER" }, 84 { "port": 20, "speed": 0, "type": "FIBER" },
85 { "port": 50, "speed": 0, "type": "FIBER" }] 85 { "port": 50, "speed": 0, "type": "FIBER" }]
86 }, 86 },
87 { 87 {
88 "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH", 88 "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
89 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "SFO-R10", 89 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
90 - "annotations": { "latitude": 37.6, "longitude": -122.3 }, 90 + "annotations": { "name": "SFO-R10", "latitude": 37.6, "longitude": -122.3 },
91 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 91 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
92 }, 92 },
93 { 93 {
94 "uri": "of:0000ffffffff0002", "mac": "ffffffffff0003", "type": "SWITCH", 94 "uri": "of:0000ffffffff0002", "mac": "ffffffffff0003", "type": "SWITCH",
95 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "LAX-R10", 95 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
96 - "annotations": { "latitude": 33.9, "longitude": -118.4 }, 96 + "annotations": { "name": "LAX-R10", "latitude": 33.9, "longitude": -118.4 },
97 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 97 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
98 }, 98 },
99 { 99 {
100 "uri": "of:0000ffffffff0003", "mac": "ffffffffff0004", "type": "SWITCH", 100 "uri": "of:0000ffffffff0003", "mac": "ffffffffff0004", "type": "SWITCH",
101 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "SDG-R10", 101 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
102 - "annotations": { "latitude": 32.8, "longitude": -117.1 }, 102 + "annotations": { "name": "SDG-R10", "latitude": 32.8, "longitude": -117.1 },
103 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 103 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
104 }, 104 },
105 { 105 {
106 "uri": "of:0000ffffffff0004", "mac": "ffffffffff0007", "type": "SWITCH", 106 "uri": "of:0000ffffffff0004", "mac": "ffffffffff0007", "type": "SWITCH",
107 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "CHG-R10", 107 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
108 - "annotations": { "latitude": 41.8, "longitude": -120.1 }, 108 + "annotations": { "name": "CHG-R10", "latitude": 41.8, "longitude": -87.6 },
109 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 109 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
110 }, 110 },
111 { 111 {
112 "uri": "of:0000ffffffff0005", "mac": "ffffffffff0009", "type": "SWITCH", 112 "uri": "of:0000ffffffff0005", "mac": "ffffffffff0009", "type": "SWITCH",
113 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "JFK-R10", 113 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
114 - "annotations": { "latitude": 40.8, "longitude": -73.1 }, 114 + "annotations": { "name": "JFK-R10", "latitude": 40.8, "longitude": -73.1 },
115 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 115 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
116 }, 116 },
117 { 117 {
118 "uri": "of:0000ffffffff0006", "mac": "ffffffffff000A", "type": "SWITCH", 118 "uri": "of:0000ffffffff0006", "mac": "ffffffffff000A", "type": "SWITCH",
119 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ATL-R10", 119 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
120 - "annotations": { "latitude": 33.8, "longitude": -84.1 }, 120 + "annotations": { "name": "ATL-R10", "latitude": 33.8, "longitude": -84.1 },
121 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 121 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
122 } 122 }
123 123
......
...@@ -2,38 +2,38 @@ ...@@ -2,38 +2,38 @@
2 "devices" : [ 2 "devices" : [
3 { 3 {
4 "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM", 4 "uri": "of:0000ffffffffff01", "mac": "ffffffffffff01", "type": "ROADM",
5 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM1", 5 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
6 - "annotations": { "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 }, 6 + "annotations": { "name": "ROADM1", "latitude": 37.6, "longitude": -122.3, "optical.regens": 0 },
7 "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ] 7 "ports": [ { "port": 10, "speed": 100000, "type": "FIBER" }, { "port": 20, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ]
8 }, 8 },
9 { 9 {
10 "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM", 10 "uri": "of:0000ffffffffff02", "mac": "ffffffffffff02", "type": "ROADM",
11 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM2", 11 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
12 - "annotations": { "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 }, 12 + "annotations": { "name": "ROADM2", "latitude": 37.3, "longitude": -121.9, "optical.regens": 0 },
13 "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ] 13 "ports": [ { "port": 11, "speed": 100000, "type": "FIBER" }, { "port": 21, "speed": 0, "type": "FIBER" }, { "port": 22, "speed": 0, "type": "FIBER" } ]
14 }, 14 },
15 { 15 {
16 "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM", 16 "uri": "of:0000ffffffffff03", "mac": "ffffffffffff03", "type": "ROADM",
17 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM3", 17 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
18 - "annotations": { "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 }, 18 + "annotations": { "name": "ROADM3", "latitude": 33.9, "longitude": -118.4, "optical.regens": 2 },
19 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ] 19 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
20 }, 20 },
21 { 21 {
22 "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type":"ROADM", 22 "uri": "of:0000ffffffffff04", "mac": "ffffffffffff04", "type":"ROADM",
23 - "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?", "name": "ROADM4", 23 + "mfr": "Linc", "hw": "OE", "sw": "?", "serial": "?",
24 - "annotations": { "latitude": 39.9, "longitude": -119.4, "optical.regens": 2 }, 24 + "annotations": { "name": "ROADM4", "latitude": 39.9, "longitude": -119.4, "optical.regens": 2 },
25 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ] 25 "ports": [ { "port": 30, "speed": 0, "type": "FIBER" }, { "port": 31, "speed": 0, "type": "FIBER" } ]
26 }, 26 },
27 { 27 {
28 "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH", 28 "uri": "of:0000ffffffff0001", "mac": "ffffffffff0001", "type": "SWITCH",
29 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER1", 29 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
30 - "annotations": { "latitude": 37.6, "longitude": -122.3 }, 30 + "annotations": { "name": "ROUTER1", "latitude": 37.6, "longitude": -122.3 },
31 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 31 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
32 }, 32 },
33 { 33 {
34 "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH", 34 "uri": "of:0000ffffffff0002", "mac": "ffffffffff0002", "type": "SWITCH",
35 - "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?", "name": "ROUTER2", 35 + "mfr": "Linc", "hw": "PK", "sw": "?", "serial": "?",
36 - "annotations": { "latitude": 37.3, "longitude": -121.9 }, 36 + "annotations": { "name": "ROUTER2", "latitude": 37.3, "longitude": -121.9 },
37 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ] 37 "ports": [ { "port": 1, "speed": 10000, "type": "COPPER" }, { "port": 2, "speed": 100000, "type": "FIBER" } ]
38 } 38 }
39 ], 39 ],
......
...@@ -143,8 +143,10 @@ public abstract class TopologyViewMessages { ...@@ -143,8 +143,10 @@ public abstract class TopologyViewMessages {
143 // Produces JSON structure from annotations. 143 // Produces JSON structure from annotations.
144 private JsonNode props(Annotations annotations) { 144 private JsonNode props(Annotations annotations) {
145 ObjectNode props = mapper.createObjectNode(); 145 ObjectNode props = mapper.createObjectNode();
146 - for (String key : annotations.keys()) { 146 + if (annotations != null) {
147 - props.put(key, annotations.value(key)); 147 + for (String key : annotations.keys()) {
148 + props.put(key, annotations.value(key));
149 + }
148 } 150 }
149 return props; 151 return props;
150 } 152 }
...@@ -306,6 +308,10 @@ public abstract class TopologyViewMessages { ...@@ -306,6 +308,10 @@ public abstract class TopologyViewMessages {
306 // Adds a geo location JSON to the specified payload object. 308 // Adds a geo location JSON to the specified payload object.
307 private void addGeoLocation(Annotated annotated, ObjectNode payload) { 309 private void addGeoLocation(Annotated annotated, ObjectNode payload) {
308 Annotations annotations = annotated.annotations(); 310 Annotations annotations = annotated.annotations();
311 + if (annotations == null) {
312 + return;
313 + }
314 +
309 String slat = annotations.value("latitude"); 315 String slat = annotations.value("latitude");
310 String slng = annotations.value("longitude"); 316 String slng = annotations.value("longitude");
311 try { 317 try {
......