From 26e18f6bdc06fa38565c117f4ac3b4b6969b8b72 Mon Sep 17 00:00:00 2001
From: Frederick Borges <fborges@opennebula.io>
Date: Wed, 8 Feb 2023 12:05:19 +0100
Subject: [PATCH] B OpenNebula/one#6106: Show all IPs from nic on FSunstone
 (#2487)

(cherry picked from commit 65e1549d9290b53c1e577d1a3128ce79f3a6804f)
---
 src/fireedge/src/client/constants/vm.js          |  1 -
 src/fireedge/src/client/models/VirtualMachine.js | 13 ++++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/fireedge/src/client/constants/vm.js b/src/fireedge/src/client/constants/vm.js
index 8ad108b8a0..06237620b9 100644
--- a/src/fireedge/src/client/constants/vm.js
+++ b/src/fireedge/src/client/constants/vm.js
@@ -2013,7 +2013,6 @@ export const NIC_IP_ATTRS = [
   'EXTERNAL_IP', // external IP must be first
   'IP',
   'IP6',
-  ['IP6_ULA', 'IP6_GLOBAL'],
   'IP6_GLOBAL',
   'IP6_ULA',
   'MAC',
diff --git a/src/fireedge/src/client/models/VirtualMachine.js b/src/fireedge/src/client/models/VirtualMachine.js
index 60b436f576..81c4c15eda 100644
--- a/src/fireedge/src/client/models/VirtualMachine.js
+++ b/src/fireedge/src/client/models/VirtualMachine.js
@@ -218,18 +218,13 @@ export const getNics = (vm, options = {}) => {
 
 /**
  * @param {Nic} nic - NIC
- * @returns {string} Ips from resource
+ * @returns {string[]} Ips from resource
  */
 export const getIpsFromNic = (nic) => {
-  const attributeIp = NIC_IP_ATTRS.find((attr) =>
-    [attr].flat().every((flatted) => nic[flatted] !== undefined)
-  )
+  const ipAttributes = NIC_IP_ATTRS.filter((attr) => nic[attr] !== undefined)
 
-  if (attributeIp) {
-    return [attributeIp]
-      .flat()
-      .map((attribute) => nic[attribute])
-      .join(' ')
+  if (ipAttributes) {
+    return [ipAttributes].flat().map((attribute) => nic[attribute])
   }
 }