Don't validate security group passed by uuid

Author: mdbooth

pkg/cloud/services/compute/instance_test.go

@@ -33,7 +33,6 @@ import (
 	"github.com/gophercloud/gophercloud/openstack/imageservice/v2/images"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags"
-	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/security/groups"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/trunks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/networks"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/ports"
@@ -1030,10 +1029,6 @@ func TestService_CreateInstance(t *testing.T) {
 				expectUseExistingDefaultPort(networkRecorder)
 				expectDefaultImageAndFlavor(computeRecorder)
 
-				// TODO: Shortcut this API call if security groups are passed by UUID
-				networkRecorder.ListSecGroup(groups.ListOpts{ID: extraSecurityGroupUUID}).
-					Return([]groups.SecGroup{{ID: extraSecurityGroupUUID}}, nil)
-
 				createMap := getDefaultServerMap()
 				serverMap := createMap["server"].(map[string]interface{})
 				serverMap["security_groups"] = []map[string]interface{}{

pkg/cloud/services/networking/securitygroups.go

@@ -393,6 +393,15 @@ func (s *Service) generateDesiredSecGroups(openStackCluster *infrav1.OpenStackCl
 func (s *Service) GetSecurityGroups(securityGroupParams []infrav1.SecurityGroupParam) ([]string, error) {
 	var sgIDs []string
 	for _, sg := range securityGroupParams {
+		// Don't validate an explicit UUID if we were given one
+		if sg.UUID != "" {
+			if isDuplicate(sgIDs, sg.UUID) {
+				continue
+			}
+			sgIDs = append(sgIDs, sg.UUID)
+			continue
+		}
+
 		listOpts := groups.ListOpts(sg.Filter)
 		if listOpts.ProjectID == "" {
 			listOpts.ProjectID = s.projectID