Merge lp:~hduran-8/goose/testservice_errors into lp:goose

[Horacio Durán]

Added proper errortype in testservices.

Added an error type for testservers that
contains a message and an error code.
Switched novaservice to use new error type.

https://codereview.appspot.com/99960043/

R=axwalk

Added proper errortype in testservices.

Added an error type for testservers that
contains a message and an error code.
Switched novaservice to use new error type.

https://codereview.appspot.com/99960043/

[Horacio Durán (hduran-8)]

Reviewers: mp+217818_code.launchpad.net,

Message:
Please take a look.

Description:
Added proper errortype in testservices.

Added an error type for testservers that
contains a message and an error code.
Switched novaservice to use new error type.

https://code.launchpad.net/~hduran-8/goose/testservice_errors/+merge/217818

(do not edit description out of merge proposal)

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

Affected files (+295, -58 lines):
   A [revision details]
   A testservices/errors.go
   A testservices/errors_test.go
   M testservices/novaservice/service.go
   M testservices/novaservice/service_test.go
   M testservices/service.go

[Andrew Wilkins (axwalk)]

https://codereview.appspot.com/99960043/diff/1/testservices/errors.go
File testservices/errors.go (right):

https://codereview.appspot.com/99960043/diff/1/testservices/errors.go#newcode5
testservices/errors.go:5: var nameReference = map[int]string{
Where do these values come from? I assume these are meant to match what
OpenStack returns exactly? If so, can you refer to some official
documentation?

If they're *not* meant to be identical to OpenStack, then this is
duplication of code in net/http.

https://codereview.appspot.com/99960043/diff/1/testservices/errors.go#newcode19
testservices/errors.go:19: type ServerError struct {
Does it perhaps make sense to expose more of goose/errors and use the
existing error types that would be returned by the real OpenStack?

https://codereview.appspot.com/99960043/diff/1/testservices/errors.go#newcode60
testservices/errors.go:60: // XXX: hduran-8 I infered this from the
python nova code, might be wrong
XXX is not typical to Juju or related projects. Use something like
"TODO(hduran-8) this is inferred from the Python nova code and might be
wrong; validate".

For most cases, we have a common format:
     TODO(nick) YYYY-MM-DD #bugid
     Summary.

and file a bug.

https://codereview.appspot.com/99960043/diff/1/testservices/errors.go#newcode66
testservices/errors.go:66: return &ServerError{
I would suggest a minor refactoring to simplify all of these functions:

func serverErrorf(code int, message string, args ...interface{})
*ServerError {
     return &ServerError{code: code, message: fmt.Sprintf(message,
args...)}
}

func NewAddFlavorError(id string) *ServerError {
     return serverErrorf(409, "A flavor with id %q already exists", id)
}

...

https://codereview.appspot.com/99960043/diff/1/testservices/errors.go#newcode67
testservices/errors.go:67: message: fmt.Sprintf("A flavor with id %q
already exists", id),
Do these error messages come from OpenStack, or did you make them up? We
typically start all error messages lower-case.

https://codereview.appspot.com/99960043/diff/1/testservices/errors_test.go
File testservices/errors_test.go (right):

https://codereview.appspot.com/99960043/diff/1/testservices/errors_test.go#newcode20
testservices/errors_test.go:20: // _, ok := err.(*error)
delete me

https://codereview.appspot.com/99960043/diff/1/testservices/errors_test.go#newcode30
testservices/errors_test.go:30: // _, ok := err.(*error)
delete me

https://codereview.appspot.com/99960043/

[Horacio Durán (hduran-8)]

Please take a look.

https://codereview.appspot.com/99960043/

[Andrew Wilkins (axwalk)]

LGTM with an added comment

https://codereview.appspot.com/99960043/diff/20001/testservices/errors.go
File testservices/errors.go (right):

https://codereview.appspot.com/99960043/diff/20001/testservices/errors.go#newcode5
testservices/errors.go:5: var nameReference = map[int]string{
Can you please add a note about the origins of this mapping as
discussed?

https://codereview.appspot.com/99960043/

[Horacio Durán (hduran-8)]

Please take a look.

https://codereview.appspot.com/99960043/

[Go Bot (go-bot)]

The attempt to merge lp:~hduran-8/goose/testservice_errors into lp:goose failed. Below is the output from the failed tests.

ok launchpad.net/goose 0.012s
ok launchpad.net/goose/client 0.109s
ok launchpad.net/goose/errors 0.011s
ok launchpad.net/goose/glance 0.019s
ok launchpad.net/goose/http 0.070s
ok launchpad.net/goose/identity 0.025s
ok launchpad.net/goose/nova 0.109s
ok launchpad.net/goose/swift 0.057s
ok launchpad.net/goose/sync 0.008s
ok launchpad.net/goose/testing/envsuite 0.010s
ok launchpad.net/goose/testing/httpsuite 0.063s
ok launchpad.net/goose/testservices 0.024s
? launchpad.net/goose/testservices/cmd [no test files]
ok launchpad.net/goose/testservices/hook 0.010s
ok launchpad.net/goose/testservices/identityservice 0.025s
ok launchpad.net/goose/testservices/novaservice 0.093s
? launchpad.net/goose/testservices/openstackservice [no test files]
ok launchpad.net/goose/testservices/swiftservice 0.054s
FAIL launchpad.net/goose/tools/secgroup-delete-all [build failed]

Setting GOPATH to: /home/tarmac/goose-trees
Running: go fmt ./...
Running: go build ./...
Running: go test ./...
# launchpad.net/goose/tools/secgroup-delete-all_test
tools/secgroup-delete-all/main_test.go:13: can't find import: "launchpad.net/goose/tools/secgroup-delete-all"
FAIL: failed running: go test ./...

=== added file 'testservices/errors.go'
--- testservices/errors.go	1970-01-01 00:00:00 +0000
+++ testservices/errors.go	2014-04-30 23:16:31 +0000
@@ -0,0 +1,137 @@
+package testservices
+
+import "fmt"
+
+// This map is copied from nova python client
+// https://github.com/openstack/nova/blob/master/nova/api/openstack/wsgi.py#L1185
+var nameReference = map[int]string{
+	400: "badRequest",
+	401: "unauthorized",
+	403: "forbidden",
+	404: "itemNotFound",
+	405: "badMethod",
+	409: "conflictingRequest",
+	413: "overLimit",
+	415: "badMediaType",
+	429: "overLimit",
+	501: "notImplemented",
+	503: "serviceUnavailable",
+}
+
+type ServerError struct {
+	message string
+	code    int
+}
+
+func serverErrorf(code int, message string, args ...interface{}) *ServerError {
+	return &ServerError{code: code, message: fmt.Sprintf(message, args...)}
+}
+
+func (n *ServerError) Error() string {
+	return fmt.Sprintf("%s: %s", n.Name(), n.message)
+}
+
+func (n *ServerError) Name() string {
+	name, ok := nameReference[n.code]
+	if !ok {
+		return "computeFault"
+	}
+	return name
+}
+
+func NewNotFoundError(message string) *ServerError {
+	return serverErrorf(404, message)
+}
+
+func NewNoMoreFloatingIpsError() *ServerError {
+	return serverErrorf(404, "Zero floating ips available")
+}
+
+func NewIPLimitExceededError() *ServerError {
+	return serverErrorf(413, "Maximum number of floating ips exceeded")
+}
+
+func NewRateLimitExceededError() *ServerError {
+	// This is an undocumented error
+	return serverErrorf(413, "Retry limit exceeded")
+}
+
+func NewAddFlavorError(id string) *ServerError {
+	return serverErrorf(409, "A flavor with id %q already exists", id)
+}
+
+func NewNoSuchFlavorError(id string) *ServerError {
+	return serverErrorf(404, "No such flavor %q", id)
+}
+
+func NewServerByIDNotFoundError(id string) *ServerError {
+	return serverErrorf(404, "No such server %q", id)
+}
+
+func NewServerByNameNotFoundError(name string) *ServerError {
+	return serverErrorf(404, "No such server named %q", name)
+}
+
+func NewServerAlreadyExistsError(id string) *ServerError {
+	return serverErrorf(409, "A server with id %q already exists", id)
+}
+
+func NewSecurityGroupAlreadyExistsError(id string) *ServerError {
+	return serverErrorf(409, "A security group with id %s already exists", id)
+}
+
+func NewSecurityGroupByIDNotFoundError(groupId string) *ServerError {
+	return serverErrorf(404, "No such security group %s", groupId)
+}
+
+func NewSecurityGroupByNameNotFoundError(name string) *ServerError {
+	return serverErrorf(404, "No such security group named %q", name)
+}
+
+func NewSecurityGroupRuleAlreadyExistsError(id string) *ServerError {
+	return serverErrorf(409, "A security group rule with id %s already exists", id)
+}
+
+func NewCannotAddTwiceRuleToGroupError(ruleId, groupId string) *ServerError {
+	return serverErrorf(409, "Cannot add twice rule %s to security group %s", ruleId, groupId)
+}
+
+func NewUnknownSecurityGroupError(groupId string) *ServerError {
+	return serverErrorf(409, "Unknown source security group %s", groupId)
+}
+
+func NewSecurityGroupRuleNotFoundError(ruleId string) *ServerError {
+	return serverErrorf(404, "No such security group rule %s", ruleId)
+}
+
+func NewServerBelongsToGroupError(serverId, groupId string) *ServerError {
+	return serverErrorf(409, "Server %q already belongs to group %s", serverId, groupId)
+}
+
+func NewServerDoesNotBelongToGroupsError(serverId string) *ServerError {
+	return serverErrorf(400, "Server %q does not belong to any groups", serverId)
+}
+
+func NewServerDoesNotBelongToGroupError(serverId, groupId string) *ServerError {
+	return serverErrorf(400, "Server %q does not belong to group %s", serverId, groupId)
+}
+
+func NewFloatingIPExistsError(ipID string) *ServerError {
+	return serverErrorf(409, "A floating IP with id %s already exists", ipID)
+}
+
+func NewFloatingIPNotFoundError(address string) *ServerError {
+	return serverErrorf(404, "No such floating IP %q", address)
+}
+
+func NewServerHasFloatingIPError(serverId, ipId string) *ServerError {
+	return serverErrorf(409, "Server %q already has floating IP %s", serverId, ipId)
+}
+
+func NewNoFloatingIPsToRemoveError(serverId string) *ServerError {
+	return serverErrorf(409, "Server %q does not have any floating IPs to remove", serverId)
+}
+
+func NewNoFloatingIPsError(serverId, ipId string) *ServerError {
+	return serverErrorf(404, "Server %q does not have floating IP %s", serverId, ipId)
+}

=== added file 'testservices/errors_test.go'
--- testservices/errors_test.go	1970-01-01 00:00:00 +0000
+++ testservices/errors_test.go	2014-04-30 23:16:31 +0000
@@ -0,0 +1,29 @@
+package testservices
+
+import (
+	gc "launchpad.net/gocheck"
+	"testing"
+)
+
+func Test(t *testing.T) { gc.TestingT(t) }
+
+type ErrorsSuite struct {
+}
+
+var _ = gc.Suite(&ErrorsSuite{})
+
+func (s *ErrorsSuite) TestServerErrorMessage(c *gc.C) {
+	err := &ServerError{
+		message: "Instance could not be found",
+		code:    404,
+	}
+	c.Assert(err, gc.ErrorMatches, "itemNotFound: Instance could not be found")
+}
+
+func (s *ErrorsSuite) TestServerUnknownErrcode(c *gc.C) {
+	err := &ServerError{
+		message: "Impossible http code.",
+		code:    999,
+	}
+	c.Assert(err, gc.ErrorMatches, "computeFault: Impossible http code.")
+}

=== modified file 'testservices/novaservice/service.go'
--- testservices/novaservice/service.go	2014-03-07 14:22:57 +0000
+++ testservices/novaservice/service.go	2014-04-30 23:16:31 +0000
@@ -139,7 +139,7 @@
 		return err
 	}
 	if _, err := n.flavor(flavor.Id); err == nil {
-		return fmt.Errorf("a flavor with id %q already exists", flavor.Id)
+		return testservices.NewAddFlavorError(flavor.Id)
 	}
 	n.flavors[flavor.Id] = flavor
 	return nil
@@ -152,7 +152,7 @@
 	}
 	flavor, ok := n.flavors[flavorId]
 	if !ok {
-		return nil, fmt.Errorf("no such flavor %q", flavorId)
+		return nil, testservices.NewNoSuchFlavorError(flavorId)
 	}
 	return &flavor, nil
 }
@@ -224,7 +224,7 @@
 		return err
 	}
 	if _, err := n.server(server.Id); err == nil {
-		return fmt.Errorf("a server with id %q already exists", server.Id)
+		return testservices.NewServerAlreadyExistsError(server.Id)
 	}
 	n.servers[server.Id] = server
 	return nil
@@ -237,7 +237,7 @@
 	}
 	server, ok := n.servers[serverId]
 	if !ok {
-		return nil, fmt.Errorf("no such server %q", serverId)
+		return nil, testservices.NewServerByIDNotFoundError(serverId)
 	}
 	return &server, nil
 }
