commit 01972e2e74626a9453d5fd443bdb8b5bb913ea0a
author Jon Perritt <jrperritt@gmail.com> Wed Jan 28 10:30:45 2015 -0700
committer Jon Perritt <jrperritt@gmail.com> Sat Feb 07 13:18:52 2015 -0700
tree 64bd59754e6f001731616edaca106023a1c2abf2
parent 3711cd05ed1dbbc6855c2a23834e10902766be46

change struct names; use mapstructure instead of json

openstack/orchestration/v1/stacks/results.go

diff --git a/openstack/orchestration/v1/stacks/results.go b/openstack/orchestration/v1/stacks/results.go
index 9e11f82..d74ee6c 100644
--- a/openstack/orchestration/v1/stacks/results.go
+++ b/openstack/orchestration/v1/stacks/results.go
@@ -8,7 +8,7 @@
 	"github.com/rackspace/gophercloud/pagination"
 )
 
-type CreateStack struct {
+type CreatedStack struct {
 	ID    string             `mapstructure:"id"`
 	Links []gophercloud.Link `mapstructure:"links"`
 }
@@ -23,7 +23,7 @@
 	}
 
 	var res struct {
-		Stack *CreateStack `json:"stack"`
+		Stack *CreateStack `mapstructure:"stack"`
 	}
 
 	if err := mapstructure.Decode(r.Body, &res); err != nil {
@@ -37,6 +37,8 @@
 	gophercloud.Result
 }
 
+
+
 // StackPage is a pagination.Pager that is returned from a call to the List function.
 type StackPage struct {
 	pagination.SinglePageBase
@@ -51,14 +53,14 @@
 	return len(stacks) == 0, nil
 }
 
-type ListStack struct {
+type ListedStack struct {
 	CreationTime time.Time          `mapstructure:"-"`
 	Description  string             `mapstructure:"description"`
 	ID           string             `mapstructure:"id"`
 	Links        []gophercloud.Link `mapstructure:"links"`
 	Name         string             `mapstructure:"stack_name"`
 	Status       string             `mapstructure:"stack_status"`
-	StausReason  string             `mapstructure:"stack_status_reason"`
+	StatusReason string             `mapstructure:"stack_status_reason"`
 	UpdatedTime  time.Time          `mapstructure:"-"`
 }
 
@@ -66,14 +68,33 @@
 // over a stacks.List call.
 func ExtractStacks(page pagination.Page) ([]ListStack, error) {
 	var res struct {
-		Stacks []ListStack `json:"stacks"`
+		Stacks []ListStack `mapstructure:"stacks"`
 	}
 
 	err := mapstructure.Decode(page.(StackPage).Body, &res)
-	return res.Stacks, err
+	if err != nil {
+		return nil, err
+	}
+
+	rawStacks := (((page.(StackPage).Body).(map[string]interface{}))["stacks"]).([]interface{})
+	for i := range rawStacks {
+		creationTime, err := time.Parse(time.RFC3339, ((rawStacks[i]).(map[string]interface{}))["creation_time"].(string))
+		if err != nil {
+			return res.Stacks, err
+		}
+		res.Stacks[i].CreationTime = creationTime
+
+		updatedTime, err := time.Parse(time.RFC3339, ((rawStacks[i]).(map[string]interface{}))["updated_time"].(string))
+		if err != nil {
+			return res.Stacks, err
+		}
+		res.Stacks[i].UpdatedTime = updatedTime
+	}
+
+	return res.Stacks, nil
 }
 
-type GetStack struct {
+type RetrievedStack struct {
 	Capabilities        []interface{}       `mapstructure:"capabilities"`
 	CreationTime        time.Time           `mapstructure:"-"`
 	Description         string              `mapstructure:"description"`
@@ -101,7 +122,7 @@
 	}
 
 	var res struct {
-		Stack *GetStack `json:"stack"`
+		Stack *GetStack `mapstructure:"stack"`
 	}
 
 	config := &mapstructure.DecoderConfig{
@@ -146,7 +167,7 @@
 	gophercloud.ErrResult
 }
 
-type PreviewStack struct {
+type PreviewedStack struct {
 	Capabilities        []interface{}       `mapstructure:"capabilities"`
 	CreationTime        time.Time           `mapstructure:"-"`
 	Description         string              `mapstructure:"description"`
@@ -174,7 +195,7 @@
 	}
 
 	var res struct {
-		Stack *PreviewStack `json:"stack"`
+		Stack *PreviewStack `mapstructure:"stack"`
 	}
 
 	config := &mapstructure.DecoderConfig{
@@ -211,7 +232,7 @@
 	return res.Stack, err
 }
 
-type AbandonStack struct {
+type AbandonedStack struct {
 }
 
 type AbandonResult struct {