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

M #~: preserve NETWORK name intantiate ()

Browse Source 
Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
This commit is contained in:
Jorge Lobo 2020-04-24 13:47:12 +02:00 committed by GitHub
parent 90605d15be
commit e31550cb8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions

11
src/sunstone/public/app/utils/nics-section.js

@ -173,12 +173,15 @@ define(function(require) {
if ( !nic["NETWORK_MODE"] || ( nic["NETWORK_MODE"] && nic["NETWORK_MODE"] !== "auto" ) )
{
var val = $(this).data("vnetsTable").retrieveResourceTableSelect();
var tempNetwork = nic["NETWORK"];
var preserveNetwork = false;
if (val == undefined || val == ""){
if (nic["NETWORK"] == undefined && nic["NETWORK_ID"] == undefined ){
// No network name or id in original NIC, and no selection done
delete nic['FROM'];
return; //continue
}
preserveNetwork = true;
}else{
if(nic && nic.FROM && nic.FROM==='TEMPLATE'){
delete nic['FROM'];
@ -191,7 +194,13 @@ define(function(require) {
delete nic["NETWORK_UNAME"];
delete nic["NETWORK_UID"];
delete nic["FROM"];
nic["NETWORK_ID"] = val;
if(preserveNetwork){
nic["NETWORK"] = tempNetwork;
preserveNetwork = false;
}
if(val && val.length){
nic["NETWORK_ID"] = val;
}
delete nic["FLOATING_IP"];
if ($("input.floating_ip", $(this)).prop("checked")){
nic["FLOATING_IP"] = "YES";