From 84debc254564745e3c9c22b502726f192f51c7da Mon Sep 17 00:00:00 2001
From: Sergio Betanzos <sbetanzos@opennebula.io>
Date: Thu, 3 Sep 2020 19:07:33 +0200
Subject: [PATCH] B #5061: Fix force IP (#179)

---
 src/sunstone/public/app/utils/nics-section.js | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/sunstone/public/app/utils/nics-section.js b/src/sunstone/public/app/utils/nics-section.js
index ff8ff5ebc6..feb8399274 100644
--- a/src/sunstone/public/app/utils/nics-section.js
+++ b/src/sunstone/public/app/utils/nics-section.js
@@ -184,6 +184,20 @@ define(function(require) {
 
       if ( !nic["NETWORK_MODE"] || ( nic["NETWORK_MODE"] && nic["NETWORK_MODE"] !== "auto" ) )
       {
+        var ip4 = $("input.manual_ip4", $(this)).val();
+        if (ip4 != undefined){
+          delete nic["IP"];
+          if (ip4 != ""){
+            nic["IP"] = ip4;
+          }
+        }
+        var ip6 = $("input.manual_ip6", $(this)).val();
+        if (ip6 != undefined){
+          delete nic["IP6"];
+          if (ip6 != ""){
+            nic["IP6"] = ip6;
+          }
+        }
         var val = $(this).data("vnetsTable").retrieveResourceTableSelect();
         var tempNetwork = nic["NETWORK"];
         var preserveNetwork = false;
@@ -217,20 +231,6 @@ define(function(require) {
         if ($("input.floating_ip", $(this)).prop("checked")){
           nic["FLOATING_IP"] = "YES";
         }
-        var ip4 = $("input.manual_ip4", $(this)).val();
-        if (ip4 != undefined){
-          delete nic["IP"];
-          if (ip4 != ""){
-            nic["IP"] = ip4;
-          }
-        }
-        var ip6 = $("input.manual_ip6", $(this)).val();
-        if (ip6 != undefined){
-          delete nic["IP6"];
-          if (ip6 != ""){
-            nic["IP6"] = ip6;
-          }
-        }
         delete nic["VROUTER_MANAGEMENT"];
         if ($("input.management", $(this)).prop("checked")){
           nic["VROUTER_MANAGEMENT"] = "YES";