Michael Pasternak has posted comments on this change. Change subject: restapi: Rest API for brick advanced details ......................................................................
Patch Set 1: I would prefer that you didn't submit this (12 inline comments) .................................................... File backend/manager/modules/restapi/interface/definition/src/main/resources/api.xsd Line 2917: </xs:sequence> Line 2918: </xs:extension> Line 2919: </xs:complexContent> Line 2920: </xs:complexType> Line 2921: please add element definition <xs:element name="gluster_client" type="GlusterClient"/> Line 2922: <xs:complexType name="GlusterClient"> Line 2923: <xs:sequence> Line 2924: <xs:element name="host_name" type="xs:string" minOccurs="0" maxOccurs="1"/> Line 2925: <xs:element name="client_port" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2926: <xs:element name="bytes_read" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2927: <xs:element name="bytes_written" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2928: </xs:sequence> Line 2929: </xs:complexType> Line 2930: please add element definition <xs:element name="gluster_clients" type="GlusterClients"/> Line 2931: <xs:complexType name="GlusterClients"> Line 2932: <xs:sequence> Line 2933: <xs:annotation> Line 2934: <xs:appinfo> Line 2927: <xs:element name="bytes_written" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2928: </xs:sequence> Line 2929: </xs:complexType> Line 2930: Line 2931: <xs:complexType name="GlusterClients"> all collections should inherit from the BaseResources Line 2932: <xs:sequence> Line 2933: <xs:annotation> Line 2934: <xs:appinfo> Line 2935: <jaxb:property name="GlusterClients"/> Line 2934: <xs:appinfo> Line 2935: <jaxb:property name="GlusterClients"/> Line 2936: </xs:appinfo> Line 2937: </xs:annotation> Line 2938: <xs:element name="client" type="GlusterClient" minOccurs="0" maxOccurs="unbounded"/> use gluster_clients ref instead. Line 2939: </xs:sequence> Line 2940: </xs:complexType> Line 2941: Line 2942: <xs:complexType name="MemoryPool"> Line 2937: </xs:annotation> Line 2938: <xs:element name="client" type="GlusterClient" minOccurs="0" maxOccurs="unbounded"/> Line 2939: </xs:sequence> Line 2940: </xs:complexType> Line 2941: please add element definition as described above. Line 2942: <xs:complexType name="MemoryPool"> Line 2943: <xs:sequence> Line 2944: <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/> Line 2945: <xs:element name="hot_count" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2938: <xs:element name="client" type="GlusterClient" minOccurs="0" maxOccurs="unbounded"/> Line 2939: </xs:sequence> Line 2940: </xs:complexType> Line 2941: Line 2942: <xs:complexType name="MemoryPool"> GlusterMemoryPool? Line 2943: <xs:sequence> Line 2944: <xs:element name="name" type="xs:string" minOccurs="0" maxOccurs="1"/> Line 2945: <xs:element name="hot_count" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2946: <xs:element name="cold_count" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2950: <xs:element name="pool_misses" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2951: <xs:element name="max_std_alloc" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2952: </xs:sequence> Line 2953: </xs:complexType> Line 2954: please add element definition as described above. Line 2955: <xs:complexType name="MemoryPools"> Line 2956: <xs:sequence> Line 2957: <xs:annotation> Line 2958: <xs:appinfo> Line 2951: <xs:element name="max_std_alloc" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2952: </xs:sequence> Line 2953: </xs:complexType> Line 2954: Line 2955: <xs:complexType name="MemoryPools"> 1. GlusterMemoryPools? 2. all collections should inherit from the BaseResources Line 2956: <xs:sequence> Line 2957: <xs:annotation> Line 2958: <xs:appinfo> Line 2959: <jaxb:property name="MemoryPools"/> Line 2961: </xs:annotation> Line 2962: <xs:element name="memory_pool" type="MemoryPool" minOccurs="0" maxOccurs="unbounded"/> Line 2963: </xs:sequence> Line 2964: </xs:complexType> Line 2965: please add element definition as described above. Line 2966: <xs:complexType name="GlusterBrickMemoryInfo"> Line 2967: <xs:sequence> Line 2968: <!-- equivalent to arena --> Line 2969: <xs:element name="total_alloc" type="xs:int" minOccurs="0" maxOccurs="1"/> Line 2988: <xs:element name="memory_pools" type="MemoryPools" minOccurs="0" maxOccurs="1"/> Line 2989: </xs:sequence> Line 2990: </xs:complexType> Line 2991: Line 2992: <xs:element name="brick_details" type="GlusterBrickAdvancedDetails" /> - Type should be called GlusterBrickDetails (there is no difference between BrickDetails and AdvancedBricksDetails in xml, simply because you can choose elements not to appear for regular details) - or on other hand, you can create type GlusterAdvancedBricksDetails and make GlusterBrick to inherit from it (i prefer this solution) Line 2993: <xs:complexType name="GlusterBrickAdvancedDetails"> Line 2994: <xs:annotation> Line 2995: <xs:appinfo> Line 2996: <jaxb:class name="GlusterBrickAdvancedDetails"/> Line 3028: <xs:element ref="gluster_volume" minOccurs="0" maxOccurs="1"/> Line 3029: <xs:element name="server_id" type="xs:string" minOccurs="0" maxOccurs="1"/> Line 3030: <xs:element name="brick_dir" type="xs:string" minOccurs="0" maxOccurs="1"/> Line 3031: <xs:element ref="status" minOccurs="0" maxOccurs="1"/> Line 3032: <xs:element ref="brick_details" minOccurs="0" maxOccurs="1"/> i'd suggest GlusterBrick inheriting from the GlusterAdvancedBrickDetails rather using element to add extra details to Brick Line 3033: </xs:sequence> Line 3034: </xs:extension> Line 3035: </xs:complexContent> Line 3036: </xs:complexType> .................................................... File backend/manager/modules/restapi/jaxrs/src/test/java/org/ovirt/engine/api/restapi/resource/gluster/BackendGlusterBrickResourceTest.java Line 111: Line 112: resource.setParent(bricksResourceMock); Line 113: control.replay(); Line 114: Line 115: verifyModel(resource.get(), 0); don't you want to verify AdvancedDetails here? Line 116: Line 117: } Line 118: Line 119: @Test -- To view, visit http://gerrit.ovirt.org/11391 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ie219c7cf59fec8a21a54f34959ee5966eed7d524 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Sahina Bose <sab...@redhat.com> Gerrit-Reviewer: Michael Pasternak <mpast...@redhat.com> Gerrit-Reviewer: Shireesh Anjal <san...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
