Fix blkio major/minor json marshaling

[crosbymichael]

Currently ffjson does not support embedded structs so we can just remove
that. Its only saving us ~2 lines of code to have this embeded struct
so we can just remove it.

Signed-off-by: Michael Crosby [email protected]

[wking]

More disussion on IRC 1. Previous discussion on why this was an
anonymous structure in #232 and 2.

Do you want to update the JSON Schema as well?

$ git grep blockIODevice 45cc9f8
45cc9f8:schema/defs-linux.json: "blockIODevice": {
45cc9f8:schema/defs-linux.json: "blockIODeviceWeight": {
45cc9f8:schema/defs-linux.json: "$ref": "#/definitions/blockIODevice"
45cc9f8:schema/defs-linux.json: "blockIODeviceWeightPointer": {
45cc9f8:schema/defs-linux.json: "$ref": "#/definitions/blockIODeviceWeight"
45cc9f8:schema/defs-linux.json: "blockIODeviceThrottle": {
45cc9f8:schema/defs-linux.json: "$ref": "#/definitions/blockIODevice"
45cc9f8:schema/defs-linux.json: "blockIODeviceThrottlePointer": {
45cc9f8:schema/defs-linux.json: "$ref": "#/definitions/blockIODeviceThrottle"
45cc9f8:schema/schema-linux.json: "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
45cc9f8:schema/schema-linux.json: "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
45cc9f8:schema/schema-linux.json: "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
45cc9f8:schema/schema-linux.json: "$ref": "defs-linux.json#/definitions/blockIODeviceThrottlePointer"
45cc9f8:schema/schema-linux.json: "$ref": "defs-linux.json#/definitions/blockIODeviceWeightPointer"

I'd guess the current JSON Schema is compatible (although I haven't
checked), but it looks like @vbatts was picking names to match the Go
types. I'm not sure if he intended for them to stay synchronized or
not.

Other than that, 45cc9f8 looks good to me (although I'd also be
fine just patching ffjson 3).

[vbatts]

I'm working on other updates for the json schema as well.

On Wed, Mar 30, 2016, 18:37 W. Trevor King [email protected] wrote:

More disussion on IRC 1. Previous discussion on why this was an
anonymous structure in #232 and 2.

Do you want to update the JSON Schema as well?

$ git grep blockIODevice 45cc9f8
45cc9f8:schema/defs-linux.json: "blockIODevice": {
45cc9f8:schema/defs-linux.json: "blockIODeviceWeight": {
45cc9f8:schema/defs-linux.json: "$ref": "#/definitions/blockIODevice"
45cc9f8:schema/defs-linux.json: "blockIODeviceWeightPointer": {
45cc9f8:schema/defs-linux.json: "$ref":
"#/definitions/blockIODeviceWeight"
45cc9f8:schema/defs-linux.json: "blockIODeviceThrottle": {
45cc9f8:schema/defs-linux.json: "$ref": "#/definitions/blockIODevice"
45cc9f8:schema/defs-linux.json: "blockIODeviceThrottlePointer": {
45cc9f8:schema/defs-linux.json: "$ref":
"#/definitions/blockIODeviceThrottle"
45cc9f8:schema/schema-linux.json: "$ref":
"defs-linux.json#/definitions/blockIODeviceThrottlePointer"
45cc9f8:schema/schema-linux.json: "$ref":
"defs-linux.json#/definitions/blockIODeviceThrottlePointer"
45cc9f8:schema/schema-linux.json: "$ref":
"defs-linux.json#/definitions/blockIODeviceThrottlePointer"
45cc9f8:schema/schema-linux.json: "$ref":
"defs-linux.json#/definitions/blockIODeviceThrottlePointer"
45cc9f8:schema/schema-linux.json: "$ref":
"defs-linux.json#/definitions/blockIODeviceWeightPointer"

I'd guess the current JSON Schema is compatible (although I haven't
checked), but it looks like @vbatts was picking names to match the Go
types. I'm not sure if he intended for them to stay synchronized or
not.

Other than that, blockIODevice looks good to me (although I'd also be
fine just patching ffjson 3).

—
You are receiving this because you were mentioned.

Reply to this email directly or view it on GitHub
#361 (comment)

[JakeWarner]

ffjson has an open issue/pull request related to this issue as a whole (beyond just removing the anonymous struct): pquerna/ffjson#172