GUI changes to use new JSON format returned by get all flows summary REST API
diff --git a/web/ons-demo/js/app.js b/web/ons-demo/js/app.js
index 695e4bb..526b884 100644
--- a/web/ons-demo/js/app.js
+++ b/web/ons-demo/js/app.js
@@ -98,8 +98,8 @@
var pts = [];
if (!d.dataPath.flowEntries || !d.dataPath.flowEntries.length) {
// create a temporary vector to indicate the pending flow
- var s1 = d3.select(document.getElementById(d.dataPath.srcPort.dpid.value));
- var s2 = d3.select(document.getElementById(d.dataPath.dstPort.dpid.value));
+ var s1 = d3.select(document.getElementById(d.srcDpid));
+ var s2 = d3.select(document.getElementById(d.dstDpid));
var pt1 = document.querySelector('svg').createSVGPoint();
pt1.x = s1.attr('x');
@@ -175,7 +175,7 @@
});
row.on('dblclick', function () {
if (d) {
- var prompt = 'Delete flow ' + d.flowId.value + '?';
+ var prompt = 'Delete flow ' + d.flowId + '?';
if (confirm(prompt)) {
deleteFlow(d);
d.deletePending = true;
@@ -193,7 +193,7 @@
.text(function (d) {
if (d) {
if (d.flowId) {
- return d.flowId.value;
+ return d.flowId;
} else {
return '0x--';
}
@@ -206,14 +206,14 @@
row.select('.srcDPID')
.text(function (d) {
if (d) {
- return d.dataPath.srcPort.dpid.value;
+ return d.srcDpid;
}
});
row.select('.dstDPID')
.text(function (d) {
if (d) {
- return d.dataPath.dstPort.dpid.value;
+ return d.dstDpid;
}
});
}
@@ -315,20 +315,20 @@
row.append('div')
.classed('flowId', true)
.text(function (d) {
- return d.flowId.value;
+ return d.flowId;
});
row.append('div')
.classed('srcDPID', true)
.text(function (d) {
- return d.dataPath.srcPort.dpid.value;
+ return d.srcDpid;
});
row.append('div')
.classed('dstDPID', true)
.text(function (d) {
- return d.dataPath.dstPort.dpid.value;
+ return d.dstDpid;
});
}
@@ -471,7 +471,7 @@
}
function makeFlowKey(flow) {
- return flow.dataPath.srcPort.dpid.value + '=>' + flow.dataPath.dstPort.dpid.value;
+ return flow.srcDpid + '=>' + flow.dstDpid;
}
function createLinkMap(links) {
@@ -813,6 +813,8 @@
}
}
},
+ srcDpid: srcData.dpid,
+ dstDpid: dstData.dpid,
createPending: true
};
diff --git a/web/ons-demo/js/controller.js b/web/ons-demo/js/controller.js
index fd3f6ae..d91fba1 100644
--- a/web/ons-demo/js/controller.js
+++ b/web/ons-demo/js/controller.js
@@ -35,7 +35,7 @@
callURL(url);
},
delFlowCmd: function (flow) {
- var url = '/proxy/gui/delflow/' + flow.flowId.value;
+ var url = '/proxy/gui/delflow/' + flow.flowId;
callURL(url);
}
};