Ravi Nori has uploaded a new change for review. Change subject: engine : Make StatusReturnForXmlRpc.mStatus private ......................................................................
engine : Make StatusReturnForXmlRpc.mStatus private Change visibility of StatusReturnForXmlRpc.mStatus to private and add a getter method getXmlRpcStatus to retrive the status. Change-Id: Id31af427cd66fdd7af92a4c5ca93dee99e40b16c Signed-off-by: Ravi Nori <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateBrickVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHookContentVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostUUIDVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostsPubKeyVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeOptionsInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRebalanceStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRemoveBricksStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotConfigInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/OneStorageDeviceReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRebalanceGlusterVolumeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRemoveGlusterVolumeBricksVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRemoveGlusterVolumeBricksVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StorageDeviceListReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ActivateStorageDomainVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExtendImageSizeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImagesListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVolumesListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsCreateCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/OneImageInfoReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ReconcileVolumeChainVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ExtendVmDiskSizeVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDevicesVisibilityVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDiskAlignmentVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainInfoVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStatusVDSCommand.java M backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/jsonrpc/MarshallingTestCase.java 66 files changed, 88 insertions(+), 91 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/99/39399/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateBrickVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateBrickVDSCommand.java index b7c91c2..e757e69 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateBrickVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateBrickVDSCommand.java @@ -44,7 +44,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return storageDeviceReturn.mStatus; + return storageDeviceReturn.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java index 7865974..bb31cde 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeSnapshotVDSCommand.java @@ -12,7 +12,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return xmlRpcReturnValue.mStatus; + return xmlRpcReturnValue.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java index 9e7c123..466894b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/CreateGlusterVolumeVDSCommand.java @@ -22,7 +22,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return uuidReturn.mStatus; + return uuidReturn.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHookContentVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHookContentVDSCommand.java index fc78cb6..a9e12c5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHookContentVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHookContentVDSCommand.java @@ -13,7 +13,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return returnValue.mStatus; + return returnValue.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostUUIDVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostUUIDVDSCommand.java index d4f7685..cc566e3 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostUUIDVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostUUIDVDSCommand.java @@ -24,7 +24,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return glusterHostUUID.mStatus; + return glusterHostUUID.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostsPubKeyVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostsPubKeyVDSCommand.java index 04461ff..2e25d7f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostsPubKeyVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterHostsPubKeyVDSCommand.java @@ -13,7 +13,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java index 8d0ca29..d61845e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepConfigListVDSCommand.java @@ -16,7 +16,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java index 34ac9c9..e25f84f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionListVDSCommand.java @@ -12,7 +12,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java index f4a8089..97bc865 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeGeoRepSessionStatusVDSCommand.java @@ -12,7 +12,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeOptionsInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeOptionsInfoVDSCommand.java index cd4d874..a26647c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeOptionsInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeOptionsInfoVDSCommand.java @@ -12,7 +12,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRebalanceStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRebalanceStatusVDSCommand.java index df2e8e0..c14c925 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRebalanceStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRebalanceStatusVDSCommand.java @@ -15,7 +15,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRemoveBricksStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRemoveBricksStatusVDSCommand.java index 4e3263c..f00a434 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRemoveBricksStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeRemoveBricksStatusVDSCommand.java @@ -17,7 +17,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotConfigInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotConfigInfoVDSCommand.java index 38f08a50..378c9a1 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotConfigInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotConfigInfoVDSCommand.java @@ -13,7 +13,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return this.infoReturn.mStatus; + return this.infoReturn.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java index d4567de..c31373d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetGlusterVolumeSnapshotInfoVDSCommand.java @@ -13,7 +13,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return infoReturn.mStatus; + return infoReturn.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java index 55eb09a..40b2a9b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GetStorageDeviceListVDSCommand.java @@ -21,7 +21,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturnForXmlRpc.java index 869420f..bb44073 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListReturnForXmlRpc.java @@ -24,7 +24,7 @@ public GlusterHooksListReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); - if (mStatus.mCode != 0) { + if (getXmlRpcStatus().mCode != 0) { return; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListVDSCommand.java index aa36f55..54038d4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterHooksListVDSCommand.java @@ -23,7 +23,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return glusterHooks.mStatus; + return glusterHooks.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListReturnForXmlRpc.java index 22e8177..641807f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListReturnForXmlRpc.java @@ -29,7 +29,7 @@ public GlusterServersListReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); - if (mStatus.mCode != 0) { + if (getXmlRpcStatus().mCode != 0) { return; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListVDSCommand.java index d1744ac..5f37b4a 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServersListVDSCommand.java @@ -25,7 +25,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return glusterServers.mStatus; + return glusterServers.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesListVDSCommand.java index 78dc5e5..fb86b09 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesListVDSCommand.java @@ -29,6 +29,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return glusterServices.mStatus; + return glusterServices.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java index 600c2ff..6d24de4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterServicesReturnForXmlRpc.java @@ -33,7 +33,7 @@ super(innerMap); this.serverId = serverId; - if (mStatus.mCode != GlusterConstants.CODE_SUCCESS) { + if (getXmlRpcStatus().mCode != GlusterConstants.CODE_SUCCESS) { return; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturnForXmlRpc.java index b02fb25..85213ef 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListReturnForXmlRpc.java @@ -35,7 +35,7 @@ public GlusterTasksListReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); - if (mStatus.mCode != 0) { + if (getXmlRpcStatus().mCode != 0) { return; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListVDSCommand.java index 0ad63fc..7dae3ea 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterTasksListVDSCommand.java @@ -23,6 +23,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return glusterTasksReturn.mStatus; + return glusterTasksReturn.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java index e4d38e2..4d8c49c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListReturnForXmlRpc.java @@ -54,7 +54,7 @@ super(innerMap); this.clusterId = clusterId; - if(mStatus.mCode != 0) { + if(getXmlRpcStatus().mCode != 0) { return; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListVDSCommand.java index 77010a6..b9e7ea0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/GlusterVolumesListVDSCommand.java @@ -12,7 +12,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java index 5e7aa6c..e54a5da 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/ManageGlusterServiceVDSCommand.java @@ -16,7 +16,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return returnValue.mStatus; + return returnValue.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/OneStorageDeviceReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/OneStorageDeviceReturnForXmlRpc.java index 4eb4c99..b541557 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/OneStorageDeviceReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/OneStorageDeviceReturnForXmlRpc.java @@ -13,7 +13,7 @@ public OneStorageDeviceReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); - if (mStatus.mCode != 0) { + if (getXmlRpcStatus().mCode != 0) { return; } if (innerMap.containsKey(DEVICE)) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRebalanceGlusterVolumeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRebalanceGlusterVolumeVDSCommand.java index 8c6add5..35903d5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRebalanceGlusterVolumeVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRebalanceGlusterVolumeVDSCommand.java @@ -24,7 +24,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return glusterTaskReturn.mStatus; + return glusterTaskReturn.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRemoveGlusterVolumeBricksVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRemoveGlusterVolumeBricksVDSCommand.java index d46de7e..dce0276 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRemoveGlusterVolumeBricksVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StartRemoveGlusterVolumeBricksVDSCommand.java @@ -15,7 +15,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return glusterTaskReturn.mStatus; + return glusterTaskReturn.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java index 24d1908..9aa08d7 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRebalanceGlusterVolumeVDSCommand.java @@ -15,7 +15,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRemoveGlusterVolumeBricksVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRemoveGlusterVolumeBricksVDSCommand.java index 149b226..0497820 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRemoveGlusterVolumeBricksVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StopRemoveGlusterVolumeBricksVDSCommand.java @@ -15,7 +15,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StorageDeviceListReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StorageDeviceListReturnForXmlRpc.java index 500876c..a77d8f6 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StorageDeviceListReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/gluster/StorageDeviceListReturnForXmlRpc.java @@ -15,7 +15,7 @@ public StorageDeviceListReturnForXmlRpc(Map<String, Object> innerMap) { super(innerMap); - if (mStatus.mCode != 0) { + if (getXmlRpcStatus().mCode != 0) { return; } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ActivateStorageDomainVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ActivateStorageDomainVDSCommand.java index edecc33..8c03f04 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ActivateStorageDomainVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ActivateStorageDomainVDSCommand.java @@ -21,7 +21,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExtendImageSizeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExtendImageSizeVDSCommand.java index d25a118..90b9838 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExtendImageSizeVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ExtendImageSizeVDSCommand.java @@ -31,6 +31,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java index 27500d7..abcfbc3 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetFloppyListVDSCommand.java @@ -30,6 +30,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return floppyList.mStatus; + return floppyList.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java index 879ff26..7581524 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImageInfoVDSCommand.java @@ -69,7 +69,7 @@ .getStorageName(), getParameters().getStorageDomainId(), returnStatus, - imageInfoReturn.mStatus.mMessage); + imageInfoReturn.getXmlRpcStatus().mMessage); throw new IRSErrorException(returnStatus.toString()); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImagesListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImagesListVDSCommand.java index f6b8923..051817b 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImagesListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetImagesListVDSCommand.java @@ -27,7 +27,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java index 3b0895a..fecbd27 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetStoragePoolInfoVDSCommand.java @@ -66,6 +66,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java index bfe521a..b44d1c8 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVmsInfoVDSCommand.java @@ -44,7 +44,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _vmsInfo.mStatus; + return _vmsInfo.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVolumesListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVolumesListVDSCommand.java index 5e2c30a..0618d37 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVolumesListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/GetVolumesListVDSCommand.java @@ -31,7 +31,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsCreateCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsCreateCommand.java index 205af66..7024e50 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsCreateCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsCreateCommand.java @@ -10,7 +10,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return uuidReturn.mStatus; + return uuidReturn.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/OneImageInfoReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/OneImageInfoReturnForXmlRpc.java index 5de116d..7685163 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/OneImageInfoReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/OneImageInfoReturnForXmlRpc.java @@ -29,7 +29,7 @@ @SuppressWarnings("unchecked") public OneImageInfoReturnForXmlRpc(Map<String, Object> innerMap) { - super(innerMap, true); + super(innerMap); } public Map<String, Object> getInfo() { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ReconcileVolumeChainVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ReconcileVolumeChainVDSCommand.java index bc5a27a..f63ce11 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ReconcileVolumeChainVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/ReconcileVolumeChainVDSCommand.java @@ -35,6 +35,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return volumeListReturn.mStatus; + return volumeListReturn.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java index 2593f62..5ad6b84 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/StatusReturnForXmlRpc.java @@ -10,17 +10,10 @@ protected Map<String, Object> innerMap; - public StatusForXmlRpc mStatus; + private StatusForXmlRpc mStatus; public StatusReturnForXmlRpc(Map<String, Object> innerMap) { - this(innerMap, false); - } - - public StatusReturnForXmlRpc(Map<String, Object> innerMap, boolean deferGetStatus) { this.innerMap = innerMap; - if (!deferGetStatus) { - getXmlRpcStatus(); - } } public boolean isRequestCompleted() { @@ -38,6 +31,10 @@ return mStatus; } + public void setXmlRpcStatus(StatusForXmlRpc status) { + mStatus = status; + } + @Override public String toString() { return getClass().getSimpleName() + " [mStatus=" + getXmlRpcStatus() + "]"; diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java index 6b3222c..260f54f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ConnectStorageServerVDSCommand.java @@ -130,7 +130,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java index d579adb..6a96ff3 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/CreateVGVDSCommand.java @@ -35,7 +35,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java index faf0c76..85d2013 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/DiscoverSendTargetsVDSCommand.java @@ -25,7 +25,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ExtendVmDiskSizeVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ExtendVmDiskSizeVDSCommand.java index 5254cd3..74b7d94 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ExtendVmDiskSizeVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/ExtendVmDiskSizeVDSCommand.java @@ -27,6 +27,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java index 3e05947..42d4806 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/FenceVdsVDSCommand.java @@ -102,7 +102,7 @@ getVDSReturnValue().setSucceeded(false); if (getParameters().getAction() == FenceActionType.STATUS && _result.power != null) { String stat = _result.power.toLowerCase(); - String msg = _result.mStatus.mMessage; + String msg = _result.getXmlRpcStatus().mMessage; if ("on".equals(stat) || "off".equals(stat)) { getVDSReturnValue().setSucceeded(true); } else { @@ -116,10 +116,10 @@ } else { FenceStatusReturnValue fenceStatusReturnValue = new FenceStatusReturnValue( _result.operationStatus, - _result.mStatus.mMessage != null ? _result.mStatus.mMessage : "" + _result.getXmlRpcStatus().mMessage != null ? _result.getXmlRpcStatus().mMessage : "" ); setReturnValue(fenceStatusReturnValue); - getVDSReturnValue().setSucceeded(_result.mStatus.mCode == 0); + getVDSReturnValue().setSucceeded(_result.getXmlRpcStatus().mCode == 0); } } else { handleSkippedOperation(); @@ -208,7 +208,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return (_result.mStatus != null) ? _result.mStatus : new StatusForXmlRpc(); + return (_result.getXmlRpcStatus() != null) ? _result.getXmlRpcStatus() : new StatusForXmlRpc(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java index 30a8084..694b30e 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDeviceListVDSCommand.java @@ -163,7 +163,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDevicesVisibilityVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDevicesVisibilityVDSCommand.java index 8e97ce3..743becc 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDevicesVisibilityVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDevicesVisibilityVDSCommand.java @@ -23,6 +23,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return result.mStatus; + return result.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDiskAlignmentVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDiskAlignmentVDSCommand.java index 479a1b1..8a7f174 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDiskAlignmentVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetDiskAlignmentVDSCommand.java @@ -25,6 +25,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return diskAlignment.mStatus; + return diskAlignment.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java index 72adb44..c033106 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetFileStatsVDSCommand.java @@ -28,6 +28,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return fileStats.mStatus; + return fileStats.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java index ee03272..8a5e9a7 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageConnectionsListVDSCommand.java @@ -39,7 +39,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java index a453145d..ca5a81d 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetStorageDomainStatsVDSCommand.java @@ -37,7 +37,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @SuppressWarnings("unchecked") diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java index 83805a8..70e7b8f 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGInfoVDSCommand.java @@ -32,7 +32,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java index 5cc6a82..25595bf 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/GetVGListVDSCommand.java @@ -28,7 +28,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } protected ArrayList<StorageDomain> parseVGList(Map<String, Object>[] vgList) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java index bf2af09..2ed2fab 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksInfoVDSCommand.java @@ -72,7 +72,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java index 4ab3da3..5a605e5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetAllTasksStatusesVDSCommand.java @@ -94,7 +94,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } // overrides the value of the status that is being checked in the @@ -104,7 +104,7 @@ // verb // execution status and an asynchronous task status. protected void updateReturnStatus(StatusForXmlRpc newReturnStatus) { - _result.mStatus = newReturnStatus; + _result.setXmlRpcStatus(newReturnStatus); } @Override 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 a2ddf63..d6d61bb 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 @@ -88,7 +88,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java index 81e4b5d..ab939b5 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetStorageDomainsListVDSCommand.java @@ -31,7 +31,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java index a6cdd7f..80c76a9 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HSMGetTaskStatusVDSCommand.java @@ -38,11 +38,11 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override protected void updateReturnStatus(StatusForXmlRpc newReturnStatus) { - _result.mStatus = newReturnStatus; + _result.setXmlRpcStatus(newReturnStatus); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java index a0d37ce..84275e0 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/HsmGetIsoListVDSCommand.java @@ -24,6 +24,6 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return isoList.mStatus; + return isoList.getXmlRpcStatus(); } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java index 8fd7e8d..074dc4c 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStartVDSCommand.java @@ -74,7 +74,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStatusVDSCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStatusVDSCommand.java index c09bc7d..feb11f4 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStatusVDSCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/SpmStatusVDSCommand.java @@ -72,7 +72,7 @@ @Override protected StatusForXmlRpc getReturnStatus() { - return _result.mStatus; + return _result.getXmlRpcStatus(); } @Override diff --git a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/jsonrpc/MarshallingTestCase.java b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/jsonrpc/MarshallingTestCase.java index d96467a..e61bd58 100644 --- a/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/jsonrpc/MarshallingTestCase.java +++ b/backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/jsonrpc/MarshallingTestCase.java @@ -204,8 +204,8 @@ // Then ServerConnectionStatusReturnForXmlRpc status = new ServerConnectionStatusReturnForXmlRpc(map); - assertEquals("Done", status.mStatus.mMessage); - assertEquals(0, status.mStatus.mCode); + assertEquals("Done", status.getXmlRpcStatus().mMessage); + assertEquals(0, status.getXmlRpcStatus().mCode); assertEquals(1, status.mStatusList.length); Map<String, Object> result = status.mStatusList[0]; assertEquals(0, result.get("status")); @@ -232,8 +232,8 @@ // Then FileStatsReturnForXmlRpc isoList = new FileStatsReturnForXmlRpc(map); - assertEquals("Done", isoList.mStatus.mMessage); - assertEquals(0, isoList.mStatus.mCode); + assertEquals("Done", isoList.getXmlRpcStatus().mMessage); + assertEquals(0, isoList.getXmlRpcStatus().mCode); assertEquals(0, isoList.getFileStats().size()); } @@ -258,8 +258,8 @@ // Then FileStatsReturnForXmlRpc isoList = new FileStatsReturnForXmlRpc(map); - assertEquals("Done", isoList.mStatus.mMessage); - assertEquals(0, isoList.mStatus.mCode); + assertEquals("Done", isoList.getXmlRpcStatus().mMessage); + assertEquals(0, isoList.getXmlRpcStatus().mCode); assertEquals(1, isoList.getFileStats().size()); assertEquals("Fedora-Live-Desktop-x86_64-19-1.iso", isoList.getFileStats().keySet().iterator().next()); } @@ -346,8 +346,8 @@ // Then StoragePoolInfoReturnForXmlRpc storagePoolInfo = new StoragePoolInfoReturnForXmlRpc(map); - assertEquals("Done", storagePoolInfo.mStatus.mMessage); - assertEquals(0, storagePoolInfo.mStatus.mCode); + assertEquals("Done", storagePoolInfo.getXmlRpcStatus().mMessage); + assertEquals(0, storagePoolInfo.getXmlRpcStatus().mCode); Set<String> keys = storagePoolInfo.mDomainsList.keySet(); assertEquals(3, keys.size()); assertTrue(keys.contains("05a0ad59-1259-4353-b40b-34eb80d8590a")); @@ -378,8 +378,8 @@ // Then StorageStatusReturnForXmlRpc storageStatus = new StorageStatusReturnForXmlRpc(map); - assertEquals("Done", storageStatus.mStatus.mMessage); - assertEquals(0, storageStatus.mStatus.mCode); + assertEquals("Done", storageStatus.getXmlRpcStatus().mMessage); + assertEquals(0, storageStatus.getXmlRpcStatus().mCode); assertEquals("true", storageStatus.mStorageStatus); } @@ -403,8 +403,8 @@ // Then OneUuidReturnForXmlRpc oneuuid = new OneUuidReturnForXmlRpc(map); - assertEquals("Done", oneuuid.mStatus.mMessage); - assertEquals(0, oneuuid.mStatus.mCode); + assertEquals("Done", oneuuid.getXmlRpcStatus().mMessage); + assertEquals(0, oneuuid.getXmlRpcStatus().mCode); assertEquals("4f84eef5-8f8b-4732-babd-0a860cf0d1b9", UUID.fromString(oneuuid.mUuid).toString()); } @@ -442,8 +442,8 @@ // When Map<String, Object> map = new FutureMap(client, request).withResponseKey("fullTargets"); IQNListReturnForXmlRpc list = new IQNListReturnForXmlRpc(map); - assertEquals("Done", list.mStatus.mMessage); - assertEquals(0, list.mStatus.mCode); + assertEquals("Done", list.getXmlRpcStatus().mMessage); + assertEquals(0, list.getXmlRpcStatus().mCode); assertEquals(37, parseFullTargets(list.getIqnList()).size()); } -- To view, visit https://gerrit.ovirt.org/39399 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id31af427cd66fdd7af92a4c5ca93dee99e40b16c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ravi Nori <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
