Alon Bar-Lev has uploaded a new change for review. Change subject: host-deploy: cleanup: remove depreciated netmask parameter ......................................................................
host-deploy: cleanup: remove depreciated netmask parameter Change-Id: If6b32d02a2a5333c98783993d24ae683c8c1bd96 Signed-off-by: Alon Bar-Lev <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/queries/RegisterVdsParameters.java M backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java 2 files changed, 2 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/96/20596/1 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 bd28dd4..9819deb 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,18 +48,6 @@ privateVdsUniqueId = value; } - @Deprecated - private String privateNetMask; - - public String getNetMask() { - return privateNetMask; - } - - @Deprecated - public void setNetMask(String value) { - privateNetMask = value; - } - private int privatePort; public int getPort() { @@ -101,13 +89,12 @@ } public RegisterVdsParameters(Guid vdsId, String vds_host_name, String vds_name, String vds_unique_id, int port, - String netmask, Guid vds_group_id, VDSType vds_type) { + Guid vds_group_id, VDSType vds_type) { setVdsId(vdsId); setVdsHostName(vds_host_name); setVdsName(vds_name); setVdsUniqueId(vds_unique_id); setPort(port); - setNetMask(netmask); setVdsGroupId(vds_group_id); setVdsType(vds_type); } diff --git a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java index 22b5ee2..49be41b 100644 --- a/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java +++ b/backend/manager/modules/root/src/main/java/org/ovirt/engine/core/register/RegisterServlet.java @@ -28,7 +28,6 @@ public class RegisterServlet extends HttpServlet { private static final long serialVersionUID = 2156012277778558480L; - public static final String MASK = "255.255.255.0"; public static final String VDS_IP = "vds_ip"; public static final String VDS_NAME = "vds_name"; public static final String VDS_ID = "vds_unique_id"; @@ -81,7 +80,7 @@ * Ignore MAC if exists (old format) */ String strIDNoMAC = strID.split("_")[0]; - params = new RegisterVdsParameters(Guid.Empty, strIP, strName, strIDNoMAC, nPort, MASK, + params = new RegisterVdsParameters(Guid.Empty, strIP, strName, strIDNoMAC, nPort, Guid.Empty, VDSType.oVirtNode); params.setOtp(otp); -- To view, visit http://gerrit.ovirt.org/20596 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If6b32d02a2a5333c98783993d24ae683c8c1bd96 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