@@ -252,7 +252,7 @@
 			return &server, nil
 		}
 	}
-	return nil, fmt.Errorf("no such server named %q", name)
+	return nil, testservices.NewServerByNameNotFoundError(name)
 }
 
 // serverAsEntity returns the stored ServerDetail as Entity.
@@ -378,7 +378,7 @@
 		return err
 	}
 	if _, err := n.securityGroup(group.Id); err == nil {
-		return fmt.Errorf("a security group with id %s already exists", group.Id)
+		return testservices.NewSecurityGroupAlreadyExistsError(group.Id)
 	}
 	group.TenantId = n.TenantId
 	if group.Rules == nil {
@@ -395,7 +395,7 @@
 	}
 	group, ok := n.groups[groupId]
 	if !ok {
-		return nil, fmt.Errorf("no such security group %s", groupId)
+		return nil, testservices.NewSecurityGroupByIDNotFoundError(groupId)
 	}
 	return &group, nil
 }
@@ -410,7 +410,7 @@
 			return &group, nil
 		}
 	}
-	return nil, fmt.Errorf("no such security group named %q", groupName)
+	return nil, testservices.NewSecurityGroupByNameNotFoundError(groupName)
 }
 
 // allSecurityGroups returns a list of all existing groups.
@@ -442,7 +442,7 @@
 		return err
 	}
 	if _, err := n.securityGroupRule(ruleId); err == nil {
-		return fmt.Errorf("a security group rule with id %s already exists", ruleId)
+		return testservices.NewSecurityGroupRuleAlreadyExistsError(ruleId)
 	}
 	group, err := n.securityGroup(rule.ParentGroupId)
 	if err != nil {
@@ -450,7 +450,7 @@
 	}
 	for _, ru := range group.Rules {
 		if ru.Id == ruleId {
-			return fmt.Errorf("cannot add twice rule %s to security group %s", ru.Id, group.Id)
+			return testservices.NewCannotAddTwiceRuleToGroupError(ru.Id, group.Id)
 		}
 	}
 	var zeroSecurityGroupRef nova.SecurityGroupRef
