Eli Mesika has posted comments on this change. Change subject: REST API: Adding external status to API ......................................................................
Patch Set 1: (3 comments) https://gerrit.ovirt.org/#/c/42137/1/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java File backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendEventsResource.java: Line 90: event.getHost().getExternalStatus().getState()), null)); Line 91: } Line 92: else if (isStorageDomainExternalStateDefined) { Line 93: parameters = new AddExternalEventParameters(map(event), Line 94: HostMapper.map(EntityExternalStatus.fromValue( > HostMapper? Isn't this if branch for StorageDomain? Maybe that map method s Will refactor and create ExternalStatusMapper that will be used both from host and SD Line 95: event.getStorageDomain().getExternalStatus().getState()), null)); Line 96: } Line 97: else{ Line 98: parameters = new AddExternalEventParameters(map(event), null); https://gerrit.ovirt.org/#/c/42137/1/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/StorageDomainValidator.java File backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/validation/StorageDomainValidator.java: Line 27: if (storageDomain.isSetStorage() && storageDomain.getStorage().isSetNfsVersion()) { Line 28: validateEnum(NfsVersion.class, storageDomain.getStorage().getNfsVersion(), true); Line 29: } Line 30: if (storageDomain.isSetExternalStatus()) { Line 31: validateEnum(EntityExternalStatus.class, storageDomain.getExternalStatus().getState().toUpperCase()); > The call to "getState().toUpperCase()" here may generate a NPE. You need to will fix Line 32: } Line 33: } Line 34: } https://gerrit.ovirt.org/#/c/42137/1/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java File backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/StorageDomainMapper.java: Line 143: StorageDomainStatus status = map(entity.getStatus(), null); Line 144: model.setStatus(status==null ? null : StatusUtils.create(status)); Line 145: } Line 146: if (entity.getExternalStatus() != null) { Line 147: // Reuse enum mappings fro HostMapper > Move it to a new ExternalStatusMapper class. will do Line 148: EntityExternalStatus entityExternalStatus = HostMapper.map(entity.getExternalStatus(), null); Line 149: Status hostStatus = new Status(); Line 150: hostStatus.setState(entityExternalStatus.value()); Line 151: model.setExternalStatus(hostStatus); -- To view, visit https://gerrit.ovirt.org/42137 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I4d748b1123c4dafc7776d79097eec8e94793bf1d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Eli Mesika <emes...@redhat.com> Gerrit-Reviewer: Allon Mureinik <amure...@redhat.com> Gerrit-Reviewer: Eli Mesika <emes...@redhat.com> Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Juan Hernandez <juan.hernan...@redhat.com> Gerrit-Reviewer: Ori Liel <ol...@redhat.com> Gerrit-Reviewer: Oved Ourfali <oourf...@redhat.com> Gerrit-Reviewer: Tal Nisan <tni...@redhat.com> Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: Yes _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches