홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
Committed by Gerrit Code Review
d0949d28 1 parent f6ec97b3

ONOS-3864 : glyohs for OTN and FIBER_SWITCH. 

Change-Id: I585ce829409de6459cf3ccc1ef215f519006cd56
Inline Side-by-side
Showing 1 changed file with 81 additions and 18 deletions
...@@ -58,9 +58,11 @@ ...@@ -58,9 +58,11 @@
58 glyphDataSet = { 58 glyphDataSet = {
59 _viewbox: "0 0 110 110", 59 _viewbox: "0 0 110 110",
60 60
61 + // Small dot
61 unknown: "M35,40a5,5,0,0,1,5-5h30a5,5,0,0,1,5,5v30a5,5,0,0,1-5,5" + 62 unknown: "M35,40a5,5,0,0,1,5-5h30a5,5,0,0,1,5,5v30a5,5,0,0,1-5,5" +
62 "h-30a5,5,0,0,1-5-5z", 63 "h-30a5,5,0,0,1-5-5z",
63 64
65 + // Question mark for unknown device types
64 query: "M51.4,69.9c0-0.9,0-1.6,0-2.1c0-2.7,0.4-5.1,1.2-7.1" + 66 query: "M51.4,69.9c0-0.9,0-1.6,0-2.1c0-2.7,0.4-5.1,1.2-7.1" +
65 "c0.6-1.5,1.5-3,2.8-4.5c0.9-1.1,2.6-2.7,5.1-4.8c2.4-2.1,4-3.8," + 67 "c0.6-1.5,1.5-3,2.8-4.5c0.9-1.1,2.6-2.7,5.1-4.8c2.4-2.1,4-3.8," +
66 "4.8-5.1 c0.7-1.3,1.1-2.6,1.1-4.1c0-2.7-1.1-5.1-3.2-7.1c-2.1-2" + 68 "4.8-5.1 c0.7-1.3,1.1-2.6,1.1-4.1c0-2.7-1.1-5.1-3.2-7.1c-2.1-2" +
...@@ -70,40 +72,82 @@ ...@@ -70,40 +72,82 @@
70 "s-3.5,4.6-6.9,7.6c-2.3,2-3.8,3.5-4.5,4.4c-0.7,1-1.2,2-1.6,3.3" + 72 "s-3.5,4.6-6.9,7.6c-2.3,2-3.8,3.5-4.5,4.4c-0.7,1-1.2,2-1.6,3.3" +
71 "c-0.3,1.2-0.5,3.2-0.6,6H51.4z M51,83.8v-7.9h8v7.9H51z", 73 "c-0.3,1.2-0.5,3.2-0.6,6H51.4z M51,83.8v-7.9h8v7.9H51z",
72 74
75 +
76 + // --- ONOS cluster node ---
73 node: "M15,100a5,5,0,0,1-5-5v-65a5,5,0,0,1,5-5h80a5,5,0,0,1,5,5" + 77 node: "M15,100a5,5,0,0,1-5-5v-65a5,5,0,0,1,5-5h80a5,5,0,0,1,5,5" +
74 "v65a5,5,0,0,1-5,5zM14,22.5l11-11a10,3,0,0,1,10-2h40a10,3,0,0,1," + 78 "v65a5,5,0,0,1-5,5zM14,22.5l11-11a10,3,0,0,1,10-2h40a10,3,0,0,1," +
75 "10,2l11,11zM16,35a5,5,0,0,1,10,0a5,5,0,0,1-10,0z", 79 "10,2l11,11zM16,35a5,5,0,0,1,10,0a5,5,0,0,1-10,0z",
76 80
81 +
82 + // --- DEVICES ---
83 + // See Device.DeviceType enum for the following...
84 +
85 + // NOTE: "other" should map to 'unknown' (.) above
86 +
77 switch: "M10,20a10,10,0,0,1,10-10h70a10,10,0,0,1,10,10v70a10,10," + 87 switch: "M10,20a10,10,0,0,1,10-10h70a10,10,0,0,1,10,10v70a10,10," +
78 "0,0,1-10,10h-70a10,10,0,0,1-10-10zM60,26l12,0,0-8,18,13-18,13,0" + 88 "0,0,1-10,10h-70a10,10,0,0,1-10-10zM60,26l12,0,0-8,18,13-18,13,0" +
79 "-8-12,0zM60,60l12,0,0-8,18,13-18,13,0-8-12,0zM50,40l-12,0,0-8" + 89 "-8-12,0zM60,60l12,0,0-8,18,13-18,13,0-8-12,0zM50,40l-12,0,0-8" +
80 "-18,13,18,13,0-8,12,0zM50,74l-12,0,0-8-18,13,18,13,0-8,12,0z", 90 "-18,13,18,13,0-8,12,0zM50,74l-12,0,0-8-18,13,18,13,0-8,12,0z",
81 91
82 - roadm: "M10,35l25-25h40l25,25v40l-25,25h-40l-25-25zM58,26l12,0,0" +
83 - "-8,18,13-18,13,0-8-12,0zM58,60l12,0,0-8,18,13-18,13,0-8-12,0z" +
84 - "M52,40l-12,0,0-8-18,13,18,13,0-8,12,0zM52,74l-12,0,0-8-18,13," +
85 - "18,13,0-8,12,0z",
86 -
87 - otn: "M10,35l25-25h40l25,25v40l-25,25h-40l-25-25zM58,26l12,0,0" +
88 - "-8,18,13-18,13,0-8-12,0zM58,60l12,0,0-8,18,13-18,13,0-8-12,0z" +
89 - "M52,40l-12,0,0-8-18,13,18,13,0-8,12,0zM52,74l-12,0,0-8-18,13," +
90 - "18,13,0-8,12,0z",
91 -
92 - endstation: "M10,15a5,5,0,0,1,5-5h65a5,5,0,0,1,5,5v80a5,5,0,0,1" +
93 - "-5,5h-65a5,5,0,0,1-5-5zM87.5,14l11,11a3,10,0,0,1,2,10v40a3,10," +
94 - "0,0,1,-2,10l-11,11zM17,19a2,2,0,0,1,2-2h56a2,2,0,0,1,2,2v26a2," +
95 - "2,0,0,1-2,2h-56a2,2,0,0,1-2-2zM20,20h54v10h-54zM20,33h54v10h" +
96 - "-54zM42,70a5,5,0,0,1,10,0a5,5,0,0,1-10,0z",
97 -
98 router: "M10,55A45,45,0,0,1,100,55A45,45,0,0,1,10,55M20,50l12,0," + 92 router: "M10,55A45,45,0,0,1,100,55A45,45,0,0,1,10,55M20,50l12,0," +
99 "0-8,18,13-18,13,0-8-12,0zM90,50l-12,0,0-8-18,13,18,13,0-8,12,0z" + 93 "0-8,18,13-18,13,0-8-12,0zM90,50l-12,0,0-8-18,13,18,13,0-8,12,0z" +
100 "M50,47l0-12-8,0,13-18,13,18-8,0,0,12zM50,63l0,12-8,0,13,18,13" + 94 "M50,47l0-12-8,0,13-18,13,18-8,0,0,12zM50,63l0,12-8,0,13,18,13" +
101 "-18-8,0,0-12z", 95 "-18-8,0,0-12z",
102 96
103 - bgpSpeaker: "M10,40a45,35,0,0,1,90,0Q100,77,55,100Q10,77,10,40z" + 97 + roadm: "M10,35l25-25h40l25,25v40l-25,25h-40l-25-25zM58,26l12,0,0" +
104 - "M50,29l12,0,0-8,18,13-18,13,0-8-12,0zM60,57l-12,0,0-8-18,13," + 98 + "-8,18,13-18,13,0-8-12,0zM58,60l12,0,0-8,18,13-18,13,0-8-12,0z" +
99 + "M52,40l-12,0,0-8-18,13,18,13,0-8,12,0zM52,74l-12,0,0-8-18,13," +
105 "18,13,0-8,12,0z", 100 "18,13,0-8,12,0z",
106 101
102 + // TODO: review -- OTN
103 + otn: "M70.7,42A32.5,32.5,0,0,1,50.2,69.3c-0.2.1-.2,0.3-0.2,0.6" +
104 + "V82.3A4.1,4.1,0,0,1,46.2,86H33.5A3.8,3.8,0,0,1,30,82V70.4" +
105 + "a0.7,0.7,0,0,0-.5-0.6A31.6,31.6,0,1,1,69.9,32.3a4.5,4.5,0,0,0-1.7-.9" +
106 + "c-3.3-.9-5.8,1.7-7.1,4.4s-2.9,12-3.9,12.9-4.5,1.3-5.8-.5" +
107 + "a22.8,22.8,0,0,1-2.4-4.9C47.6,40,46.1,32,42,31.1" +
108 + "s-5.6,4.9-7,7.4,0.8,3.7,2.2,2.2,1.4-3.9,2.7-5.4a1.8,1.8,0,0,1,3,.7" +
109 + "c0.3,1,2.1,6,2.7,7.3,1.5,3.7,2.8,7.6,6.2,9.8,1.6,1,5.9.9,7.5-1.6" +
110 + "a27.8,27.8,0,0,0,2.7-7.1c0.6-2.5,2.1-13.1,6.8-8.1" +
111 + "C69.7,37.2,70.2,39.8,70.7,42Z" +
112 + "M48,91.7L32,94.2a0.7,0.7,0,0,1-.8-0.7V91.4a1,1,0,0,1,.8-0.9l16-2.5" +
113 + "a0.7,0.7,0,0,1,.8.7v2.2A1,1,0,0,1,48,91.7Z" +
114 + "M48,96.6L32,99.1a0.7,0.7,0,0,1-.8-0.7V96.2a1,1,0,0,1,.8-0.9l16-2.5" +
115 + "a0.7,0.7,0,0,1,.8.7v2.2A1,1,0,0,1,48,96.6Z" +
116 + "M35.6,99.4L45.3,98a2.1,2.1,0,0,0-.3,1c-0.5,3.4-7.7,4.6-8.8,1.4" +
117 + "C35.8,99.1,35.6,99.4,35.6,99.4Z" +
118 + "M34.9,89H34.6l-2.6.5a0.4,0.4,0,0,1-.5-0.4V87.8a0.7,0.7,0,0,1,.5-0.6" +
119 + "l9.8-.3c1,0,1.1,0,1.1.3s0.2,0.5-.5.6Z" +
120 + "M99.4,49.9c-1.3-3.6-4.2-12.1-5.2-13.5s-2.4-.9-3.7.3-4.1,14.1-7,15.7" +
121 + "a7.3,7.3,0,0,1-8.7-1.7,23.3,23.3,0,0,1-3.2-6.1,19.7,19.7,0,0,1-.7-2.7" +
122 + "c0.1-.7.1-1.5,0.1-2.2a30.9,30.9,0,0,0-.9-7.4" +
123 + "c2.9,2.5,3.4,8.4,4.6,11.4,0.5,1.2,1.2,3.4,2.2,4.5s4.7,2.1,5.8-.2" +
124 + "S86,37.1,87.5,34.5a5.5,5.5,0,0,1,8.1-1.9c1.7,1.2,2.1,3.1,2.7,4.9" +
125 + "l4,11.5C103.1,51,100,51.8,99.4,49.9Z",
126 +
127 + // TODO: roadm_otn
128 +
129 + // TODO: firewall
130 +
131 + // TODO: balancer
132 +
133 + // TODO: ips
134 +
135 + // TODO: ids
136 +
137 + // TODO: controller
138 +
139 + // TODO: virtual
140 +
141 + // TODO: review -- FIBER_SWITCH
142 + fiber_switch: "M98,61.3V57H74.6a19,19,0,0,1-4,9.8L86.9,83.1l3-3" +
143 + "v9.5H80.4l2.8-2.8L66.8,70.6a19,19,0,0,1-9.8,4V98h4.5l-6.7,6.7" +
144 + "L48.1,98H52V74.6a18.7,18.7,0,0,1-9.7-4L26,86.9l2.9,2.9H19.4" +
145 + "V80.3l2.9,2.9L38.6,66.8a19,19,0,0,1-4-9.8H12v4.3L5.3,54.5,12,47.9" +
146 + "V52H34.6a18.7,18.7,0,0,1,4-9.7L22.3,26l-2.8,2.8V19.2h9.4l-3,3" +
147 + "L42.3,38.6a18.7,18.7,0,0,1,9.7-4V12H48.1l6.8-6.7L61.5,12H57" +
148 + "V34.6a19,19,0,0,1,9.8,4L83.1,22.3l-2.9-2.9h9.5v9.5" +
149 + "L86.9,26,70.6,42.3a18.7,18.7,0,0,1,4,9.7H98V47.9l6.7,6.7Z",
150 +
107 microwave: "M85,71.2c-8.9,10.5-29.6,8.7-45.3-3.5C23.9,55.4,19.8," + 151 microwave: "M85,71.2c-8.9,10.5-29.6,8.7-45.3-3.5C23.9,55.4,19.8," +
108 "37,28.6,26.5C29.9,38.6,71.5,69.9,85,71.2z M92.7,76.2M16.2,15 " + 152 "37,28.6,26.5C29.9,38.6,71.5,69.9,85,71.2z M92.7,76.2M16.2,15 " +
109 "M69.5,100.7v-4c0-1.4-1.2-2.2-2.6-2.2H19.3c-1.4,0-2.8,0.7-2.8,2.2" + 153 "M69.5,100.7v-4c0-1.4-1.2-2.2-2.6-2.2H19.3c-1.4,0-2.8,0.7-2.8,2.2" +
...@@ -120,6 +164,25 @@ ...@@ -120,6 +164,25 @@
120 "c0.6,0.2,1.3,0.3,1.9,0.3c2.9-0.1,5.2-2.3,5.1-4.9C79.3,27.6,76.8," + 164 "c0.6,0.2,1.3,0.3,1.9,0.3c2.9-0.1,5.2-2.3,5.1-4.9C79.3,27.6,76.8," +
121 "25.6,73.9,25.7z", 165 "25.6,73.9,25.7z",
122 166
167 + // NOTE: "unrecognized" should map to 'query' (?) above
168 +
169 +
170 + // --- HOSTS ---
171 +
172 + // default glyph for a host
173 + endstation: "M10,15a5,5,0,0,1,5-5h65a5,5,0,0,1,5,5v80a5,5,0,0,1" +
174 + "-5,5h-65a5,5,0,0,1-5-5zM87.5,14l11,11a3,10,0,0,1,2,10v40a3,10," +
175 + "0,0,1,-2,10l-11,11zM17,19a2,2,0,0,1,2-2h56a2,2,0,0,1,2,2v26a2," +
176 + "2,0,0,1-2,2h-56a2,2,0,0,1-2-2zM20,20h54v10h-54zM20,33h54v10h" +
177 + "-54zM42,70a5,5,0,0,1,10,0a5,5,0,0,1-10,0z",
178 +
179 + bgpSpeaker: "M10,40a45,35,0,0,1,90,0Q100,77,55,100Q10,77,10,40z" +
180 + "M50,29l12,0,0-8,18,13-18,13,0-8-12,0zM60,57l-12,0,0-8-18,13," +
181 + "18,13,0-8,12,0z",
182 +
183 +
184 + // --- Miscellaneous glyphs ---------------------------------
185 +
123 chain: "M60.4,77.6c-4.9,5.2-9.6,11.3-15.3,16.3c-8.6,7.5-20.4,6.8" + 186 chain: "M60.4,77.6c-4.9,5.2-9.6,11.3-15.3,16.3c-8.6,7.5-20.4,6.8" +
124 "-28-0.8c-7.7-7.7-8.4-19.6-0.8-28.4c6.5-7.4,13.5-14.4,20.9-20.9" + 187 "-28-0.8c-7.7-7.7-8.4-19.6-0.8-28.4c6.5-7.4,13.5-14.4,20.9-20.9" +
125 "c7.5-6.7,19.2-6.7,26.5-0.8c3.5,2.8,4.4,6.1,2.2,8.7c-2.7,3.1" + 188 "c7.5-6.7,19.2-6.7,26.5-0.8c3.5,2.8,4.4,6.1,2.2,8.7c-2.7,3.1" +
......