Merge pull request juju#12 from 4a6f656c/caas-prototype-refresh

api,cmd/modelcmd: bring model type through to store.
mikemccracken · Apr 10, 2017 · d80ca5c · d80ca5c
2 parents 04efb01 + e4fbbfc
commit d80ca5c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/api/base/types.go b/api/base/types.go
@@ -16,6 +16,7 @@ import (
 type UserModel struct {
 	Name           string
 	UUID           string
+	Type           string
 	Owner          string
 	LastConnection *time.Time
 }

diff --git a/api/modelmanager/modelmanager.go b/api/modelmanager/modelmanager.go
@@ -170,6 +170,7 @@ func (c *Client) ListModels(user string) ([]base.UserModel, error) {
 		result[i] = base.UserModel{
 			Name:           model.Name,
 			UUID:           model.UUID,
+			Type:           model.Type,
 			Owner:          owner.Id(),
 			LastConnection: model.LastConnection,
 		}

diff --git a/cmd/modelcmd/base.go b/cmd/modelcmd/base.go
@@ -239,7 +239,10 @@ func (c *JujuCommandBase) RefreshModels(store jujuclient.ClientStore, controller
 		return errors.Trace(err)
 	}
 	for _, model := range models {
-		modelDetails := jujuclient.ModelDetails{ModelUUID: model.UUID}
+		modelDetails := jujuclient.ModelDetails{
+			ModelUUID: model.UUID,
+			Type:      jujuclient.ModelType(model.Type),
+		}
 		owner := names.NewUserTag(model.Owner)
 		modelName := jujuclient.JoinOwnerModelName(owner, model.Name)
 		if err := store.UpdateModel(controllerName, modelName, modelDetails); err != nil {