@@ -462,7 +462,7 @@
 	if rule.GroupId != nil {
 		sourceGroup, err := n.securityGroup(*rule.GroupId)
 		if err != nil {
-			return fmt.Errorf("unknown source security group %s", *rule.GroupId)
+			return testservices.NewUnknownSecurityGroupError(*rule.GroupId)
 		}
 		newrule.Group = nova.SecurityGroupRef{
 			TenantId: sourceGroup.TenantId,
@@ -511,7 +511,7 @@
 	}
 	rule, ok := n.rules[ruleId]
 	if !ok {
-		return nil, fmt.Errorf("no such security group rule %s", ruleId)
+		return nil, testservices.NewSecurityGroupRuleNotFoundError(ruleId)
 	}
 	return &rule, nil
 }
@@ -559,7 +559,7 @@
 	if ok {
 		for _, gid := range groups {
 			if gid == groupId {
-				return fmt.Errorf("server %q already belongs to group %s", serverId, groupId)
+				return testservices.NewServerBelongsToGroupError(serverId, groupId)
 			}
 		}
 	}
@@ -615,7 +615,7 @@
 	}
 	groups, ok := n.serverGroups[serverId]
 	if !ok {
-		return fmt.Errorf("server %q does not belong to any groups", serverId)
+		return testservices.NewServerDoesNotBelongToGroupsError(serverId)
 	}
 	idx := -1
 	for gi, gid := range groups {
@@ -625,7 +625,7 @@
 		}
 	}
 	if idx == -1 {
-		return fmt.Errorf("server %q does not belong to group %s", serverId, groupId)
+		return testservices.NewServerDoesNotBelongToGroupError(serverId, groupId)
 	}
 	groups = append(groups[:idx], groups[idx+1:]...)
 	n.serverGroups[serverId] = groups
