From 5178c31268f72207bc5b8c48b152f86f67ccf767 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn?= Date: Fri, 15 Jul 2016 17:37:01 +0200 Subject: [PATCH] Feature #4620: Show PCI IPs in the vms table --- src/sunstone/public/app/opennebula/vm.js | 39 ++++++++++++++++-------- 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js index afdf542c36..fe1224cafa 100644 --- a/src/sunstone/public/app/opennebula/vm.js +++ b/src/sunstone/public/app/opennebula/vm.js @@ -675,6 +675,7 @@ define(function(require) { function ipsStr(element, divider) { var divider = divider || "
" var nic = element.TEMPLATE.NIC; + var pci = element.TEMPLATE.PCI; var ips = []; var monitoring = element.MONITORING; @@ -695,21 +696,35 @@ define(function(require) { }) } + if (nic == undefined){ + nic = []; + } + + if (!$.isArray(nic)) { + nic = [nic]; + } + + if (pci != undefined) { + if (!$.isArray(pci)) { + pci = [pci]; + } + + $.each(pci, function(){ + if (this["TYPE"] == "NIC"){ + nic.push(this); + } + }); + } + if(ips.length==0) { - if (nic != undefined) { - if (!$.isArray(nic)) { - nic = [nic]; - } - - $.each(nic, function(index, value) { - $.each(NIC_IP_ATTRS, function(j, attr){ - if (value[attr]) { - ips.push(value[attr]); - } - }); + $.each(nic, function(index, value) { + $.each(NIC_IP_ATTRS, function(j, attr){ + if (value[attr]) { + ips.push(value[attr]); + } }); - } + }); } if (ips.length > 0) {