Roy Golan has submitted this change and it was merged. Change subject: core: osinfo - Rmove unassigned and streamline all ids with the REST ids. ...................................................................... core: osinfo - Rmove unassigned and streamline all ids with the REST ids. This patch renders the uniqe os ids to be exact as the REST OsType so there is no mapping needed at all. The effect it that every new os added to the system immediatly is reflected with no changes in the REST * REST - VmMapper - the mapper now converts from the osinfo values back * and forth. The osType enum is kept as reference for now. * REST - capabilities - merge the osinfo values with OsType values * osinfo.properties - rename all os uniqe ids to fit the REST ids. * UI - static content images names relayed on the uniqe names and * renamd accordingly Change-Id: Ie508a8828caedf4cb8fdf971e14139404f7dded3 Bug-Url: https://bugzilla.redhat.com/980813 Signed-off-by: Roy Golan <rgolan(a)redhat.com&gt; --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/osinfo/OsRepository.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/osinfo/OsRepositoryImpl.java M backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/osinfo/OsRepositoryImplTest.java M backend/manager/modules/restapi/interface/common/jaxrs/src/main/java/org/ovirt/engine/api/common/util/EnumValidator.java M backend/manager/modules/restapi/interface/definition/pom.xml A backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/OsTypeUtils.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/OsValidator.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java M backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/OsTypeMockUtils.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfTemplateReader.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/ovf/OvfVmReader.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/ApplicationResourcesWithLookup.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java D frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/Unassigned.jpg D frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/Unassigned.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/other.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/other_linux.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/rhel_3.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/rhel_3x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/rhel_4.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/rhel_4x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/rhel_5.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/rhel_5x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/rhel_6.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/rhel_6x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_2003.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_2003x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_2008.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_2008R2.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_2008R2x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_2008x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_2012x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_7.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_7x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_8.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_8x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/large/windows_xp.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/other.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/other_linux.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/rhel_3.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/rhel_3x64.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/rhel_4.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/rhel_4x64.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/rhel_5.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/rhel_5x64.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/rhel_6.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/rhel_6x64.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_2003.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_2003x64.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_2008.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_2008R2x64.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_2008x64.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_2012x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_7.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_7x64.jpg R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_8.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_8x64.png R frontend/webadmin/modules/userportal-gwtp/src/main/resources/org/ovirt/engine/ui/userportal/images/os/windows_xp.jpg M packaging/conf/osinfo-defaults.properties A packaging/dbscripts/upgrade/03_03_0660_alter_os_type_unassigned_to_other.sql 62 files changed, 328 insertions(+), 321 deletions(-) Approvals: Michael Pasternak: Looks good to me, but someone else must approve Roy Golan: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/16679 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie508a8828caedf4cb8fdf971e14139404f7dded3 Gerrit-PatchSet: 11 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: Itamar Heim <iheim(a)redhat.com&gt; Gerrit-Reviewer: Michael Pasternak <mpastern(a)redhat.com&gt; Gerrit-Reviewer: Michal Skrivanek <michal.skrivanek(a)redhat.com&gt; Gerrit-Reviewer: Omer Frenkel <ofrenkel(a)redhat.com&gt; Gerrit-Reviewer: Roy Golan <rgolan(a)redhat.com&gt; Gerrit-Reviewer: oVirt Jenkins CI Server