Michael Pasternak has posted comments on this change.
Change subject: core, restapi: cloud-init [1/6] - multiple files in VM Payload
......................................................................
Patch Set 8: I would prefer that you didn't submit this
(4 inline comments)
....................................................
File
backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd
Line 2054: <xs:element name="payload" type="Payload"/>
Line 2055:
Line 2056: <xs:complexType name="Payload">
Line 2057: <xs:sequence>
Line 2058: <xs:element name="file" type="PayloadFile" minOccurs="0"
maxOccurs="unbounded"/>
this change is not correct, for 1:N relation should be used "Payloads" type
defined above
(note "payload" also has file descriptor in it, so it should contain single
file)
Line 2059: </xs:sequence>
Line 2060: <xs:attribute name="type" type="xs:string">
Line 2061: <xs:annotation>
Line 2062: <xs:appinfo>
....................................................
File
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmResourceTest.java
Line 841:
Line 842: private VmPayload getPayloadModel() {
Line 843: VmPayload payload = new VmPayload();
Line 844: payload.setType(VmDeviceType.CDROM);
Line 845: payload.getFiles().put("payloadFile", PAYLOAD_COMTENT);
this change is not correct for other content where Payload is used, obviously
it has Base64 encoding there
Line 846: return payload;
Line 847: }
Line 848:
Line 849: protected void setUpGetNoPayloadExpectations(int index, int
times) throws Exception {
....................................................
File
backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/BackendVmsResourceTest.java
Line 777:
Line 778: private VmPayload getPayloadModel() {
Line 779: VmPayload payload = new VmPayload();
Line 780: payload.setType(VmDeviceType.CDROM);
Line 781: payload.getFiles().put("payloadFile", PAYLOAD_COMTENT);
this change is not correct for other content where Payload is used, obviously
it has Base64 encoding there
Line 782: return payload;
Line 783: }
Line 784:
Line 785: private void setUpGetCertuficateExpectations(int times) throws
Exception {
....................................................
File
backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/VmMapper.java
Line 818: }
Line 819: }
Line 820: return 0;
Line 821: }
Line 822:
i guess all these changes are not relevant after api.xsd comment
Line 823: @Mapping(from = VmPayload.class, to = Payload.class)
Line 824: public static Payload map(VmPayload entity, Payload template) {
Line 825: if (entity.getType() != null || entity.getFiles().isEmpty()) {
Line 826: Payload model = template != null ? template : new
Payload();
--
To view, visit http://gerrit.ovirt.org/14348
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: I70934b8013459037f3d56573f80915bfa6b42bb4
Gerrit-PatchSet: 8
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <[email protected]>
Gerrit-Reviewer: Michael Pasternak <[email protected]>
Gerrit-Reviewer: Michal Skrivanek <[email protected]>
Gerrit-Reviewer: Omer Frenkel <[email protected]>
Gerrit-Reviewer: Oved Ourfali <[email protected]>
Gerrit-Reviewer: Shahar Havivi <[email protected]>
Gerrit-Reviewer: oVirt Jenkins CI Server
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches
