Merge lp:~wallyworld/goose/nova-testdouble-default-secgroup into lp:goose

[Ian Booth]

The nova service test double was incorrectly ignoring the default security group when starting an instance. It assumed that the default group did not need to be in the list of groups specified when starting, but this is not the case.

The nova service test double was incorrectly ignoring the default security group when starting an instance. It assumed that the default group did not need to be in the list of groups specified when starting, but this is not the case.

=== modified file 'testservices/novaservice/service_http.go'
--- testservices/novaservice/service_http.go	2013-11-25 05:52:30 +0000
+++ testservices/novaservice/service_http.go	2013-12-23 00:01:12 +0000
@@ -563,10 +563,6 @@
 	if len(req.Server.SecurityGroups) > 0 {
 		for _, group := range req.Server.SecurityGroups {
 			groupName := group["name"]
-			if groupName == "default" {
-				// assume default security group exists
-				continue
-			}
 			if sg, err := n.securityGroupByName(groupName); err != nil {
 				return noGroupError(groupName, n.TenantId)
 			} else {

=== modified file 'testservices/novaservice/service_http_test.go'
--- testservices/novaservice/service_http_test.go	2013-10-17 23:02:16 +0000
+++ testservices/novaservice/service_http_test.go	2013-12-23 00:01:12 +0000
@@ -666,6 +666,7 @@
 	s.service.removeServer(srv.Id)
 	req.Server.Name = "test2"
 	req.Server.SecurityGroups = []map[string]string{
+		{"name": "default"},
 		{"name": "group1"},
 		{"name": "group2"},
 	}
@@ -686,8 +687,11 @@
 	c.Assert(ok, Equals, true)
 	ok = s.service.hasServerSecurityGroup(srv.Id, "2")
 	c.Assert(ok, Equals, true)
+	ok = s.service.hasServerSecurityGroup(srv.Id, "999")
+	c.Assert(ok, Equals, true)
 	s.service.removeServerSecurityGroup(srv.Id, "1")
 	s.service.removeServerSecurityGroup(srv.Id, "2")
+	s.service.removeServerSecurityGroup(srv.Id, "999")
 	s.service.removeServer(srv.Id)
 }