Moti Asayag has uploaded a new change for review.
Change subject: core: Maintain Java naming convention for methods
......................................................................
core: Maintain Java naming convention for methods
Change-Id: I5dedb9038ff86a9bcc01a07abadb8c347260e955
Signed-off-by: Moti Asayag <masa...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java
3 files changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/30/37330/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
index 84fd29e..4707393 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddVdsCommand.java
@@ -114,7 +114,7 @@
}
});
- if (getParameters().getAddProvisioned()) {
+ if (getParameters().isProvisioned()) {
if (getParameters().getComputeResource() == null) {
log.error("Failed to provision: Compute resource cannot be
empty");
throw new
VdcBLLException(VdcBllErrors.PROVIDER_PROVISION_MISSING_COMPUTERESOURCE);
@@ -174,8 +174,8 @@
// do not install vds's which added in pending mode or for
provisioning (currently power
// clients). they are installed as part of the approve process or
automatically after provision
if (Config.<Boolean> getValue(ConfigValues.InstallVds) &&
- !getParameters().getAddPending() &&
- !getParameters().getAddProvisioned()) {
+ !getParameters().isPending() &&
+ !getParameters().isProvisioned()) {
final InstallVdsParameters installVdsParameters = new
InstallVdsParameters(getVdsId(), getParameters().getPassword());
installVdsParameters.setAuthMethod(getParameters().getAuthMethod());
installVdsParameters.setOverrideFirewall(getParameters().getOverrideFirewall());
@@ -288,10 +288,10 @@
VdsDynamic vdsDynamic = new VdsDynamic();
vdsDynamic.setId(getParameters().getVdsStaticData().getId());
// TODO: oVirt type - here oVirt behaves like power client?
- if (getParameters().getAddPending()) {
+ if (getParameters().isPending()) {
vdsDynamic.setStatus(VDSStatus.PendingApproval);
}
- else if (getParameters().getAddProvisioned()) {
+ else if (getParameters().isProvisioned()) {
vdsDynamic.setStatus(VDSStatus.InstallingOS);
}
else if (Config.<Boolean> getValue(ConfigValues.InstallVds)) {
@@ -332,7 +332,7 @@
&& validate(validator.sshUserNameNotEmpty())
&& validate(validator.validateSingleHostAttachedToLocalStorage())
&& validate(validator.securityKeysExists())
- &&
validate(validator.passwordNotEmpty(getParameters().getAddPending(),
+ && validate(validator.passwordNotEmpty(getParameters().isPending(),
getParameters().getAuthMethod(),
getParameters().getPassword()));
}
@@ -437,7 +437,7 @@
protected boolean canConnect(VDS vds) {
// execute the connectivity and id uniqueness validation for VDS type
hosts
if (
- !getParameters().getAddPending() &&
!getParameters().getAddProvisioned() &&
+ !getParameters().isPending() && !getParameters().isProvisioned() &&
Config.<Boolean> getValue(ConfigValues.InstallVds)
) {
try (final EngineSSHClient sshclient = getSSHClient()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
index 43e6f2f..a42144f 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java
@@ -315,7 +315,7 @@
IsPending);
AddVdsActionParameters p = new AddVdsActionParameters(vds, "");
- p.setAddPending(IsPending);
+ p.setPending(IsPending);
VdcReturnValueBase ret =
Backend.getInstance().runInternalAction(VdcActionType.AddVds, p);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java
index e10f00a..5ca9589 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java
@@ -46,7 +46,7 @@
this.discoverIp = discoverIp;
}
- public boolean getAddProvisioned() {
+ public boolean isProvisioned() {
return provisioned;
}
@@ -66,12 +66,12 @@
return glusterPeerProbeNeeded;
}
- public boolean getAddPending() {
+ public boolean isPending() {
return pending;
}
- public void setAddPending(boolean value) {
- pending = value;
+ public void setPending(boolean pending) {
+ this.pending = pending;
}
public List<FenceAgent> getFenceAgents() {
--
To view, visit http://gerrit.ovirt.org/37330
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5dedb9038ff86a9bcc01a07abadb8c347260e955
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Moti Asayag <masa...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
