Gilad Chaplik has uploaded a new change for review.
Change subject: webadmin: move Trusted Service to ClusterModel
......................................................................
webadmin: move Trusted Service to ClusterModel
ClusterPolicyModel is being removed, hence moving the
logic behind 'Enable Trusted Service' into the parent model.
Change-Id: If8c85d6321cc9f60eecfcdf4b7ae719581c5e90a
Signed-off-by: Gilad Chaplik <gchap...@redhat.com>
---
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/clusters/ClusterModel.java
M
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java
M
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
4 files changed, 32 insertions(+), 30 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/01/16801/1
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 cd99e7f..a57f691 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
@@ -354,7 +354,7 @@
clusterModel.setEntity(cluster);
clusterModel.init(true);
clusterModel.getClusterPolicyModel().setEditClusterPolicyFirst(clusterPolicyFirst);
-
clusterModel.getClusterPolicyModel().getEnableTrustedService().setEntity(cluster.supportsTrustedService());
+
clusterModel.getEnableTrustedService().setEntity(cluster.supportsTrustedService());
setWindow(clusterModel);
clusterModel.setTitle(ConstantsManager.getInstance().getConstants().editClusterTitle());
clusterModel.setHashName("edit_cluster"); //$NON-NLS-1$
@@ -376,11 +376,11 @@
}
if (cluster.supportsVirtService()&& !cluster.supportsGlusterService())
{
-
clusterModel.getClusterPolicyModel().getEnableTrustedService().setIsChangable(true);
+ clusterModel.getEnableTrustedService().setIsChangable(true);
}
else
{
-
clusterModel.getClusterPolicyModel().getEnableTrustedService().setIsChangable(false);
+ clusterModel.getEnableTrustedService().setIsChangable(false);
}
AsyncDataProvider.getAllowClusterWithVirtGlusterEnabled(new
AsyncQuery(this, new INewAsyncCallback() {
@@ -433,8 +433,10 @@
ArrayList<VDS> vdsList = (ArrayList<VDS>) result;
if (vdsList.size() > 0)
{
-
clusterModel.getClusterPolicyModel().getEnableTrustedService().setIsChangable(false);
-
clusterModel.getClusterPolicyModel().getEnableTrustedService().setInfo(ConstantsManager.getInstance().getConstants().trustedServiceDisabled());
+
clusterModel.getEnableTrustedService().setIsChangable(false);
+
clusterModel.getEnableTrustedService().setInfo(ConstantsManager.getInstance()
+ .getConstants()
+ .trustedServiceDisabled());
}
}
};
@@ -646,7 +648,7 @@
cluster.setVirtService((Boolean)
model.getEnableOvirtService().getEntity());
cluster.setGlusterService((Boolean)
model.getEnableGlusterService().getEntity());
cluster.setselection_algorithm(model.getClusterPolicyModel().getSelectionAlgorithm());
- cluster.setTrustedService((Boolean)
model.getClusterPolicyModel().getEnableTrustedService().getEntity());
+ cluster.setTrustedService((Boolean)
model.getEnableTrustedService().getEntity());
if (model.getClusterPolicyModel().getOverCommitTime().getIsAvailable())
{
cluster.setcpu_over_commit_duration_minutes(Integer.parseInt(model.getClusterPolicyModel().getOverCommitTime()
@@ -832,7 +834,7 @@
host.setSSHKeyFingerprint(hostDetailModel.getFingerprint());
host.setPort(54321);
- host.setVdsGroupId((Guid)
hostsModel.getClusterModel().getClusterId());
+ host.setVdsGroupId(hostsModel.getClusterModel().getClusterId());
host.setpm_enabled(false);
AddVdsActionParameters parameters = new AddVdsActionParameters();
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
index 5e43836..2c8766d 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterModel.java
@@ -568,6 +568,16 @@
}
}
+ private EntityModel privateEnableTrustedService;
+
+ public EntityModel getEnableTrustedService() {
+ return privateEnableTrustedService;
+ }
+
+ public void setEnableTrustedService(EntityModel value) {
+ this.privateEnableTrustedService = value;
+ }
+
public int getMemoryOverCommit()
{
if ((Boolean) getOptimizationNone_IsSelected().getEntity())
@@ -620,6 +630,7 @@
setIsEdit(isEdit);
setName(new EntityModel());
setDescription(new EntityModel());
+ setEnableTrustedService(new EntityModel(false));
setClusterPolicyModel(new ClusterPolicyModel());
setAllowClusterWithVirtGlusterEnabled(true);
AsyncDataProvider.getAllowClusterWithVirtGlusterEnabled(new
AsyncQuery(this, new INewAsyncCallback() {
@@ -639,24 +650,24 @@
getEnableGlusterService().setEntity(Boolean.FALSE);
}
getEnableGlusterService().setIsChangable(true);
-
getClusterPolicyModel().getEnableTrustedService().setEntity(false);
+ getEnableTrustedService().setEntity(false);
if (getEnableOvirtService().getEntity() != null
&& (Boolean)getEnableOvirtService().getEntity())
{
if (getEnableGlusterService().getEntity() != null
&& !(Boolean)getEnableGlusterService().getEntity())
{
-
getClusterPolicyModel().getEnableTrustedService().setIsChangable(true);
+ getEnableTrustedService().setIsChangable(true);
}
else
{
-
getClusterPolicyModel().getEnableTrustedService().setIsChangable(false);
+ getEnableTrustedService().setIsChangable(false);
}
}
else
{
-
getClusterPolicyModel().getEnableTrustedService().setIsChangable(false);
+ getEnableTrustedService().setIsChangable(false);
}
}
});
@@ -696,30 +707,30 @@
if (getEnableGlusterService().getEntity() != null
&& (Boolean) getEnableGlusterService().getEntity())
{
-
getClusterPolicyModel().getEnableTrustedService().setEntity(false);
-
getClusterPolicyModel().getEnableTrustedService().setIsChangable(false);
+ getEnableTrustedService().setEntity(false);
+ getEnableTrustedService().setIsChangable(false);
}
else
{
if (getEnableOvirtService().getEntity() != null
&& (Boolean)getEnableOvirtService().getEntity())
{
-
getClusterPolicyModel().getEnableTrustedService().setIsChangable(true);
+ getEnableTrustedService().setIsChangable(true);
}
else
{
-
getClusterPolicyModel().getEnableTrustedService().setIsChangable(false);
+ getEnableTrustedService().setIsChangable(false);
}
}
}
});
-
getClusterPolicyModel().getEnableTrustedService().getEntityChangedEvent().addListener(new
IEventListener() {
+ getEnableTrustedService().getEntityChangedEvent().addListener(new
IEventListener() {
@Override
public void eventRaised(Event ev, Object sender, EventArgs args) {
- if
(getClusterPolicyModel().getEnableTrustedService().getEntity() != null
- &&
(Boolean)getClusterPolicyModel().getEnableTrustedService().getEntity())
+ if (getEnableTrustedService().getEntity() != null
+ && (Boolean) getEnableTrustedService().getEntity())
{
getEnableGlusterService().setEntity(false);
getEnableGlusterService().setIsChangable(false);
diff --git
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java
index 49afc78..0935c18 100644
---
a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java
+++
b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterPolicyModel.java
@@ -113,16 +113,6 @@
}
}
- private EntityModel privateEnableTrustedService;
-
- public EntityModel getEnableTrustedService() {
- return privateEnableTrustedService;
- }
-
- public void setEnableTrustedService(EntityModel value) {
- this.privateEnableTrustedService = value;
- }
-
public void saveDefaultValues()
{
if (getSelectionAlgorithm() == VdsSelectionAlgorithm.EvenlyDistribute)
@@ -169,7 +159,6 @@
}
setOverCommitTime(new EntityModel());
- setEnableTrustedService(new EntityModel(false));
// Set all properties according to default selected algorithm:
selectionAlgorithmChanged();
}
diff --git
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
index ed02b39..1b36d3b 100644
---
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
+++
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/popup/cluster/ClusterPopupView.java
@@ -224,7 +224,7 @@
Label additionPropsPanelTitle;
@UiField(provided = true)
- @Path(value = "clusterPolicyModel.enableTrustedService.entity")
+ @Path(value = "enableTrustedService.entity")
@WithElementId
EntityModelCheckBoxEditor enableTrustedServiceEditor;
--
To view, visit http://gerrit.ovirt.org/16801
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If8c85d6321cc9f60eecfcdf4b7ae719581c5e90a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Gilad Chaplik <gchap...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
