Omer Frenkel has posted comments on this change. Change subject: core: present the guest cpu count ......................................................................
Patch Set 9: (7 comments) http://gerrit.ovirt.org/#/c/27243/9/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java: Line 301: String isoName = Paths.get((String) xmlRpcStruct.get(VdsProperties.CDRom)).getFileName().toString(); Line 302: vm.setCurrentCd(isoName); Line 303: } Line 304: Line 305: if (xmlRpcStruct.containsKey(VdsProperties.ACTUAL_CPU_TOPOLOGY)) { need to be GUEST_CPU_COUNT (above and below) Line 306: vm.setGuestCpuCount(AssignIntValue(xmlRpcStruct, VdsProperties.ACTUAL_CPU_TOPOLOGY)); Line 307: } Line 308: } Line 309: http://gerrit.ovirt.org/#/c/27243/9/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java File backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsProperties.java: Line 229: public static final String vm_balloon_min = "balloon_min"; Line 230: public static final String vm_balloon_target = "balloon_target"; Line 231: Line 232: // reported by guest-agent Line 233: public static final String ACTUAL_CPU_TOPOLOGY = "guestCPUCount"; not needed Line 234: Line 235: public static final String DriveC = "hda"; // drive C: Line 236: public static final String DriveE = "hdb"; // drive E: (D: is the CD-ROM) Line 237: public static final String DriveF = "hdc"; // drive F: http://gerrit.ovirt.org/#/c/27243/9/frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java File frontend/webadmin/modules/gwt-common/src/main/java/org/ovirt/engine/ui/common/CommonApplicationConstants.java: Line 1781: Line 1782: @DefaultStringValue("The field is not attached to any instance type") Line 1783: String detachedFromInstanceType(); Line 1784: Line 1785: @DefaultStringValue("Actual CPU Topology") please change to guest cpu count Line 1786: String guestGuestCpuCount(); http://gerrit.ovirt.org/#/c/27243/9/packaging/dbscripts/create_views.sql File packaging/dbscripts/create_views.sql: Line 625: vm_dynamic.last_watchdog_event as last_watchdog_event, vm_dynamic.last_watchdog_action as last_watchdog_action, vm_dynamic.is_run_once as is_run_once, vm_dynamic.vm_fqdn as vm_fqdn, vm_dynamic.cpu_name as cpu_name, vm_dynamic.current_cd as current_cd, vm_dynamic.reason as reason, vm_dynamic.exit_reason as exit_reason, Line 626: vm_static.instance_type_id as instance_type_id, vm_static.image_type_id as image_type_id, vds_groups.architecture as architecture, vm_static.original_template_id as original_template_id, vm_static.original_template_name as original_template_name, vm_dynamic.last_stop_time as last_stop_time, Line 627: vm_static.migration_downtime as migration_downtime, vm_static.template_version_number as template_version_number, Line 628: vm_static.serial_number_policy as serial_number_policy, vm_static.custom_serial_number as custom_serial_number, Line 629: vm_static.is_boot_menu_enabled as is_boot_menu_enabled, vm_dynamic.guest_cpu_count as actual_cpu_topology here also Line 630: FROM vm_static INNER JOIN Line 631: vm_dynamic ON vm_static.vm_guid = vm_dynamic.vm_guid INNER JOIN Line 632: vm_static AS vm_templates ON vm_static.vmt_guid = vm_templates.vm_guid INNER JOIN Line 633: vm_statistics ON vm_static.vm_guid = vm_statistics.vm_guid INNER JOIN Line 668: vms.instance_type_id as instance_type_id, vms.image_type_id as image_type_id, vms.architecture as architecture, vms.original_template_id as original_template_id, vms.original_template_name as original_template_name, Line 669: vms.migration_downtime as migration_downtime, vms.template_version_number as template_version_number, Line 670: vms.current_cd as current_cd, vms.reason as reason, Line 671: vms.serial_number_policy as serial_number_policy, vms.custom_serial_number as custom_serial_number, vms.exit_reason as exit_reason, Line 672: vms.is_boot_menu_enabled as is_boot_menu_enabled, vms.guest_cpu_count as actual_cpu_topology and here Line 673: FROM vms LEFT OUTER JOIN Line 674: tags_vm_map_view ON vms.vm_guid = tags_vm_map_view.vm_id LEFT OUTER JOIN Line 675: vm_device ON vm_device.vm_id = vms.vm_guid LEFT OUTER JOIN Line 676: images ON images.image_group_id = vm_device.device_id LEFT OUTER JOIN http://gerrit.ovirt.org/#/c/27243/9/packaging/dbscripts/upgrade/03_05_0390_add_actual_cpu_topology_to_vm_dynamic.sql File packaging/dbscripts/upgrade/03_05_0390_add_actual_cpu_topology_to_vm_dynamic.sql: Line 1: select fn_db_add_column('vm_dynamic', 'guest_cpu_count', 'INTEGER'); maybe also change upgrade script name http://gerrit.ovirt.org/#/c/27243/9/packaging/dbscripts/vms_sp.sql File packaging/dbscripts/vms_sp.sql: Line 347: last_watchdog_event = v_last_watchdog_event, last_watchdog_action = v_last_watchdog_action, is_run_once = v_is_run_once, cpu_name = v_cpu_name, Line 348: current_cd = v_current_cd, Line 349: reason = v_reason, Line 350: exit_reason = v_exit_reason, Line 351: guest_cpu_count = v_actual_cpu_topology balagan Line 352: WHERE vm_guid = v_vm_guid; Line 353: END; $procedure$ Line 354: LANGUAGE plpgsql; Line 355: -- To view, visit http://gerrit.ovirt.org/27243 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I7aa88e18ba620980ee31a633deaa3345298300e2 Gerrit-PatchSet: 9 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> Gerrit-Reviewer: Daniel Erez <[email protected]> Gerrit-Reviewer: Gilad Chaplik <[email protected]> Gerrit-Reviewer: Omer Frenkel <[email protected]> Gerrit-Reviewer: Roy Golan <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
