← Back to branch summary

~thumper/juju-core/more-ipperms

« back to all changes in this revision

Viewing changes to cmd/juju/status.go

  • Committer: William Reade
  • Author(s): William Reade
  • Date: 2013-04-19 13:05:24 UTC
  • mfrom: (1184.1.2 juju-core)
  • Revision ID: fwereade@gmail.com-20130419130524-fk8uqt8wwldbyb8u
cmd/juju: alphabetise status output fields

R=dimitern
CC=
https://codereview.appspot.com/8834047

Show diffs side-by-side

added added

removed removed

Lines of Context:
cmd/juju/status.go
309
309
 
310
310
type machineStatus struct {
311
311
        Err            error            `json:"-" yaml:",omitempty"`
312
 
        Series         string           `json:"series,omitempty" yaml:"series,omitempty"`
313
 
        InstanceId     state.InstanceId `json:"instance-id,omitempty" yaml:"instance-id,omitempty"`
314
 
        DNSName        string           `json:"dns-name,omitempty" yaml:"dns-name,omitempty"`
315
 
        Life           string           `json:"life,omitempty" yaml:"life,omitempty"`
316
 
        AgentVersion   string           `json:"agent-version,omitempty" yaml:"agent-version,omitempty"`
317
312
        AgentState     params.Status    `json:"agent-state,omitempty" yaml:"agent-state,omitempty"`
318
313
        AgentStateInfo string           `json:"agent-state-info,omitempty" yaml:"agent-state-info,omitempty"`
 
314
        AgentVersion   string           `json:"agent-version,omitempty" yaml:"agent-version,omitempty"`
 
315
        DNSName        string           `json:"dns-name,omitempty" yaml:"dns-name,omitempty"`
 
316
        InstanceId     state.InstanceId `json:"instance-id,omitempty" yaml:"instance-id,omitempty"`
319
317
        InstanceState  string           `json:"instance-state,omitempty" yaml:"instance-state,omitempty"`
 
318
        Life           string           `json:"life,omitempty" yaml:"life,omitempty"`
 
319
        Series         string           `json:"series,omitempty" yaml:"series,omitempty"`
320
320
}
321
321
 
322
322
// A goyaml bug means we can't declare these types
347
347
 
348
348
type serviceStatus struct {
349
349
        Err           error                 `json:"-" yaml:",omitempty"`
350
 
        Life          string                `json:"life,omitempty" yaml:"life,omitempty"`
351
350
        Charm         string                `json:"charm" yaml:"charm"`
352
351
        Exposed       bool                  `json:"exposed" yaml:"exposed"`
353
 
        Units         map[string]unitStatus `json:"units,omitempty" yaml:"units,omitempty"`
 
352
        Life          string                `json:"life,omitempty" yaml:"life,omitempty"`
354
353
        Relations     map[string][]string   `json:"relations,omitempty" yaml:"relations,omitempty"`
355
354
        SubordinateTo []string              `json:"subordinate-to,omitempty" yaml:"subordinate-to,omitempty"`
 
355
        Units         map[string]unitStatus `json:"units,omitempty" yaml:"units,omitempty"`
356
356
}
357
357
type serviceStatusNoMarshal serviceStatus
358
358
 
374
374
 
375
375
type unitStatus struct {
376
376
        Err            error                 `json:"-" yaml:",omitempty"`
377
 
        PublicAddress  string                `json:"public-address,omitempty" yaml:"public-address,omitempty"`
378
 
        Machine        string                `json:"machine,omitempty" yaml:"machine,omitempty"`
379
 
        Life           string                `json:"life,omitempty" yaml:"life,omitempty"`
380
 
        AgentVersion   string                `json:"agent-version,omitempty" yaml:"agent-version,omitempty"`
381
377
        AgentState     params.Status         `json:"agent-state,omitempty" yaml:"agent-state,omitempty"`
382
378
        AgentStateInfo string                `json:"agent-state-info,omitempty" yaml:"agent-state-info,omitempty"`
 
379
        AgentVersion   string                `json:"agent-version,omitempty" yaml:"agent-version,omitempty"`
 
380
        Life           string                `json:"life,omitempty" yaml:"life,omitempty"`
 
381
        Machine        string                `json:"machine,omitempty" yaml:"machine,omitempty"`
 
382
        PublicAddress  string                `json:"public-address,omitempty" yaml:"public-address,omitempty"`
383
383
        Subordinates   map[string]unitStatus `json:"subordinates,omitempty" yaml:"subordinates,omitempty"`
384
384
}
385
385