CP-25551: Change Type page, Add provisioning page

Signed-off-by: serenc <seren.corbett@citrix.com>

XenAdmin/Wizards/NewSRWizard.cs

@@ -66,6 +66,7 @@ namespace XenAdmin.Wizards
         private readonly CslgLocation xenTabPageCslgLocation;
         private readonly FilerDetails xenTabPageFilerDetails;
         private readonly ChooseSrTypePage xenTabPageChooseSrType;
+        private readonly ChooseSrProvisioningPage xenTabPageChooseSrProv;
         private readonly RBACWarningPage xenTabPageRbacWarning;
         #endregion
 
@@ -114,6 +115,7 @@ namespace XenAdmin.Wizards
             xenTabPageCslgLocation = new CslgLocation();
             xenTabPageFilerDetails = new FilerDetails();
             xenTabPageChooseSrType = new ChooseSrTypePage();
+            xenTabPageChooseSrProv = new ChooseSrProvisioningPage();
             xenTabPageRbacWarning = new RBACWarningPage((srToReattach == null && !disasterRecoveryTask)
                              ? Messages.RBAC_WARNING_PAGE_DESCRIPTION_SR_CREATE
                              : Messages.RBAC_WARNING_PAGE_DESCRIPTION_SR_ATTACH);
@@ -132,6 +134,7 @@ namespace XenAdmin.Wizards
             // Order the tab pages
             AddPage(xenTabPageChooseSrType);
             AddPage(xenTabPageSrName);
+            //AddPage(xenTabPageChooseSrProv);
             AddPage(new XenTabPage {Text = Messages.NEWSR_LOCATION});
 
             // RBAC warning page 
@@ -283,15 +286,18 @@ namespace XenAdmin.Wizards
                 else if (m_srWizardType is SrWizardType_Iscsi)
                 {
                     AddPage(xenTabPageLvmoIscsi);
+                    AddPage(xenTabPageChooseSrProv, 2);
                 }
                 else if (m_srWizardType is SrWizardType_Hba)
                 {
                     AddPage(xenTabPageLvmoHba);
+                    AddPage(xenTabPageChooseSrProv, 2);
                     AddPage(xenTabPageLvmoHbaSummary);
                 }
                 else if (m_srWizardType is SrWizardType_Fcoe)
                 {
                     AddPage(xenTabPageLvmoFcoe);
+                    AddPage(xenTabPageChooseSrProv, 2);
                     AddPage(xenTabPageLvmoHbaSummary);
                 }
                 else if (m_srWizardType is SrWizardType_Cslg)
@@ -352,6 +358,11 @@ namespace XenAdmin.Wizards
                     xenTabPageLvmoFcoe.SrWizardType = m_srWizardType;
                 #endregion
             }
+            else if (senderPagetype == typeof(ChooseSrProvisioningPage))
+            {
+                #region
+                #endregion
+            }
             else if (senderPagetype == typeof(CIFS_ISO))
             {
                 m_srWizardType.DeviceConfig = xenTabPageCifsIso.DeviceConfig;
@@ -786,5 +797,6 @@ namespace XenAdmin.Wizards
         {
             xenTabPageChooseSrType.PreselectNewSrWizardType(typeof(SrWizardType_NfsIso));
         }
+
     }
 }

XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.Designer.cs

@@ -0,0 +1,179 @@
+namespace XenAdmin.Wizards.NewSRWizard_Pages
+{
+    partial class ChooseSrProvisioningPage
+    {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.radioButton1 = new System.Windows.Forms.RadioButton();
+            this.label2 = new System.Windows.Forms.Label();
+            this.radioButton2 = new System.Windows.Forms.RadioButton();
+            this.label3 = new System.Windows.Forms.Label();
+            this.pictureBox1 = new System.Windows.Forms.PictureBox();
+            this.label4 = new System.Windows.Forms.Label();
+            this.tableLayoutPanel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
+            this.SuspendLayout();
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 2;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 7.5F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 92.5F));
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.radioButton1, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 2);
+            this.tableLayoutPanel1.Controls.Add(this.radioButton2, 0, 3);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 4);
+            this.tableLayoutPanel1.Controls.Add(this.label4, 1, 5);
+            this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 0, 5);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 6;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(540, 336);
+            this.tableLayoutPanel1.TabIndex = 0;
+            // 
+            // label1
+            // 
+            this.label1.AutoSize = true;
+            this.tableLayoutPanel1.SetColumnSpan(this.label1, 2);
+            this.label1.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.label1.Location = new System.Drawing.Point(3, 3);
+            this.label1.Margin = new System.Windows.Forms.Padding(3, 3, 3, 10);
+            this.label1.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(340, 15);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "Select the provisioning method for the new Storage Repository.";
+            // 
+            // radioButton1
+            // 
+            this.radioButton1.AutoSize = true;
+            this.tableLayoutPanel1.SetColumnSpan(this.radioButton1, 2);
+            this.radioButton1.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.radioButton1.Location = new System.Drawing.Point(3, 34);
+            this.radioButton1.Margin = new System.Windows.Forms.Padding(3, 6, 3, 3);
+            this.radioButton1.Name = "radioButton1";
+            this.radioButton1.Size = new System.Drawing.Size(155, 19);
+            this.radioButton1.TabIndex = 1;
+            this.radioButton1.TabStop = true;
+            this.radioButton1.Text = "Thin provisioning (GFS2)";
+            this.radioButton1.UseVisualStyleBackColor = true;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.tableLayoutPanel1.SetColumnSpan(this.label2, 2);
+            this.label2.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.label2.Location = new System.Drawing.Point(20, 59);
+            this.label2.Margin = new System.Windows.Forms.Padding(20, 3, 3, 3);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(511, 15);
+            this.label2.TabIndex = 2;
+            this.label2.Text = "The SR will be formatted with the GFS2 cluster file system for hosting thinly pro" +
+    "visioned images.";
+            // 
+            // radioButton2
+            // 
+            this.radioButton2.AutoSize = true;
+            this.tableLayoutPanel1.SetColumnSpan(this.radioButton2, 2);
+            this.radioButton2.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.radioButton2.Location = new System.Drawing.Point(3, 83);
+            this.radioButton2.Margin = new System.Windows.Forms.Padding(3, 6, 3, 3);
+            this.radioButton2.Name = "radioButton2";
+            this.radioButton2.Size = new System.Drawing.Size(147, 19);
+            this.radioButton2.TabIndex = 3;
+            this.radioButton2.TabStop = true;
+            this.radioButton2.Text = "Full provisioning (LVM)";
+            this.radioButton2.UseVisualStyleBackColor = true;
+            // 
+            // label3
+            // 
+            this.label3.AutoSize = true;
+            this.tableLayoutPanel1.SetColumnSpan(this.label3, 2);
+            this.label3.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.label3.Location = new System.Drawing.Point(20, 108);
+            this.label3.Margin = new System.Windows.Forms.Padding(20, 3, 3, 3);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(185, 15);
+            this.label3.TabIndex = 4;
+            this.label3.Text = "LVM description...............................";
+            // 
+            // pictureBox1
+            // 
+            this.pictureBox1.Image = global::XenAdmin.Properties.Resources._000_Info3_h32bit_16;
+            this.pictureBox1.Location = new System.Drawing.Point(10, 136);
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(10, 10, 10, 3);
+            this.pictureBox1.Name = "pictureBox1";
+            this.pictureBox1.Size = new System.Drawing.Size(19, 20);
+            this.pictureBox1.TabIndex = 5;
+            this.pictureBox1.TabStop = false;
+            // 
+            // label4
+            // 
+            this.label4.AutoSize = true;
+            this.label4.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.label4.Location = new System.Drawing.Point(43, 136);
+            this.label4.Margin = new System.Windows.Forms.Padding(3, 10, 3, 0);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(38, 15);
+            this.label4.TabIndex = 6;
+            this.label4.Text = "label4";
+            // 
+            // ChooseSrProvisioningPage
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
+            this.Controls.Add(this.tableLayoutPanel1);
+            this.Name = "ChooseSrProvisioningPage";
+            this.Size = new System.Drawing.Size(540, 336);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.tableLayoutPanel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.RadioButton radioButton1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.RadioButton radioButton2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.PictureBox pictureBox1;
+        private System.Windows.Forms.Label label4;
+    }
+}

XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.cs

@@ -0,0 +1,64 @@
+/* Copyright (c) Citrix Systems, Inc. 
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, 
+ * with or without modification, are permitted provided 
+ * that the following conditions are met: 
+ * 
+ * *   Redistributions of source code must retain the above 
+ *     copyright notice, this list of conditions and the 
+ *     following disclaimer. 
+ * *   Redistributions in binary form must reproduce the above 
+ *     copyright notice, this list of conditions and the 
+ *     following disclaimer in the documentation and/or other 
+ *     materials provided with the distribution. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Data;
+using System.Linq;
+using System.Text;
+using System.Windows.Forms;
+using XenAdmin.Controls;
+using XenAdmin.Core;
+using XenAPI;
+
+namespace XenAdmin.Wizards.NewSRWizard_Pages
+{
+    public partial class ChooseSrProvisioningPage : XenTabPage
+
+    {
+        private bool m_allowNext = true;
+
+        public ChooseSrProvisioningPage()
+        {
+            InitializeComponent();
+        }
+
+        #region XenTabPage overrides
+
+        public override string Text { get { return Messages.PROVISIONING; } }
+
+        public override string PageTitle { get { return Messages.CHOOSE_SR_PROVISIONING_PAGE_TITLE; } }
+
+        #endregion
+    }
+}

XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrProvisioningPage.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.Designer.cs

@@ -29,100 +29,30 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ChooseSrTypePage));
-            this.radioButtonNfs = new System.Windows.Forms.RadioButton();
-            this.radioButtonIscsi = new System.Windows.Forms.RadioButton();
-            this.radioButtonNfsIso = new System.Windows.Forms.RadioButton();
-            this.radioButtonCifsIso = new System.Windows.Forms.RadioButton();
-            this.radioButtonFibreChannel = new System.Windows.Forms.RadioButton();
-            this.radioButtonCslg = new System.Windows.Forms.RadioButton();
-            this.labelISOlibrary = new System.Windows.Forms.Label();
-            this.labelVirtualDiskStorage = new System.Windows.Forms.Label();
-            this.upsellPage1 = new XenAdmin.Controls.UpsellPage();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.upsellPage1 = new XenAdmin.Controls.UpsellPage();
             this.SRBlurb = new XenAdmin.Controls.Common.AutoHeightLabel();
             this.deprecationBanner = new XenAdmin.Controls.DeprecationBanner();
             this.selectedStoreTypeLabel = new System.Windows.Forms.Label();
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
+            this.radioButtonCslg = new System.Windows.Forms.RadioButton();
+            this.labelISOlibrary = new System.Windows.Forms.Label();
+            this.radioButtonCifsIso = new System.Windows.Forms.RadioButton();
+            this.radioButtonNfsIso = new System.Windows.Forms.RadioButton();
+            this.radioButtonIscsi = new System.Windows.Forms.RadioButton();
+            this.radioButtonFibreChannel = new System.Windows.Forms.RadioButton();
             this.radioButtonFcoe = new System.Windows.Forms.RadioButton();
+            this.radioButtonNfs = new System.Windows.Forms.RadioButton();
             this.radioButtonCifs = new System.Windows.Forms.RadioButton();
+            this.labelVirtualDiskStorage = new System.Windows.Forms.Label();
+            this.labelFileBasedStorage = new System.Windows.Forms.Label();
+            this.labelBlockBasedStorage = new System.Windows.Forms.Label();
             this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             this.tableLayoutPanel3.SuspendLayout();
             this.SuspendLayout();
             // 
-            // radioButtonNfs
-            // 
-            resources.ApplyResources(this.radioButtonNfs, "radioButtonNfs");
-            this.radioButtonNfs.BackColor = System.Drawing.Color.Transparent;
-            this.radioButtonNfs.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.radioButtonNfs.Name = "radioButtonNfs";
-            this.radioButtonNfs.UseVisualStyleBackColor = false;
-            this.radioButtonNfs.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // radioButtonIscsi
-            // 
-            resources.ApplyResources(this.radioButtonIscsi, "radioButtonIscsi");
-            this.radioButtonIscsi.BackColor = System.Drawing.Color.Transparent;
-            this.radioButtonIscsi.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.radioButtonIscsi.Name = "radioButtonIscsi";
-            this.radioButtonIscsi.UseVisualStyleBackColor = false;
-            this.radioButtonIscsi.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // radioButtonNfsIso
-            // 
-            resources.ApplyResources(this.radioButtonNfsIso, "radioButtonNfsIso");
-            this.radioButtonNfsIso.BackColor = System.Drawing.Color.Transparent;
-            this.radioButtonNfsIso.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.radioButtonNfsIso.Name = "radioButtonNfsIso";
-            this.radioButtonNfsIso.UseVisualStyleBackColor = false;
-            this.radioButtonNfsIso.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // radioButtonCifsIso
-            // 
-            resources.ApplyResources(this.radioButtonCifsIso, "radioButtonCifsIso");
-            this.radioButtonCifsIso.BackColor = System.Drawing.Color.Transparent;
-            this.radioButtonCifsIso.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.radioButtonCifsIso.Name = "radioButtonCifsIso";
-            this.radioButtonCifsIso.UseVisualStyleBackColor = false;
-            this.radioButtonCifsIso.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // radioButtonFibreChannel
-            // 
-            resources.ApplyResources(this.radioButtonFibreChannel, "radioButtonFibreChannel");
-            this.radioButtonFibreChannel.BackColor = System.Drawing.Color.Transparent;
-            this.radioButtonFibreChannel.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.radioButtonFibreChannel.Name = "radioButtonFibreChannel";
-            this.radioButtonFibreChannel.UseVisualStyleBackColor = false;
-            this.radioButtonFibreChannel.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // radioButtonCslg
-            // 
-            resources.ApplyResources(this.radioButtonCslg, "radioButtonCslg");
-            this.radioButtonCslg.BackColor = System.Drawing.Color.Transparent;
-            this.radioButtonCslg.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.radioButtonCslg.Name = "radioButtonCslg";
-            this.radioButtonCslg.UseVisualStyleBackColor = false;
-            this.radioButtonCslg.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
-            // 
-            // labelISOlibrary
-            // 
-            resources.ApplyResources(this.labelISOlibrary, "labelISOlibrary");
-            this.labelISOlibrary.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.labelISOlibrary.Name = "labelISOlibrary";
-            // 
-            // labelVirtualDiskStorage
-            // 
-            resources.ApplyResources(this.labelVirtualDiskStorage, "labelVirtualDiskStorage");
-            this.labelVirtualDiskStorage.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.labelVirtualDiskStorage.Name = "labelVirtualDiskStorage";
-            // 
-            // upsellPage1
-            // 
-            resources.ApplyResources(this.upsellPage1, "upsellPage1");
-            this.upsellPage1.Image = ((System.Drawing.Image)(resources.GetObject("upsellPage1.Image")));
-            this.upsellPage1.Name = "upsellPage1";
-            // 
             // tableLayoutPanel1
             // 
             resources.ApplyResources(this.tableLayoutPanel1, "tableLayoutPanel1");
@@ -139,6 +69,12 @@
             this.tableLayoutPanel2.Controls.Add(this.selectedStoreTypeLabel, 0, 2);
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
             // 
+            // upsellPage1
+            // 
+            resources.ApplyResources(this.upsellPage1, "upsellPage1");
+            this.upsellPage1.Image = ((System.Drawing.Image)(resources.GetObject("upsellPage1.Image")));
+            this.upsellPage1.Name = "upsellPage1";
+            // 
             // SRBlurb
             // 
             this.SRBlurb.AutoEllipsis = true;
@@ -160,17 +96,72 @@
             // tableLayoutPanel3
             // 
             resources.ApplyResources(this.tableLayoutPanel3, "tableLayoutPanel3");
-            this.tableLayoutPanel3.Controls.Add(this.radioButtonFcoe, 0, 5);
+            this.tableLayoutPanel3.Controls.Add(this.radioButtonCslg, 1, 8);
-            this.tableLayoutPanel3.Controls.Add(this.radioButtonCifs, 0, 4);
+            this.tableLayoutPanel3.Controls.Add(this.labelISOlibrary, 0, 9);
-            this.tableLayoutPanel3.Controls.Add(this.radioButtonCslg, 0, 6);
+            this.tableLayoutPanel3.Controls.Add(this.radioButtonCifsIso, 1, 10);
+            this.tableLayoutPanel3.Controls.Add(this.radioButtonNfsIso, 1, 11);
+            this.tableLayoutPanel3.Controls.Add(this.radioButtonIscsi, 1, 2);
+            this.tableLayoutPanel3.Controls.Add(this.radioButtonFibreChannel, 1, 3);
+            this.tableLayoutPanel3.Controls.Add(this.radioButtonFcoe, 1, 4);
+            this.tableLayoutPanel3.Controls.Add(this.radioButtonNfs, 1, 6);
+            this.tableLayoutPanel3.Controls.Add(this.radioButtonCifs, 1, 7);
             this.tableLayoutPanel3.Controls.Add(this.labelVirtualDiskStorage, 0, 0);
-            this.tableLayoutPanel3.Controls.Add(this.radioButtonNfs, 0, 1);
+            this.tableLayoutPanel3.Controls.Add(this.labelFileBasedStorage, 1, 5);
-            this.tableLayoutPanel3.Controls.Add(this.radioButtonFibreChannel, 0, 3);
+            this.tableLayoutPanel3.Controls.Add(this.labelBlockBasedStorage, 1, 1);
-            this.tableLayoutPanel3.Controls.Add(this.radioButtonIscsi, 0, 2);
-            this.tableLayoutPanel3.Controls.Add(this.labelISOlibrary, 0, 7);
-            this.tableLayoutPanel3.Controls.Add(this.radioButtonCifsIso, 0, 8);
-            this.tableLayoutPanel3.Controls.Add(this.radioButtonNfsIso, 0, 9);
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
+            this.tableLayoutPanel3.Paint += new System.Windows.Forms.PaintEventHandler(this.tableLayoutPanel3_Paint);
+            // 
+            // radioButtonCslg
+            // 
+            resources.ApplyResources(this.radioButtonCslg, "radioButtonCslg");
+            this.radioButtonCslg.BackColor = System.Drawing.Color.Transparent;
+            this.radioButtonCslg.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.radioButtonCslg.Name = "radioButtonCslg";
+            this.radioButtonCslg.UseVisualStyleBackColor = false;
+            this.radioButtonCslg.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+            // 
+            // labelISOlibrary
+            // 
+            resources.ApplyResources(this.labelISOlibrary, "labelISOlibrary");
+            this.tableLayoutPanel3.SetColumnSpan(this.labelISOlibrary, 2);
+            this.labelISOlibrary.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.labelISOlibrary.Name = "labelISOlibrary";
+            // 
+            // radioButtonCifsIso
+            // 
+            resources.ApplyResources(this.radioButtonCifsIso, "radioButtonCifsIso");
+            this.radioButtonCifsIso.BackColor = System.Drawing.Color.Transparent;
+            this.radioButtonCifsIso.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.radioButtonCifsIso.Name = "radioButtonCifsIso";
+            this.radioButtonCifsIso.UseVisualStyleBackColor = false;
+            this.radioButtonCifsIso.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+            // 
+            // radioButtonNfsIso
+            // 
+            resources.ApplyResources(this.radioButtonNfsIso, "radioButtonNfsIso");
+            this.radioButtonNfsIso.BackColor = System.Drawing.Color.Transparent;
+            this.radioButtonNfsIso.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.radioButtonNfsIso.Name = "radioButtonNfsIso";
+            this.radioButtonNfsIso.UseVisualStyleBackColor = false;
+            this.radioButtonNfsIso.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+            // 
+            // radioButtonIscsi
+            // 
+            resources.ApplyResources(this.radioButtonIscsi, "radioButtonIscsi");
+            this.radioButtonIscsi.BackColor = System.Drawing.Color.Transparent;
+            this.radioButtonIscsi.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.radioButtonIscsi.Name = "radioButtonIscsi";
+            this.radioButtonIscsi.UseVisualStyleBackColor = false;
+            this.radioButtonIscsi.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+            // 
+            // radioButtonFibreChannel
+            // 
+            resources.ApplyResources(this.radioButtonFibreChannel, "radioButtonFibreChannel");
+            this.radioButtonFibreChannel.BackColor = System.Drawing.Color.Transparent;
+            this.radioButtonFibreChannel.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.radioButtonFibreChannel.Name = "radioButtonFibreChannel";
+            this.radioButtonFibreChannel.UseVisualStyleBackColor = false;
+            this.radioButtonFibreChannel.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
             // 
             // radioButtonFcoe
             // 
@@ -181,6 +172,15 @@
             this.radioButtonFcoe.UseVisualStyleBackColor = false;
             this.radioButtonFcoe.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
             // 
+            // radioButtonNfs
+            // 
+            resources.ApplyResources(this.radioButtonNfs, "radioButtonNfs");
+            this.radioButtonNfs.BackColor = System.Drawing.Color.Transparent;
+            this.radioButtonNfs.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.radioButtonNfs.Name = "radioButtonNfs";
+            this.radioButtonNfs.UseVisualStyleBackColor = false;
+            this.radioButtonNfs.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
+            // 
             // radioButtonCifs
             // 
             resources.ApplyResources(this.radioButtonCifs, "radioButtonCifs");
@@ -190,6 +190,25 @@
             this.radioButtonCifs.UseVisualStyleBackColor = false;
             this.radioButtonCifs.CheckedChanged += new System.EventHandler(this.RadioButton_CheckedChanged);
             // 
+            // labelVirtualDiskStorage
+            // 
+            resources.ApplyResources(this.labelVirtualDiskStorage, "labelVirtualDiskStorage");
+            this.tableLayoutPanel3.SetColumnSpan(this.labelVirtualDiskStorage, 2);
+            this.labelVirtualDiskStorage.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.labelVirtualDiskStorage.Name = "labelVirtualDiskStorage";
+            // 
+            // labelFileBasedStorage
+            // 
+            resources.ApplyResources(this.labelFileBasedStorage, "labelFileBasedStorage");
+            this.labelFileBasedStorage.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.labelFileBasedStorage.Name = "labelFileBasedStorage";
+            // 
+            // labelBlockBasedStorage
+            // 
+            resources.ApplyResources(this.labelBlockBasedStorage, "labelBlockBasedStorage");
+            this.labelBlockBasedStorage.ForeColor = System.Drawing.SystemColors.WindowText;
+            this.labelBlockBasedStorage.Name = "labelBlockBasedStorage";
+            // 
             // ChooseSrTypePage
             // 
             resources.ApplyResources(this, "$this");
@@ -213,8 +232,6 @@
         private System.Windows.Forms.RadioButton radioButtonCifsIso;
         private System.Windows.Forms.RadioButton radioButtonFibreChannel;
         private System.Windows.Forms.RadioButton radioButtonCslg;
-        private System.Windows.Forms.Label labelISOlibrary;
-        private System.Windows.Forms.Label labelVirtualDiskStorage;
         private XenAdmin.Controls.UpsellPage upsellPage1;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
@@ -224,5 +241,9 @@
         private System.Windows.Forms.RadioButton radioButtonCifs;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel3;
         private System.Windows.Forms.RadioButton radioButtonFcoe;
+        private System.Windows.Forms.Label labelBlockBasedStorage;
+        private System.Windows.Forms.Label labelFileBasedStorage;
+        private System.Windows.Forms.Label labelISOlibrary;
+        private System.Windows.Forms.Label labelVirtualDiskStorage;
     }
 }

XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.cs

@@ -48,7 +48,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
     {
         private bool m_allowNext = true;
         private int _matchingFrontends;
-        private Type m_preselectedWizardType = typeof(SrWizardType_VhdoNfs);
+        private Type m_preselectedWizardType = typeof(SrWizardType_Iscsi);
         private readonly RadioButton[] _radioButtons;
 
         public ChooseSrTypePage()
@@ -71,6 +71,7 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
                 radioButtonCslg, radioButtonCifs, radioButtonFcoe,
                 radioButtonNfsIso, radioButtonCifsIso
             };
+
         }
 
         private void SetupDeprecationBanner(bool visible)
@@ -289,5 +290,10 @@ namespace XenAdmin.Wizards.NewSRWizard_Pages
             }
             return sm;
         }
+
+        private void tableLayoutPanel3_Paint(object sender, PaintEventArgs e)
+        {
+
+        }
     }
 }

XenAdmin/Wizards/NewSRWizard_Pages/ChooseSrTypePage.resx

@@ -118,302 +118,20 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="radioButtonNfs.AutoSize" type="System.Boolean, mscorlib">
+  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="radioButtonNfs.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="radioButtonNfs.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="radioButtonNfs.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 31</value>
-  </data>
-  <data name="radioButtonNfs.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 3, 3, 3</value>
-  </data>
-  <data name="radioButtonNfs.Size" type="System.Drawing.Size, System.Drawing">
-    <value>46, 19</value>
-  </data>
-  <data name="radioButtonNfs.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="radioButtonNfs.Text" xml:space="preserve">
-    <value>N&amp;FS</value>
-  </data>
-  <data name="&gt;&gt;radioButtonNfs.Name" xml:space="preserve">
-    <value>radioButtonNfs</value>
-  </data>
-  <data name="&gt;&gt;radioButtonNfs.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;radioButtonNfs.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;radioButtonNfs.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="radioButtonIscsi.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="radioButtonIscsi.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
-  <data name="radioButtonIscsi.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="radioButtonIscsi.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 56</value>
-  </data>
-  <data name="radioButtonIscsi.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 3, 3, 3</value>
-  </data>
-  <data name="radioButtonIscsi.Size" type="System.Drawing.Size, System.Drawing">
-    <value>51, 19</value>
-  </data>
-  <data name="radioButtonIscsi.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
-  </data>
-  <data name="radioButtonIscsi.Text" xml:space="preserve">
-    <value>i&amp;SCSI</value>
-  </data>
-  <data name="&gt;&gt;radioButtonIscsi.Name" xml:space="preserve">
-    <value>radioButtonIscsi</value>
-  </data>
-  <data name="&gt;&gt;radioButtonIscsi.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;radioButtonIscsi.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;radioButtonIscsi.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="radioButtonNfsIso.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="radioButtonNfsIso.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
-  <data name="radioButtonNfsIso.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="radioButtonNfsIso.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 247</value>
-  </data>
-  <data name="radioButtonNfsIso.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 3, 3, 3</value>
-  </data>
-  <data name="radioButtonNfsIso.Size" type="System.Drawing.Size, System.Drawing">
-    <value>67, 19</value>
-  </data>
-  <data name="radioButtonNfsIso.TabIndex" type="System.Int32, mscorlib">
-    <value>18</value>
-  </data>
-  <data name="radioButtonNfsIso.Text" xml:space="preserve">
-    <value>NFS &amp;ISO</value>
-  </data>
-  <data name="&gt;&gt;radioButtonNfsIso.Name" xml:space="preserve">
-    <value>radioButtonNfsIso</value>
-  </data>
-  <data name="&gt;&gt;radioButtonNfsIso.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;radioButtonNfsIso.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;radioButtonNfsIso.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="radioButtonCifsIso.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="radioButtonCifsIso.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
-  <data name="radioButtonCifsIso.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="radioButtonCifsIso.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 222</value>
-  </data>
-  <data name="radioButtonCifsIso.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 3, 3, 3</value>
-  </data>
-  <data name="radioButtonCifsIso.Size" type="System.Drawing.Size, System.Drawing">
-    <value>201, 19</value>
-  </data>
-  <data name="radioButtonCifsIso.TabIndex" type="System.Int32, mscorlib">
-    <value>17</value>
-  </data>
-  <data name="radioButtonCifsIso.Text" xml:space="preserve">
-    <value>&amp;Windows File Sharing (SMB/CIFS)</value>
-  </data>
-  <data name="&gt;&gt;radioButtonCifsIso.Name" xml:space="preserve">
-    <value>radioButtonCifsIso</value>
-  </data>
-  <data name="&gt;&gt;radioButtonCifsIso.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;radioButtonCifsIso.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;radioButtonCifsIso.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="radioButtonFibreChannel.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="radioButtonFibreChannel.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
-  <data name="radioButtonFibreChannel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="radioButtonFibreChannel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 81</value>
-  </data>
-  <data name="radioButtonFibreChannel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 3, 3, 3</value>
-  </data>
-  <data name="radioButtonFibreChannel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>103, 19</value>
-  </data>
-  <data name="radioButtonFibreChannel.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
-  </data>
-  <data name="radioButtonFibreChannel.Text" xml:space="preserve">
-    <value>Hardware &amp;HBA</value>
-  </data>
-  <data name="&gt;&gt;radioButtonFibreChannel.Name" xml:space="preserve">
-    <value>radioButtonFibreChannel</value>
-  </data>
-  <data name="&gt;&gt;radioButtonFibreChannel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;radioButtonFibreChannel.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;radioButtonFibreChannel.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="radioButtonCslg.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="radioButtonCslg.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt</value>
-  </data>
-  <data name="radioButtonCslg.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="radioButtonCslg.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 156</value>
-  </data>
-  <data name="radioButtonCslg.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 3, 3, 3</value>
-  </data>
-  <data name="radioButtonCslg.Size" type="System.Drawing.Size, System.Drawing">
-    <value>150, 19</value>
-  </data>
-  <data name="radioButtonCslg.TabIndex" type="System.Int32, mscorlib">
-    <value>16</value>
-  </data>
-  <data name="radioButtonCslg.Text" xml:space="preserve">
-    <value>S&amp;torageLink technology</value>
-  </data>
-  <data name="&gt;&gt;radioButtonCslg.Name" xml:space="preserve">
-    <value>radioButtonCslg</value>
-  </data>
-  <data name="&gt;&gt;radioButtonCslg.Type" xml:space="preserve">
-    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;radioButtonCslg.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;radioButtonCslg.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="labelISOlibrary.AutoSize" type="System.Boolean, mscorlib">
+  <data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
-    <value>True</value>
+    <value>1</value>
-  </data>
-  <data name="labelISOlibrary.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt, style=Bold</value>
-  </data>
-  <data name="labelISOlibrary.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labelISOlibrary.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 194</value>
-  </data>
-  <data name="labelISOlibrary.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 16, 3, 10</value>
-  </data>
-  <data name="labelISOlibrary.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 15</value>
-  </data>
-  <data name="labelISOlibrary.TabIndex" type="System.Int32, mscorlib">
-    <value>15</value>
-  </data>
-  <data name="labelISOlibrary.Text" xml:space="preserve">
-    <value>ISO library</value>
-  </data>
-  <data name="&gt;&gt;labelISOlibrary.Name" xml:space="preserve">
-    <value>labelISOlibrary</value>
-  </data>
-  <data name="&gt;&gt;labelISOlibrary.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelISOlibrary.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;labelISOlibrary.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="labelVirtualDiskStorage.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="labelVirtualDiskStorage.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt, style=Bold</value>
-  </data>
-  <data name="labelVirtualDiskStorage.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labelVirtualDiskStorage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 3</value>
-  </data>
-  <data name="labelVirtualDiskStorage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 10</value>
-  </data>
-  <data name="labelVirtualDiskStorage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>114, 15</value>
-  </data>
-  <data name="labelVirtualDiskStorage.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="labelVirtualDiskStorage.Text" xml:space="preserve">
-    <value>Virtual disk storage</value>
-  </data>
-  <data name="&gt;&gt;labelVirtualDiskStorage.Name" xml:space="preserve">
-    <value>labelVirtualDiskStorage</value>
-  </data>
-  <data name="&gt;&gt;labelVirtualDiskStorage.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelVirtualDiskStorage.Parent" xml:space="preserve">
-    <value>tableLayoutPanel3</value>
-  </data>
-  <data name="&gt;&gt;labelVirtualDiskStorage.ZOrder" xml:space="preserve">
-    <value>3</value>
   </data>
   <data name="upsellPage1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="upsellPage1.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
     <value>GrowAndShrink</value>
   </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="upsellPage1.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9pt</value>
   </data>
@@ -438,7 +156,7 @@
     <value>3, 51</value>
   </data>
   <data name="upsellPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>312, 67</value>
+    <value>91, 67</value>
   </data>
   <data name="upsellPage1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -455,18 +173,15 @@
   <data name="&gt;&gt;upsellPage1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="tableLayoutPanel1.ColumnCount" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="tableLayoutPanel2.ColumnCount" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
   <data name="SRBlurb.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="SRBlurb.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
+  <data name="SRBlurb.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="SRBlurb.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 167</value>
   </data>
@@ -474,7 +189,7 @@
     <value>3, 3, 3, 0</value>
   </data>
   <data name="SRBlurb.Size" type="System.Drawing.Size, System.Drawing">
-    <value>312, 163</value>
+    <value>292, 163</value>
   </data>
   <data name="SRBlurb.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -513,7 +228,7 @@
     <value>5, 5, 5, 5</value>
   </data>
   <data name="deprecationBanner.Size" type="System.Drawing.Size, System.Drawing">
-    <value>308, 38</value>
+    <value>288, 38</value>
   </data>
   <data name="deprecationBanner.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -539,6 +254,9 @@
   <data name="selectedStoreTypeLabel.Font" type="System.Drawing.Font, System.Drawing">
     <value>Microsoft Sans Serif, 8.25pt, style=Italic</value>
   </data>
+  <data name="selectedStoreTypeLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="selectedStoreTypeLabel.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 137</value>
   </data>
@@ -570,13 +288,13 @@
     <value>Fill</value>
   </data>
   <data name="tableLayoutPanel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>219, 3</value>
+    <value>239, 3</value>
   </data>
   <data name="tableLayoutPanel2.RowCount" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
   <data name="tableLayoutPanel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 330</value>
+    <value>298, 330</value>
   </data>
   <data name="tableLayoutPanel2.TabIndex" type="System.Int32, mscorlib">
     <value>36</value>
@@ -597,8 +315,224 @@
     <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="upsellPage1" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="SRBlurb" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="deprecationBanner" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="selectedStoreTypeLabel" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,Percent,100" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <data name="tableLayoutPanel3.ColumnCount" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="radioButtonCslg.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="radioButtonCslg.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
+  <data name="radioButtonCslg.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="radioButtonCslg.Location" type="System.Drawing.Point, System.Drawing">
+    <value>26, 219</value>
+  </data>
+  <data name="radioButtonCslg.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>15, 3, 3, 3</value>
+  </data>
+  <data name="radioButtonCslg.Size" type="System.Drawing.Size, System.Drawing">
+    <value>150, 19</value>
+  </data>
+  <data name="radioButtonCslg.TabIndex" type="System.Int32, mscorlib">
+    <value>16</value>
+  </data>
+  <data name="radioButtonCslg.Text" xml:space="preserve">
+    <value>S&amp;torageLink technology</value>
+  </data>
+  <data name="&gt;&gt;radioButtonCslg.Name" xml:space="preserve">
+    <value>radioButtonCslg</value>
+  </data>
+  <data name="&gt;&gt;radioButtonCslg.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;radioButtonCslg.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;radioButtonCslg.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="labelISOlibrary.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labelISOlibrary.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt, style=Bold</value>
+  </data>
+  <data name="labelISOlibrary.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labelISOlibrary.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 257</value>
+  </data>
+  <data name="labelISOlibrary.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 16, 3, 10</value>
+  </data>
+  <data name="labelISOlibrary.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 15</value>
+  </data>
+  <data name="labelISOlibrary.TabIndex" type="System.Int32, mscorlib">
+    <value>15</value>
+  </data>
+  <data name="labelISOlibrary.Text" xml:space="preserve">
+    <value>ISO library</value>
+  </data>
+  <data name="&gt;&gt;labelISOlibrary.Name" xml:space="preserve">
+    <value>labelISOlibrary</value>
+  </data>
+  <data name="&gt;&gt;labelISOlibrary.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labelISOlibrary.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;labelISOlibrary.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="radioButtonCifsIso.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="radioButtonCifsIso.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
+  <data name="radioButtonCifsIso.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="radioButtonCifsIso.Location" type="System.Drawing.Point, System.Drawing">
+    <value>26, 285</value>
+  </data>
+  <data name="radioButtonCifsIso.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>15, 3, 3, 3</value>
+  </data>
+  <data name="radioButtonCifsIso.Size" type="System.Drawing.Size, System.Drawing">
+    <value>201, 19</value>
+  </data>
+  <data name="radioButtonCifsIso.TabIndex" type="System.Int32, mscorlib">
+    <value>17</value>
+  </data>
+  <data name="radioButtonCifsIso.Text" xml:space="preserve">
+    <value>&amp;Windows File Sharing (SMB/CIFS)</value>
+  </data>
+  <data name="&gt;&gt;radioButtonCifsIso.Name" xml:space="preserve">
+    <value>radioButtonCifsIso</value>
+  </data>
+  <data name="&gt;&gt;radioButtonCifsIso.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;radioButtonCifsIso.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;radioButtonCifsIso.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="radioButtonNfsIso.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="radioButtonNfsIso.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
+  <data name="radioButtonNfsIso.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="radioButtonNfsIso.Location" type="System.Drawing.Point, System.Drawing">
+    <value>26, 310</value>
+  </data>
+  <data name="radioButtonNfsIso.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>15, 3, 3, 3</value>
+  </data>
+  <data name="radioButtonNfsIso.Size" type="System.Drawing.Size, System.Drawing">
+    <value>67, 19</value>
+  </data>
+  <data name="radioButtonNfsIso.TabIndex" type="System.Int32, mscorlib">
+    <value>18</value>
+  </data>
+  <data name="radioButtonNfsIso.Text" xml:space="preserve">
+    <value>NFS &amp;ISO</value>
+  </data>
+  <data name="&gt;&gt;radioButtonNfsIso.Name" xml:space="preserve">
+    <value>radioButtonNfsIso</value>
+  </data>
+  <data name="&gt;&gt;radioButtonNfsIso.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;radioButtonNfsIso.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;radioButtonNfsIso.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="radioButtonIscsi.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="radioButtonIscsi.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
+  <data name="radioButtonIscsi.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="radioButtonIscsi.Location" type="System.Drawing.Point, System.Drawing">
+    <value>26, 59</value>
+  </data>
+  <data name="radioButtonIscsi.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>15, 3, 3, 3</value>
+  </data>
+  <data name="radioButtonIscsi.Size" type="System.Drawing.Size, System.Drawing">
+    <value>51, 19</value>
+  </data>
+  <data name="radioButtonIscsi.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="radioButtonIscsi.Text" xml:space="preserve">
+    <value>i&amp;SCSI</value>
+  </data>
+  <data name="&gt;&gt;radioButtonIscsi.Name" xml:space="preserve">
+    <value>radioButtonIscsi</value>
+  </data>
+  <data name="&gt;&gt;radioButtonIscsi.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;radioButtonIscsi.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;radioButtonIscsi.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="radioButtonFibreChannel.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="radioButtonFibreChannel.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
+  <data name="radioButtonFibreChannel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="radioButtonFibreChannel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>26, 84</value>
+  </data>
+  <data name="radioButtonFibreChannel.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>15, 3, 3, 3</value>
+  </data>
+  <data name="radioButtonFibreChannel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>103, 19</value>
+  </data>
+  <data name="radioButtonFibreChannel.TabIndex" type="System.Int32, mscorlib">
+    <value>13</value>
+  </data>
+  <data name="radioButtonFibreChannel.Text" xml:space="preserve">
+    <value>Hardware &amp;HBA</value>
+  </data>
+  <data name="&gt;&gt;radioButtonFibreChannel.Name" xml:space="preserve">
+    <value>radioButtonFibreChannel</value>
+  </data>
+  <data name="&gt;&gt;radioButtonFibreChannel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;radioButtonFibreChannel.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;radioButtonFibreChannel.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
   <data name="radioButtonFcoe.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -609,10 +543,10 @@
     <value>NoControl</value>
   </data>
   <data name="radioButtonFcoe.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 131</value>
+    <value>26, 109</value>
   </data>
   <data name="radioButtonFcoe.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 3, 3, 3</value>
+    <value>15, 3, 3, 3</value>
   </data>
   <data name="radioButtonFcoe.Size" type="System.Drawing.Size, System.Drawing">
     <value>101, 19</value>
@@ -633,7 +567,43 @@
     <value>tableLayoutPanel3</value>
   </data>
   <data name="&gt;&gt;radioButtonFcoe.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>6</value>
+  </data>
+  <data name="radioButtonNfs.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="radioButtonNfs.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt</value>
+  </data>
+  <data name="radioButtonNfs.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="radioButtonNfs.Location" type="System.Drawing.Point, System.Drawing">
+    <value>26, 169</value>
+  </data>
+  <data name="radioButtonNfs.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>15, 3, 3, 3</value>
+  </data>
+  <data name="radioButtonNfs.Size" type="System.Drawing.Size, System.Drawing">
+    <value>46, 19</value>
+  </data>
+  <data name="radioButtonNfs.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
+  <data name="radioButtonNfs.Text" xml:space="preserve">
+    <value>N&amp;FS</value>
+  </data>
+  <data name="&gt;&gt;radioButtonNfs.Name" xml:space="preserve">
+    <value>radioButtonNfs</value>
+  </data>
+  <data name="&gt;&gt;radioButtonNfs.Type" xml:space="preserve">
+    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;radioButtonNfs.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;radioButtonNfs.ZOrder" xml:space="preserve">
+    <value>7</value>
   </data>
   <data name="radioButtonCifs.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -645,10 +615,10 @@
     <value>NoControl</value>
   </data>
   <data name="radioButtonCifs.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 106</value>
+    <value>26, 194</value>
   </data>
   <data name="radioButtonCifs.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>6, 3, 3, 3</value>
+    <value>15, 3, 3, 3</value>
   </data>
   <data name="radioButtonCifs.Size" type="System.Drawing.Size, System.Drawing">
     <value>77, 19</value>
@@ -669,16 +639,130 @@
     <value>tableLayoutPanel3</value>
   </data>
   <data name="&gt;&gt;radioButtonCifs.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>8</value>
+  </data>
+  <data name="labelVirtualDiskStorage.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labelVirtualDiskStorage.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt, style=Bold</value>
+  </data>
+  <data name="labelVirtualDiskStorage.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labelVirtualDiskStorage.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 3</value>
+  </data>
+  <data name="labelVirtualDiskStorage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 10</value>
+  </data>
+  <data name="labelVirtualDiskStorage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>114, 15</value>
+  </data>
+  <data name="labelVirtualDiskStorage.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="labelVirtualDiskStorage.Text" xml:space="preserve">
+    <value>Virtual disk storage</value>
+  </data>
+  <data name="&gt;&gt;labelVirtualDiskStorage.Name" xml:space="preserve">
+    <value>labelVirtualDiskStorage</value>
+  </data>
+  <data name="&gt;&gt;labelVirtualDiskStorage.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labelVirtualDiskStorage.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;labelVirtualDiskStorage.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="labelFileBasedStorage.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labelFileBasedStorage.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt, style=Bold</value>
+  </data>
+  <data name="labelFileBasedStorage.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labelFileBasedStorage.Location" type="System.Drawing.Point, System.Drawing">
+    <value>14, 141</value>
+  </data>
+  <data name="labelFileBasedStorage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 10, 3, 10</value>
+  </data>
+  <data name="labelFileBasedStorage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>106, 15</value>
+  </data>
+  <data name="labelFileBasedStorage.TabIndex" type="System.Int32, mscorlib">
+    <value>20</value>
+  </data>
+  <data name="labelFileBasedStorage.Text" xml:space="preserve">
+    <value>File based storage</value>
+  </data>
+  <data name="labelFileBasedStorage.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleCenter</value>
+  </data>
+  <data name="&gt;&gt;labelFileBasedStorage.Name" xml:space="preserve">
+    <value>labelFileBasedStorage</value>
+  </data>
+  <data name="&gt;&gt;labelFileBasedStorage.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labelFileBasedStorage.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;labelFileBasedStorage.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="labelBlockBasedStorage.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labelBlockBasedStorage.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt, style=Bold</value>
+  </data>
+  <data name="labelBlockBasedStorage.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labelBlockBasedStorage.Location" type="System.Drawing.Point, System.Drawing">
+    <value>14, 31</value>
+  </data>
+  <data name="labelBlockBasedStorage.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 10</value>
+  </data>
+  <data name="labelBlockBasedStorage.Size" type="System.Drawing.Size, System.Drawing">
+    <value>118, 15</value>
+  </data>
+  <data name="labelBlockBasedStorage.TabIndex" type="System.Int32, mscorlib">
+    <value>19</value>
+  </data>
+  <data name="labelBlockBasedStorage.Text" xml:space="preserve">
+    <value>Block based storage</value>
+  </data>
+  <data name="labelBlockBasedStorage.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleCenter</value>
+  </data>
+  <data name="&gt;&gt;labelBlockBasedStorage.Name" xml:space="preserve">
+    <value>labelBlockBasedStorage</value>
+  </data>
+  <data name="&gt;&gt;labelBlockBasedStorage.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labelBlockBasedStorage.Parent" xml:space="preserve">
+    <value>tableLayoutPanel3</value>
+  </data>
+  <data name="&gt;&gt;labelBlockBasedStorage.ZOrder" xml:space="preserve">
+    <value>11</value>
   </data>
   <data name="tableLayoutPanel3.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 3</value>
   </data>
   <data name="tableLayoutPanel3.RowCount" type="System.Int32, mscorlib">
-    <value>10</value>
+    <value>12</value>
   </data>
   <data name="tableLayoutPanel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>210, 302</value>
+    <value>230, 330</value>
   </data>
   <data name="tableLayoutPanel3.TabIndex" type="System.Int32, mscorlib">
     <value>37</value>
@@ -696,7 +780,7 @@
     <value>1</value>
   </data>
   <data name="tableLayoutPanel3.LayoutSettings" type="System.Windows.Forms.TableLayoutSettings, System.Windows.Forms">
-    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="radioButtonFcoe" Row="5" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonCifs" Row="4" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonCslg" Row="6" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelVirtualDiskStorage" Row="0" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonNfs" Row="1" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonFibreChannel" Row="3" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonIscsi" Row="2" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="labelISOlibrary" Row="7" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonCifsIso" Row="8" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonNfsIso" Row="9" RowSpan="1" Column="0" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,100" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,20,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,Absolute,20" /&gt;&lt;/TableLayoutSettings&gt;</value>
+    <value>&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;TableLayoutSettings&gt;&lt;Controls&gt;&lt;Control Name="radioButtonCslg" Row="8" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelISOlibrary" Row="9" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="radioButtonCifsIso" Row="10" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonNfsIso" Row="11" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonIscsi" Row="2" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonFibreChannel" Row="3" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonFcoe" Row="4" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonNfs" Row="6" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="radioButtonCifs" Row="7" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelVirtualDiskStorage" Row="0" RowSpan="1" Column="0" ColumnSpan="2" /&gt;&lt;Control Name="labelFileBasedStorage" Row="5" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;Control Name="labelBlockBasedStorage" Row="1" RowSpan="1" Column="1" ColumnSpan="1" /&gt;&lt;/Controls&gt;&lt;Columns Styles="Percent,5,Percent,95" /&gt;&lt;Rows Styles="AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0,AutoSize,0" /&gt;&lt;/TableLayoutSettings&gt;</value>
   </data>
   <data name="tableLayoutPanel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>

XenAdmin/XenAdmin.csproj

@@ -718,6 +718,12 @@
       <DependentUpon>IntraPoolCopyPage.cs</DependentUpon>
     </Compile>
     <Compile Include="Wizards\ImportWizard\HardwareCompatibilityFilter.cs" />
+    <Compile Include="Wizards\NewSRWizard_Pages\ChooseSrProvisioningPage.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Wizards\NewSRWizard_Pages\ChooseSrProvisioningPage.Designer.cs">
+      <DependentUpon>ChooseSrProvisioningPage.cs</DependentUpon>
+    </Compile>
     <Compile Include="Wizards\NewSRWizard_Pages\Frontends\CIFSFrontend.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -2082,6 +2088,9 @@
       <SubType>Designer</SubType>
       <DependentUpon>RBACWarningPage.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Wizards\NewSRWizard_Pages\ChooseSrProvisioningPage.resx">
+      <DependentUpon>ChooseSrProvisioningPage.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Wizards\NewSRWizard_Pages\Frontends\CIFSFrontend.ja.resx">
       <DependentUpon>CIFSFrontend.cs</DependentUpon>
     </EmbeddedResource>

XenModel/Messages.Designer.cs

@@ -6929,6 +6929,15 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Choose the provisioning method.
+        /// </summary>
+        public static string CHOOSE_SR_PROVISIONING_PAGE_TITLE {
+            get {
+                return ResourceManager.GetString("CHOOSE_SR_PROVISIONING_PAGE_TITLE", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Choose the type of new storage.
         /// </summary>
@@ -15835,6 +15844,24 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Your pool license does not allow GFS2..
+        /// </summary>
+        public static string GFS2_INCORRECT_POOL_LICENSE {
+            get {
+                return ResourceManager.GetString("GFS2_INCORRECT_POOL_LICENSE", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to GFS2 requires clustering to be enabled on the pool..
+        /// </summary>
+        public static string GFS2_REQUIRES_CLUSTERING_ENABLED {
+            get {
+                return ResourceManager.GetString("GFS2_REQUIRES_CLUSTERING_ENABLED", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to GPU.
         /// </summary>
@@ -24218,9 +24245,7 @@ namespace XenAdmin {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to iSCSI or Fibre Channel access to a shared LUN can be configured using LVM.
+        ///   Looks up a localized string similar to iSCSI or Fibre Channel access to a shared LUN can be configured to host fully provisioned virtual disks using LVM or be formatted with the GFS2 cluster file system for hosting thinly provisioned images..
-        ///
-        ///Using an LVM for a shared SR provides the same performance benefits as a unshared LVM for local disk storage but also enables VM agility..
         /// </summary>
         public static string NEWSR_LVMOISCSI_BLURB {
             get {
@@ -28381,6 +28406,15 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Provisioning.
+        /// </summary>
+        public static string PROVISIONING {
+            get {
+                return ResourceManager.GetString("PROVISIONING", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Provisioning Options.
         /// </summary>

XenModel/Messages.resx

@@ -8272,9 +8272,7 @@ Once all configuration is complete the HBA will expose a SCSI device backed by t
     <value>Hardware HBA</value>
   </data>
   <data name="NEWSR_LVMOISCSI_BLURB" xml:space="preserve">
-    <value>iSCSI or Fibre Channel access to a shared LUN can be configured using LVM.
+    <value>iSCSI or Fibre Channel access to a shared LUN can be configured to host fully provisioned virtual disks using LVM or be formatted with the GFS2 cluster file system for hosting thinly provisioned images.</value>
-
-Using an LVM for a shared SR provides the same performance benefits as a unshared LVM for local disk storage but also enables VM agility.</value>
   </data>
   <data name="NEWSR_LVMOISCSI_TYPE_NAME" xml:space="preserve">
     <value>iSCSI</value>
@@ -13567,4 +13565,16 @@ You will need to navigate to the Console on each of the selected VMs to complete
   <data name="YOU_ARE_HERE" xml:space="preserve">
     <value>You are here</value>
   </data>
+  <data name="CHOOSE_SR_PROVISIONING_PAGE_TITLE" xml:space="preserve">
+    <value>Choose the provisioning method</value>
+  </data>
+  <data name="GFS2_INCORRECT_POOL_LICENSE" xml:space="preserve">
+    <value>Your pool license does not allow GFS2.</value>
+  </data>
+  <data name="GFS2_REQUIRES_CLUSTERING_ENABLED" xml:space="preserve">
+    <value>GFS2 requires clustering to be enabled on the pool.</value>
+  </data>
+  <data name="PROVISIONING" xml:space="preserve">
+    <value>Provisioning</value>
+  </data>
 </root>