shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

feature #3718: Fix external IPs path

Browse Source
This commit is contained in:
Daniel Molina 2015-07-07 16:41:09 +02:00
parent 2c6f9aa1cb
commit fc5e264e99
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/sunstone/public/app/opennebula/vm.js
View File

@ -578,12 +578,12 @@ define(function(require) {
}
function retrieveExternalIPs(element) {
var template = element.TEMPLATE;
var monitoring = element.MONITORING;
var ips = {};
var externalIP;
$.each(EXTERNAL_IP_ATTRS, function(index, IPAttr) {
externalIP = template[IPAttr];
externalIP = monitoring[IPAttr];
if (externalIP) {
ips[IPAttr] = externalIP;
}
@ -593,16 +593,18 @@ define(function(require) {
}
function retrieveExternalNetworkAttrs(element) {
var template = element.TEMPLATE;
var ips = {};
var externalAttr;
$.each(EXTERNAL_NETWORK_ATTRIBUTES, function(index, attr) {
externalAttr = template[attr];
if (externalAttr) {
ips[attr] = externalAttr;
}
});
var monitoring = element.MONITORING;
if (monitoring) {
$.each(EXTERNAL_NETWORK_ATTRIBUTES, function(index, attr) {
externalAttr = monitoring[attr];
if (externalAttr) {
ips[attr] = externalAttr;
}
});
}
return ips;
}
@ -633,14 +635,16 @@ define(function(require) {
});
}
var template = element.TEMPLATE;
var externalIP;
$.each(EXTERNAL_IP_ATTRS, function(index, IPAttr) {
externalIP = template[IPAttr];
if (externalIP && ($.inArray(externalIP, ips) == -1)) {
ips.push(externalIP);
}
})
var monitoring = element.MONITORING;
if (monitoring) {
var externalIP;
$.each(EXTERNAL_IP_ATTRS, function(index, IPAttr) {
externalIP = monitoring[IPAttr];
if (externalIP && ($.inArray(externalIP, ips) == -1)) {
ips.push(externalIP);
}
})
}
if (ips.length > 0) {
return ips.join(divider);