홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Thomas Vachuska
ece59ee9 1 parent 6741a5fd

Fixing visuals for the SDN-IP demo. 

Change-Id: Idd518213062c49c4f9011b951d87d2020927608a
Inline Side-by-side
Showing 7 changed files with 33 additions and 20 deletions
...@@ -13,14 +13,14 @@ ...@@ -13,14 +13,14 @@
13 ], 13 ],
14 14
15 "hosts" : [ 15 "hosts" : [
16 - { "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000000000000001/10", "ip": "0.0.0.0", "annotations": { "type": "bgpSpeaker" } }, 16 + { "mac": "00:00:00:00:00:01", "vlan": -1, "location": "of:0000000000000001/10", "ip": "10.0.1.2, 10.0.2.2", "annotations": { "type": "bgpSpeaker" } },
17 - { "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000000000000002/10", "ip": "0.0.0.0", "annotations": { "type": "bgpSpeaker" } }, 17 + { "mac": "00:00:00:00:00:02", "vlan": -1, "location": "of:0000000000000002/10", "ip": "10.0.11.2, 10.0.22.2, 10.0.3.2, 10.0.4.2", "annotations": { "type": "bgpSpeaker" } },
18 - { "mac": "00:00:00:00:00:03", "vlan": -1, "location": "of:0000000000000003/10", "ip": "0.0.0.0", "annotations": { "type": "bgpSpeaker" } }, 18 + { "mac": "00:00:00:00:00:03", "vlan": -1, "location": "of:0000000000000003/10", "ip": "10.0.33.2, 10.0.44.2", "annotations": { "type": "bgpSpeaker" } },
19 - { "mac": "00:00:00:00:01:01", "vlan": -1, "location": "of:0000000000000005/10", "ip": "0.0.0.0", "annotations": { "type": "router" } }, 19 + { "mac": "00:00:00:00:01:01", "vlan": -1, "location": "of:0000000000000005/10", "ip": "10.0.1.1", "annotations": { "type": "router" } },
20 - { "mac": "00:00:00:00:01:02", "vlan": -1, "location": "of:0000000000000006/10", "ip": "0.0.0.0", "annotations": { "type": "router" } }, 20 + { "mac": "00:00:00:00:01:02", "vlan": -1, "location": "of:0000000000000006/10", "ip": "10.0.11.1", "annotations": { "type": "router" } },
21 - { "mac": "00:00:00:00:02:01", "vlan": -1, "location": "of:0000000000000007/10", "ip": "0.0.0.0", "annotations": { "type": "router" } }, 21 + { "mac": "00:00:00:00:02:01", "vlan": -1, "location": "of:0000000000000007/10", "ip": "10.0.2.1, 10.0.22.1", "annotations": { "type": "router" } },
22 - { "mac": "00:00:00:00:03:01", "vlan": -1, "location": "of:0000000000000008/10", "ip": "0.0.0.0", "annotations": { "type": "router" } }, 22 + { "mac": "00:00:00:00:03:01", "vlan": -1, "location": "of:0000000000000008/10", "ip": "10.0.3.1, 10.0.33.1", "annotations": { "type": "router" } },
23 - { "mac": "00:00:00:00:04:01", "vlan": -1, "location": "of:0000000000000009/10", "ip": "0.0.0.0", "annotations": { "type": "router" } }, 23 + { "mac": "00:00:00:00:04:01", "vlan": -1, "location": "of:0000000000000009/10", "ip": "10.0.4.1", "annotations": { "type": "router" } },
24 - { "mac": "00:00:00:00:44:01", "vlan": -1, "location": "of:0000000000000010/10", "ip": "0.0.0.0", "annotations": { "type": "router" } } 24 + { "mac": "00:00:00:00:44:01", "vlan": -1, "location": "of:0000000000000010/10", "ip": "10.0.44.1", "annotations": { "type": "router" } }
25 ] 25 ]
26 } 26 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -50,8 +50,10 @@ import org.onlab.packet.VlanId; ...@@ -50,8 +50,10 @@ import org.onlab.packet.VlanId;
50 50
51 import java.net.URI; 51 import java.net.URI;
52 import java.util.ArrayList; 52 import java.util.ArrayList;
53 +import java.util.HashSet;
53 import java.util.Iterator; 54 import java.util.Iterator;
54 import java.util.List; 55 import java.util.List;
56 +import java.util.Set;
55 57
56 import static com.google.common.base.Preconditions.checkNotNull; 58 import static com.google.common.base.Preconditions.checkNotNull;
57 import static org.onlab.onos.net.DeviceId.deviceId; 59 import static org.onlab.onos.net.DeviceId.deviceId;
...@@ -205,10 +207,15 @@ class ConfigProvider implements DeviceProvider, LinkProvider, HostProvider { ...@@ -205,10 +207,15 @@ class ConfigProvider implements DeviceProvider, LinkProvider, HostProvider {
205 HostId hostId = HostId.hostId(mac, vlanId); 207 HostId hostId = HostId.hostId(mac, vlanId);
206 SparseAnnotations annotations = annotations(node.get("annotations")); 208 SparseAnnotations annotations = annotations(node.get("annotations"));
207 HostLocation location = new HostLocation(connectPoint(get(node, "location")), 0); 209 HostLocation location = new HostLocation(connectPoint(get(node, "location")), 0);
208 - IpAddress ip = IpAddress.valueOf(get(node, "ip")); 210 +
211 + String[] ipStrings = get(node, "ip").split(",");
212 + Set<IpAddress> ips = new HashSet<>();
213 + for (String ip : ipStrings) {
214 + ips.add(IpAddress.valueOf(ip.trim()));
215 + }
209 216
210 DefaultHostDescription desc = 217 DefaultHostDescription desc =
211 - new DefaultHostDescription(mac, vlanId, location, ip, annotations); 218 + new DefaultHostDescription(mac, vlanId, location, ips, annotations);
212 hps.hostDetected(hostId, desc); 219 hps.hostDetected(hostId, desc);
213 } 220 }
214 221
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
77 <script type="text/javascript"> 77 <script type="text/javascript">
78 var ONOS = $.onos({ 78 var ONOS = $.onos({
79 comment: 'configuration options', 79 comment: 'configuration options',
80 - theme: 'light', 80 + theme: 'dark',
81 startVid: 'topo', 81 startVid: 'topo',
82 trace: false 82 trace: false
83 }); 83 });
......
...@@ -85,11 +85,13 @@ ...@@ -85,11 +85,13 @@
85 background-color: #bbb; 85 background-color: #bbb;
86 border: 1px solid #eee; 86 border: 1px solid #eee;
87 color: #666; 87 color: #666;
88 +
88 } 89 }
89 .dark #mast span.radio.active { 90 .dark #mast span.radio.active {
90 background-color: #222; 91 background-color: #222;
91 border: 1px solid #eee; 92 border: 1px solid #eee;
92 - color: #aaf; 93 + Xcolor: #aaf;
94 + color: #78a;
93 } 95 }
94 96
95 /* Button Bar */ 97 /* Button Bar */
...@@ -119,6 +121,7 @@ ...@@ -119,6 +121,7 @@
119 border-bottom-color: #fff; 121 border-bottom-color: #fff;
120 background-color: #888; 122 background-color: #888;
121 color: #ddf; 123 color: #ddf;
124 + font-weight: bold;
122 } 125 }
123 126
124 .dark #bb .btn { 127 .dark #bb .btn {
...@@ -133,6 +136,8 @@ ...@@ -133,6 +136,8 @@
133 border-right-color: #888; 136 border-right-color: #888;
134 border-bottom-color: #888; 137 border-bottom-color: #888;
135 background-color: #555; 138 background-color: #555;
136 - color: #bbd; 139 + Xcolor: #bbd;
140 + color: #78a;
141 + font-weight: bold;
137 } 142 }
138 143
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
38 38
39 var defaultOptions = { 39 var defaultOptions = {
40 trace: false, 40 trace: false,
41 - theme: 'light', 41 + theme: 'dark',
42 startVid: defaultVid 42 startVid: defaultVid
43 }; 43 };
44 44
......
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
44 44
45 #topo svg .node.selected rect, 45 #topo svg .node.selected rect,
46 #topo svg .node.selected circle { 46 #topo svg .node.selected circle {
47 + fill: #ffA300;
47 filter: url(#blue-glow); 48 filter: url(#blue-glow);
48 } 49 }
49 50
...@@ -81,7 +82,7 @@ ...@@ -81,7 +82,7 @@
81 } 82 }
82 83
83 #topo svg .node.device.roadm.online { 84 #topo svg .node.device.roadm.online {
84 - fill: #03c; 85 + fill: #335a9a;
85 } 86 }
86 87
87 /* note: device is offline without the 'online' class */ 88 /* note: device is offline without the 'online' class */
......
...@@ -77,10 +77,10 @@ ...@@ -77,10 +77,10 @@
77 linkOutWidth: 30 77 linkOutWidth: 30
78 }, 78 },
79 icons: { 79 icons: {
80 - w: 24, 80 + w: 30,
81 - h: 24, 81 + h: 30,
82 - xoff: -10, 82 + xoff: -16,
83 - yoff: -6 83 + yoff: -14
84 }, 84 },
85 iconUrl: { 85 iconUrl: {
86 device: 'img/device.png', 86 device: 'img/device.png',
......