Alissa Bonas has uploaded a new change for review.
Change subject: core: rename remove storage connection command
......................................................................
core: rename remove storage connection command
Rename removeStorageServerConnection command and vdcAction type
to disconnectStorageServerConnection since this command
disconnects it on vdsm side, but does not remove its record from the db.
It's more correct to call it "disconnect" according to what it actually does.
It's also preparation for adding (in different patch) a remove command
that actully both disconnects the storage and removes the storage connection
from
the db.
Change-Id: I0b6043810a5c4200593befd668a279ea56ff4693
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
R
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.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/action/VdcActionType.java
M
backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
7 files changed, 14 insertions(+), 95 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/11378/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.java
similarity index 92%
rename from
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java
rename to
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.java
index 70b0314..c77c535 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/RemoveStorageServerConnectionCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DisconnectStorageServerConnectionCommand.java
@@ -12,9 +12,9 @@
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
@InternalCommandAttribute
-public class RemoveStorageServerConnectionCommand<T extends
StorageServerConnectionParametersBase> extends
+public class DisconnectStorageServerConnectionCommand<T extends
StorageServerConnectionParametersBase> extends
StorageServerConnectionCommandBase<T> {
- public RemoveStorageServerConnectionCommand(T parameters) {
+ public DisconnectStorageServerConnectionCommand(T parameters) {
super(parameters);
}
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..f0ea572 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
@@ -45,7 +45,7 @@
@Override
public boolean disconnectStorageFromDomainByStoragePoolId(storage_domains
storageDomain, Guid storagePoolId) {
return runForSingleConnectionInHost(storageDomain, storagePoolId,
- VdcActionType.RemoveStorageServerConnection.getValue());
+ VdcActionType.DisconnectStorageServerConnection.getValue());
}
protected abstract boolean runConnectionStorageToDomain(storage_domains
storageDomain, Guid vdsId, int type);
@@ -66,7 +66,7 @@
@Override
public boolean disconnectStorageFromDomainByVdsId(storage_domains
storageDomain, Guid vdsId) {
return runConnectionStorageToDomain(storageDomain, vdsId,
- VdcActionType.RemoveStorageServerConnection.getValue());
+ VdcActionType.DisconnectStorageServerConnection.getValue());
}
@Override
@@ -81,7 +81,7 @@
@Override
public boolean disconnectStorageFromLunByVdsId(storage_domains
storageDomain, Guid vdsId, LUNs lun) {
return runConnectionStorageToDomain(storageDomain, vdsId,
- VdcActionType.RemoveStorageServerConnection.getValue(), lun,
Guid.Empty);
+ VdcActionType.DisconnectStorageServerConnection.getValue(),
lun, Guid.Empty);
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
index 5a144c8..fac403a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdcActionType.java
@@ -217,7 +217,7 @@
AddExistingNFSStorageDomain(960, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
AddExistingSANStorageDomain(961, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
AddStorageServerConnection(1000, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
- RemoveStorageServerConnection(1002, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
+ DisconnectStorageServerConnection(1002, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
ConnectHostToStoragePoolServers(1004, QuotaDependency.NONE),
DisconnectHostFromStoragePoolServers(1005, QuotaDependency.NONE),
ConnectStorageToVds(1006, ActionGroup.CREATE_STORAGE_DOMAIN,
QuotaDependency.NONE),
diff --git
a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties
b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties
index ece6294..ef7a635 100644
---
a/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties
+++
b/backend/manager/modules/dal/src/main/resources/bundles/ExecutionMessages.properties
@@ -58,7 +58,7 @@
job.AddExistingNFSStorageDomain=Adding NFS Storage Domain ${Storage}
job.AddExistingSANStorageDomain=Adding SAN Storage Domain ${Storage}
job.AddStorageServerConnection=Connecting Host ${VDS} to Storage server
-job.RemoveStorageServerConnection=Disconnecting from Storage server on ${VDS}
+job.DisconnectStorageServerConnection=Disconnecting from Storage server on
${VDS}
job.ConnectStorageToVds=Connecting Host ${VDS} to Storage server
job.AddVmPoolWithVms=Creating VM Pool ${VmPool} from template ${VmTemplate}
job.ChangeDisk=Changing CD-ROM for VM ${VM}
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
index 9622d9e..9cc6945 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java
@@ -869,7 +869,7 @@
private void CleanConnection(StorageServerConnections connection, Guid
hostId)
{
- Frontend.RunAction(VdcActionType.RemoveStorageServerConnection,
+ Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection,
new StorageServerConnectionParametersBase(connection, hostId),
new IFrontendActionAsyncCallback() {
@Override
@@ -966,7 +966,7 @@
actionTypes.add(VdcActionType.AddStorageServerConnection);
actionTypes.add(VdcActionType.AddNFSStorageDomain);
- actionTypes.add(VdcActionType.RemoveStorageServerConnection);
+ actionTypes.add(VdcActionType.DisconnectStorageServerConnection);
parameters.add(new StorageServerConnectionParametersBase(connection,
host.getId()));
StorageDomainManagementParameter tempVar2 = new
StorageDomainManagementParameter(storageDomain);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
index bb2ba7e..c3ecf5f 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/AddStorageDomainRM.java
@@ -202,7 +202,7 @@
StorageServerConnectionParametersBase parameter =
new
StorageServerConnectionParametersBase(context.connection, context.host.getId());
parameter.setCorrelationId(getCorrelationId());
- Frontend.RunAction(VdcActionType.RemoveStorageServerConnection,
+ Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection,
parameter,
new IFrontendActionAsyncCallback() {
@Override
@@ -234,87 +234,6 @@
enlistment.Prepared();
}
}
-
- // @Override
- // public void Prepare(PreparingEnlistment enlistment)
- // {
- // VDS host = (VDS) getModel().getSelectedItem();
- // ConfigureLocalStorageModel model = (ConfigureLocalStorageModel)
getModel().getWindow();
- //
- // // Activate host.
- // VdcReturnValueBase returnValue =
- // Frontend.RunAction(VdcActionType.ActivateVds, new
VdsActionParameters(host.getvds_id()));
- //
- // if (returnValue == null || !returnValue.getSucceeded())
- // {
- // enlistment.ForceRollback();
- // return;
- // }
- //
- // // Wait for a host to be Up.
- // for (int i = 0; i <= MaxWaitTries; i++)
- // {
- // if (i == MaxWaitTries)
- // {
- // enlistment.ForceRollback();
- // return;
- // }
- //
- // VDS tmpHost = DataProvider.GetHostById(host.getvds_id());
- // if (tmpHost.getstatus() != VDSStatus.Up)
- // {
- // // Wrap Thread.Sleep with try/catch to pass conversion to Java.
- // try
- // {
- // Thread.sleep(WaitInterval);
- // } catch (InterruptedException e)
- // {
- // }
- // }
- // else
- // {
- // break;
- // }
- // }
- //
- // // Add storage domain.
- // storage_server_connections tempVar = new storage_server_connections();
- // tempVar.setconnection((String)
model.getStorage().getPath().getEntity());
- // tempVar.setstorage_type(StorageType.LOCALFS);
- // storage_server_connections connection = tempVar;
- //
- // storage_domain_static storageDomain = new storage_domain_static();
- // storageDomain.setstorage_type(StorageType.LOCALFS);
- // storageDomain.setstorage_domain_type(StorageDomainType.Data);
- // storageDomain.setstorage_name((String)
model.getFormattedStorageName().getEntity());
- //
- // returnValue =
- // Frontend.RunAction(VdcActionType.AddStorageServerConnection,
- // new StorageServerConnectionParametersBase(connection,
host.getvds_id()));
- //
- // if (returnValue == null || !returnValue.getSucceeded())
- // {
- // // Don't rollback, just throw exception to indicate failure at this
step.
- // enlistment.Done();
- // }
- //
- // storageDomain.setstorage((String) returnValue.getActionReturnValue());
- //
- // StorageDomainManagementParameter tempVar2 = new
StorageDomainManagementParameter(storageDomain);
- // tempVar2.setVdsId(host.getvds_id());
- // returnValue = Frontend.RunAction(VdcActionType.AddLocalStorageDomain,
tempVar2);
- //
- // // Clean up connection.
- // if (returnValue == null || !returnValue.getSucceeded())
- // {
- // Frontend.RunAction(VdcActionType.RemoveStorageServerConnection,
- // new StorageServerConnectionParametersBase(connection,
host.getvds_id()));
- //
- // enlistment.Done();
- // }
- //
- // enlistment.Prepared();
- // }
@Override
public void commit(Enlistment enlistment) {
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
index 5e602c4..5506fb0 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/storage/StorageListModel.java
@@ -700,7 +700,7 @@
private void CleanConnection(StorageServerConnections connection, Guid
hostId) {
- Frontend.RunAction(VdcActionType.RemoveStorageServerConnection, new
StorageServerConnectionParametersBase(connection, hostId), new
IFrontendActionAsyncCallback() {
+ Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection,
new StorageServerConnectionParametersBase(connection, hostId), new
IFrontendActionAsyncCallback() {
@Override
public void Executed(FrontendActionAsyncResult result) {
@@ -1344,7 +1344,7 @@
actionTypes.add(VdcActionType.AddStorageServerConnection);
actionTypes.add(VdcActionType.AddNFSStorageDomain);
- actionTypes.add(VdcActionType.RemoveStorageServerConnection);
+ actionTypes.add(VdcActionType.DisconnectStorageServerConnection);
parameters.add(new StorageServerConnectionParametersBase(connection,
host.getId()));
StorageDomainManagementParameter tempVar2 = new
StorageDomainManagementParameter(storageDomain);
@@ -1685,7 +1685,7 @@
if (nfsConnection != null)
{
// Clean nfs connection
- Frontend.RunAction(VdcActionType.RemoveStorageServerConnection,
+ Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection,
new StorageServerConnectionParametersBase(nfsConnection,
hostId),
new IFrontendActionAsyncCallback() {
@Override
@@ -1846,7 +1846,7 @@
public void PostImportNfsStorage(TaskContext context, boolean isSucceeded,
IStorageModel model, String message)
{
- Frontend.RunAction(VdcActionType.RemoveStorageServerConnection,
+ Frontend.RunAction(VdcActionType.DisconnectStorageServerConnection,
new StorageServerConnectionParametersBase(nfsConnection, hostId),
new IFrontendActionAsyncCallback() {
@Override
--
To view, visit http://gerrit.ovirt.org/11378
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b6043810a5c4200593befd668a279ea56ff4693
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
