commit d27e0ff565e45fb6a3bdf49687f2088db7fc3c31
author Ash Wilson <smashwilson@gmail.com> Thu Sep 25 11:50:31 2014 -0400
committer Ash Wilson <smashwilson@gmail.com> Thu Sep 25 11:50:31 2014 -0400
tree 7fb140142b4535b8c2633c68d421ad31b7d7d7a5
parent d2f8703428c4973c9720cd4d2ff154aad1061fc2

Use result structs for server requests.

openstack/compute/v2/servers/requests_test.go

diff --git a/openstack/compute/v2/servers/requests_test.go b/openstack/compute/v2/servers/requests_test.go
index 3f5f2b4..fa1a2f5 100644
--- a/openstack/compute/v2/servers/requests_test.go
+++ b/openstack/compute/v2/servers/requests_test.go
@@ -88,20 +88,15 @@
 	})
 
 	client := serviceClient()
-	result, err := Create(client, map[string]interface{}{
+	actual, err := Create(client, map[string]interface{}{
 		"name":      "derp",
 		"imageRef":  "f90f6034-2570-4974-8351-6b49732ef2eb",
 		"flavorRef": "1",
-	})
+	}).Extract()
 	if err != nil {
 		t.Fatalf("Unexpected Create error: %v", err)
 	}
 
-	actual, err := ExtractServer(result)
-	if err != nil {
-		t.Fatalf("Unexpected ExtractServer error: %v", err)
-	}
-
 	equalServers(t, serverDerp, *actual)
 }
 
@@ -136,16 +131,11 @@
 	})
 
 	client := serviceClient()
-	response, err := Get(client, "1234asdf")
+	actual, err := Get(client, "1234asdf").Extract()
 	if err != nil {
 		t.Fatalf("Unexpected Get error: %v", err)
 	}
 
-	actual, err := ExtractServer(response)
-	if err != nil {
-		t.Fatalf("Unexpected ExtractServer error: %v", err)
-	}
-
 	equalServers(t, serverDerp, *actual)
 }
 
@@ -164,18 +154,13 @@
 	})
 
 	client := serviceClient()
-	response, err := Update(client, "1234asdf", map[string]interface{}{
+	actual, err := Update(client, "1234asdf", map[string]interface{}{
 		"name": "new-name",
-	})
+	}).Extract()
 	if err != nil {
 		t.Fatalf("Unexpected Update error: %v", err)
 	}
 
-	actual, err := ExtractServer(response)
-	if err != nil {
-		t.Fatalf("Unexpected ExtractServer error: %v", err)
-	}
-
 	equalServers(t, serverDerp, *actual)
 }
 
@@ -241,19 +226,15 @@
 	})
 
 	client := serviceClient()
-	response, err := Rebuild(client,
+	actual, err := Rebuild(client,
 		"1234asdf", "new-name", "swordfish",
 		"http://104.130.131.164:8774/fcad67a6189847c4aecfa3c81a05783b/images/f90f6034-2570-4974-8351-6b49732ef2eb",
-		map[string]interface{}{"accessIPv4": "1.2.3.4"})
+		map[string]interface{}{"accessIPv4": "1.2.3.4"},
+	).Extract()
 	if err != nil {
 		t.Fatalf("Unexpected Rebuild error: %v", err)
 	}
 
-	actual, err := ExtractServer(response)
-	if err != nil {
-		t.Fatalf("Unexpected ExtractServer error: %v", err)
-	}
-
 	equalServers(t, serverDerp, *actual)
 }