CP-14647: Intermediate check-in xenserver#3

stephen-turner · Oct 27, 2015 · 0dd8f9c · 0dd8f9c
1 parent 55c60c3
commit 0dd8f9c
Show file tree

Hide file tree

Showing 30 changed files with 460 additions and 3,340 deletions.
diff --git a/XenAdmin/Commands/ImportStorageLinkVolumeCommand.cs b/XenAdmin/Commands/ImportStorageLinkVolumeCommand.cs
diff --git a/XenAdmin/Commands/NewSRCommand.cs b/XenAdmin/Commands/NewSRCommand.cs
@@ -90,25 +90,7 @@ private static bool CanExecuteOnPool(Pool pool)
 
         protected override bool CanExecuteCore(SelectedItemCollection selection)
         {
-            if (selection.Count == 1 && selection.FirstIsStorageLink)
-            {
-                var storageLinkObject = (IStorageLinkObject)selection[0].XenObject;
-
-                if (storageLinkObject is StorageLinkServer || storageLinkObject is StorageLinkSystem || storageLinkObject is StorageLinkPool)
-                {
-                    if (storageLinkObject.StorageLinkConnection.ConnectionState == XenAdmin.Network.StorageLink.StorageLinkConnectionState.Connected)
-                    {
-                        foreach (IXenConnection c in ConnectionsManager.XenConnectionsCopy)
-                        {
-                            if (c.IsConnected && CanExecuteOnPool(Helpers.GetPool(c)) || CanExecuteOnHost(Helpers.GetMaster(c)))
-                            {
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-            else if (selection.HostAncestor != null)
+            if (selection.HostAncestor != null)
             {
                 return CanExecuteOnHost(selection.HostAncestor);
             }

diff --git a/XenAdmin/Commands/RemoveStorageLinkVolumeCommand.cs b/XenAdmin/Commands/RemoveStorageLinkVolumeCommand.cs