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

M #~: Fix external ip (#1015)

Browse Source
This commit is contained in:
Frederick Borges 2021-03-23 14:15:25 +01:00 committed by GitHub
parent 39384c1095
commit 270544685e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1060,11 +1060,13 @@ define(function(require) {
var external_nics = [];
var non_external_nics = [];
nics.forEach(function(nic){
if (nic.EXTERNAL_IP && nic.EXTERNAL_IP.toLowerCase() === "yes")
nics.forEach(function(nic, index){
var copy_nic = Object.assign({}, nic);
if (nic.EXTERNAL_IP)
external_nics.push(nic);
else
non_external_nics.push(nic);
delete copy_nic.EXTERNAL_IP;
non_external_nics.push(copy_nic);
});
return external_nics.concat(non_external_nics);
@ -1093,13 +1095,19 @@ define(function(require) {
}
else{
if (nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
var ip = nic.IP || nic.IP6_ULA + "

" + identation + nic.IP6_GLOBAL;
var ip;
var nicSection = $("<a/>").css("color", "gray").html(nic.NIC_ID + ": " + ip);
if (nic.EXTERNAL_IP && String(nic.EXTERNAL_IP).toLowerCase() === 'yes') {
var nicSection = $("<a/>").css("color", "gray")
if (nic.EXTERNAL_IP) {
ip = nic.EXTERNAL_IP;
nicSection.css("font-weight", "bold");
}
else{
ip = nic.IP || nic.IP6_ULA + "&#10;&#13;" + identation + nic.IP6_GLOBAL;
}
nicSection.html(nic.NIC_ID + ": " + ip);
column.append($("<li/>").append(nicSection));
@ -1138,16 +1146,21 @@ define(function(require) {
return all_nics.reduce(function(column, nic) {
if (nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
var ip = nic.IP || nic.IP6_ULA + "<br>" + identation + nic.IP6_GLOBAL
var ip;
var nicSection = $("<p/>")
.css("color", "gray")
.css("margin-bottom", 0)
.html(nic.NIC_ID + ": " + ip);
.css("color", "#0a0a0a")
.css("margin-bottom", 0);
if (nic.EXTERNAL_IP && String(nic.EXTERNAL_IP).toLowerCase() === 'yes'){
if (nic.EXTERNAL_IP){
ip = nic.EXTERNAL_IP;
nicSection.css("font-weight","bold");
}
else {
ip = nic.IP || nic.IP6_ULA + "<br>" + identation + nic.IP6_GLOBAL
}
nicSection.html(nic.NIC_ID + ": " + ip);
column.append(nicSection);