Add support for model type #19

Merged
merged 1 commit into from Aug 22, 2017

Conversation

Projects
None yet
2 participants

mjs commented Aug 22, 2017

Juju is starting to introduce different model types. This requires support in the model serialisation format.

This bumps the serialisation format.

model.go
@@ -1176,6 +1192,10 @@ func newModelFromValid(valid map[string]interface{}, importVersion int) (*model,
CloudRegion_: valid["cloud-region"].(string),
StatusHistory_: newStatusHistory(),
}
+ if rawType, found := valid["type"]; found {
@howbazaar

howbazaar Aug 22, 2017

Owner

In other places we have explicitly depended on the importVersion rather than existence of a value in the valid map.

@mjs

mjs Aug 22, 2017

Ah right... yeah that's better. I'll do that.

Add support for model type
Juju is starting to introduce different model types. This requires
support in the model serialisation format.

This bumps the serialisation format.

@howbazaar howbazaar merged commit fedf2ab into juju:master Aug 22, 2017

@mjs mjs deleted the mjs:model-type branch Aug 22, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment