Reviewers: mp+159818_code.launchpad.net,

Message:
Please take a look.

Description:
cmd/juju: alphabetise status output fields



https://code.launchpad.net/~fwereade/juju-core/cosmetic-status-output/+merge/159818

(do not edit description out of merge proposal)


Please review this at https://codereview.appspot.com/8834047/

Affected files:
   A [revision details]
   M cmd/juju/status.go


Index: [revision details]
=== added file '[revision details]'
--- [revision details]	2012-01-01 00:00:00 +0000
+++ [revision details]	2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: cmd/juju/status.go
=== modified file 'cmd/juju/status.go'
--- cmd/juju/status.go	2013-04-18 14:18:36 +0000
+++ cmd/juju/status.go	2013-04-19 12:45:35 +0000
@@ -309,14 +309,14 @@

  type machineStatus struct {
  	Err            error            `json:"-" yaml:",omitempty"`
-	Series         string           `json:"series,omitempty"  
yaml:"series,omitempty"`
-	InstanceId     state.InstanceId `json:"instance-id,omitempty"  
yaml:"instance-id,omitempty"`
-	DNSName        string           `json:"dns-name,omitempty"  
yaml:"dns-name,omitempty"`
-	Life           string           `json:"life,omitempty"  
yaml:"life,omitempty"`
-	AgentVersion   string           `json:"agent-version,omitempty"  
yaml:"agent-version,omitempty"`
  	AgentState     params.Status    `json:"agent-state,omitempty"  
yaml:"agent-state,omitempty"`
  	AgentStateInfo string           `json:"agent-state-info,omitempty"  
yaml:"agent-state-info,omitempty"`
+	AgentVersion   string           `json:"agent-version,omitempty"  
yaml:"agent-version,omitempty"`
+	DNSName        string           `json:"dns-name,omitempty"  
yaml:"dns-name,omitempty"`
+	InstanceId     state.InstanceId `json:"instance-id,omitempty"  
yaml:"instance-id,omitempty"`
  	InstanceState  string           `json:"instance-state,omitempty"  
yaml:"instance-state,omitempty"`
+	Life           string           `json:"life,omitempty"  
yaml:"life,omitempty"`
+	Series         string           `json:"series,omitempty"  
yaml:"series,omitempty"`
  }

  // A goyaml bug means we can't declare these types
@@ -347,12 +347,12 @@

  type serviceStatus struct {
  	Err           error                 `json:"-" yaml:",omitempty"`
-	Life          string                `json:"life,omitempty"  
yaml:"life,omitempty"`
  	Charm         string                `json:"charm" yaml:"charm"`
  	Exposed       bool                  `json:"exposed" yaml:"exposed"`
-	Units         map[string]unitStatus `json:"units,omitempty"  
yaml:"units,omitempty"`
+	Life          string                `json:"life,omitempty"  
yaml:"life,omitempty"`
  	Relations     map[string][]string   `json:"relations,omitempty"  
yaml:"relations,omitempty"`
  	SubordinateTo []string              `json:"subordinate-to,omitempty"  
yaml:"subordinate-to,omitempty"`
+	Units         map[string]unitStatus `json:"units,omitempty"  
yaml:"units,omitempty"`
  }
  type serviceStatusNoMarshal serviceStatus

@@ -374,12 +374,12 @@

  type unitStatus struct {
  	Err            error                 `json:"-" yaml:",omitempty"`
-	PublicAddress  string                `json:"public-address,omitempty"  
yaml:"public-address,omitempty"`
-	Machine        string                `json:"machine,omitempty"  
yaml:"machine,omitempty"`
-	Life           string                `json:"life,omitempty"  
yaml:"life,omitempty"`
-	AgentVersion   string                `json:"agent-version,omitempty"  
yaml:"agent-version,omitempty"`
  	AgentState     params.Status         `json:"agent-state,omitempty"  
yaml:"agent-state,omitempty"`
  	AgentStateInfo string                `json:"agent-state-info,omitempty"  
yaml:"agent-state-info,omitempty"`
+	AgentVersion   string                `json:"agent-version,omitempty"  
yaml:"agent-version,omitempty"`
+	Life           string                `json:"life,omitempty"  
yaml:"life,omitempty"`
+	Machine        string                `json:"machine,omitempty"  
yaml:"machine,omitempty"`
+	PublicAddress  string                `json:"public-address,omitempty"  
yaml:"public-address,omitempty"`
  	Subordinates   map[string]unitStatus `json:"subordinates,omitempty"  
yaml:"subordinates,omitempty"`
  }