From e31550cb8ef66a07b7f72adc82d75250de1e64aa Mon Sep 17 00:00:00 2001
From: Jorge Lobo <47326048+jloboescalona2@users.noreply.github.com>
Date: Fri, 24 Apr 2020 13:47:12 +0200
Subject: [PATCH] M #~: preserve NETWORK name intantiate (#4603)

Signed-off-by: Jorge Lobo <jlobo@opennebula.systems>
---
 src/sunstone/public/app/utils/nics-section.js | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js
index 0f8e359ee5..64aace1978 100644
--- a/src/sunstone/public/app/utils/nics-section.js
+++ b/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";