Yaniv Bronhaim has uploaded a new change for review.
Change subject: API: UI: host-deploy: unlock username field to allow
authentication by any user
......................................................................
API: UI: host-deploy: unlock username field to allow authentication by any user
Change-Id: Ic909fe6a926ffb894978e746fbc7052935af9988
Signed-off-by: Yaniv Bronhaim <ybron...@redhat.com>
---
M
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
5 files changed, 3 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/16885/1
diff --git
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
index 56581a4..440d732 100644
---
a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
+++
b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java
@@ -553,10 +553,9 @@
if (action.getSsh().getUser().isSetPassword()) {
params.setRootPassword(action.getSsh().getUser().getPassword());
}
- // TODO: adding username support.
- //if (action.getSsh().getUser().isSetUserName()) {
- //
params.getvds().setSshUsername(action.getSsh().getUser().getUserName());
- //}
+ if (action.getSsh().getUser().isSetUserName()) {
+
params.getvds().setSshUsername(action.getSsh().getUser().getUserName());
+ }
}
if (action.getSsh().isSetPort()) {
params.getvds().setSshPort(action.getSsh().getPort());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
index ebd3782..7e459af 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java
@@ -823,7 +823,6 @@
getHostPort().setEntity(constants.defaultHostSSHPort());
setUserName(new EntityModel());
getUserName().setEntity(constants.defaultUserName());
- getUserName().setIsChangable(false);
setFetchSshFingerprint(new EntityModel());
getFetchSshFingerprint().setEntity(constants.empty());
setUserPassword(new EntityModel());
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
index e4fa111..4a6fa0a 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/InstallModel.java
@@ -100,7 +100,6 @@
getOverrideIpTables().setEntity(false);
setUserName(new EntityModel());
getUserName().setEntity(constants.defaultUserName());
- getUserName().setIsChangable(false);
setPublicKey(new EntityModel());
getPublicKey().setEntity(constants.empty());
fetchPublicKey();
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
index 96f7a8e..5e453e1 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostInstallPopupView.java
@@ -155,8 +155,6 @@
displayPassPkWindow(false);
}
});
- // TODO: until we allow using different username
- userNameEditor.setEnabled(false);
}
private void displayPassPkWindow(boolean isPasswordVisible) {
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
index 9a5033b..e47ccda 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/host/HostPopupView.java
@@ -721,8 +721,6 @@
});
updatePmPanelsVisibility(true);
- // TODO: until we allow different username for authentication
- userNameEditor.setEnabled(false);
externalProviderPanel.setVisible(object.showExternalProviderPanel());
addTextAndLinkAlert(fetchPanel,
appConstants.fetchingHostFingerprint(), object.getSSHFingerPrint());
nameEditor.setFocus(true);
--
To view, visit http://gerrit.ovirt.org/16885
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic909fe6a926ffb894978e746fbc7052935af9988
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Yaniv Bronhaim <ybron...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
