Skip to content

Commit

Permalink
remove Async check in NewVSCGHandler
Browse files Browse the repository at this point in the history 
Signed-off-by: youhangwang <[email protected]>
  • Loading branch information
@youhangwang
youhangwang committed Jul 21, 2024
1 parent a79c820 commit c5880c0
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 11 deletions.
10 changes: 4 additions & 6 deletions internal/controller/cephfscg/cghandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,11 @@ func NewVSCGHandler(
logger: log,
}

if instance.Spec.Async != nil {
log.Info("Set Async config")
log.Info("Set Async config")

cgHandler.volumeSnapshotClassSelector = instance.Spec.Async.VolumeSnapshotClassSelector
cgHandler.ramenSchedulingInterval = instance.Spec.Async.SchedulingInterval
cgHandler.volumeGroupSnapshotClassSelector = instance.Spec.Async.VolumeGroupSnapshotClassSelector
}
cgHandler.volumeSnapshotClassSelector = instance.Spec.Async.VolumeSnapshotClassSelector
cgHandler.ramenSchedulingInterval = instance.Spec.Async.SchedulingInterval
cgHandler.volumeGroupSnapshotClassSelector = instance.Spec.Async.VolumeGroupSnapshotClassSelector

return cgHandler
}
Expand Down
56 changes: 51 additions & 5 deletions internal/controller/cephfscg/cghandler_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ var _ = Describe("Cghandler", func() {
Namespace: "default",
UID: "123",
},
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, nil, nil, "0", testLogger)
rgd, err := vsCGHandler.CreateOrUpdateReplicationGroupDestination(vgdName, "default", nil)
Expect(err).To(BeNil())
Expand All @@ -49,6 +52,9 @@ var _ = Describe("Cghandler", func() {
Namespace: "default",
UID: "123",
},
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, nil, nil, "0", testLogger)
rgd, err := vsCGHandler.CreateOrUpdateReplicationGroupDestination(vgdName, "default",
[]ramendrv1alpha1.VolSyncReplicationDestinationSpec{{
Expand Down Expand Up @@ -157,6 +163,9 @@ var _ = Describe("Cghandler", func() {
Name: vrgName,
UID: "123",
},
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, &metav1.LabelSelector{}, nil, "0", testLogger)
rgs, finalSync, err := vsCGHandler.CreateOrUpdateReplicationGroupSource(rgsName, "default", false)
Expect(err).To(BeNil())
Expand All @@ -173,6 +182,9 @@ var _ = Describe("Cghandler", func() {
Name: vrgName,
UID: "123",
},
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, &metav1.LabelSelector{}, nil, "0", testLogger)
image, err := vsCGHandler.GetLatestImageFromRGD(Ctx, "notexist", "default")
Expect(err).NotTo(BeNil())
Expand Down Expand Up @@ -211,6 +223,9 @@ var _ = Describe("Cghandler", func() {
Name: vrgName,
UID: "123",
},
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, &metav1.LabelSelector{}, nil, "0", testLogger)
image, err := vsCGHandler.GetLatestImageFromRGD(Ctx, "pvc1", "default")
Expect(err).NotTo(BeNil())
Expand Down Expand Up @@ -269,6 +284,9 @@ var _ = Describe("Cghandler", func() {
Name: vrgName,
UID: "123",
},
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, &metav1.LabelSelector{}, nil, "0", testLogger)
image, err := vsCGHandler.GetLatestImageFromRGD(Ctx, "pvc1", "default")
Expect(err).To(BeNil())
Expand All @@ -286,6 +304,9 @@ var _ = Describe("Cghandler", func() {
Name: vrgName,
UID: "123",
},
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, &metav1.LabelSelector{},
volsync.NewVSHandler(context.Background(), k8sClient, testLogger, &ramendrv1alpha1.VolumeReplicationGroup{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -325,6 +346,9 @@ var _ = Describe("Cghandler", func() {
Name: vrgName,
UID: "123",
},
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, &metav1.LabelSelector{},
volsync.NewVSHandler(
context.Background(), k8sClient, testLogger,
Expand Down Expand Up @@ -352,29 +376,45 @@ var _ = Describe("Cghandler", func() {
Describe("CheckIfPVCMatchLabel", func() {
It("Should be success", func() {
vsCGHandler = cephfscg.NewVSCGHandler(
Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{}, nil, nil, "0", testLogger,
Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, nil, nil, "0", testLogger,
)
match, err := vsCGHandler.CheckIfPVCMatchLabel(nil)
Expect(err).To(BeNil())
Expect(match).To(BeFalse())
})
It("Should be success", func() {
vsCGHandler = cephfscg.NewVSCGHandler(
Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{}, nil, nil, "0", testLogger,
Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, nil, nil, "0", testLogger,
)
match, err := vsCGHandler.CheckIfPVCMatchLabel(map[string]string{"test": "test"})
Expect(err).To(BeNil())
Expect(match).To(BeFalse())
})
It("Should be success", func() {
vsCGHandler = cephfscg.NewVSCGHandler(Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{},
vsCGHandler = cephfscg.NewVSCGHandler(Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
},
&metav1.LabelSelector{MatchLabels: map[string]string{"test": ""}}, nil, "0", testLogger)
match, err := vsCGHandler.CheckIfPVCMatchLabel(map[string]string{"test": "test"})
Expect(err).To(BeNil())
Expect(match).To(BeFalse())
})
It("Should be success", func() {
vsCGHandler = cephfscg.NewVSCGHandler(Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{},
vsCGHandler = cephfscg.NewVSCGHandler(Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
},
&metav1.LabelSelector{MatchLabels: map[string]string{"test": "test"}}, nil, "0", testLogger)
match, err := vsCGHandler.CheckIfPVCMatchLabel(map[string]string{"test": "test"})
Expect(err).To(BeNil())
Expand All @@ -383,7 +423,11 @@ var _ = Describe("Cghandler", func() {
})
Describe("GetRDInCG", func() {
It("Should be success", func() {
vsCGHandler = cephfscg.NewVSCGHandler(Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{},
vsCGHandler = cephfscg.NewVSCGHandler(Ctx, k8sClient, &ramendrv1alpha1.VolumeReplicationGroup{
Spec: ramendrv1alpha1.VolumeReplicationGroupSpec{
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
},
nil, nil, "0", testLogger)
rdSpecs, err := vsCGHandler.GetRDInCG()
Expect(err).To(BeNil())
Expand All @@ -399,6 +443,7 @@ var _ = Describe("Cghandler", func() {
},
}},
},
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, nil, nil, "0", testLogger)
rdSpecs, err := vsCGHandler.GetRDInCG()
Expand All @@ -415,6 +460,7 @@ var _ = Describe("Cghandler", func() {
},
}},
},
Async: &ramendrv1alpha1.VRGAsyncSpec{},
},
}, &metav1.LabelSelector{
MatchLabels: map[string]string{"test": "test"},
Expand Down

0 comments on commit c5880c0

Please sign in to comment.