Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: cleanup: rename Port->VdsPort to distinguish ssh and other ports ......................................................................
host-deploy: cleanup: rename Port->VdsPort to distinguish ssh and other ports Change-Id: Id2ceb930c534289f7e81d6c968e2fdfe9810022d Signed-off-by: Alon Bar-Lev <[email protected]> --- 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/queries/RegisterVdsParameters.java 2 files changed, 15 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/98/20598/1 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 2c880cd..9b756ce 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 @@ -240,13 +240,13 @@ private boolean updateExistingHost(VDS vdsByUniqueId, boolean IsPending) { boolean returnValue = true; vdsByUniqueId.setHostName(getParameters().getVdsHostName()); - vdsByUniqueId.setPort(getParameters().getPort()); + vdsByUniqueId.setPort(getParameters().getVdsPort()); log.debugFormat( - "RegisterVdsQuery::Register - Will try now to update VDS with existing unique id; Name: {0}, Hostname: {1}, Unique: {2}, Port: {3}, IsPending: {4} with force synchronize", + "RegisterVdsQuery::Register - Will try now to update VDS with existing unique id; Name: {0}, Hostname: {1}, Unique: {2}, VdsPort: {3}, IsPending: {4} with force synchronize", getParameters().getVdsHostName(), getStrippedVdsUniqueId(), getStrippedVdsUniqueId(), - getParameters().getPort(), + getParameters().getVdsPort(), IsPending); UpdateVdsActionParameters p = new UpdateVdsActionParameters(vdsByUniqueId.getStaticData(), "", false); @@ -256,11 +256,11 @@ if (rc == null || !rc.getSucceeded()) { error = AuditLogType.VDS_REGISTER_EXISTING_VDS_UPDATE_FAILED; log.debugFormat( - "RegisterVdsQuery::Register - Failed to update existing VDS Name: {0}, Hostname: {1}, Unique: {2}, Port: {3}, IsPending: {4}", + "RegisterVdsQuery::Register - Failed to update existing VDS Name: {0}, Hostname: {1}, Unique: {2}, VdsPort: {3}, IsPending: {4}", getParameters().getVdsHostName(), getStrippedVdsUniqueId(), getStrippedVdsUniqueId(), - getParameters().getPort(), + getParameters().getVdsPort(), IsPending); CaptureCommandErrorsToLogger(rc, "RegisterVdsQuery::Register"); @@ -284,7 +284,7 @@ final String SSH_USER_NAME = "root"; VdsStatic vds = new VdsStatic(getParameters().getVdsHostName(), "", - getStrippedVdsUniqueId(), getParameters().getPort(), + getStrippedVdsUniqueId(), getParameters().getVdsPort(), SSH_PORT, SSH_USER_NAME, vdsGroupId, Guid.Empty, @@ -298,11 +298,11 @@ // registration log.debugFormat( - "RegisterVdsQuery::Register - Will try now to add VDS from scratch; Name: {0}, Hostname: {1}, Unique: {2}, Port: {3},Subnet mask: {4}, IsPending: {5} with force synchronize", + "RegisterVdsQuery::Register - Will try now to add VDS from scratch; Name: {0}, Hostname: {1}, Unique: {2}, VdsPort: {3},Subnet mask: {4}, IsPending: {5} with force synchronize", getParameters().getVdsName(), getParameters().getVdsHostName(), getStrippedVdsUniqueId(), - getParameters().getPort(), + getParameters().getVdsPort(), IsPending); AddVdsActionParameters p = new AddVdsActionParameters(vds, ""); diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java index 02f3df6..3e4b008 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java @@ -48,14 +48,14 @@ privateVdsUniqueId = value; } - private int privatePort; + private int privateVdsPort; - public int getPort() { - return privatePort; + public int getVdsPort() { + return privateVdsPort; } - private void setPort(int value) { - privatePort = value; + private void setVdsPort(int value) { + privateVdsPort = value; } private Guid privateVdsGroupId; @@ -78,13 +78,13 @@ privateVdsType = value; } - public RegisterVdsParameters(Guid vdsId, String vds_host_name, String vds_name, String vds_unique_id, int port, + public RegisterVdsParameters(Guid vdsId, String vds_host_name, String vds_name, String vds_unique_id, int vds_port, Guid vds_group_id, VDSType vds_type) { setVdsId(vdsId); setVdsHostName(vds_host_name); setVdsName(vds_name); setVdsUniqueId(vds_unique_id); - setPort(port); + setVdsPort(vds_port); setVdsGroupId(vds_group_id); setVdsType(vds_type); } -- To view, visit http://gerrit.ovirt.org/20598 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id2ceb930c534289f7e81d6c968e2fdfe9810022d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
