← 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/cmd/juju/status/output_summary.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/cmd/juju/status/output_summary.go
13
13
        "github.com/juju/errors"
14
14
        "github.com/juju/utils/set"
15
15
 
16
 
        "github.com/juju/juju/apiserver/params"
17
16
        "github.com/juju/juju/cmd/juju/common"
 
17
        "github.com/juju/juju/status"
18
18
)
19
19
 
20
20
// FormatSummary returns a summary of the current environment
68
68
                ipAddrs:     make([]net.IPNet, 0),
69
69
                netStrings:  make([]string, 0),
70
70
                openPorts:   set.NewStrings(),
71
 
                stateToUnit: make(map[params.Status]int),
 
71
                stateToUnit: make(map[status.Status]int),
72
72
        }
73
73
        f.tw = tabwriter.NewWriter(&f.out, 0, 1, 1, ' ', 0)
74
74
        return f
80
80
        numUnits   int
81
81
        openPorts  set.Strings
82
82
        // status -> count
83
 
        stateToUnit map[params.Status]int
 
83
        stateToUnit map[status.Status]int
84
84
        tw          *tabwriter.Writer
85
85
        out         bytes.Buffer
86
86
}
121
121
        f.stateToUnit[status.WorkloadStatusInfo.Current]++
122
122
}
123
123
 
124
 
func (f *summaryFormatter) printStateToCount(m map[params.Status]int) {
125
 
        for _, status := range common.SortStringsNaturally(stringKeysFromMap(m)) {
126
 
                numInStatus := m[params.Status(status)]
127
 
                f.delimitValuesWithTabs(status+":", fmt.Sprintf(" %d ", numInStatus))
 
124
func (f *summaryFormatter) printStateToCount(m map[status.Status]int) {
 
125
        for _, stateToCount := range common.SortStringsNaturally(stringKeysFromMap(m)) {
 
126
                numInStatus := m[status.Status(stateToCount)]
 
127
                f.delimitValuesWithTabs(stateToCount+":", fmt.Sprintf(" %d ", numInStatus))
128
128
        }
129
129
}
130
130
 
154
154
        f.trackIp(ip.IP)
155
155
}
156
156
 
157
 
func (f *summaryFormatter) aggregateMachineStates(machines map[string]machineStatus) map[params.Status]int {
158
 
        stateToMachine := make(map[params.Status]int)
 
157
func (f *summaryFormatter) aggregateMachineStates(machines map[string]machineStatus) map[status.Status]int {
 
158
        stateToMachine := make(map[status.Status]int)
159
159
        for _, name := range common.SortStringsNaturally(stringKeysFromMap(machines)) {
160
160
                m := machines[name]
161
161
                f.resolveAndTrackIp(m.DNSName)
162
162
 
163
 
                if agentState := m.AgentState; agentState == "" {
164
 
                        agentState = params.StatusPending
 
163
                if agentState := m.JujuStatus.Current; agentState == "" {
 
164
                        agentState = status.StatusPending
165
165
                } else {
166
166
                        stateToMachine[agentState]++
167
167
                }