Yaniv Bronhaim has uploaded a new change for review. Change subject: Using specific username and password to install and update host ......................................................................
Using specific username and password to install and update host Currently we provide installation only with root user. This patch adds username and password fields to add and update vds command and makes those parameters configurable for authentication. Change-Id: Id39914e1286870373ad6f69360fa7b3ddfabd8df Signed-off-by: Yaniv Bronhaim <[email protected]> --- 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/InstallVdsCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterVdsQuery.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java M backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/AddVdsActionParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ApproveVdsParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateVdsActionParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java M backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java M backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java 23 files changed, 88 insertions(+), 51 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/06/16006/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 afb08c4..5826928 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 @@ -64,8 +64,6 @@ @NonTransactiveCommandAttribute(forceCompensation = true) public class AddVdsCommand<T extends AddVdsActionParameters> extends VdsCommand<T> { - private static final String USER_NAME = "root"; - private VDS upServer; private AuditLogType errorType = AuditLogType.USER_FAILED_ADD_VDS; @@ -150,7 +148,7 @@ // clients). they are installed as part of the approve process if (Config.<Boolean> GetValue(ConfigValues.InstallVds) && !getParameters().getAddPending()) { final InstallVdsParameters installVdsParameters = new InstallVdsParameters(getVdsId(), - getParameters().getRootPassword()); + getParameters().getUsername(), getParameters().getPassword()); installVdsParameters.setOverrideFirewall(getParameters().getOverrideFirewall()); installVdsParameters.setRebootAfterInstallation(getParameters().isRebootAfterInstallation()); Map<String, String> values = new HashMap<String, String>(); @@ -323,7 +321,8 @@ && !EngineLocalConfig.getInstance().getPKIEngineStore().exists()) { returnValue = failCanDoAction(VdcBllMessages.VDS_TRY_CREATE_SECURE_CERTIFICATE_NOT_FOUND); } else if (!getParameters().getAddPending() - && StringUtils.isEmpty(getParameters().getRootPassword())) { + && StringUtils.isEmpty(getParameters().getPassword()) + && StringUtils.isEmpty(getParameters().getUsername())) { // We block vds installations if it's not a RHEV-H and password is empty // Note that this may override local host SSH policy. See BZ#688718. returnValue = failCanDoAction(VdcBllMessages.VDS_CANNOT_INSTALL_EMPTY_PASSWORD); @@ -367,8 +366,8 @@ sshclient.setHardTimeout(timeout); sshclient.setSoftTimeout(timeout); sshclient.setHost(hostname); - sshclient.setUser(USER_NAME); - sshclient.setPassword(getParameters().getRootPassword()); + sshclient.setUser(getParameters().getUsername()); + sshclient.setPassword(getParameters().getPassword()); return sshclient; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java index 7e19fcf..8065f5f 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java @@ -154,8 +154,8 @@ switch (getVds().getVdsType()) { case VDS: - installer.setUser("root"); - installer.setPassword(parameters.getRootPassword()); + installer.setUser(parameters.getUsername()); + installer.setPassword(parameters.getPassword()); installer.setFirewall(parameters.getOverrideFirewall()); break; case oVirtNode: @@ -166,7 +166,7 @@ getVds().getVdsType().name() ); } - installer.setUser("root"); + installer.setUser(parameters.getUsername()); installer.useDefaultKeyPair(); break; default: 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 ed03af2..eb40a3a 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 @@ -275,7 +275,7 @@ getParameters().getPort(), IsPending); - UpdateVdsActionParameters p = new UpdateVdsActionParameters(vdsByUniqueId.getStaticData(), "", false); + UpdateVdsActionParameters p = new UpdateVdsActionParameters(vdsByUniqueId.getStaticData(), "root", "", false); p.setTransactionScopeOption(TransactionScopeOption.RequiresNew); VdcReturnValueBase rc = Backend.getInstance().runInternalAction(VdcActionType.UpdateVds, p); @@ -323,7 +323,7 @@ getParameters().getPort(), IsPending); - AddVdsActionParameters p = new AddVdsActionParameters(vds, ""); + AddVdsActionParameters p = new AddVdsActionParameters(vds, "root", ""); p.setAddPending(IsPending); VdcReturnValueBase ret = Backend.getInstance().runInternalAction(VdcActionType.AddVds, p); @@ -384,7 +384,7 @@ String old_host_name = vds_byHostName.getHostName(); vds_byHostName.setHostName(try_host_name); UpdateVdsActionParameters parameters = new UpdateVdsActionParameters( - vds_byHostName.getStaticData(), "", false); + vds_byHostName.getStaticData(), "root","" , false); parameters.setShouldBeLogged(false); parameters.setTransactionScopeOption(TransactionScopeOption.RequiresNew); VdcReturnValueBase ret = Backend.getInstance().runInternalAction(VdcActionType.UpdateVds, parameters); @@ -457,7 +457,7 @@ newName = generateUniqueName(nameToRegister, allHostNames); hostToRegister.setVdsName(newName); UpdateVdsActionParameters parameters = - new UpdateVdsActionParameters(hostToRegister.getStaticData(), "", false); + new UpdateVdsActionParameters(hostToRegister.getStaticData(), "root", "", false); VdcReturnValueBase ret = Backend.getInstance().runInternalAction(VdcActionType.UpdateVds, parameters); if (ret == null || !ret.getSucceeded()) { error = AuditLogType.VDS_REGISTER_ERROR_UPDATING_NAME; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java index 4299c2f..47a46d8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVdsCommand.java @@ -87,7 +87,8 @@ && _oldVds.getStatus() != VDSStatus.InstallFailed) { addCanDoActionMessage(VdcBllMessages.VDS_CANNOT_INSTALL_STATUS_ILLEGAL); } else if (getParameters().getInstallVds() - && StringUtils.isEmpty(getParameters().getRootPassword()) + && StringUtils.isEmpty(getParameters().getPassword()) + && StringUtils.isEmpty(getParameters().getUsername()) && getParameters().getVdsStaticData().getVdsType() == VDSType.VDS) { addCanDoActionMessage(VdcBllMessages.VDS_CANNOT_INSTALL_EMPTY_PASSWORD); } else if (!getParameters().getInstallVds() @@ -129,7 +130,8 @@ } if (getParameters().getInstallVds()) { - InstallVdsParameters tempVar = new InstallVdsParameters(getVdsId(), getParameters().getRootPassword()); + InstallVdsParameters tempVar = new InstallVdsParameters(getVdsId(), + getParameters().getUsername(), getParameters().getPassword()); tempVar.setIsReinstallOrUpgrade(getParameters().getIsReinstallOrUpgrade()); tempVar.setoVirtIsoFile(getParameters().getoVirtIsoFile()); tempVar.setOverrideFirewall(getParameters().getOverrideFirewall()); diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java index 9aa9c90..9f9faa9 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddVdsCommandTest.java @@ -74,7 +74,8 @@ @Before public void createParameters() { parameters = new AddVdsActionParameters(); - parameters.setRootPassword("secret"); + parameters.setPassword("secret"); + parameters.setUsername("root"); VDS newVds = makeTestVds(vdsId); parameters.setvds(newVds); } diff --git a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java index a363115..141e2b0 100644 --- a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java +++ b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/InstallVdsCommandTest.java @@ -57,7 +57,7 @@ } private static InstallVdsParameters createParameters() { - InstallVdsParameters param = new InstallVdsParameters(Guid.NewGuid(), null); + InstallVdsParameters param = new InstallVdsParameters(Guid.NewGuid()); param.setIsReinstallOrUpgrade(true); return param; } 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 bd6fe43..505fc6c 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 @@ -6,8 +6,8 @@ public class AddVdsActionParameters extends VdsOperationActionParameters { private static final long serialVersionUID = 8452910234577071082L; - public AddVdsActionParameters(VdsStatic vdsStatic, String rootPassword) { - super(vdsStatic, rootPassword); + public AddVdsActionParameters(VdsStatic vdsStatic, String username, String password) { + super(vdsStatic, username, password); } private Guid vdsId; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ApproveVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ApproveVdsParameters.java index b9cc0ac..bfdc4de 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ApproveVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/ApproveVdsParameters.java @@ -7,7 +7,7 @@ private boolean isApprovedByRegister; public ApproveVdsParameters(Guid vdsId) { - super(vdsId, ""); + super(vdsId); } public ApproveVdsParameters() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java index ceab53b..8e2574d 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/InstallVdsParameters.java @@ -13,10 +13,16 @@ public InstallVdsParameters() { } - public InstallVdsParameters(Guid vdsId, String password) { + public InstallVdsParameters(Guid vdsId) { super(); this.setVdsId(vdsId); - setRootPassword(password); + } + + public InstallVdsParameters(Guid vdsId, String username, String password) { + super(); + this.setVdsId(vdsId); + setUsername(username); + setPassword(password); } public boolean getIsReinstallOrUpgrade() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateVdsActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateVdsActionParameters.java index 68e123e..ea1b2cd 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateVdsActionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/UpdateVdsActionParameters.java @@ -5,8 +5,13 @@ public class UpdateVdsActionParameters extends VdsOperationActionParameters { private static final long serialVersionUID = -7467029979089285065L; - public UpdateVdsActionParameters(VdsStatic vdsStatic, String rootPassword, boolean installVds) { - super(vdsStatic, rootPassword); + public UpdateVdsActionParameters(VdsStatic vdsStatic, String username, String password, boolean installVds) { + super(vdsStatic, username, password); + _installVds = installVds; + } + + public UpdateVdsActionParameters(VdsStatic vdsStatic, boolean installVds) { + super(vdsStatic); _installVds = installVds; } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java index 6e530b5..3d34cf5 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java @@ -11,7 +11,8 @@ @Valid private VdsStatic _vdsStatic; - private String _rootPassword; + private String _password; + private String _username; private boolean overrideFirewall; @@ -20,29 +21,38 @@ */ private boolean rebootAfterInstallation = true; - public VdsOperationActionParameters(VdsStatic vdsStatic, String rootPassword) { + public VdsOperationActionParameters(VdsStatic vdsStatic, String username, String password) { super(vdsStatic.getId()); if ("".equals(vdsStatic.getManagementIp())) { vdsStatic.setManagementIp(null); } _vdsStatic = vdsStatic; - _rootPassword = rootPassword; + _username = username; + _password = password; } public VdsOperationActionParameters(VdsStatic vdsStatic) { - this(vdsStatic, null); + this(vdsStatic, null, null); } public VdsStatic getVdsStaticData() { return _vdsStatic; } - public String getRootPassword() { - return _rootPassword; + public String getPassword() { + return _password; } - public void setRootPassword(String value) { - _rootPassword = value; + public void setPassword(String value) { + _password = value; + } + + public String getUsername() { + return _username; + } + + public void setUsername(String value) { + _username = value; } public VdsOperationActionParameters() { diff --git a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd index 0df3464..b442d08 100644 --- a/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd +++ b/backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd @@ -140,8 +140,10 @@ <xs:element name="host" type="Host" minOccurs="0"/> <!-- for host NIC attach action --> <xs:element name="network" type="Network" minOccurs="0"/> - <!-- when installing a host, a root password is required --> - <xs:element name="root_password" type="xs:string" minOccurs="0" maxOccurs="1"/> + <!-- when installing a host, username to authenticate is required --> + <xs:element name="username" type="xs:string" minOccurs="0" maxOccurs="1"/> + <!-- when installing a host, user password is required --> + <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1"/> <!-- when installing a rhev-h host, an ISO image file is required --> <xs:element name="image" type="xs:string" minOccurs="0" maxOccurs="1"/> <!-- for host fence action --> @@ -1264,9 +1266,10 @@ <xs:element ref="ksm" minOccurs="0"/> <xs:element ref="transparent_hugepages" minOccurs="0"/> <xs:element name="iscsi" type="IscsiDetails" minOccurs="0"/> - <!-- when creating a new host, a root password is required, but + <!-- when creating a new host, a username and password is required, but this is not subsequently included in the representation --> - <xs:element name="root_password" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="username" type="xs:string" minOccurs="0" maxOccurs="1"/> + <xs:element name="password" type="xs:string" minOccurs="0" maxOccurs="1"/> <xs:element name="statistics" type="Statistics" minOccurs="0" maxOccurs="1"/> <xs:element ref="cpu" minOccurs="0" maxOccurs="1"/> <xs:element name="memory" type="xs:long" minOccurs="0"/> diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java index 0d4e7c4..7fe11cf 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostResource.java @@ -92,14 +92,14 @@ public Response install(Action action) { // REVISIT fencing options VDS vds = getEntity(); - UpdateVdsActionParameters params = new UpdateVdsActionParameters(vds.getStaticData(), action.getRootPassword(), true); + UpdateVdsActionParameters params = new UpdateVdsActionParameters(vds.getStaticData(), action.getUsername(), action.getPassword(), true); if (vds.getVdsType()==VDSType.oVirtNode) { params.setIsReinstallOrUpgrade(true); if (action.isSetImage()) { params.setoVirtIsoFile(action.getImage()); } } else { - validateParameters(action, "rootPassword"); + validateParameters(action, "Password"); } return doAction(VdcActionType.UpdateVds, params, @@ -325,7 +325,7 @@ public VdcActionParametersBase getParameters(Host incoming, VDS entity) { VdsStatic updated = getMapper(modelType, VdsStatic.class).map(incoming, entity.getStaticData()); - UpdateVdsActionParameters updateParams = new UpdateVdsActionParameters(updated, "", false); + UpdateVdsActionParameters updateParams = new UpdateVdsActionParameters(updated, "root", "", false); if (incoming.isSetOverrideIptables()) { updateParams.setOverrideFirewall(incoming.isOverrideIptables()); } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java index 0310821..8cf8100 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendHostsResource.java @@ -86,10 +86,10 @@ @Override public Response add(Host host) { validateEnums(Host.class, host); - validateParameters(host, "name", "address", "rootPassword"); + validateParameters(host, "name", "address", "password"); VdsStatic staticHost = getMapper(Host.class, VdsStatic.class).map(host, null); staticHost.setVdsGroupId(getClusterId(host)); - AddVdsActionParameters addParams = new AddVdsActionParameters(staticHost, host.getRootPassword()); + AddVdsActionParameters addParams = new AddVdsActionParameters(staticHost, host.getUsername(), host.getPassword()); if (host.isSetOverrideIptables()) { addParams.setOverrideFirewall(host.isOverrideIptables()); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java index 014337c..3d9c493 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostResourceTest.java @@ -421,7 +421,8 @@ new Object[] { NAMES[2] })); Action action = new Action(); - action.setRootPassword(NAMES[2]); + action.setPassword(NAMES[2]); + action.setUsername("root"); verifyActionResponse(resource.install(action)); } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java index 44bdc6c..8e3fc69 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendHostsResourceTest.java @@ -339,7 +339,8 @@ Host model = new Host(); model.setName(NAMES[index]); model.setAddress(ADDRESSES[index]); - model.setRootPassword(ROOT_PASSWORD); + model.setPassword(ROOT_PASSWORD); + model.setUsername("root"); return model; } diff --git a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java index 28de390..19f1796 100644 --- a/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java +++ b/backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendResourceTest.java @@ -70,7 +70,8 @@ true, true))); Action action = new Action(); - action.setRootPassword(NAMES[2]); + action.setPassword(NAMES[2]); + action.setUsername("root"); resource.install(action); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java index 0994340..474209a 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java @@ -496,7 +496,8 @@ AddVdsActionParameters parameters = new AddVdsActionParameters(); parameters.setVdsId(host.getId()); parameters.setvds(host); - parameters.setRootPassword(hostDetailModel.getPassword()); + parameters.setPassword(hostDetailModel.getPassword()); + parameters.setUsername("root"); //$NON-NLS-1$ parameters.setOverrideFirewall(false); parameters.setRebootAfterInstallation(getEntity().supportsVirtService()); parametersList.add(parameters); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java index 6178ee7..037a15c 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGuideModel.java @@ -493,7 +493,8 @@ AddVdsActionParameters vdsActionParams = new AddVdsActionParameters(); vdsActionParams.setvds(host); vdsActionParams.setVdsId(host.getId()); - vdsActionParams.setRootPassword((String) model.getRootPassword().getEntity()); + vdsActionParams.setPassword((String) model.getRootPassword().getEntity()); + vdsActionParams.setUsername("root"); //$NON-NLS-1$ vdsActionParams.setRebootAfterInstallation(((VDSGroup) model.getCluster().getSelectedItem()).supportsVirtService()); model.startProgress(null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java index f4aa0f2..313472e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterListModel.java @@ -804,7 +804,8 @@ AddVdsActionParameters parameters = new AddVdsActionParameters(); parameters.setVdsId(host.getId()); parameters.setvds(host); - parameters.setRootPassword(hostDetailModel.getPassword()); + parameters.setPassword(hostDetailModel.getPassword()); + parameters.setUsername("root"); //$NON-NLS-1$ parameters.setOverrideFirewall(false); parameters.setRebootAfterInstallation(hostsModel.getClusterModel().getEnableOvirtService().getIsSelected()); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java index 8572013..9c0eab7 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/datacenters/DataCenterGuideModel.java @@ -1627,7 +1627,8 @@ AddVdsActionParameters addVdsParams = new AddVdsActionParameters(); addVdsParams.setVdsId(host.getId()); addVdsParams.setvds(host); - addVdsParams.setRootPassword((String) model.getRootPassword().getEntity()); + addVdsParams.setPassword((String) model.getRootPassword().getEntity()); + addVdsParams.setUsername("root"); //$NON-NLS-1$ addVdsParams.setRebootAfterInstallation(((VDSGroup) model.getCluster().getSelectedItem()).supportsVirtService()); model.startProgress(null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java index 33d1551..536ffcf 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostGeneralModel.java @@ -905,7 +905,8 @@ UpdateVdsActionParameters param = new UpdateVdsActionParameters(); param.setvds(getEntity()); param.setVdsId(getEntity().getId()); - param.setRootPassword((String) model.getRootPassword().getEntity()); + param.setPassword((String) model.getRootPassword().getEntity()); + param.setUsername("root"); //$NON-NLS-1$ param.setIsReinstallOrUpgrade(true); param.setInstallVds(true); param.setoVirtIsoFile(isOVirt ? ((RpmVersion) model.getOVirtISO().getSelectedItem()).getRpmName() : null); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java index 9e0bf60..bc0d4ba 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostListModel.java @@ -836,7 +836,9 @@ AddVdsActionParameters parameters = new AddVdsActionParameters(); parameters.setVdsId(host.getId()); parameters.setvds(host); - parameters.setRootPassword((String) model.getRootPassword().getEntity()); + parameters.setPassword((String) model.getRootPassword().getEntity()); + // TODO: until adding UI field for username + parameters.setUsername("root"); //$NON-NLS-1$ parameters.setOverrideFirewall((Boolean) model.getOverrideIpTables().getEntity()); parameters.setRebootAfterInstallation(isVirt) ; @@ -858,7 +860,8 @@ UpdateVdsActionParameters parameters = new UpdateVdsActionParameters(); parameters.setvds(host); parameters.setVdsId(host.getId()); - parameters.setRootPassword(""); //$NON-NLS-1$ + parameters.setPassword(""); //$NON-NLS-1$ + parameters.setUsername("root"); //$NON-NLS-1$ parameters.setInstallVds(false); parameters.setRebootAfterInstallation(isVirt) ; -- To view, visit http://gerrit.ovirt.org/16006 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id39914e1286870373ad6f69360fa7b3ddfabd8df Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yaniv Bronhaim <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