@@ -638,7 +638,7 @@
 		return err
 	}
 	if _, err := n.floatingIP(ip.Id); err == nil {
-		return fmt.Errorf("a floating IP with id %s already exists", ip.Id)
+		return testservices.NewFloatingIPExistsError(ip.Id)
 	}
 	n.floatingIPs[ip.Id] = ip
 	return nil
@@ -664,7 +664,7 @@
 	}
 	ip, ok := n.floatingIPs[ipId]
 	if !ok {
-		return nil, fmt.Errorf("no such floating IP %s", ipId)
+		return nil, testservices.NewFloatingIPNotFoundError(ipId)
 	}
 	return &ip, nil
 }
@@ -679,7 +679,7 @@
 			return &fip, nil
 		}
 	}
-	return nil, fmt.Errorf("no such floating IP with address %q", address)
+	return nil, testservices.NewFloatingIPNotFoundError(address)
 }
 
 // allFloatingIPs returns a list of all created floating IPs.
@@ -723,7 +723,7 @@
 	if ok {
 		for _, fipId := range fips {
 			if fipId == ipId {
-				return fmt.Errorf("server %q already has floating IP %s", serverId, ipId)
+				return testservices.NewServerHasFloatingIPError(serverId, ipId)
 			}
 		}
 	}
