Merge pull request #600 from shiftstack/mock-keypair

Mocks: use the mock keypair client

Author: mandre

internal/scope/mock.go

@@ -35,37 +35,39 @@ import (
 // when we want to use mocked service clients which do not attempt to connect to a running OpenStack cloud.
 type MockScopeFactory struct {
 	ComputeClient    *mock.MockComputeClient
-	KeyPairClient    osclients.KeyPairClient
-	NetworkClient    *mock.MockNetworkClient
-	ImageClient      *mock.MockImageClient
+	DomainClient     *mock.MockDomainClient
 	IdentityClient   *mock.MockIdentityClient
+	ImageClient      *mock.MockImageClient
+	KeyPairClient    *mock.MockKeyPairClient
+	NetworkClient    *mock.MockNetworkClient
+	ServiceClient    *mock.MockServiceClient
 	VolumeClient     *mock.MockVolumeClient
 	VolumeTypeClient *mock.MockVolumeTypeClient
-	DomainClient     *mock.MockDomainClient
-	ServiceClient    *mock.MockServiceClient
 
 	clientScopeCreateError error
 }
 
 func NewMockScopeFactory(mockCtrl *gomock.Controller) *MockScopeFactory {
 	computeClient := mock.NewMockComputeClient(mockCtrl)
+	domainClient := mock.NewMockDomainClient(mockCtrl)
+	identityClient := mock.NewMockIdentityClient(mockCtrl)
 	imageClient := mock.NewMockImageClient(mockCtrl)
+	keypairClient := mock.NewMockKeyPairClient(mockCtrl)
 	networkClient := mock.NewMockNetworkClient(mockCtrl)
-	identityClient := mock.NewMockIdentityClient(mockCtrl)
+	serviceClient := mock.NewMockServiceClient(mockCtrl)
 	volumeClient := mock.NewMockVolumeClient(mockCtrl)
 	volumetypeClient := mock.NewMockVolumeTypeClient(mockCtrl)
-	domainClient := mock.NewMockDomainClient(mockCtrl)
-	serviceClient := mock.NewMockServiceClient(mockCtrl)
 
 	return &MockScopeFactory{
 		ComputeClient:    computeClient,
+		DomainClient:     domainClient,
+		IdentityClient:   identityClient,
 		ImageClient:      imageClient,
+		KeyPairClient:    keypairClient,
 		NetworkClient:    networkClient,
-		IdentityClient:   identityClient,
+		ServiceClient:    serviceClient,
 		VolumeClient:     volumeClient,
 		VolumeTypeClient: volumetypeClient,
-		DomainClient:     domainClient,
-		ServiceClient:    serviceClient,
 	}
 }
 

internal/scope/scope.go

@@ -49,15 +49,15 @@ type Factory interface {
 // Scope contains arguments common to most operations.
 type Scope interface {
 	NewComputeClient() (osclients.ComputeClient, error)
+	NewDomainClient() (osclients.DomainClient, error)
+	NewIdentityClient() (osclients.IdentityClient, error)
 	NewImageClient() (osclients.ImageClient, error)
+	NewKeyPairClient() (osclients.KeyPairClient, error)
 	NewNetworkClient() (osclients.NetworkClient, error)
-	NewIdentityClient() (osclients.IdentityClient, error)
+	NewServiceClient() (osclients.ServiceClient, error)
 	NewVolumeClient() (osclients.VolumeClient, error)
 	NewVolumeTypeClient() (osclients.VolumeTypeClient, error)
-	NewDomainClient() (osclients.DomainClient, error)
-	NewServiceClient() (osclients.ServiceClient, error)
 	ExtractToken() (*tokens.Token, error)
-	NewKeyPairClient() (osclients.KeyPairClient, error)
 }
 
 // WithLogger extends Scope with a logger.