From b23ec8136aa9a63e893611e4a18e69eb3a5736a8 Mon Sep 17 00:00:00 2001
From: Mihaela Stoica <Mihaela.Stoica@citrix.com>
Date: Thu, 17 Mar 2016 16:38:19 +0000
Subject: [PATCH] CP-16480: Add gfs2 to the list of XenCenter known sr types

Signed-off-by: Mihaela Stoica <Mihaela.Stoica@citrix.com>

Conflicts:
	XenModel/FriendlyNames.Designer.cs
	XenModel/FriendlyNames.resx
	XenModel/XenAPI-Extensions/SR.cs
---
 XenModel/FriendlyNames.Designer.cs |  9 +++++++++
 XenModel/FriendlyNames.resx        |  3 +++
 XenModel/XenAPI-Extensions/SR.cs   | 26 +++++++++++++++-----------
 3 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/XenModel/FriendlyNames.Designer.cs b/XenModel/FriendlyNames.Designer.cs
index 78ff640b2..e52a0fe21 100644
--- a/XenModel/FriendlyNames.Designer.cs
+++ b/XenModel/FriendlyNames.Designer.cs
@@ -2679,6 +2679,15 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to GFS2.
+        /// </summary>
+        public static string Label_SR_SRTypes_gfs2 {
+            get {
+                return ResourceManager.GetString("Label-SR.SRTypes-gfs2", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to VDI-per-LUN iSCSI.
         /// </summary>
diff --git a/XenModel/FriendlyNames.resx b/XenModel/FriendlyNames.resx
index 558de99c5..a3d5933a7 100644
--- a/XenModel/FriendlyNames.resx
+++ b/XenModel/FriendlyNames.resx
@@ -1835,4 +1835,7 @@
   <data name="Message.action-pbd_plug_failed_on_server_start" xml:space="preserve">
     <value>Repair Storage</value>
   </data>
+  <data name="Label-SR.SRTypes-gfs2" xml:space="preserve">
+    <value>GFS2</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/XenModel/XenAPI-Extensions/SR.cs b/XenModel/XenAPI-Extensions/SR.cs
index 82f43ee81..3a57781b9 100644
--- a/XenModel/XenAPI-Extensions/SR.cs
+++ b/XenModel/XenAPI-Extensions/SR.cs
@@ -53,7 +53,7 @@ namespace XenAPI
             lvmohba, egenera, egeneracd, dummy, unknown, equal, cslg, shm,
             iscsi,
             ebs, rawhba,
-            smb, lvmofcoe,
+            smb, lvmofcoe, gfs2,
             nutanix, nutanixiso, 
             tmpfs
         }
@@ -229,16 +229,20 @@ namespace XenAPI
         /// </summary>
         public bool CanCreateWithXenCenter()
         {
-            SRTypes typ = GetSRType(false);
-            return typ == SRTypes.iso
-                   || typ == SRTypes.lvmoiscsi
-                   || typ == SRTypes.nfs
-                   || typ == SRTypes.equal
-                   || typ == SRTypes.netapp
-                   || typ == SRTypes.lvmohba
-                   || typ == SRTypes.cslg
-                   || typ == SRTypes.smb
-                   || typ == SRTypes.lvmofcoe;
+            get
+            {
+                SRTypes type = GetSRType(false);
+                return type == SRTypes.iso
+                    || type == SRTypes.lvmoiscsi
+                    || type == SRTypes.nfs
+                    || type == SRTypes.equal
+                    || type == SRTypes.netapp
+                    || type == SRTypes.lvmohba
+                    || type == SRTypes.cslg
+                    || type == SRTypes.smb
+                    || type == SRTypes.lvmofcoe
+                    || type == SRTypes.gfs2;
+            }
         }
 
         public bool IsLocalSR()