Skip to content

Commit

Permalink
Merge "Partial-Bug: #1459472 Networking monitoring issues on scale se…
Browse files Browse the repository at this point in the history 
…tup" into R2.20
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed May 28, 2015
2 parents 29fee20 + 66ee75c commit 16422a8
Show file tree
Hide file tree
Showing 5 changed files with 59 additions and 50 deletions.
21 changes: 6 additions & 15 deletions webroot/common/ui/js/controller.graph.config.js
View file
Expand Up @@ -194,14 +194,6 @@ define([
return tooltipContent({
info: [
{label: 'Project', value: virtualNetworkName[0] + ':' + virtualNetworkName[1]},
{
label: 'Traffic In',
value: formatNumberByCommas(viewElement.attributes.nodeDetails.more_attr.in_tpkts) + ' packets | ' + formatBytes(viewElement.attributes.nodeDetails.more_attr.in_bytes)
},
{
label: 'Traffic Out',
value: formatNumberByCommas(viewElement.attributes.nodeDetails.more_attr.out_tpkts) + ' packets | ' + formatBytes(viewElement.attributes.nodeDetails.more_attr.out_bytes)
},
{label: 'Instance Count', value: viewElement.attributes.nodeDetails.more_attr.vm_cnt}
],
iconClass: 'icon-contrail-virtual-network',
Expand Down Expand Up @@ -296,8 +288,7 @@ define([
return tooltipContent({
info: [
{label: 'UUID', value: viewElement.attributes.nodeDetails['fqName']},
{label: 'Network', value: srcVNDetails.name},
{label: 'Interface Count', value: srcVNDetails.more_attr.interface_list.length}
{label: 'Network', value: srcVNDetails.name}
],
iconClass: 'icon-contrail-virtual-machine font-size-30'
});
Expand Down Expand Up @@ -345,13 +336,13 @@ define([
});
data.push({
label: "Traffic In",
value: formatNumberByCommas(in_stats[i].pkts) + " packets | " + formatBytes(in_stats[i].bytes)
value: cowu.addUnits2Packets(in_stats[i].pkts, false, null, 1) + " | " + formatBytes(in_stats[i].bytes)
});
for (var j = 0; j < out_stats.length; j++) {
if (src == out_stats[j].src && dst == out_stats[j].dst) {
data.push({
label: "Traffic Out",
value: formatNumberByCommas(out_stats[j].pkts) + " packets | " + formatBytes(out_stats[i].bytes)
value: cowu.addUnits2Packets(out_stats[j].pkts, false, null, 1) + " | " + formatBytes(out_stats[i].bytes)
});
}
}
Expand All @@ -363,13 +354,13 @@ define([
});
data.push({
label: "Traffic In",
value: formatNumberByCommas(in_stats[i].pkts) + " packets | " + formatBytes(in_stats[i].bytes)
value: cowu.addUnits2Packets(in_stats[i].pkts, false, null, 1) + " | " + formatBytes(in_stats[i].bytes)
});
for (var j = 0; j < out_stats.length; j++) {
if (src == out_stats[j].dst && dst == out_stats[j].src) {
data.push({
label: "Traffic Out",
value: formatNumberByCommas(out_stats[j].pkts) + " packets | " + formatBytes(out_stats[i].bytes)
value: cowu.addUnits2Packets(out_stats[j].pkts, false, null, 1) + " | " + formatBytes(out_stats[i].bytes)
});
}
}
Expand Down Expand Up @@ -413,7 +404,7 @@ define([
return tooltipContent({info: data, iconClass: 'icon-long-arrow-right'});
},
dimension: {
width: 355
width: 400
}
}
};
Expand Down
69 changes: 37 additions & 32 deletions webroot/common/ui/js/controller.grid.config.js
View file
Expand Up @@ -113,7 +113,7 @@ define([
return '-';
}
},
minWidth: 150,
minWidth: 250,
searchable: true,
events: {
onClick: onClickGrid
Expand All @@ -126,7 +126,7 @@ define([
formatter: function (r, c, v, cd, dc) {
return getMultiValueStr(dc['vn']);
},
minWidth: 150,
minWidth: 250,
searchable: true
},
{
Expand Down Expand Up @@ -310,19 +310,22 @@ define([
successCallback: function (response, contrailListModel) {
var statDataList = ctwp.parseInstanceStats(response[0], type),
dataItems = contrailListModel.getItems(),
updatedDataItems = [],
statData;

for (var j = 0; j < statDataList.length; j++) {
statData = statDataList[j];
for (var i = 0; i < dataItems.length; i++) {
var dataItem = dataItems[i];
if (statData['name'] == dataItem['name']) {
dataItem['inBytes60'] = ifNull(statData['inBytes'], 0);
dataItem['outBytes60'] = ifNull(statData['outBytes'], 0);
updatedDataItems.push(dataItem);
break;
}
}
}
contrailListModel.updateData(dataItems);
contrailListModel.updateData(updatedDataItems);
}
},
{
Expand Down Expand Up @@ -351,7 +354,8 @@ define([
},
successCallback: function (response, contrailListModel) {
var interfaceMap = ctwp.instanceInterfaceDataParser(response),
dataItems = contrailListModel.getItems();
dataItems = contrailListModel.getItems(),
updatedDataItems = [];

for (var i = 0; i < dataItems.length; i++) {
var dataItem = dataItems[i],
Expand All @@ -372,39 +376,40 @@ define([
}
}

throughput = inThroughput + outThroughput;
dataItem['throughput'] = throughput;
dataItem['size'] = throughput;
uveVirtualMachineAgent['interface_details'] = interfaceDetailsList;
dataItem['vn'] = ifNull(jsonPath(interfaceDetailsList, '$...virtual_network'), []);

if (dataItem['vn'] != false) {
if (dataItem['vn'].length != 0) {
dataItem['vnFQN'] = dataItem['vn'][0];
if(interfaceDetailsList.length > 0) {
throughput = inThroughput + outThroughput;
dataItem['throughput'] = throughput;
dataItem['size'] = throughput;
uveVirtualMachineAgent['interface_details'] = interfaceDetailsList;
dataItem['vn'] = ifNull(jsonPath(interfaceDetailsList, '$...virtual_network'), []);

if (dataItem['vn'] != false) {
if (dataItem['vn'].length != 0) {
dataItem['vnFQN'] = dataItem['vn'][0];
}
dataItem['vn'] = tenantNetworkMonitorUtils.formatVN(dataItem['vn']);
}
dataItem['vn'] = tenantNetworkMonitorUtils.formatVN(dataItem['vn']);
}

for (var k = 0; k < interfaceDetailsList.length; k++) {
if (interfaceDetailsList[k]['ip6_active'] == true) {
if (interfaceDetailsList[k]['ip_address'] != '0.0.0.0')
dataItem['ip'].push(interfaceDetailsList[k]['ip_address']);
if (interfaceDetailsList[k]['ip6_address'] != null)
dataItem['ip'].push(interfaceDetailsList[k]['ip6_address']);
} else {
if (interfaceDetailsList[k]['ip_address'] != '0.0.0.0')
dataItem['ip'].push(interfaceDetailsList[k]['ip_address']);
for (var k = 0; k < interfaceDetailsList.length; k++) {
if (interfaceDetailsList[k]['ip6_active'] == true) {
if (interfaceDetailsList[k]['ip_address'] != '0.0.0.0')
dataItem['ip'].push(interfaceDetailsList[k]['ip_address']);
if (interfaceDetailsList[k]['ip6_address'] != null)
dataItem['ip'].push(interfaceDetailsList[k]['ip6_address']);
} else {
if (interfaceDetailsList[k]['ip_address'] != '0.0.0.0')
dataItem['ip'].push(interfaceDetailsList[k]['ip_address']);
}
}
/*
if (interfaceDetailsList.length > 0) {
dataItem['vmName'] = interfaceDetailsList[0]['vm_name'];
}
*/
updatedDataItems.push(dataItem);
}

/*
if (interfaceDetailsList.length > 0) {
dataItem['vmName'] = interfaceDetailsList[0]['vm_name'];
}
*/
}

contrailListModel.updateData(dataItems);
contrailListModel.updateData(updatedDataItems);
}
}
];
Expand Down
9 changes: 9 additions & 0 deletions webroot/monitor/networking/ui/js/views/BreadcrumbView.js
View file
Expand Up @@ -48,6 +48,10 @@ define([
contrailListModel.onAllRequestsComplete.subscribe(function() {
populateNetworkBreadcrumbDropdown(contrailListModel, fqName, initCB, changeCB);
});
},

renderInstanceBreadcrumbDropdown: function(networkSelectedValueData, instanceUUID, initCB) {
populateInstanceBreadcrumbDropdown(networkSelectedValueData, instanceUUID, initCB);
}

});
Expand Down Expand Up @@ -224,6 +228,11 @@ define([
}
};

var populateInstanceBreadcrumbDropdown = function(networkSelectedValueData, instanceUUID, initCB) {
pushBreadcrumb([instanceUUID]);
initCB(networkSelectedValueData);
};

var getDomainFromFQN = function(fqName) {
return contrail.checkIfExist(fqName) ? fqName.split(':')[0] : contrail.getCookie(cowc.COOKIE_DOMAIN);
};
Expand Down
2 changes: 1 addition & 1 deletion webroot/monitor/networking/ui/js/views/InstanceListView.js
View file
Expand Up @@ -124,7 +124,7 @@ define([
]
},
dimension: {
width: 370
width: 400
}
};
};
Expand Down
8 changes: 6 additions & 2 deletions webroot/monitor/networking/ui/js/views/MonitorNetworkingView.js
View file
Expand Up @@ -109,13 +109,17 @@ define([
contrail.setCookie(cowc.COOKIE_PROJECT, projectSelectedValueData.name);

breadcrumbView.renderNetworkBreadcrumbDropdown(fqName,
function (networkSelectedValueData, networkBreadcrumbChanged) {
self.renderInstanceCB(hashParams, networkSelectedValueData, instanceUUID);
function (networkSelectedValueData) {
breadcrumbView.renderInstanceBreadcrumbDropdown(networkSelectedValueData, instanceUUID, function (networkSelectedValueData) {
self.renderInstanceCB(hashParams, networkSelectedValueData, instanceUUID);
});
}, function (networkSelectedValueData, networkBreadcrumbChanged) {
removeActiveBreadcrumb();
self.renderNetworkCB(hashParams, networkSelectedValueData, networkBreadcrumbChanged);
}
);
}, function (projectSelectedValueData, projectBreadcrumbChanged) {
removeActiveBreadcrumb();
self.renderProjectCB(hashParams, projectSelectedValueData, projectBreadcrumbChanged);
});
});
Expand Down

0 comments on commit 16422a8

Please sign in to comment.