@@ -767,7 +767,7 @@
 	}
 	fips, ok := n.serverIPs[serverId]
 	if !ok {
-		return fmt.Errorf("server %q does not have any floating IPs to remove", serverId)
+		return testservices.NewNoFloatingIPsToRemoveError(serverId)
 	}
 	idx := -1
 	for fi, fipId := range fips {
@@ -777,7 +777,7 @@
 		}
 	}
 	if idx == -1 {
-		return fmt.Errorf("server %q does not have floating IP %s", serverId, ipId)
+		return testservices.NewNoFloatingIPsError(serverId, ipId)
 	}
 	fips = append(fips[:idx], fips[idx+1:]...)
 	n.serverIPs[serverId] = fips

=== modified file 'testservices/novaservice/service_test.go'
--- testservices/novaservice/service_test.go	2014-03-07 14:24:31 +0000
+++ testservices/novaservice/service_test.go	2014-04-30 23:16:31 +0000
@@ -27,27 +27,27 @@
 
 func (s *NovaSuite) ensureNoFlavor(c *C, flavor nova.FlavorDetail) {
 	_, err := s.service.flavor(flavor.Id)
-	c.Assert(err, ErrorMatches, fmt.Sprintf("no such flavor %q", flavor.Id))
+	c.Assert(err, ErrorMatches, fmt.Sprintf("itemNotFound: No such flavor %q", flavor.Id))
 }
 
 func (s *NovaSuite) ensureNoServer(c *C, server nova.ServerDetail) {
 	_, err := s.service.server(server.Id)
-	c.Assert(err, ErrorMatches, fmt.Sprintf("no such server %q", server.Id))
+	c.Assert(err, ErrorMatches, fmt.Sprintf("itemNotFound: No such server %q", server.Id))
 }
 
 func (s *NovaSuite) ensureNoGroup(c *C, group nova.SecurityGroup) {
 	_, err := s.service.securityGroup(group.Id)
-	c.Assert(err, ErrorMatches, fmt.Sprintf("no such security group %s", group.Id))
+	c.Assert(err, ErrorMatches, fmt.Sprintf("itemNotFound: No such security group %s", group.Id))
 }
 
 func (s *NovaSuite) ensureNoRule(c *C, rule nova.SecurityGroupRule) {
 	_, err := s.service.securityGroupRule(rule.Id)
-	c.Assert(err, ErrorMatches, fmt.Sprintf("no such security group rule %s", rule.Id))
+	c.Assert(err, ErrorMatches, fmt.Sprintf("itemNotFound: No such security group rule %s", rule.Id))
 }
 
 func (s *NovaSuite) ensureNoIP(c *C, ip nova.FloatingIP) {
 	_, err := s.service.floatingIP(ip.Id)
-	c.Assert(err, ErrorMatches, fmt.Sprintf("no such floating IP %s", ip.Id))
+	c.Assert(err, ErrorMatches, fmt.Sprintf("itemNotFound: No such floating IP %q", ip.Id))
 }
 
 func (s *NovaSuite) createFlavor(c *C, flavor nova.FlavorDetail) {
@@ -142,7 +142,7 @@
 	s.createFlavor(c, flavor)
 	defer s.deleteFlavor(c, flavor)
 	err := s.service.addFlavor(flavor)
-	c.Assert(err, ErrorMatches, `a flavor with id "test" already exists`)
+	c.Assert(err, ErrorMatches, `conflictingRequest: A flavor with id "test" already exists`)
 }
 
 func (s *NovaSuite) TestRemoveFlavorTwiceFails(c *C) {
@@ -150,7 +150,7 @@
 	s.createFlavor(c, flavor)
 	s.deleteFlavor(c, flavor)
 	err := s.service.removeFlavor(flavor.Id)
-	c.Assert(err, ErrorMatches, `no such flavor "test"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such flavor "test"`)
 }
 
 func (s *NovaSuite) TestAllFlavors(c *C) {
@@ -238,7 +238,7 @@
 	s.createServer(c, server)
 	defer s.deleteServer(c, server)
 	err := s.service.addServer(server)
-	c.Assert(err, ErrorMatches, `a server with id "test" already exists`)
+	c.Assert(err, ErrorMatches, `conflictingRequest: A server with id "test" already exists`)
 }
 
 // A control point can be used to change the status of the added server.
