Skip to content

Commit 74db9d7

Browse files
author
Joshua Reed
committed
Cleanup merge with main.
1 parent b5eed4a commit 74db9d7

18 files changed

+114
-699
lines changed

affinity_groups_test.go

Lines changed: 0 additions & 108 deletions
This file was deleted.
File renamed without changes.

test/helpers/client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import (
44
"os"
55

66
"github.com/apache/cloudstack-go/v2/cloudstack"
7-
"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
87
"github.com/pkg/errors"
98
"gopkg.in/ini.v1"
9+
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
1010
)
1111

1212
func NewCSClient() (*cloudstack.CloudStackClient, error) {

test/helpers/user.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"strings"
66

77
"github.com/apache/cloudstack-go/v2/cloudstack"
8-
"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
8+
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
99
)
1010

1111
const TempUserName = "TemporaryUser"

test/helpers/user_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ limitations under the License.
1717
package helpers_test
1818

1919
import (
20-
"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
21-
"github.com/aws/cluster-api-provider-cloudstack/test/helpers"
2220
. "github.com/onsi/ginkgo/v2"
2321
. "github.com/onsi/gomega"
22+
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
23+
"sigs.k8s.io/cluster-api-provider-cloudstack/test/helpers"
2424
)
2525

2626
var _ = Describe("Test helper methods", func() {

test/unit/cloud/cloud_suite_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import (
2222
"testing"
2323

2424
"github.com/apache/cloudstack-go/v2/cloudstack"
25-
"github.com/aws/cluster-api-provider-cloudstack-staging/test/unit/dummies"
26-
"github.com/aws/cluster-api-provider-cloudstack/pkg/cloud"
27-
"github.com/aws/cluster-api-provider-cloudstack/test/helpers"
2825
. "github.com/onsi/ginkgo/v2"
2926
. "github.com/onsi/gomega"
3027
"k8s.io/apimachinery/pkg/util/uuid"
28+
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
29+
"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
30+
"sigs.k8s.io/cluster-api-provider-cloudstack/test/helpers"
3131
)
3232

3333
var (

test/unit/cloud/instance_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222
"github.com/apache/cloudstack-go/v2/cloudstack"
2323
"github.com/golang/mock/gomock"
2424
. "github.com/onsi/ginkgo/v2"
25-
"sigs.k8s.io/cluster-api-provider-cloudstack-staging/test/unit/dummies"
2625
"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
2726
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
27+
"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
2828

2929
. "github.com/onsi/gomega"
3030
"github.com/pkg/errors"

test/unit/cloud/isolated_network_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
. "github.com/onsi/ginkgo/v2"
2525
. "github.com/onsi/gomega"
2626
"github.com/pkg/errors"
27-
"sigs.k8s.io/cluster-api-provider-cloudstack-staging/test/unit/dummies"
2827
capcv1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta1"
2928
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
3029
"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"

test/unit/cloud/network_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"github.com/golang/mock/gomock"
2222
. "github.com/onsi/ginkgo/v2"
2323
. "github.com/onsi/gomega"
24-
"sigs.k8s.io/cluster-api-provider-cloudstack-staging/test/unit/dummies"
2524
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
25+
"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
2626
)
2727

2828
var _ = Describe("Network", func() {

test/unit/cloud/tags_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package cloud_test
1919
import (
2020
. "github.com/onsi/ginkgo/v2"
2121
. "github.com/onsi/gomega"
22-
"sigs.k8s.io/cluster-api-provider-cloudstack-staging/test/unit/dummies"
2322
"sigs.k8s.io/cluster-api-provider-cloudstack/pkg/cloud"
23+
"sigs.k8s.io/cluster-api-provider-cloudstack/test/dummies"
2424
)
2525

2626
var _ = Describe("Tag Unit Tests", func() {

0 commit comments

Comments
 (0)