Roy Golan has uploaded a new change for review. Change subject: core: present the guest cpu toplogy ......................................................................
core: present the guest cpu toplogy Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1063169 Change-Id: I7aa88e18ba620980ee31a633deaa3345298300e2 Signed-off-by: Roy Golan <rgo...@redhat.com> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java M frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java M frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java 8 files changed, 48 insertions(+), 4 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/43/27243/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java index b9beb8c..bc428f1 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VM.java @@ -1738,4 +1738,12 @@ public void setBootMenuEnabled(boolean enabled) { vmStatic.setBootMenuEnabled(enabled); } + + public void setGuestActualCpuTopology(String guestActualCpuTopology) { + getDynamicData().setGuestActualCpuTopology(guestActualCpuTopology); + } + + public String getGuestActualCpuTopology() { + return getDynamicData().getGuestActualCpuTopology(); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java index 7486e85..40b1762 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java @@ -70,6 +70,7 @@ @UnchangeableByVdsm private String stopReason; private VmExitReason exitReason; + private String guestActualCpuTopology; public static final String APPLICATIONS_LIST_FIELD_NAME = "appList"; public static final String STATUS_FIELD_NAME = "status"; @@ -497,7 +498,6 @@ public void setPauseStatus(VmPauseStatus pauseStatus) { this.pauseStatus = pauseStatus; - } public VmPauseStatus getPauseStatus() { @@ -563,4 +563,12 @@ public void setExitReason(VmExitReason value) { exitReason = value; } + + public void setGuestActualCpuTopology(String guestActualCpuTopology) { + this.guestActualCpuTopology = guestActualCpuTopology; + } + + public String getGuestActualCpuTopology() { + return guestActualCpuTopology; + } } diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index 683e6b0..1105662 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -190,6 +190,10 @@ vm.setDisplayIp((String) xmlRpcStruct.get(VdsProperties.displayIp)); } + if (xmlRpcStruct.containsKey((VdsProperties.GUEST_ACTUAL_CPU_TOPOLOGY))) { + vm.setGuestActualCpuTopology((String) xmlRpcStruct.get(VdsProperties.GUEST_ACTUAL_CPU_TOPOLOGY)); + } + if (xmlRpcStruct.containsKey((VdsProperties.utc_diff))) { String utc_diff = xmlRpcStruct.get(VdsProperties.utc_diff).toString(); if (utc_diff.startsWith("+")) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java index d8c4af5..5875e53 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java @@ -226,6 +226,9 @@ public static final String vm_balloon_min = "balloon_min"; public static final String vm_balloon_target = "balloon_target"; + // reported by guest-agent + public static final String GUEST_ACTUAL_CPU_TOPOLOGY = "cpu_topology"; + public static final String DriveC = "hda"; // drive C: public static final String DriveE = "hdb"; // drive E: (D: is the CD-ROM) public static final String DriveF = "hdc"; // drive F: diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java index 556908a..cea7f90 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java @@ -1761,4 +1761,7 @@ "For Windows OS this should correspond to the time zone set in the guest (during installation or afterwards). " + "Most default Linux installations expect hardware clock to be GMT+00:00.") String timeZoneInfo(); + + @DefaultStringValue("Actual CPU Topology") + String guestActualCpuTopology(); } diff --git a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java index f2da2d5..0657229 100644 --- a/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java +++ b/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/widget/uicommon/vm/VmGeneralModelForm.java @@ -26,6 +26,7 @@ @Path("OS") TextBoxLabel oS = new TextBoxLabel(); TextBoxLabel cpuInfo = new TextBoxLabel(); + TextBoxLabel guestActualCpuTopology = new TextBoxLabel(); TextBoxLabel defaultDisplayType = new TextBoxLabel(); TextBoxLabel origin = new TextBoxLabel(); TextBoxLabel priority = new TextBoxLabel(); @@ -60,9 +61,10 @@ formBuilder.addFormItem(new FormItem(constants.definedMemoryVm(), definedMemory, 0, 1)); formBuilder.addFormItem(new FormItem(constants.physMemGauranteedVm(), minAllocatedMemory, 1, 1)); formBuilder.addFormItem(new FormItem(constants.numOfCpuCoresVm(), cpuInfo, 2, 1)); - formBuilder.addFormItem(new FormItem(constants.highlyAvailableVm(), isHighlyAvailable, 3, 1)); - formBuilder.addFormItem(new FormItem(constants.numOfMonitorsVm(), monitorCount, 4, 1)); - formBuilder.addFormItem(new FormItem(constants.usbPolicyVm(), usbPolicy, 5, 1)); + formBuilder.addFormItem(new FormItem(constants.guestActualCpuTopology(), guestActualCpuTopology, 3, 1)); + formBuilder.addFormItem(new FormItem(constants.highlyAvailableVm(), isHighlyAvailable, 4, 1)); + formBuilder.addFormItem(new FormItem(constants.numOfMonitorsVm(), monitorCount, 5, 1)); + formBuilder.addFormItem(new FormItem(constants.usbPolicyVm(), usbPolicy, 6, 1)); formBuilder.addFormItem(new FormItem(constants.originVm(), origin, 0, 2)); formBuilder.addFormItem(new FormItem(constants.runOnVm(), defaultHost, 1, 2)); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java index 52928ec..ad8e84b 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/vms/VmGeneralModel.java @@ -276,6 +276,16 @@ } } + private String guestActualCpuTopology; + + public String getGuestActualCpuTopology() { + return guestActualCpuTopology; + } + + public void setGuestActualCpuTopology(String value) { + guestActualCpuTopology = value; + } + private boolean isHighlyAvailable; public boolean getIsHighlyAvailable() @@ -570,6 +580,9 @@ vm.getNumOfSockets(), vm.getCpuPerSocket())); + setGuestActualCpuTopology( + ConstantsManager.getInstance().getMessages().guestActualCpuTopologyLabel(vm.getGuestActualCpuTopology())); + setHasDomain(AsyncDataProvider.isWindowsOsType(vm.getVmOsId())); if (vm.getVmInit() != null) { setDomain(vm.getVmInit().getDomain()); diff --git a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java index 459bbb6..35bf913 100644 --- a/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java +++ b/frontend/webadmin/modules/uicompat/src/main/java/org/ovirt/engine/ui/uicompat/UIMessages.java @@ -255,6 +255,9 @@ @DefaultMessage("{0} ({1} Socket(s), {2} Core(s) per Socket)") String cpuInfoLabel(int numberOfCpus, int numberOfSockets, int numberOfCpusPerSocket); + @DefaultMessage("{0}") + String guestActualCpuTopologyLabel(String guestActualCpuTopology); + @DefaultMessage("{0} (from Storage Domain {1})") String templateDiskDescription(String diskAlias, String storageDomainName); -- To view, visit http://gerrit.ovirt.org/27243 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7aa88e18ba620980ee31a633deaa3345298300e2 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
