From 2d3ef1be41d0b554e1af6ef2203c7806a6cf062a Mon Sep 17 00:00:00 2001 From: Jorge Lobo <47326048+jloboescalona2@users.noreply.github.com> Date: Thu, 7 May 2020 18:42:24 +0200 Subject: [PATCH] M #~: fix lost var ips (#4679) Signed-off-by: Jorge Lobo --- src/sunstone/public/app/opennebula/vm.js | 54 ++++++++++-------------- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js index 140ffea1d3..aa6054971b 100644 --- a/src/sunstone/public/app/opennebula/vm.js +++ b/src/sunstone/public/app/opennebula/vm.js @@ -765,16 +765,37 @@ define(function(require) { function getNICs(element){ var nics = element && element.TEMPLATE && element.TEMPLATE.NIC; var pci = element && element.TEMPLATE && element.TEMPLATE.PCI; + if (nics == undefined || nics == false){ + nics = []; + } + if (!$.isArray(nics)) { + nics = [nics]; + } + if (pci != undefined || pci != false) { + if (!$.isArray(pci)) { + pci = [pci]; + } + $.each(pci, function(){ + if (this["TYPE"] == "NIC"){ + nics.push(this); + } + }); + } + return nics; + } + + // Return the IP or several IPs of a VM + function ipsStr(element, divider, groupStrFuntion = groupByIpsStr) { + var divider = divider || "
"; + var nics = getNICs(element); var ips = []; var monitoring = element && element.MONITORING; if (monitoring) { var externalIP; $.each(EXTERNAL_IP_ATTRS, function(index, IPAttr) { externalIP = monitoring[IPAttr]; - if (externalIP) { var splitArr = externalIP.split(","); - $.each(splitArr, function(i,ip){ if (ip && ($.inArray(ip, ips) == -1)) { ips.push(ip); @@ -783,35 +804,6 @@ define(function(require) { } }); } - - if (nics == undefined || nics == false){ - nics = []; - } - - if (!$.isArray(nics)) { - nics = [nics]; - } - - if (pci != undefined || pci != false) { - if (!$.isArray(pci)) { - pci = [pci]; - } - - $.each(pci, function(){ - if (this["TYPE"] == "NIC"){ - nics.push(this); - } - }); - } - - return nics; - } - - // Return the IP or several IPs of a VM - function ipsStr(element, divider, groupStrFuntion = groupByIpsStr) { - var divider = divider || "
"; - var nics = getNICs(element); - // infoextended: alias will be group by nic return ( config.system_config &&