Maor Lipchuk has uploaded a new change for review.
Change subject: core: Change GaetStorageDomainInfo return value
......................................................................
core: Change GaetStorageDomainInfo return value
Use the new attribute in StorageDomainStatic to initialize SANState
instead of passing it in the Pair.
Also adding storagePoolId data from VDSM to the Pair result.
Change-Id: I60ca10fd579b6588d57b7ce590e424ee0f8cf75e
Signed-off-by: Maor Lipchuk <mlipc...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetExistingStorageDomainListQuery.java
M
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java
3 files changed, 13 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/29146/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java
index 6994972..92218c3 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/AddExistingFileStorageDomainCommand.java
@@ -78,7 +78,7 @@
return
failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_STORAGE_DOMAIN_ALREADY_EXIST);
}
- Pair<StorageDomainStatic, SANState> domainFromIrs =
(Pair<StorageDomainStatic, SANState>) runVdsCommand(
+ Pair<StorageDomainStatic, Guid> domainFromIrs =
(Pair<StorageDomainStatic, Guid>) runVdsCommand(
VDSCommandType.HSMGetStorageDomainInfo,
new HSMGetStorageDomainInfoVDSCommandParameters(getVdsId(),
getStorageDomain().getId())
).getReturnValue();
@@ -90,7 +90,7 @@
return concreteCheckExistingStorageDomain(domainFromIrs);
}
- protected boolean
concreteCheckExistingStorageDomain(Pair<StorageDomainStatic, SANState> domain) {
+ protected boolean
concreteCheckExistingStorageDomain(Pair<StorageDomainStatic, Guid> domain) {
boolean returnValue = false;
StorageDomainStatic domainFromIrs = domain.getFirst();
if
(StringUtils.isEmpty(getStorageDomain().getStorageStaticData().getStorage())
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetExistingStorageDomainListQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetExistingStorageDomainListQuery.java
index 66ab398..a2edfde 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetExistingStorageDomainListQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/GetExistingStorageDomainListQuery.java
@@ -6,9 +6,8 @@
import org.ovirt.engine.core.bll.Backend;
import org.ovirt.engine.core.bll.QueriesCommandBase;
-import org.ovirt.engine.core.common.businessentities.SANState;
-import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.StorageDomain;
+import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import
org.ovirt.engine.core.common.queries.GetExistingStorageDomainListParameters;
import org.ovirt.engine.core.common.utils.Pair;
import
org.ovirt.engine.core.common.vdscommands.HSMGetStorageDomainInfoVDSCommandParameters;
@@ -49,8 +48,8 @@
}
for (Guid domainId : guidsFromIrs) {
if (!guidsFromDb.contains(domainId)) {
- Pair<StorageDomainStatic, SANState> domainFromIrs =
- (Pair<StorageDomainStatic, SANState>) Backend
+ Pair<StorageDomainStatic, Guid> domainFromIrs =
+ (Pair<StorageDomainStatic, Guid>) Backend
.getInstance()
.getResourceManager()
.RunVdsCommand(
diff --git
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java
index d60fd9b..c543ab9 100644
---
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java
+++
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java
@@ -4,14 +4,15 @@
import java.util.Map;
import org.ovirt.engine.core.common.businessentities.SANState;
+import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.StorageFormatType;
-import org.ovirt.engine.core.common.businessentities.StorageType;
-import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
+import org.ovirt.engine.core.common.businessentities.StorageType;
import org.ovirt.engine.core.common.utils.EnumUtils;
import org.ovirt.engine.core.common.utils.Pair;
import
org.ovirt.engine.core.common.vdscommands.HSMGetStorageDomainInfoVDSCommandParameters;
+import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
public class HSMGetStorageDomainInfoVDSCommand<P extends
HSMGetStorageDomainInfoVDSCommandParameters>
@@ -26,13 +27,13 @@
protected void executeVdsBrokerCommand() {
_result =
getBroker().getStorageDomainInfo(getParameters().getStorageDomainId().toString());
proceedProxyReturnValue();
- Pair<StorageDomainStatic, SANState> pairSdStatic =
BuildStorageStaticFromXmlRpcStruct(_result.mStorageInfo);
+ Pair<StorageDomainStatic, Guid> pairSdStatic =
BuildStorageStaticFromXmlRpcStruct(_result.mStorageInfo);
pairSdStatic.getFirst().setId(getParameters().getStorageDomainId());
setReturnValue(pairSdStatic);
}
- private static Pair<StorageDomainStatic, SANState>
BuildStorageStaticFromXmlRpcStruct(Map<String, Object> xmlRpcStruct) {
- Pair<StorageDomainStatic, SANState> returnValue = new
Pair<StorageDomainStatic, SANState>();
+ private static Pair<StorageDomainStatic, Guid>
BuildStorageStaticFromXmlRpcStruct(Map<String, Object> xmlRpcStruct) {
+ Pair<StorageDomainStatic, Guid> returnValue = new
Pair<StorageDomainStatic, Guid>();
StorageDomainStatic sdStatic = new StorageDomainStatic();
if (xmlRpcStruct.containsKey("name")) {
sdStatic.setStorageName(xmlRpcStruct.get("name").toString());
@@ -71,12 +72,13 @@
}
}
if (xmlRpcStruct.containsKey("state")) {
- returnValue.setSecond(EnumUtils.valueOf(SANState.class,
xmlRpcStruct.get("state")
+ sdStatic.setSANState(EnumUtils.valueOf(SANState.class,
xmlRpcStruct.get("state")
.toString()
.toUpperCase(),
false));
}
returnValue.setFirst(sdStatic);
+
returnValue.setSecond(Guid.createGuidFromString(((String[])xmlRpcStruct.get("pool"))[0]));
return returnValue;
}
--
To view, visit http://gerrit.ovirt.org/29146
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60ca10fd579b6588d57b7ce590e424ee0f8cf75e
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
