Tal Nisan has uploaded a new change for review. Change subject: core: Switched ineritance between Connect & Disconnet pool params (#846768) ......................................................................
core: Switched ineritance between Connect & Disconnet pool params (#846768) https://bugzilla.redhat.com/846768 Switched inheritance between connect storage pool VDS command params and disconnect storage pool VDS command params, disconnect was inheriting from connect which had more parameters than needed to disconnect which had to be filled with static values and appear in the log misleading, now connect inherits from disconnect thus no redundant parameters are used Change-Id: I01f0b389508b7b9b30169ba9a1fdfa2effc8d74e Signed-off-by: Tal Nisan <tni...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java 2 files changed, 36 insertions(+), 28 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/7808/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java index 9bd022d..cc0e0f1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java @@ -1,34 +1,13 @@ package org.ovirt.engine.core.common.vdscommands; -import org.ovirt.engine.core.compat.*; +import org.ovirt.engine.core.compat.Guid; -public class ConnectStoragePoolVDSCommandParameters extends GetStorageConnectionsListVDSCommandParameters { +public class ConnectStoragePoolVDSCommandParameters extends DisconnectStoragePoolVDSCommandParameters { public ConnectStoragePoolVDSCommandParameters(Guid vdsId, Guid storagePoolId, int vds_spm_id, Guid masterDomainId, int masterVersion) { - super(vdsId, storagePoolId); - this.setvds_spm_id(vds_spm_id); + super(vdsId, storagePoolId, vds_spm_id); setMasterDomainId(masterDomainId); setMasterVersion(masterVersion); - } - - private int privatevds_spm_id; - - public int getvds_spm_id() { - return privatevds_spm_id; - } - - private void setvds_spm_id(int value) { - privatevds_spm_id = value; - } - - private Guid privateMasterDomainId = new Guid(); - - public Guid getMasterDomainId() { - return privateMasterDomainId; - } - - private void setMasterDomainId(Guid value) { - privateMasterDomainId = value; } private int privateMasterVersion; @@ -44,8 +23,21 @@ public ConnectStoragePoolVDSCommandParameters() { } + private Guid privateMasterDomainId = new Guid(); + + public Guid getMasterDomainId() { + return privateMasterDomainId; + } + + private void setMasterDomainId(Guid value) { + privateMasterDomainId = value; + } + @Override public String toString() { - return String.format("%s, vds_spm_id = %s, masterDomainId = %s, masterVersion = %s", super.toString(), getvds_spm_id(), getMasterDomainId(), getMasterVersion()); + return String.format("%s, masterDomainId = %s, masterVersion = %s", + super.toString(), + getMasterDomainId(), + getMasterVersion()); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java index c3319ef..714466a 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java @@ -1,12 +1,28 @@ package org.ovirt.engine.core.common.vdscommands; -import org.ovirt.engine.core.compat.*; +import org.ovirt.engine.core.compat.Guid; -public class DisconnectStoragePoolVDSCommandParameters extends ConnectStoragePoolVDSCommandParameters { +public class DisconnectStoragePoolVDSCommandParameters extends GetStorageConnectionsListVDSCommandParameters { public DisconnectStoragePoolVDSCommandParameters(Guid vdsId, Guid storagePoolId, int vds_spm_id) { - super(vdsId, storagePoolId, vds_spm_id, Guid.Empty, 0); + super(vdsId, storagePoolId); + setvds_spm_id(vds_spm_id); } public DisconnectStoragePoolVDSCommandParameters() { } + + private int privatevds_spm_id; + + public int getvds_spm_id() { + return privatevds_spm_id; + } + + private void setvds_spm_id(int value) { + privatevds_spm_id = value; + } + + @Override + public String toString() { + return String.format("%s, vds_spm_id = %s", super.toString(), getvds_spm_id()); + } } -- To view, visit http://gerrit.ovirt.org/7808 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I01f0b389508b7b9b30169ba9a1fdfa2effc8d74e Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tal Nisan <tni...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
