← Back to branch summary

~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/apiserver/common/getstatus.go

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/apiserver/common/getstatus.go
11
11
 
12
12
        "github.com/juju/juju/apiserver/params"
13
13
        "github.com/juju/juju/state"
 
14
        "github.com/juju/juju/status"
14
15
)
15
16
 
16
17
// ErrIsNotLeader is an error for operations that require for a
46
47
                return result
47
48
        }
48
49
        switch getter := entity.(type) {
49
 
        case state.StatusGetter:
 
50
        case status.StatusGetter:
50
51
                statusInfo, err := getter.Status()
51
 
                result.Status = params.Status(statusInfo.Status)
 
52
                result.Status = statusInfo.Status
52
53
                result.Info = statusInfo.Message
53
54
                result.Data = statusInfo.Data
54
55
                result.Since = statusInfo.Since
170
171
                        result.Results[i].Error = ServerError(err)
171
172
                        continue
172
173
                }
173
 
                result.Results[i].Service.Status = params.Status(serviceStatus.Status)
 
174
                result.Results[i].Service.Status = serviceStatus.Status
174
175
                result.Results[i].Service.Info = serviceStatus.Message
175
176
                result.Results[i].Service.Data = serviceStatus.Data
176
177
                result.Results[i].Service.Since = serviceStatus.Since
178
179
                result.Results[i].Units = make(map[string]params.StatusResult, len(unitStatuses))
179
180
                for uTag, r := range unitStatuses {
180
181
                        ur := params.StatusResult{
181
 
                                Status: params.Status(r.Status),
 
182
                                Status: r.Status,
182
183
                                Info:   r.Message,
183
184
                                Data:   r.Data,
184
185
                                Since:  r.Since,
190
191
}
191
192
 
192
193
// EntityStatusFromState converts a state.StatusInfo into a params.EntityStatus.
193
 
func EntityStatusFromState(status state.StatusInfo) params.EntityStatus {
 
194
func EntityStatusFromState(status status.StatusInfo) params.EntityStatus {
194
195
        return params.EntityStatus{
195
 
                params.Status(status.Status),
 
196
                status.Status,
196
197
                status.Message,
197
198
                status.Data,
198
199
                status.Since,