Fixed a defect in GUI details fly-out (it would not appear)
Adjusted L&F of the port labels
Suppressed using buffer-id in packet-out messages; we now always send data; cbench is much more steady now and I see no 0s!!!!
diff --git a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java
index ac3406a..7924b9d 100644
--- a/openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java
+++ b/openflow/api/src/main/java/org/onlab/onos/openflow/controller/DefaultOpenFlowPacketContext.java
@@ -60,7 +60,9 @@
OFAction act = buildOutput(outPort.getPortNumber());
pktout = builder.setXid(pktin.getXid())
.setInPort(inport())
- .setBufferId(pktin.getBufferId())
+ .setBufferId(OFBufferId.NO_BUFFER)
+ .setData(pktin.getData())
+// .setBufferId(pktin.getBufferId())
.setActions(Collections.singletonList(act))
.build();
}
diff --git a/tools/test/topos/sol.py b/tools/test/topos/sol.py
old mode 100644
new mode 100755
diff --git a/web/gui/src/main/webapp/network.js b/web/gui/src/main/webapp/network.js
index 9ac7241..39e0f72 100644
--- a/web/gui/src/main/webapp/network.js
+++ b/web/gui/src/main/webapp/network.js
@@ -359,7 +359,7 @@
ix = Math.random() * 0.6 * nw + 0.2 * nw,
iy = ypc * nh,
node = {
- id: safeId(n.id),
+ id: n.id,
labels: n.labels,
class: 'device',
icon: 'device',
@@ -381,7 +381,7 @@
ix = Math.random() * 0.6 * nw + 0.2 * nw,
iy = ypc * nh,
node = {
- id: safeId(n.id),
+ id: n.id,
labels: n.labels,
class: 'host',
icon: 'host',
@@ -584,38 +584,40 @@
network.link.filter('.infra').each(function(d, i) {
network.linkSrcPort.append('rect').attr({
- id: 'srcPort-' + d.id,
+ id: 'srcPort-' + safeId(d.id),
class: 'port',
width: pw,
height: ph,
- x: i * 20,
- y: 0
- })
- .style('visibility', portVis);
+ Xx: i * 20,
+ Xy: 0,
+ rx: 4,
+ ry: 4
+ }).style('visibility', portVis);
network.linkTgtPort.append('rect').attr({
- id: 'tgtPort-' + d.id,
+ id: 'tgtPort-' + safeId(d.id),
class: 'port',
width: pw,
height: ph,
- x: i * 20,
- y: 20
- })
- .style('visibility', portVis);
+ Xx: i * 20,
+ Xy: 20,
+ rx: 4,
+ ry: 4
+ }).style('visibility', portVis);
network.linkSrcPort.append('text').attr({
- id: 'srcText-' + d.id,
+ id: 'srcText-' + safeId(d.id),
class: 'portText',
- x: i * 20,
- y:0
+ Xx: i * 20,
+ Xy: 0
}).text(d.srcPort)
.style('visibility', portVis);
network.linkTgtPort.append('text').attr({
- id: 'tgtText-' + d.id,
+ id: 'tgtText-' + safeId(d.id),
class: 'portText',
- x: i * 20,
- y:20
+ Xx: i * 20,
+ Xy: 20
}).text(d.tgtPort)
.style('visibility', portVis);
});
@@ -985,26 +987,27 @@
}
// adjust the endpoints of the link's line to match rectangles
+ var sid = safeId(d.id);
d3.select(this)
.attr('x1', exs)
.attr('y1', eys)
.attr('x2', ext)
.attr('y2', eyt);
- d3.select('#srcPort-' + d.id)
+ d3.select('#srcPort-' + sid)
.attr('x', pxs - portHalfW)
.attr('y', pys - portHalfH);
- d3.select('#tgtPort-' + d.id)
+ d3.select('#tgtPort-' + sid)
.attr('x', pxt - portHalfW)
.attr('y', pyt - portHalfH);
// TODO: fit label rect to size of port number.
- d3.select('#srcText-' + d.id)
+ d3.select('#srcText-' + sid)
.attr('x', pxs - 5)
.attr('y', pys + 3);
- d3.select('#tgtText-' + d.id)
+ d3.select('#tgtText-' + sid)
.attr('x', pxt - 5)
.attr('y', pyt + 3);
diff --git a/web/gui/src/main/webapp/onos.css b/web/gui/src/main/webapp/onos.css
index 143f2b0..356ccf7 100644
--- a/web/gui/src/main/webapp/onos.css
+++ b/web/gui/src/main/webapp/onos.css
@@ -103,20 +103,15 @@
svg .link.host {
stroke: #666;
stroke-width: 1px;
- Xstroke-dasharray: 3,3;
}
svg g.portLayer rect.port {
- stroke-width: 1;
- stroke: black;
- fill: white;
+ fill: #ccc;
}
svg g.portLayer text {
- stroke: #888;
- font-size: 8pt;
- text-align: center;
- font-weight: normal;
+ Xstroke: #fff;
+ font: 8pt sans-serif;
pointer-events: none;
}
@@ -149,7 +144,7 @@
svg .node text {
fill: white;
- font: 10px sans-serif;
+ font: 10pt sans-serif;
pointer-events: none;
}