From 7242b44c7e6039a4d205f4884d9f813dc23f3b6d Mon Sep 17 00:00:00 2001
From: juanmont <jjmontiel@opennebula.org>
Date: Wed, 26 Apr 2017 11:52:23 +0200
Subject: [PATCH] F #4913 Changed fields and labels to import the vnets

---
 .../public/app/utils/vcenter/networks.js      | 30 ++++---------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/sunstone/public/app/utils/vcenter/networks.js b/src/sunstone/public/app/utils/vcenter/networks.js
index 1d23a29d3f..b4fcbed187 100644
--- a/src/sunstone/public/app/utils/vcenter/networks.js
+++ b/src/sunstone/public/app/utils/vcenter/networks.js
@@ -188,29 +188,19 @@ define(function(require) {
                   break;
                   case 'IP6_STATIC':
                   net_form_str =
-                    '<div class="large-6 medium-6 columns">' +
-                      '<label>' + Locale.tr("Global Prefix") +
-                        '<input type="text" class="six_global_net" placeholder="' + Locale.tr("Optional") + '"/>' +
-                      '</label>' +
-                    '</div>' +
-                    '<div class="large-4 medium-6 columns">' +
-                      '<label>' + Locale.tr("MAC") +
-                        '<input type="text" class="eth_mac_net" placeholder="' + Locale.tr("Optional") + '"/>' +
-                      '</label>' +
-                    '</div>' +
                     '<div class="large-6 medium-6 columns end">' +
-                      '<label>' + Locale.tr("ULA Prefix") +
-                        '<input type="text" class="six_ula_net" placeholder="' + Locale.tr("Optional") + '"/>' +
-                      '</label>' +
-                    '</div>'+
-                    '<div class="large-6 medium-6 columns end">' +
-                      '<label>' + Locale.tr("IPv6 for the address") +
+                      '<label>' + Locale.tr("IPv6 address") +
                         '<input type="text" class="six_static_net"/>' +
                       '</label>' +
                     '</div>'+'<div class="large-4 medium-6 columns end">' +
                       '<label>' + Locale.tr("Prefix length") +
                         '<input type="text" class="six_prefix_net"/>' +
                       '</label>' +
+                    '</div>'+
+                    '<div class="large-6 medium-6 columns end">' +
+                      '<label>' + Locale.tr("MAC") +
+                        '<input type="text" class="eth_mac_net" placeholder="' + Locale.tr("Optional") + '"/>' +
+                      '</label>' +
                     '</div>';
                   break;
               }
@@ -281,20 +271,12 @@ define(function(require) {
             break;
           case 'IP6_STATIC':
             var mac = $('.six_mac_net', row_context).val();
-            var gp = $('.six_global_net', row_context).val();
-            var ula = $('.six_mac_net', row_context).val();
             var ip6_static = $('.six_static_net', row_context).val();
             var prefix = $('.six_prefix_net', row_context).val();
 
             if (mac) {
               ar_array.push("MAC=" + mac);
             }
-            if (gp) {
-              ar_array.push("GLOBAL_PREFIX=" + gp);
-            }
-            if (ula) {
-              ar_array.push("ULA_PREFIX=" + ula);
-            }
             if (ip6_static) {
               ar_array.push("IP6=" + ip6_static);
             }