Michael Kublin has uploaded a new change for review. Change subject: engine: Removing validateStorageServerConnection - storage part ......................................................................
engine: Removing validateStorageServerConnection - storage part The following patch is removing uses of validateStorageServerConnection. The API is depricated and usefull, espicially when it called from canDoaction of internal commands Benefit, reduced XML RPC call at most of the storage operations, reduced useless logic Change-Id: I7b3bc2491943a6daa21228e37169c83f32865984 Signed-off-by: Michael Kublin <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java M backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java D backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ValidateStorageServerConnectionVDSCommand.java M frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java M frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties M frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties 15 files changed, 1 insertion(+), 108 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/11416/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java index 0826074..b5ec121 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddStorageServerConnectionCommand.java @@ -79,16 +79,6 @@ addCanDoActionMessage(VdcBllMessages.VDS_CANNOT_ADD_LOCAL_STORAGE_TO_NON_LOCAL_HOST); } } - if (returnValue) { - IStorageHelper storageHelper = StorageHelperDirector.getInstance().getItem( - paramConnection.getstorage_type()); - if (!storageHelper.validateStoragePoolConnectionsInHost(getVds(), - new java.util.ArrayList<StorageServerConnections>(java.util.Arrays.asList(paramConnection)), - Guid.Empty)) { - returnValue = false; - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION); - } - } } return returnValue; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java index b490f8e..cb3cd1b 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/BaseFsStorageHelper.java @@ -2,7 +2,6 @@ import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import java.util.Map; @@ -10,12 +9,9 @@ import org.ovirt.engine.core.common.action.StorageServerConnectionParametersBase; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.StorageType; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; -import org.ovirt.engine.core.common.vdscommands.ConnectStorageServerVDSCommandParameters; -import org.ovirt.engine.core.common.vdscommands.VDSCommandType; import org.ovirt.engine.core.compat.Guid; import org.ovirt.engine.core.dal.dbbroker.DbFacade; @@ -36,20 +32,6 @@ + " because connection for connectionId:" + storageDomain.getstorage() + " is null."); } return returnValue; - } - - @Override - public boolean validateStoragePoolConnectionsInHost(VDS vds, List<StorageServerConnections> connections, - Guid storagePoolId) { - @SuppressWarnings("unchecked") - HashMap<String, String> validateConnections = (HashMap<String, String>) Backend - .getInstance() - .getResourceManager() - .RunVdsCommand( - VDSCommandType.ValidateStorageServerConnection, - new ConnectStorageServerVDSCommandParameters(vds.getId(), storagePoolId, getType(), - connections)).getReturnValue(); - return isConnectSucceeded(validateConnections, connections); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java index 183e08a..3835315 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ConnectStorageToVdsCommand.java @@ -31,14 +31,6 @@ return false; } } - if (!StorageHelperDirector.getInstance() - .getItem(getParameters().getStorageServerConnection().getstorage_type()) - .validateStoragePoolConnectionsInHost(getVds(), - Arrays.asList(getConnection()), - getParameters().getStoragePoolId())) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_CONNECTION); - return false; - } return true; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java index fc9e487..fcc1845 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/FCPStorageHelper.java @@ -5,10 +5,6 @@ import org.ovirt.engine.core.compat.Guid; public class FCPStorageHelper extends StorageHelperBase { - @Override - public boolean connectStorageToDomainByStoragePoolId(storage_domains storageDomain, Guid storagePoolId) { - return true; - } @Override public boolean disconnectStorageFromDomainByStoragePoolId(storage_domains storageDomain, Guid storagePoolId) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java index a741f0a..35f1de3 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/ISCSIStorageHelper.java @@ -9,7 +9,6 @@ import org.ovirt.engine.core.common.businessentities.LUN_storage_server_connection_map; import org.ovirt.engine.core.common.businessentities.LUNs; import org.ovirt.engine.core.common.businessentities.StorageType; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; @@ -118,24 +117,6 @@ } @Override - public boolean validateStoragePoolConnectionsInHost(VDS vds, List<StorageServerConnections> connections, - Guid storagePoolId) { - if (connections.size() > 0) { - @SuppressWarnings("unchecked") - Map<String, String> validateConnections = (Map<String, String>) Backend - .getInstance() - .getResourceManager() - .RunVdsCommand( - VDSCommandType.ValidateStorageServerConnection, - new ConnectStorageServerVDSCommandParameters(vds.getId(), storagePoolId, - StorageType.ISCSI, connections)).getReturnValue(); - - return isConnectSucceeded(validateConnections, connections); - } - return true; - } - - @Override public boolean isConnectSucceeded(final Map<String, String> returnValue, List<StorageServerConnections> connections) { boolean result = true; @@ -197,12 +178,6 @@ } } return true; - } - - @Override - public boolean connectStorageToDomainByStoragePoolId(storage_domains storageDomain, Guid storagePoolId) { - return runForSingleConnectionInHost(storageDomain, storagePoolId, - VDSCommandType.ConnectStorageServer.getValue()); } @Override diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java index 94ba411..14a9baa 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/IStorageHelper.java @@ -4,14 +4,12 @@ import java.util.Map; import org.ovirt.engine.core.common.businessentities.LUNs; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.StorageServerConnections; import org.ovirt.engine.core.compat.Guid; public interface IStorageHelper { - boolean connectStorageToDomainByStoragePoolId(storage_domains storageDomain, Guid storagePoolId); boolean disconnectStorageFromDomainByStoragePoolId(storage_domains storageDomain, Guid storagePoolId); @@ -26,9 +24,6 @@ boolean storageDomainRemoved(StorageDomainStatic storageDomain); void removeLun(LUNs lun); - - boolean validateStoragePoolConnectionsInHost(VDS vds, List<StorageServerConnections> connections, - Guid storagePoolId); List<StorageServerConnections> getStorageServerConnectionsByDomain( StorageDomainStatic storageDomain); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java index 4f144e6..5019996 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/StorageHelperBase.java @@ -8,7 +8,6 @@ import org.ovirt.engine.core.common.AuditLogType; import org.ovirt.engine.core.common.action.VdcActionType; import org.ovirt.engine.core.common.businessentities.LUNs; -import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.StorageDomainStatic; import org.ovirt.engine.core.common.businessentities.storage_domains; import org.ovirt.engine.core.common.businessentities.storage_pool; @@ -25,11 +24,6 @@ public abstract class StorageHelperBase implements IStorageHelper { protected final Log log = LogFactory.getLog(getClass()); - - @Override - public boolean connectStorageToDomainByStoragePoolId(storage_domains storageDomain, Guid storagePoolId) { - return runForSingleConnectionInHost(storageDomain, storagePoolId, VdcActionType.ConnectStorageToVds.getValue()); - } public boolean runForSingleConnectionInHost(storage_domains storageDomain, Guid storagePoolId, int type) { boolean returnValue = false; @@ -104,12 +98,6 @@ protected List<StorageServerConnections> filterConnectionsUsedByOthers( List<StorageServerConnections> connections, String vgId, final String lunId) { return Collections.emptyList(); - } - - @Override - public boolean validateStoragePoolConnectionsInHost(VDS vds, List<StorageServerConnections> connections, - Guid storagePoolId) { - return true; } @Override diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java index 16a2b7a..e4d3723 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VDSCommandType.java @@ -35,7 +35,6 @@ SetSafeNetworkConfig("org.ovirt.engine.core.vdsbroker.vdsbroker"), ConnectStorageServer("org.ovirt.engine.core.vdsbroker.vdsbroker"), DisconnectStorageServer("org.ovirt.engine.core.vdsbroker.vdsbroker"), - ValidateStorageServerConnection("org.ovirt.engine.core.vdsbroker.vdsbroker"), GetStorageConnectionsList("org.ovirt.engine.core.vdsbroker.vdsbroker"), ConnectStoragePool("org.ovirt.engine.core.vdsbroker.vdsbroker"), DisconnectStoragePool("org.ovirt.engine.core.vdsbroker.vdsbroker"), diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java index 3383b17..7d6b2fd 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dal/VdcBllMessages.java @@ -438,7 +438,6 @@ ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_IN_STORAGE_POOL, ACTION_TYPE_FAILED_STORAGE_POOL_NOT_EXIST, ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_EXIST, - ACTION_TYPE_FAILED_STORAGE_CONNECTION, ACTION_TYPE_FAILED_STORAGE_CONNECTION_NOT_EXIST, ACTION_TYPE_FAILED_STORAGE_CONNECTION_WRONG_PARAMETERS_FOR_STORAGE_TYPE, ACTION_TYPE_FAILED_STORAGE_DOMAIN_STATUS_ILLEGAL, diff --git a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties index 791bdc9..a5bc2ef 100644 --- a/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties +++ b/backend/manager/modules/dal/src/main/resources/bundles/AppErrors.properties @@ -341,7 +341,6 @@ VDS_GROUP_CPU_TYPE_CANNOT_BE_NULL=Cannot add Cluster. CPU type must be specified VDS_GROUP_CANNOT_DO_ACTION_NAME_IN_USE=Cannot ${action} Cluster. Cluster name is already in use. NETWORK_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. Network name already exists. -ACTION_TYPE_FAILED_STORAGE_CONNECTION=Cannot connect server to Storage. ACTION_TYPE_FAILED_STORAGE_CONNECTION_NOT_EXIST=Cannot ${action} ${type}. Storage connection doesn't exist. ACTION_TYPE_FAILED_STORAGE_CONNECTION_WRONG_PARAMETERS_FOR_STORAGE_TYPE=Cannot ${action} ${type}. Connection parameters are invalid for this storage type. ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_EXIST=Cannot ${action} ${type}. Storage Domain doesn't exist. diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java index 532dcd6..308601e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/IVdsServer.java @@ -95,6 +95,7 @@ ServerConnectionStatusReturnForXmlRpc connectStorageServer(int serverType, String spUUID, Map<String, String>[] args); + @Deprecated ServerConnectionStatusReturnForXmlRpc validateStorageServerConnection(int serverType, String spUUID, Map<String, String>[] args); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ValidateStorageServerConnectionVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ValidateStorageServerConnectionVDSCommand.java deleted file mode 100644 index c0f4d35..0000000 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ValidateStorageServerConnectionVDSCommand.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.ovirt.engine.core.vdsbroker.vdsbroker; - -import org.ovirt.engine.core.common.vdscommands.*; - -public class ValidateStorageServerConnectionVDSCommand<P extends ConnectStorageServerVDSCommandParameters> - extends ConnectStorageServerVDSCommand<P> { - public ValidateStorageServerConnectionVDSCommand(P parameters) { - super(parameters); - } - - @Override - protected void ExecuteVdsBrokerCommand() { - _result = getBroker().validateStorageServerConnection(getParameters().getStorageType().getValue(), - getParameters().getStoragePoolId().toString(), BuildStructFromConnectionListObject()); - ProceedProxyReturnValue(); - setReturnValue(_result.convertToStatusList()); - } -} diff --git a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java index 83e6dd3..b25e45e 100644 --- a/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java +++ b/frontend/webadmin/modules/frontend/src/main/java/org/ovirt/engine/ui/frontend/AppErrors.java @@ -951,9 +951,6 @@ @DefaultStringValue("Cannot ${action} ${type}. Network name already exists.") String NETWORK_NAME_ALREADY_EXISTS(); - @DefaultStringValue("Cannot connect server to Storage. ") - String ACTION_TYPE_FAILED_STORAGE_CONNECTION(); - @DefaultStringValue("Cannot ${action} ${type}. Storage connection doesn't exist.") String ACTION_TYPE_FAILED_STORAGE_CONNECTION_NOT_EXIST(); diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index 3994de3..fb12f4d 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -337,7 +337,6 @@ VDS_GROUP_CPU_TYPE_CANNOT_BE_NULL=Cannot add Cluster. CPU type must be specified. VDS_GROUP_CANNOT_DO_ACTION_NAME_IN_USE=Cannot ${action} Cluster. Cluster name is already in use. NETWORK_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. Network name already exists. -ACTION_TYPE_FAILED_STORAGE_CONNECTION=Cannot connect server to Storage. ACTION_TYPE_FAILED_STORAGE_CONNECTION_NOT_EXIST=Cannot ${action} ${type}. Storage connection doesn't exist. ACTION_TYPE_FAILED_STORAGE_CONNECTION_WRONG_PARAMETERS_FOR_STORAGE_TYPE=Cannot ${action} ${type}. Connection parameters are invalid for this storage type. ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_EXIST=Cannot ${action} ${type}. Storage Domain doesn't exist. diff --git a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties index d94de06..adccadb 100644 --- a/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties +++ b/frontend/webadmin/modules/webadmin/src/main/resources/org/ovirt/engine/ui/frontend/AppErrors.properties @@ -335,7 +335,6 @@ VDS_GROUP_CPU_TYPE_CANNOT_BE_NULL=Cannot add Cluster. CPU type must be specified. VDS_GROUP_CANNOT_DO_ACTION_NAME_IN_USE=Cannot ${action} Cluster. Cluster name is already in use. NETWORK_NAME_ALREADY_EXISTS=Cannot ${action} ${type}. Network name already exists. -ACTION_TYPE_FAILED_STORAGE_CONNECTION=Cannot connect server to Storage. ACTION_TYPE_FAILED_STORAGE_CONNECTION_NOT_EXIST=Cannot ${action} ${type}. Storage connection doesn't exist. ACTION_TYPE_FAILED_STORAGE_CONNECTION_WRONG_PARAMETERS_FOR_STORAGE_TYPE=Cannot ${action} ${type}. Connection parameters are invalid for this storage type. ACTION_TYPE_FAILED_STORAGE_DOMAIN_NOT_EXIST=Cannot ${action} ${type}. Storage Domain doesn't exist. -- To view, visit http://gerrit.ovirt.org/11416 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b3bc2491943a6daa21228e37169c83f32865984 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Michael Kublin <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