@@ -269,7 +269,7 @@
 	s.createServer(c, server)
 	s.deleteServer(c, server)
 	err := s.service.removeServer(server.Id)
-	c.Assert(err, ErrorMatches, `no such server "test"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such server "test"`)
 }
 
 func (s *NovaSuite) TestAllServers(c *C) {
@@ -523,7 +523,7 @@
 
 func (s *NovaSuite) TestGetServerByName(c *C) {
 	named, err := s.service.serverByName("test")
-	c.Assert(err, ErrorMatches, `no such server named "test"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such server named "test"`)
 	servers := []nova.ServerDetail{
 		{Id: "sr1", Name: "test"},
 		{Id: "sr2", Name: "test"},
@@ -570,7 +570,7 @@
 	s.createGroup(c, group)
 	defer s.deleteGroup(c, group)
 	err := s.service.addSecurityGroup(group)
-	c.Assert(err, ErrorMatches, "a security group with id 1 already exists")
+	c.Assert(err, ErrorMatches, "conflictingRequest: A security group with id 1 already exists")
 }
 
 func (s *NovaSuite) TestRemoveSecurityGroupTwiceFails(c *C) {
@@ -578,7 +578,7 @@
 	s.createGroup(c, group)
 	s.deleteGroup(c, group)
 	err := s.service.removeSecurityGroup(group.Id)
-	c.Assert(err, ErrorMatches, "no such security group 1")
+	c.Assert(err, ErrorMatches, "itemNotFound: No such security group 1")
 }
 
 func (s *NovaSuite) TestAllSecurityGroups(c *C) {
@@ -631,7 +631,7 @@
 	}
 	s.ensureNoGroup(c, group)
 	gr, err := s.service.securityGroupByName(group.Name)
-	c.Assert(err, ErrorMatches, `no such security group named "test"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such security group named "test"`)
 	s.createGroup(c, group)
 	defer s.deleteGroup(c, group)
 	gr, err = s.service.securityGroupByName(group.Name)
@@ -746,7 +746,7 @@
 	c.Assert(err, IsNil)
 	defer s.deleteRule(c, rule)
 	err = s.service.addSecurityGroupRule(rule.Id, ri)
-	c.Assert(err, ErrorMatches, "a security group rule with id 10 already exists")
+	c.Assert(err, ErrorMatches, "conflictingRequest: A security group rule with id 10 already exists")
 }
 
 func (s *NovaSuite) TestAddSecurityGroupRuleToParentTwiceFails(c *C) {
@@ -761,7 +761,7 @@
 	ri := nova.RuleInfo{ParentGroupId: group.Id}
 	rule := nova.SecurityGroupRule{Id: "10"}
 	err := s.service.addSecurityGroupRule(rule.Id, ri)
-	c.Assert(err, ErrorMatches, "cannot add twice rule 10 to security group 1")
+	c.Assert(err, ErrorMatches, "conflictingRequest: Cannot add twice rule 10 to security group 1")
 }
 
 func (s *NovaSuite) TestAddSecurityGroupRuleWithInvalidParentFails(c *C) {
@@ -771,7 +771,7 @@
 	rule := nova.SecurityGroupRule{Id: "10"}
 	s.ensureNoRule(c, rule)
 	err := s.service.addSecurityGroupRule(rule.Id, ri)
-	c.Assert(err, ErrorMatches, "no such security group 1")
+	c.Assert(err, ErrorMatches, "itemNotFound: No such security group 1")
 }
 
 func (s *NovaSuite) TestAddGroupSecurityGroupRuleWithInvalidSourceFails(c *C) {
@@ -786,7 +786,7 @@
 	rule := nova.SecurityGroupRule{Id: "10"}
 	s.ensureNoRule(c, rule)
 	err := s.service.addSecurityGroupRule(rule.Id, ri)
-	c.Assert(err, ErrorMatches, "unknown source security group 42")
+	c.Assert(err, ErrorMatches, "conflictingRequest: Unknown source security group 42")
 }
 
 func (s *NovaSuite) TestAddSecurityGroupRuleUpdatesParent(c *C) {
@@ -856,7 +856,7 @@
 	c.Assert(err, IsNil)
 	s.deleteRule(c, rule)
 	err = s.service.removeSecurityGroupRule(rule.Id)
-	c.Assert(err, ErrorMatches, "no such security group rule 10")
+	c.Assert(err, ErrorMatches, "itemNotFound: No such security group rule 10")
 }
 
 func (s *NovaSuite) TestAddHasRemoveServerSecurityGroup(c *C) {
@@ -891,7 +891,7 @@
 	s.createGroup(c, group)
 	defer s.deleteGroup(c, group)
 	err := s.service.addServerSecurityGroup(server.Id, group.Id)
-	c.Assert(err, ErrorMatches, `no such server "sr1"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such server "sr1"`)
 }
 
 func (s *NovaSuite) TestAddServerSecurityGroupWithInvalidGroupFails(c *C) {
@@ -901,7 +901,7 @@
 	s.createServer(c, server)
 	defer s.deleteServer(c, server)
 	err := s.service.addServerSecurityGroup(server.Id, group.Id)
-	c.Assert(err, ErrorMatches, "no such security group 1")
+	c.Assert(err, ErrorMatches, "itemNotFound: No such security group 1")
 }
 
 func (s *NovaSuite) TestAddServerSecurityGroupTwiceFails(c *C) {
@@ -914,7 +914,7 @@
 	err := s.service.addServerSecurityGroup(server.Id, group.Id)
 	c.Assert(err, IsNil)
 	err = s.service.addServerSecurityGroup(server.Id, group.Id)
-	c.Assert(err, ErrorMatches, `server "sr1" already belongs to group 1`)
+	c.Assert(err, ErrorMatches, `conflictingRequest: Server "sr1" already belongs to group 1`)
 	err = s.service.removeServerSecurityGroup(server.Id, group.Id)
 	c.Assert(err, IsNil)
 }
@@ -964,7 +964,7 @@
 	c.Assert(err, IsNil)
 	s.deleteServer(c, server)
 	err = s.service.removeServerSecurityGroup(server.Id, group.Id)
-	c.Assert(err, ErrorMatches, `no such server "sr1"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such server "sr1"`)
 	s.createServer(c, server)
 	defer s.deleteServer(c, server)
 	err = s.service.removeServerSecurityGroup(server.Id, group.Id)
@@ -981,7 +981,7 @@
 	c.Assert(err, IsNil)
 	s.deleteGroup(c, group)
 	err = s.service.removeServerSecurityGroup(server.Id, group.Id)
-	c.Assert(err, ErrorMatches, "no such security group 1")
+	c.Assert(err, ErrorMatches, "itemNotFound: No such security group 1")
 	s.createGroup(c, group)
 	defer s.deleteGroup(c, group)
 	err = s.service.removeServerSecurityGroup(server.Id, group.Id)
@@ -1000,7 +1000,7 @@
 	err = s.service.removeServerSecurityGroup(server.Id, group.Id)
 	c.Assert(err, IsNil)
 	err = s.service.removeServerSecurityGroup(server.Id, group.Id)
-	c.Assert(err, ErrorMatches, `server "sr1" does not belong to group 1`)
+	c.Assert(err, ErrorMatches, `badRequest: Server "sr1" does not belong to group 1`)
 }
 
 func (s *NovaSuite) TestAddHasRemoveFloatingIP(c *C) {
@@ -1023,7 +1023,7 @@
 	s.createIP(c, ip)
 	defer s.deleteIP(c, ip)
 	err := s.service.addFloatingIP(ip)
-	c.Assert(err, ErrorMatches, "a floating IP with id 1 already exists")
+	c.Assert(err, ErrorMatches, "conflictingRequest: A floating IP with id 1 already exists")
 }
 
 func (s *NovaSuite) TestRemoveFloatingIPTwiceFails(c *C) {
@@ -1031,7 +1031,7 @@
 	s.createIP(c, ip)
 	s.deleteIP(c, ip)
 	err := s.service.removeFloatingIP(ip.Id)
-	c.Assert(err, ErrorMatches, "no such floating IP 1")
+	c.Assert(err, ErrorMatches, "itemNotFound: No such floating IP \"1\"")
 }
 
 func (s *NovaSuite) TestAllFloatingIPs(c *C) {
@@ -1080,7 +1080,7 @@
 	c.Assert(err, IsNil)
 	c.Assert(*ip, DeepEquals, fip)
 	_, err = s.service.floatingIPByAddr("invalid")
-	c.Assert(err, ErrorMatches, `no such floating IP with address "invalid"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such floating IP "invalid"`)
 }
 
 func (s *NovaSuite) TestAddHasRemoveServerFloatingIP(c *C) {
@@ -1115,7 +1115,7 @@
 	s.createIP(c, fip)
 	defer s.deleteIP(c, fip)
 	err := s.service.addServerFloatingIP(server.Id, fip.Id)
-	c.Assert(err, ErrorMatches, `no such server "sr1"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such server "sr1"`)
 }
 
 func (s *NovaSuite) TestAddServerFloatingIPWithInvalidIPFails(c *C) {
@@ -1125,7 +1125,7 @@
 	s.createServer(c, server)
 	defer s.deleteServer(c, server)
 	err := s.service.addServerFloatingIP(server.Id, fip.Id)
-	c.Assert(err, ErrorMatches, "no such floating IP 1")
+	c.Assert(err, ErrorMatches, "itemNotFound: No such floating IP \"1\"")
 }
 
 func (s *NovaSuite) TestAddServerFloatingIPTwiceFails(c *C) {
@@ -1138,7 +1138,7 @@
 	err := s.service.addServerFloatingIP(server.Id, fip.Id)
 	c.Assert(err, IsNil)
 	err = s.service.addServerFloatingIP(server.Id, fip.Id)
-	c.Assert(err, ErrorMatches, `server "sr1" already has floating IP 1`)
+	c.Assert(err, ErrorMatches, `conflictingRequest: Server "sr1" already has floating IP 1`)
 	err = s.service.removeServerFloatingIP(server.Id, fip.Id)
 	c.Assert(err, IsNil)
 }
