Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix NPEs on switch disconnect in cluster mode
[controller.git]
/
opendaylight
/
web
/
root
/
src
/
main
/
resources
/
js
/
open.js
diff --git
a/opendaylight/web/root/src/main/resources/js/open.js
b/opendaylight/web/root/src/main/resources/js/open.js
index b2502ad71ae473b2ca157bf0f79b3fe0d74bf2ed..43a7dfdc443ab7447fb472dc31afa1b83402f9d7 100644
(file)
--- a/
opendaylight/web/root/src/main/resources/js/open.js
+++ b/
opendaylight/web/root/src/main/resources/js/open.js
@@
-562,9
+562,9
@@
one.main.cluster = {
data : function(data) {
var tdata = [];
var registry = [];
data : function(data) {
var tdata = [];
var registry = [];
- $(data).each(function(idx,
val
) {
- var name =
val
.name;
- var address =
val
.address;
+ $(data).each(function(idx,
controller
) {
+ var name =
controller
.name;
+ var address =
controller
.address;
var $registry = $(document.createElement('span'));
$registry
.append(JSON.stringify(address))
var $registry = $(document.createElement('span'));
$registry
.append(JSON.stringify(address))
@@
-572,26
+572,32
@@
one.main.cluster = {
.addClass('ux-id');
name = one.lib.dashlet.label(name, null)[0].outerHTML;
name += $registry[0].outerHTML;
.addClass('ux-id');
name = one.lib.dashlet.label(name, null)[0].outerHTML;
name += $registry[0].outerHTML;
- if (
val
.me === true) {
+ if (
controller
.me === true) {
var me = one.lib.dashlet.label('*', 'label-inverse')[0].outerHTML;
name += ' '+me;
}
var me = one.lib.dashlet.label('*', 'label-inverse')[0].outerHTML;
name += ' '+me;
}
- if (
val
.coordinator === true) {
+ if (
controller
.coordinator === true) {
var coord = one.lib.dashlet.label('C')[0].outerHTML;
name += ' '+coord;
}
tdata.push({
var coord = one.lib.dashlet.label('C')[0].outerHTML;
name += ' '+coord;
}
tdata.push({
- 'controller' : name
+ 'controller' : name,
+ 'numNodes' : controller.numConnectedNodes
});
});
var source = new StaticDataSource({
});
});
var source = new StaticDataSource({
- columns : [
- {
- property : 'controller',
- label : 'Controller',
- sortable : true
- }
- ],
+ columns : [
+ {
+ property : 'controller',
+ label : 'Controller',
+ sortable : true
+ },
+ {
+ property : 'numNodes',
+ label : 'Nodes',
+ sortable : true
+ }
+ ],
data : tdata,
delay : 0
});
data : tdata,
delay : 0
});