Wrong generate parse code for `blockIODeviceWeight` and `blockIODeviceThrottle`

[0x0916]

The current generate.py generate wrong parse code for blockIODeviceWeight and blockIODeviceThrottle.

I think we need to process Validation keywords allOf specially?

[giuseppe]

do you have any example of how the JSON for blockIODeviceWeight and blockIODeviceThrottle looks like? I can't find anything in the OCI specs to quickly validate what is going on

[0x0916]

@giuseppe the following JSON comes from OCI spec:

{
    "linux": {
        "resources": {
            "blockIO": {
                "weight": 10,
                "leafWeight": 10,
                "weightDevice": [
                    {
                        "major": 8,
                        "minor": 0,
                        "weight": 500,
                        "leafWeight": 300
                    },
                    {
                        "major": 8,
                        "minor": 16,
                        "weight": 500
                    }
                ],
                "throttleReadBpsDevice": [
                    {
                        "major": 8,
                        "minor": 0,
                        "rate": 600
                    }
                ],
                "throttleWriteIOPSDevice": [
                    {
                        "major": 8,
                        "minor": 16,
                        "rate": 300
                    }
                ]
            }
        }
    }
}

we expect to generate the code as:

typedef struct {
    uint64_t rate;
    int64_t major;
    int64_t minor;
} oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element;

void free_oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element (oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element *ptr);
oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element *make_oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element (yajl_val val, struct libocispec_context *ctx, oci_parser_error *err);

But the current generate.py generate the following code:

typedef struct {
    int64_t major;
    int64_t minor;
} oci_container_blockIODevice;
void free_oci_container_blockIODevice (oci_container_blockIODevice *ptr);
oci_container_blockIODevice *make_oci_container_blockIODevice (yajl_val val, struct libocispec_context *ctx, oci_parser_error *err);

typedef struct {
    uint64_t rate;
} oci_container_linux_resources_blockIO_throttleWriteBpsDevice;
void free_oci_container_linux_resources_blockIO_throttleWriteBpsDevice (oci_container_linux_resources_blockIO_throttleWriteBpsDevice *ptr);
oci_container_linux_resources_blockIO_throttleWriteBpsDevice *make_oci_container_linux_resources_blockIO_throttleWriteBpsDevice (yajl_val val, struct libocispec_context *ctx, oci_parser_error *err);

typedef struct {
    oci_container_blockIODevice *blockIODevice;
    oci_container_linux_resources_blockIO_throttleWriteBpsDevice *throttleWriteBpsDevice;
} oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element;

void free_oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element (oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element *ptr);
oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element *make_oci_container_linux_resources_blockIO_throttleWriteBpsDevice_element (yajl_val val, struct libocispec_context *ctx, oci_parser_error *err);

[giuseppe]

much easier to investigate it with an example :) Thanks!

I've just pushed a patch that should fix it: giuseppe@3c6da06

Can you try with the last version?

[0x0916]

@giuseppe Thanks, it works.

but I also found the issue which fix by your patch giuseppe@69a98b7

I think that the runtime-spec's schema should be update as

s/throttleWriteIopsDevice/throttleWriteIOPSDevice/g.

[0x0916]

@giuseppe I make a pr for runtime-spec: opencontainers/runtime-spec#899, once it merged, please update the runtime-spec for libocispec.

[giuseppe]

@0x0916 sure, thanks for doing that. I'll close this issue for now, as anyway once I update runtime-spec I'll notice the failure in the parser