Roy Golan has uploaded a new change for review. Change subject: core: Add supportedEmulatedMachines to Host model cluster ......................................................................
core: Add supportedEmulatedMachines to Host model cluster According to http://www.ovirt.org/Cluster_emulation_modes, Added a field to VDS - supportedEmulatedMachine Added a field to VdsGroup - emulatedMachine Added persisting those values to various procedures. Change-Id: I25df8376026f3e5f57ce85d8e7a20e5000ce7eed Signed-off-by: Roy Golan <[email protected]> --- M backend/manager/dbscripts/create_views.sql A backend/manager/dbscripts/upgrade/03_03_0220_add_emulated_machine_to_host_and_cluster.sql M backend/manager/dbscripts/vds_groups_sp.sql M backend/manager/dbscripts/vds_sp.sql M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java M backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java M backend/manager/modules/dal/src/test/resources/fixtures.xml 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 13 files changed, 84 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/64/15864/1 diff --git a/backend/manager/dbscripts/create_views.sql b/backend/manager/dbscripts/create_views.sql index f5f1a15..6063cf1 100644 --- a/backend/manager/dbscripts/create_views.sql +++ b/backend/manager/dbscripts/create_views.sql @@ -654,7 +654,7 @@ vds_dynamic.transparent_hugepages_state as transparent_hugepages_state, vds_dynamic.anonymous_hugepages as anonymous_hugepages, vds_dynamic.non_operational_reason as non_operational_reason, vds_static.recoverable as recoverable, vds_static.sshKeyFingerprint as sshKeyFingerprint, vds_dynamic.hw_manufacturer as hw_manufacturer, vds_dynamic.hw_product_name as hw_product_name, vds_dynamic.hw_version as hw_version, vds_dynamic.hw_serial_number as hw_serial_number, vds_dynamic.hw_uuid as hw_uuid, vds_dynamic.hw_family as hw_family, vds_static.console_address as console_address, - vds_dynamic.hbas as hbas + vds_dynamic.hbas as hbas, vds_dynamic.supported_emulated_machines as supported_emulated_machines FROM vds_groups INNER JOIN vds_static ON vds_groups.vds_group_id = vds_static.vds_group_id INNER JOIN vds_dynamic ON vds_static.vds_id = vds_dynamic.vds_id INNER JOIN diff --git a/backend/manager/dbscripts/upgrade/03_03_0220_add_emulated_machine_to_host_and_cluster.sql b/backend/manager/dbscripts/upgrade/03_03_0220_add_emulated_machine_to_host_and_cluster.sql new file mode 100644 index 0000000..fb73996 --- /dev/null +++ b/backend/manager/dbscripts/upgrade/03_03_0220_add_emulated_machine_to_host_and_cluster.sql @@ -0,0 +1,2 @@ +SELECT fn_db_add_column('vds_dynamic', 'supported_emulated_machines', 'character varying(255)'); +SELECT fn_db_add_column('vds_groups', 'emulated_machine', 'character varying(40)'); diff --git a/backend/manager/dbscripts/vds_groups_sp.sql b/backend/manager/dbscripts/vds_groups_sp.sql index efc08d4..ba7c4a9 100644 --- a/backend/manager/dbscripts/vds_groups_sp.sql +++ b/backend/manager/dbscripts/vds_groups_sp.sql @@ -24,16 +24,17 @@ v_migrate_on_error INTEGER, v_virt_service BOOLEAN, v_gluster_service BOOLEAN, - v_tunnel_migration BOOLEAN) + v_tunnel_migration BOOLEAN, + v_emulated_machine VARCHAR(40)) RETURNS VOID AS $procedure$ BEGIN INSERT INTO vds_groups(vds_group_id,description, name, cpu_name, selection_algorithm, high_utilization, low_utilization, cpu_over_commit_duration_minutes, storage_pool_id, max_vds_memory_over_commit, count_threads_as_cores, compatibility_version, - transparent_hugepages, migrate_on_error, virt_service, gluster_service, tunnel_migration) + transparent_hugepages, migrate_on_error, virt_service, gluster_service, tunnel_migration, emulated_machine) VALUES(v_vds_group_id,v_description, v_name, v_cpu_name, v_selection_algorithm, v_high_utilization, v_low_utilization, v_cpu_over_commit_duration_minutes, v_storage_pool_id, v_max_vds_memory_over_commit, v_count_threads_as_cores, v_compatibility_version, - v_transparent_hugepages, v_migrate_on_error, v_virt_service, v_gluster_service, v_tunnel_migration); + v_transparent_hugepages, v_migrate_on_error, v_virt_service, v_gluster_service, v_tunnel_migration, v_emulated_machine); END; $procedure$ LANGUAGE plpgsql; @@ -57,7 +58,8 @@ v_migrate_on_error INTEGER, v_virt_service BOOLEAN, v_gluster_service BOOLEAN, - v_tunnel_migration BOOLEAN) + v_tunnel_migration BOOLEAN, + v_emulated_machine VARCHAR(40)) RETURNS VOID --The [vds_groups] table doesn't have a timestamp column. Optimistic concurrency logic cannot be generated @@ -72,7 +74,8 @@ count_threads_as_cores = v_count_threads_as_cores, compatibility_version = v_compatibility_version,transparent_hugepages = v_transparent_hugepages, migrate_on_error = v_migrate_on_error, - virt_service = v_virt_service, gluster_service = v_gluster_service, tunnel_migration = v_tunnel_migration + virt_service = v_virt_service, gluster_service = v_gluster_service, tunnel_migration = v_tunnel_migration, + emulated_machine = v_emulated_machine WHERE vds_group_id = v_vds_group_id; END; $procedure$ LANGUAGE plpgsql; diff --git a/backend/manager/dbscripts/vds_sp.sql b/backend/manager/dbscripts/vds_sp.sql index d20120f..34570f8 100644 --- a/backend/manager/dbscripts/vds_sp.sql +++ b/backend/manager/dbscripts/vds_sp.sql @@ -179,14 +179,15 @@ v_hw_serial_number VARCHAR(255), v_hw_uuid VARCHAR(255), v_hw_family VARCHAR(255), - v_hbas VARCHAR(255)) + v_hbas VARCHAR(255), + v_supported_emulated_machines VARCHAR(255)) RETURNS VOID AS $procedure$ BEGIN BEGIN -INSERT INTO vds_dynamic(cpu_cores, cpu_threads, cpu_model, cpu_speed_mh, if_total_speed, kvm_enabled, mem_commited, physical_mem_mb, status, vds_id, vm_active, vm_count, vm_migrating, reserved_mem, guest_overhead, rpm_version, software_version, version_name, build_name, previous_status, cpu_flags, cpu_over_commit_time_stamp, vms_cores_count, pending_vcpus_count, pending_vmem_size, cpu_sockets,net_config_dirty, supported_cluster_levels, supported_engines, host_os, kvm_version, libvirt_version, spice_version, kernel_version, iscsi_initiator_name, transparent_hugepages_state, anonymous_hugepages,hooks, hw_manufacturer, hw_product_name, hw_version, hw_serial_number, hw_uuid, hw_family, hbas) - VALUES(v_cpu_cores, v_cpu_threads, v_cpu_model, v_cpu_speed_mh, v_if_total_speed, v_kvm_enabled, v_mem_commited, v_physical_mem_mb, v_status, v_vds_id, v_vm_active, v_vm_count, v_vm_migrating, v_reserved_mem, v_guest_overhead, v_rpm_version, v_software_version, v_version_name, v_build_name, v_previous_status, v_cpu_flags, v_cpu_over_commit_time_stamp, v_vms_cores_count,v_pending_vcpus_count, v_pending_vmem_size, v_cpu_sockets, v_net_config_dirty, v_supported_cluster_levels, v_supported_engines, v_host_os, v_kvm_version, v_libvirt_version, v_spice_version, v_kernel_version, v_iscsi_initiator_name, v_transparent_hugepages_state, v_anonymous_hugepages,v_hooks, v_hw_manufacturer, v_hw_product_name, v_hw_version, v_hw_serial_number, v_hw_uuid, v_hw_family, v_hbas); +INSERT INTO vds_dynamic(cpu_cores, cpu_threads, cpu_model, cpu_speed_mh, if_total_speed, kvm_enabled, mem_commited, physical_mem_mb, status, vds_id, vm_active, vm_count, vm_migrating, reserved_mem, guest_overhead, rpm_version, software_version, version_name, build_name, previous_status, cpu_flags, cpu_over_commit_time_stamp, vms_cores_count, pending_vcpus_count, pending_vmem_size, cpu_sockets,net_config_dirty, supported_cluster_levels, supported_engines, host_os, kvm_version, libvirt_version, spice_version, kernel_version, iscsi_initiator_name, transparent_hugepages_state, anonymous_hugepages,hooks, hw_manufacturer, hw_product_name, hw_version, hw_serial_number, hw_uuid, hw_family, hbas, supported_emulated_machines) + VALUES(v_cpu_cores, v_cpu_threads, v_cpu_model, v_cpu_speed_mh, v_if_total_speed, v_kvm_enabled, v_mem_commited, v_physical_mem_mb, v_status, v_vds_id, v_vm_active, v_vm_count, v_vm_migrating, v_reserved_mem, v_guest_overhead, v_rpm_version, v_software_version, v_version_name, v_build_name, v_previous_status, v_cpu_flags, v_cpu_over_commit_time_stamp, v_vms_cores_count,v_pending_vcpus_count, v_pending_vmem_size, v_cpu_sockets, v_net_config_dirty, v_supported_cluster_levels, v_supported_engines, v_host_os, v_kvm_version, v_libvirt_version, v_spice_version, v_kernel_version, v_iscsi_initiator_name, v_transparent_hugepages_state, v_anonymous_hugepages,v_hooks, v_hw_manufacturer, v_hw_product_name, v_hw_version, v_hw_serial_number, v_hw_uuid, v_hw_family, v_hbas, v_supported_emulated_machines); END; RETURN; @@ -242,7 +243,8 @@ v_hw_serial_number VARCHAR(255), v_hw_uuid VARCHAR(255), v_hw_family VARCHAR(255), - v_hbas VARCHAR(255)) + v_hbas VARCHAR(255), + v_supported_emulated_machines VARCHAR(255)) RETURNS VOID --The [vds_dynamic] table doesn't have a timestamp column. Optimistic concurrency logic cannot be generated @@ -272,7 +274,7 @@ _update_date = LOCALTIMESTAMP,non_operational_reason = v_non_operational_reason, hw_manufacturer = v_hw_manufacturer, hw_product_name = v_hw_product_name, hw_version = v_hw_version, hw_serial_number = v_hw_serial_number, - hw_uuid = v_hw_uuid, hw_family = v_hw_family, hbas = v_hbas + hw_uuid = v_hw_uuid, hw_family = v_hw_family, hbas = v_hbas, supported_emulated_machines = v_supported_emulated_machines WHERE vds_id = v_vds_id; END; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java index 13da77b..b92a7f8 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java @@ -28,6 +28,11 @@ */ private Map<String, Long> localDisksUsage; + /** + * comma separated list of emulated machines the host supports + */ + private String supportedEmulatedMachines; + public VDS() { mVdsStatic = new VdsStatic(); mVdsDynamic = new VdsDynamic(); @@ -1305,4 +1310,12 @@ public void setActiveNic(String activeNic) { this.activeNic = activeNic; } + + public void setSupportedEmulatedMachines(String supportedEmulatedMachines) { + mVdsDynamic.setSupportedEmulatedMachines(supportedEmulatedMachines); + } + + public String getSupportedEmulatedMachines() { + return mVdsDynamic.getSupportedEmulatedMachines(); + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java index b429f1b..564ecf0 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java @@ -70,6 +70,8 @@ private boolean tunnelMigration = false; + private String emulatedMachine; + public VDSGroup() { selection_algorithm = VdsSelectionAlgorithm.None; high_utilization = -1; @@ -243,6 +245,14 @@ tunnelMigration = value; } + public String getEmulatedMachine() { + return emulatedMachine; + } + + public void setEmulatedMachine(String emulatedMachine) { + this.emulatedMachine = emulatedMachine; + } + @Override public int hashCode() { final int prime = 31; @@ -266,6 +276,7 @@ result = prime * result + (virtService ? 1231 : 1237); result = prime * result + (glusterService ? 1231 : 1237); result = prime * result + (tunnelMigration ? 1231 : 1237); + result = prime * result + (emulatedMachine == null ? 0 : emulatedMachine.hashCode()); return result; } @@ -299,7 +310,8 @@ && transparentHugepages == other.transparentHugepages && virtService == other.virtService && glusterService == other.glusterService - && tunnelMigration == other.tunnelMigration); + && tunnelMigration == other.tunnelMigration + && ObjectUtils.objectsEqual(emulatedMachine, other.emulatedMachine)); } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java index 14cf280..89ca402 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java @@ -127,6 +127,7 @@ private java.util.HashSet<Version> _supportedClusterVersionsSet; private java.util.HashSet<Version> _supportedENGINESVersionsSet; + private String supportedEmulatedMachines; public void setVersion(RpmVersion value) { rpmVersion = value; @@ -134,6 +135,14 @@ public RpmVersion getVersion() { return rpmVersion; + } + + public String getSupportedEmulatedMachines() { + return supportedEmulatedMachines; + } + + public void setSupportedEmulatedMachines(String supportedEmulatedMachines) { + this.supportedEmulatedMachines = supportedEmulatedMachines; } public VdsDynamic() { @@ -699,6 +708,8 @@ && ObjectUtils.objectsEqual(hwSerialNumber, other.hwSerialNumber) && ObjectUtils.objectsEqual(hwUUID, other.hwUUID) && ObjectUtils.objectsEqual(hwFamily, other.hwFamily) - && ObjectUtils.objectsEqual(HBAs, other.HBAs)); + && ObjectUtils.objectsEqual(HBAs, other.HBAs) + && ObjectUtils.objectsEqual(supportedEmulatedMachines, other.supportedEmulatedMachines)); } + } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java index b672f0a..3884ef7 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDAODbFacadeImpl.java @@ -343,6 +343,7 @@ entity.setHardwareFamily(rs.getString("hw_family")); entity.setHBAs(new JsonObjectDeserializer().deserialize(rs.getString("hbas"), HashMap.class)); entity.setConsoleAddress(rs.getString("console_address")); + entity.setSupportedEmulatedMachines(rs.getString("supported_emulated_machines")); entity.calculateFreeVirtualMemory(); return entity; } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java index de71fa7..3e7dcba 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsDynamicDAODbFacadeImpl.java @@ -152,7 +152,8 @@ .addValue("hw_serial_number", vds.getHardwareSerialNumber()) .addValue("hw_uuid", vds.getHardwareUUID()) .addValue("hw_family", vds.getHardwareFamily()) - .addValue("hbas", new JsonObjectSerializer().serialize(vds.getHBAs())); + .addValue("hbas", new JsonObjectSerializer().serialize(vds.getHBAs())) + .addValue("supported_emulated_machines", vds.getSupportedEmulatedMachines()); getCallsHandler().executeModification("InsertVdsDynamic", parameterSource); } @@ -209,7 +210,8 @@ .addValue("hw_serial_number", vds.getHardwareSerialNumber()) .addValue("hw_uuid", vds.getHardwareUUID()) .addValue("hw_family", vds.getHardwareFamily()) - .addValue("hbas", new JsonObjectSerializer().serialize(vds.getHBAs())); + .addValue("hbas", new JsonObjectSerializer().serialize(vds.getHBAs())) + .addValue("supported_emulated_machines", vds.getSupportedEmulatedMachines()); getCallsHandler().executeModification("UpdateVdsDynamic", parameterSource); } diff --git a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java index e20fb72..c136426 100644 --- a/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java +++ b/backend/manager/modules/dal/src/main/java/org/ovirt/engine/core/dao/VdsGroupDAODbFacadeImpl.java @@ -151,7 +151,8 @@ .addValue("migrate_on_error", group.getMigrateOnError()) .addValue("virt_service", group.supportsVirtService()) .addValue("gluster_service", group.supportsGlusterService()) - .addValue("tunnel_migration", group.isTunnelMigration()); + .addValue("tunnel_migration", group.isTunnelMigration()) + .addValue("emulated_machine", group.getEmulatedMachine()); return parameterSource; } @@ -189,6 +190,7 @@ entity.setVirtService(rs.getBoolean("virt_service")); entity.setGlusterService(rs.getBoolean("gluster_service")); entity.setTunnelMigration(rs.getBoolean("tunnel_migration")); + entity.setEmulatedMachine(rs.getString("emulated_machine")); return entity; } } diff --git a/backend/manager/modules/dal/src/test/resources/fixtures.xml b/backend/manager/modules/dal/src/test/resources/fixtures.xml index 8dadfc2..a85f503 100644 --- a/backend/manager/modules/dal/src/test/resources/fixtures.xml +++ b/backend/manager/modules/dal/src/test/resources/fixtures.xml @@ -513,6 +513,7 @@ <column>gluster_service</column> <column>count_threads_as_cores</column> <column>tunnel_migration</column> + <column>emulated_machine</column> <row> <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d1</value> <value>rhel6.iscsi</value> @@ -528,10 +529,11 @@ <value>200</value> <value>2.3</value> <value>0</value> - <value>true</value> + <value>t/rue</value> <value>false</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> <row> <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d2</value> @@ -552,6 +554,7 @@ <value>false</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> <row> <value>b399944a-81ab-4ec5-8266-e19ba7c3c9d3</value> @@ -572,6 +575,7 @@ <value>false</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> <row> <value>0e57070e-2469-4b38-84a2-f111aaabd49d</value> @@ -592,6 +596,7 @@ <value>false</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> <row> <value>eba797fb-8e3b-4777-b63c-92e7a5957d7c</value> @@ -612,6 +617,7 @@ <value>false</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> <row> <value>eba797fb-8e3b-4777-b63c-92e7a5957d7d</value> @@ -632,6 +638,7 @@ <value>false</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> <row> <value>eba797fb-8e3b-4777-b63c-92e7a5957d7e</value> @@ -652,6 +659,7 @@ <value>false</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> <row> <value>eba797fb-8e3b-4777-b63c-92e7a5957d7f</value> @@ -672,6 +680,7 @@ <value>false</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> <row> <value>ae956031-6be2-43d6-bb8f-5191c9253314</value> @@ -692,6 +701,7 @@ <value>true</value> <value>false</value> <value>false</value> + <value>pc-1.0</value> </row> </table> @@ -1740,6 +1750,7 @@ <column>hw_serial_number</column> <column>hw_uuid</column> <column>hw_family</column> + <column>supported_emulated_machines</column> <row> <value>afce7a39-8e8c-4819-ba9c-796d316592e6</value> <value>3</value> @@ -1786,6 +1797,7 @@ <null /> <null /> <null /> + <value>rhel6.4,rhel6.4,pc-1.1,pc-1.0</value> </row> <row> <value>afce7a39-8e8c-4819-ba9c-796d316592e7</value> @@ -1833,6 +1845,7 @@ <null /> <null /> <null /> + <value>rhel6.4,rhel6.4,pc-1.1,pc-1.0</value> </row> <row> <value>afce7a39-8e8c-4819-ba9c-796d316592e8</value> @@ -1880,6 +1893,7 @@ <null /> <null /> <null /> + <value>rhel6.4,rhel6.4,pc-1.1,pc-1.0</value> </row> <row> <value>23f6d691-5dfb-472b-86dc-9e1d2d3c18f3</value> @@ -1927,6 +1941,7 @@ <null /> <null /> <null /> + <value>rhel6.4,rhel6.4,pc-1.1,pc-1.0</value> </row> <row> <value>2001751e-549b-4e7a-aff6-32d36856c125</value> @@ -1974,6 +1989,7 @@ <null /> <null /> <null /> + <value>rhel6.4,rhel6.4,pc-1.1,pc-1.0</value> </row> </table> 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 4fe2a76..d6bdb64 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 @@ -333,6 +333,8 @@ vds.setSupportedEngines(AssignStringValueFromArray(xmlRpcStruct, VdsProperties.supported_engines)); vds.setIScsiInitiatorName(AssignStringValue(xmlRpcStruct, VdsProperties.iSCSIInitiatorName)); + vds.setSupportedEmulatedMachines(AssignStringValueFromArray(xmlRpcStruct, VdsProperties.emulatedMachines)); + String hooksStr = ""; // default value if hooks is not in the xml rpc struct if (xmlRpcStruct.containsKey(VdsProperties.hooks)) { hooksStr = xmlRpcStruct.get(VdsProperties.hooks).toString(); 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 a38ed83..dad8284 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 @@ -108,6 +108,7 @@ public static final String supported_cluster_levels = "clusterLevels"; public static final String supported_engines = "supportedENGINEs"; public static final String emulatedMachine = "emulatedMachine"; + public static final String emulatedMachines = "emulatedMachines"; public static final String host_os = "operatingSystem"; public static final String packages = "packages"; public static final String packages2 = "packages2"; -- To view, visit http://gerrit.ovirt.org/15864 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I25df8376026f3e5f57ce85d8e7a20e5000ce7eed Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
