From cf20ac13c443819f65621843f03181d00c6a9201 Mon Sep 17 00:00:00 2001
From: jishengx <jisheng.xing@citrix.com>
Date: Mon, 18 Jun 2018 19:36:12 +0800
Subject: [PATCH] CA-289629: prompt host may need to be rebooted to enable
 SR-IOV (#2092)

CA-289629: prompt host may need to be rebooted to enable SR-IOV

Signed-off-by: Jisheng Xing <jisheng.xing@citrix.com>
---
 XenAdmin/Wizards/NewNetworkWizard.cs |  2 +-
 XenModel/Messages.Designer.cs        | 17 +++++------------
 XenModel/Messages.resx               |  9 ++++-----
 3 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/XenAdmin/Wizards/NewNetworkWizard.cs b/XenAdmin/Wizards/NewNetworkWizard.cs
index 155ba099e..1034e9605 100644
--- a/XenAdmin/Wizards/NewNetworkWizard.cs
+++ b/XenAdmin/Wizards/NewNetworkWizard.cs
@@ -209,7 +209,7 @@ namespace XenAdmin.Wizards
             var dlg = new ThreeButtonDialog(
                 new ThreeButtonDialog.Details(
                     SystemIcons.Warning, 
-                    Messages.SRIOV_NETWORK_CREATE_WILL_DISTURB_CONNECTION),
+                    Messages.SRIOV_NETWORK_CREATE_WARNING),
                  new ThreeButtonDialog.TBDButton(Messages.SRIOV_NETWORK_CREATE, DialogResult.OK),
                 ThreeButtonDialog.ButtonCancel);
 
diff --git a/XenModel/Messages.Designer.cs b/XenModel/Messages.Designer.cs
index 3bc59db0f..eb9a7dcd2 100755
--- a/XenModel/Messages.Designer.cs
+++ b/XenModel/Messages.Designer.cs
@@ -32284,15 +32284,6 @@ namespace XenAdmin {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to These servers needs to be rebooted for this SR-IOV network to take effect:&apos;{0}&apos;.
-        /// </summary>
-        public static string SRIOV_ENABLE_REBOOT_WARNING {
-            get {
-                return ResourceManager.GetString("SRIOV_ENABLE_REBOOT_WARNING", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to SR-IOV networks require an SR-IOV capable NIC..
         /// </summary>
@@ -32312,11 +32303,13 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Creating this SR-IOV network will have effects on network connection status and [XenCenter] connections to the pool will temporarily be disturbed.
+        ///   Looks up a localized string similar to Creating this SR-IOV network will temporarily disturb [XenCenter] connections to the pool.
+        ///
+        ///You may need to reboot your server(s) to enable SR-IOV network..
         /// </summary>
-        public static string SRIOV_NETWORK_CREATE_WILL_DISTURB_CONNECTION {
+        public static string SRIOV_NETWORK_CREATE_WARNING {
             get {
-                return ResourceManager.GetString("SRIOV_NETWORK_CREATE_WILL_DISTURB_CONNECTION", resourceCulture);
+                return ResourceManager.GetString("SRIOV_NETWORK_CREATE_WARNING", resourceCulture);
             }
         }
         
diff --git a/XenModel/Messages.resx b/XenModel/Messages.resx
index 38adbd5a8..6936cec77 100755
--- a/XenModel/Messages.resx
+++ b/XenModel/Messages.resx
@@ -11113,17 +11113,16 @@ Do you want to connect to the pool master '{1}'?</value>
   <data name="SRIOV_DISABLED" xml:space="preserve">
     <value>Yes (disabled)</value>
   </data>
-  <data name="SRIOV_ENABLE_REBOOT_WARNING" xml:space="preserve">
-    <value>These servers needs to be rebooted for this SR-IOV network to take effect:'{0}'</value>
-  </data>
   <data name="SRIOV_NEED_NICSUPPORT" xml:space="preserve">
     <value>SR-IOV networks require an SR-IOV capable NIC.</value>
   </data>
   <data name="SRIOV_NETWORK_CREATE" xml:space="preserve">
     <value>Create &amp;SR-IOV anyway</value>
   </data>
-  <data name="SRIOV_NETWORK_CREATE_WILL_DISTURB_CONNECTION" xml:space="preserve">
-    <value>Creating this SR-IOV network will have effects on network connection status and [XenCenter] connections to the pool will temporarily be disturbed</value>
+  <data name="SRIOV_NETWORK_CREATE_WARNING" xml:space="preserve">
+    <value>Creating this SR-IOV network will temporarily disturb [XenCenter] connections to the pool.
+
+You may need to reboot your server(s) to enable SR-IOV network.</value>
   </data>
   <data name="SRPANEL_ACTIVE" xml:space="preserve">
     <value>Active</value>