Michael Pasternak has posted comments on this change.
Change subject: core: osinfo - Remove Unassigned and map it to Other
......................................................................
Patch Set 4: I would prefer that you didn't submit this
(7 inline comments)
....................................................
File
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/OsType.java
Line 22: * {@link org.ovirt.engine.core.common.osinfo.OsRepository}
Line 23: */
Line 24: @Deprecated
Line 25: public enum OsType {
Line 26: @Deprecated // this value is kept for backward compatibility but
shouldn't be used. Please use "OTHER" instead.
please file documentation bug on this.
Line 27: UNASSIGNED,
Line 28: WINDOWS_XP,
Line 29: WINDOWS_2003,
Line 30: WINDOWS_2008,
....................................................
File
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/model/OsTypeUtils.java
Line 19: for (String uniqueName :
osRepository.getUniqueOsNames().values()) {
Line 20: osTypeValues.add(uniqueName);
Line 21: }
Line 22: for (OsType type : OsType.values()) {
Line 23: osTypeValues.add(type.value().toLowerCase());
.value() returns .name().toLowerCase()
Line 24: }
Line 25: }
Line 26:
Line 27: private OsTypeUtils() {
....................................................
File
backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/OsValidator.java
Line 15: @Override
Line 16: public void validateEnums(OperatingSystem os) {
Line 17: if (os != null) {
Line 18: if (os.isSetType()) {
Line 19: validateEnum(OsType.class, OsTypeUtils.getAllValues(),
os.getType(), false);
why do you change here to /false, your validateEnum() [1] will fail here for
OsType enums as all enum's are represented in lower case at api
[1] return Enum.valueOf(clz, toUppercase ? name.toUpperCase() : name).name();
Line 20: }
Line 21: if (os.isSetBoot()) {
Line 22: for (Boot boot : os.getBoot()) {
Line 23: bootValidator.validateEnums(boot);
....................................................
File
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/TemplateMapper.java
Line 258: entity.getInitrdUrl() != null ||
Line 259: entity.getKernelParams() != null) {
Line 260: OperatingSystem os = new OperatingSystem();
Line 261:
Line 262:
os.setType(SimpleDependecyInjector.getInstance().get(OsRepository.class).getUniqueOsNames().get(entity.getOsId()));
same comment as in VmMapper for corresponding mapping
Line 263:
Line 264: if (entity.getDefaultBootSequence() != null) {
Line 265: for (Boot boot :
VmMapper.map(entity.getDefaultBootSequence(), null)) {
Line 266: os.getBoot().add(boot);
....................................................
File
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
Line 245: OsType osType = OsType.fromValue(type);
Line 246: if (osType != null) {
Line 247: return map(osType,Integer.class);
Line 248: } else {
Line 249: return
SimpleDependecyInjector.getInstance().get(OsRepository.class).getOsIdByUniqueName(type);
what
SimpleDependecyInjector.getInstance().get(OsRepository.class).getOsIdByUniqueName(type);
does? can it return NULL if it's can't find the member or will it fail with
exception?
Line 250: }
Line 251: }
Line 252:
Line 253: @Mapping(from = VmAffinity.class, to = MigrationSupport.class)
Line 307: entity.getKernelParams() != null) {
Line 308: OperatingSystem os = new OperatingSystem();
Line 309:
Line 310:
os.setType(SimpleDependecyInjector.getInstance().get(OsRepository.class).getUniqueOsNames().get(entity.getVmOsId()));
Line 311:
are backend and api enum members the same? otherwise you break api here ..., i
think you should try to map to public OsType then (if not in OsType) return
backend enum here
Line 312: os.setKernel(entity.getKernelUrl());
Line 313: os.setInitrd(entity.getInitrdUrl());
Line 314: os.setCmdline(entity.getKernelParams());
Line 315: model.setOs(os);
....................................................
File
backend/manager/modules/restapi/types/src/test/java/org/ovirt/engine/api/restapi/utils/OsTypeMockUtils.java
Line 16
Line 17
Line 18
Line 19
Line 20
why to remove this test? it's still valid
--
To view, visit http://gerrit.ovirt.org/16679
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ie508a8828caedf4cb8fdf971e14139404f7dded3
Gerrit-PatchSet: 4
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <[email protected]>
Gerrit-Reviewer: Itamar Heim <[email protected]>
Gerrit-Reviewer: Michael Pasternak <[email protected]>
Gerrit-Reviewer: Michal Skrivanek <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Roy Golan <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
