diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js
index c63744127b..2ace84e1b6 100644
--- a/src/sunstone/public/app/opennebula/vm.js
+++ b/src/sunstone/public/app/opennebula/vm.js
@@ -918,10 +918,10 @@ define(function(require) {
return copy_nics.reduce(function(column, nic) {
if (nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
var identation = " ";
- var ip = (nic.IP) ? nic.IP : nic.IP6_ULA + "
" + identation + nic.IP6_GLOBAL;
+ var ip = nic.IP || nic.IP6 || nic.IP6_ULA + "
" + identation + nic.IP6_GLOBAL;
var nicSection = nic.NIC_ID
- ? $("
").append($("").css("color", "gray").html(nic.NIC_ID + ": " + ip))
- : $("").append("").html("-") ;
+ ? $("").append($("").css("color", "gray").html(nic.NIC_ID + ": " + ip))
+ : $("").append("").html("-") ;
column.append(nicSection)
@@ -933,11 +933,21 @@ define(function(require) {
var alias = templateAlias.find(function(alias) { return alias.NIC_ID === aliasId; });
if (alias) {
- var alias_ip = alias.IP ? alias.IP : alias.IP6_ULA + "
" + identation + "> " + alias.IP6_GLOBAL;
- column.append($("").append($("").css({
- "color": "gray",
- "font-style": "italic",
- }).html(identation + "> " + alias_ip)));
+ var alias_ip;
+
+ if (alias.IP)
+ alias_ip = identation + "> " + alias.IP
+ else if (alias.IP6)
+ alias_ip = identation + "> " + alias.IP6
+ else if (nic.IP6_ULA && nic.IP6_GLOBAL)
+ alias_ip = alias.IP6_ULA + "
" + identation + "> " + alias.IP6_GLOBAL;
+
+ if (alias_ip){
+ column.append($("").append($("").css({
+ "color": "gray",
+ "font-style": "italic",
+ }).html(identation + "> " + alias_ip)));
+ }
}
});
}
@@ -951,8 +961,8 @@ define(function(require) {
var identation = " ";
return nics.reduce(function(column, nic) {
- if (nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
- var ip = nic.IP || nic.IP6_ULA + "
" + identation + nic.IP6_GLOBAL
+ if (nic.IP || nic.IP6 || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
+ var ip = nic.IP || nic.IP6 || nic.IP6_ULA + "
" + identation + nic.IP6_GLOBAL
column.append($("").css("margin-bottom", 0).html(nic.NIC_ID + ": " + ip))
@@ -964,14 +974,21 @@ define(function(require) {
var alias = templateAlias.find(function(alias) { return alias.NIC_ID === aliasId; });
if (alias) {
- var alias_ip = alias.IP
- ? identation + "> " + alias.IP
- : alias.IP6_ULA + "
" + identation + "> " + alias.IP6_GLOBAL;
-
- column.append($("").css({
- "margin-bottom": 0,
- "font-style": "italic",
- }).html(alias_ip));
+ var alias_ip;
+
+ if (alias.IP)
+ alias_ip = identation + "> " + alias.IP
+ else if (alias.IP6)
+ alias_ip = identation + "> " + alias.IP6
+ else if (nic.IP6_ULA && nic.IP6_GLOBAL)
+ alias_ip = alias.IP6_ULA + "
" + identation + "> " + alias.IP6_GLOBAL;
+
+ if (alias_ip){
+ column.append($("").css({
+ "margin-bottom": 0,
+ "font-style": "italic",
+ }).html(alias_ip));
+ }
}
});
}