@@ -1153,7 +1153,7 @@
 	c.Assert(err, IsNil)
 	s.deleteServer(c, server)
 	err = s.service.removeServerFloatingIP(server.Id, fip.Id)
-	c.Assert(err, ErrorMatches, `no such server "sr1"`)
+	c.Assert(err, ErrorMatches, `itemNotFound: No such server "sr1"`)
 	s.createServer(c, server)
 	defer s.deleteServer(c, server)
 	err = s.service.removeServerFloatingIP(server.Id, fip.Id)
@@ -1170,7 +1170,7 @@
 	c.Assert(err, IsNil)
 	s.deleteIP(c, fip)
 	err = s.service.removeServerFloatingIP(server.Id, fip.Id)
-	c.Assert(err, ErrorMatches, "no such floating IP 1")
+	c.Assert(err, ErrorMatches, "itemNotFound: No such floating IP \"1\"")
 	s.createIP(c, fip)
 	defer s.deleteIP(c, fip)
 	err = s.service.removeServerFloatingIP(server.Id, fip.Id)
@@ -1189,5 +1189,5 @@
 	err = s.service.removeServerFloatingIP(server.Id, fip.Id)
 	c.Assert(err, IsNil)
 	err = s.service.removeServerFloatingIP(server.Id, fip.Id)
