[Engine-patches] Change in ovirt-engine[master]: webadmin: Show the emulated machine of a cluster

[rgolan]

Roy Golan has uploaded a new change for review.

Change subject: webadmin: Show the emulated machine of a cluster
......................................................................

webadmin: Show the emulated machine of a cluster

Currently no editing is permitted.

Change-Id: If5a6e0b1833912d7dd49c8517305689d5a558a79
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
M 
frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/clusters/ClusterGeneralModel.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
M 
frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java
3 files changed, 16 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/15911/1

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..777f717 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
@@ -159,6 +159,7 @@
     private MigrateOnErrorOptions resiliencePolicy;
     private boolean cpuThreads;
     private ClusterType clusterType;
+    private String emulatedMachine;
 
     public void setConsoleAddressPartiallyOverridden(Boolean 
consoleAddressPartiallyOverridden) {
         if (isConsoleAddressPartiallyOverridden().booleanValue() !=
@@ -225,6 +226,7 @@
         setMemoryOverCommit(vdsGroup.getmax_vds_memory_over_commit());
         setCpuThreads(vdsGroup.getCountThreadsAsCores());
         setResiliencePolicy(vdsGroup.getMigrateOnError());
+        setEmulatedMachine(vdsGroup.getEmulatedMachine());
         
setCompatibilityVersion(vdsGroup.getcompatibility_version().getValue());
         generateClusterType(vdsGroup.supportsGlusterService(), 
vdsGroup.supportsVirtService());
     }
@@ -810,4 +812,12 @@
         STOP,
         RESTART
     }
+
+    public String getEmulatedMachine() {
+        return emulatedMachine;
+    }
+
+    public void setEmulatedMachine(String emulatedMachine) {
+        this.emulatedMachine = emulatedMachine;
+    }
 }
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
index 9b7a6a9..e91838c 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/ApplicationConstants.java
@@ -2730,6 +2730,9 @@
     @DefaultStringValue("Resilience Policy")
     String resiliencePolicyCluster();
 
+    @DefaultStringValue("Emulated Machine")
+    String emulatedMachine();
+
     @Override
     @DefaultStringValue("High Priority Only")
     String highPriorityOnly();
diff --git 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java
 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java
index 787b80f..f20a3e9 100644
--- 
a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java
+++ 
b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/section/main/view/tab/cluster/ClusterGeneralModelForm.java
@@ -34,6 +34,7 @@
     TextBoxLabel noOfVolumesUp = new TextBoxLabel();
     TextBoxLabel noOfVolumesDown = new TextBoxLabel();
     TextBoxLabel compatibilityVersion = new TextBoxLabel();
+    TextBoxLabel emulatedMachine = new TextBoxLabel();
 
     private final Driver driver = GWT.create(Driver.class);
 
@@ -88,6 +89,8 @@
                     .withDefaultValue(constants.notAvailableLabel(), 
virtServiceNotSupported));
             formBuilder.addFormItem(new 
FormItem(constants.resiliencePolicyCluster(), resiliencePolicy, 3, 1)
                     .withDefaultValue(constants.notAvailableLabel(), 
virtServiceNotSupported));
+            formBuilder.addFormItem(new FormItem(constants.emulatedMachine(), 
emulatedMachine, 4, 1)
+                    .withDefaultValue(constants.notAvailableLabel(), 
virtServiceNotSupported));
         }
 
         // properties for gluster support


-- 
To view, visit http://gerrit.ovirt.org/15911
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If5a6e0b1833912d7dd49c8517305689d5a558a79
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches