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

B #5438: Fix IP shown on Sunstone (#1337)

Browse Source
This commit is contained in:
Frederick Borges 2021-06-29 12:08:10 +02:00 committed by GitHub
parent ba62aaeb9d
commit 03244dd3bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -551,8 +551,8 @@ define(function(require) {
? monitoringPool.reduce(function(result, monitoringVM) {
return $.extend(result, { [monitoringVM.ID]: monitoringVM })
}, {})
: {}
}
: monitoringPool;
};
OpenNebulaAction.list(params, VM_MONITORING_CACHE_NAME, 'vm/monitor', process, undefined, false);
},
@ -712,7 +712,7 @@ define(function(require) {
monitoring = cache.data
}
if (!monitoring || $.isEmptyObject(monitoring)) {
if ($.isEmptyObject(monitoring)) {
VM.pool_monitor({
success: function(response) {
monitoring = response
@ -820,8 +820,8 @@ define(function(require) {
}
function getNicsFromMonitoring(element = {}) {
let monitoringPool = _getMonitoringPool()
let monitoringVM = monitoringPool[element.ID]
let monitoringPool = _getMonitoringPool();
let monitoringVM = monitoringPool[element.ID] || monitoringPool;
if (!monitoringPool || $.isEmptyObject(monitoringPool) || !monitoringVM) return [];
@ -869,7 +869,7 @@ define(function(require) {
}).join(options.divider) || options.defaultValue
};
// Return a dropdown with all the
// Return dropdown with all the IPs
function ipsDropdown(element, divider) {
var ipsHtml = this.ipsStr(element, { divider, groupStrFunction: groupByIpsDropdown });
var ips = ipsHtml.split("<br>");
@ -918,7 +918,7 @@ define(function(require) {
return copy_nics.reduce(function(column, nic) {
if (nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
var identation = "&nbsp;&nbsp;&nbsp;&nbsp;";
var ip = nic.IP || nic.IP6 || nic.IP6_ULA + "&#10;&#13;" + identation + nic.IP6_GLOBAL;
var ip = nic.IP || nic.IP6 || nic.MAC || nic.IP6_ULA + "&#10;&#13;" + identation + nic.IP6_GLOBAL;
var nicSection = nic.NIC_ID
? $("<li/>").append($("<a/>").css("color", "gray").html(nic.NIC_ID + ": " + ip))
: $("<li/>").append("<li>").html("-") ;
@ -961,8 +961,8 @@ define(function(require) {
var identation = "&nbsp;&nbsp;&nbsp;&nbsp;";
return nics.reduce(function(column, nic) {
if (nic.IP || nic.IP6 || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
var ip = nic.IP || nic.IP6 || nic.IP6_ULA + "<br>" + identation + nic.IP6_GLOBAL
if (nic.IP || nic.IP6 || nic.MAC || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
var ip = nic.IP || nic.IP6 || nic.MAC || nic.IP6_ULA + "<br>" + identation + nic.IP6_GLOBAL
column.append($("<p/>").css("margin-bottom", 0).html(nic.NIC_ID + ": " + ip))