-	c.Assert(err, ErrorMatches, `server "sr1" does not have floating IP 1`)
+	c.Assert(err, ErrorMatches, `itemNotFound: Server "sr1" does not have floating IP 1`)
 }

=== modified file 'testservices/service.go'
--- testservices/service.go	2013-11-25 05:52:30 +0000
+++ testservices/service.go	2014-04-30 23:16:31 +0000
@@ -1,7 +1,6 @@
 package testservices
 
 import (
-	"errors"
 	"launchpad.net/goose/testservices/hook"
 	"launchpad.net/goose/testservices/identityservice"
 	"net/http"
@@ -26,10 +25,10 @@
 
 // Internal Openstack errors.
 
-var RateLimitExceededError = errors.New("retry limit exceeded")
+var RateLimitExceededError = NewRateLimitExceededError()
 
 // NoMoreFloatingIPs corresponds to "HTTP 404 Zero floating ips available."
-var NoMoreFloatingIPs = errors.New("zero floating ips available")
+var NoMoreFloatingIPs = NewNoMoreFloatingIpsError()
 
 // IPLimitExceeded corresponds to "HTTP 413 Maximum number of floating ips exceeded"
-var IPLimitExceeded = errors.New("maximum number of floating ips exceeded")
+var IPLimitExceeded = NewIPLimitExceededError()