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

F #~: External IP always first (#1208)

Browse Source
This commit is contained in:
Frederick Borges 2021-05-12 13:16:10 +02:00 committed by Ruben S. Montero
parent 3c5f366eac
commit befc7a95c2
No known key found for this signature in database
GPG Key ID: A0CEA6FA880A1D87
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1087,10 +1087,11 @@ define(function(require) {
nics.forEach(function(nic, index){
var copy_nic = Object.assign({}, nic);
if (nic.EXTERNAL_IP)
if (nic.EXTERNAL_IP){
external_nics.push(nic);
delete copy_nic.EXTERNAL_IP;
delete copy_nic.EXTERNAL_IP;
}
non_external_nics.push(copy_nic);
});
@ -1102,9 +1103,8 @@ define(function(require) {
// Show the first IP two times for the dropdown.
var copy_nics = Object.assign([], all_nics);
var first_nic = Object.assign({}, all_nics[0]);
delete first_nic["EXTERNAL_IP"];
delete first_nic["ALIAS_IDS"];
copy_nics.unshift(first_nic);
var first = true;
@ -1112,14 +1112,17 @@ define(function(require) {
return copy_nics.reduce(function(column, nic) {
if (first){
if (nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
if (nic.EXTERNAL_IP || nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
var ip = nic.EXTERNAL_IP || nic.IP || nic.IP6_ULA + "

" + identation + nic.IP6_GLOBAL;
column.append(nic.NIC_ID + ": " + ip + "<end_first_ip>");
nic_and_ip = nic.NIC_ID + ": " + ip;
if (nic.EXTERNAL_IP)
nic_and_ip = "<span style='color: gray; font-weight: bold;'>" + nic_and_ip + "</span>"
column.append(nic_and_ip + "<end_first_ip>");
}
first=false;
}
else{
if (nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
if (nic.EXTERNAL_IP || nic.IP || (nic.IP6_ULA && nic.IP6_GLOBAL)) {
var ip;
var nicSection = $("<a/>").css("color", "gray");