Adds UT for ReconcileLoadBalancers function #1979

carmal891 · 2024-09-29T17:46:36Z

What this PR does / why we need it: Adds UT for ReconcileLoadBalancers function

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes # #1818

Special notes for your reviewer:

/area provider/ibmcloud

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

Release note:

linux-foundation-easycla · 2024-09-29T17:46:40Z

The committers listed above are authorized under a signed CLA.

✅ login: carmal891 / name: Carmal (2232256)

k8s-ci-robot · 2024-09-29T17:46:45Z

Welcome @carmal891!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-ibmcloud 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-ibmcloud has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2024-09-29T17:46:46Z

Hi @carmal891. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

netlify · 2024-09-29T17:46:52Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-ibmcloud ready!

Name	Link
🔨 Latest commit	`2232256`
🔍 Latest deploy log	https://app.netlify.com/sites/kubernetes-sigs-cluster-api-ibmcloud/deploys/6729e59c1946f800083cb360
😎 Deploy Preview	https://deploy-preview-1979--kubernetes-sigs-cluster-api-ibmcloud.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Prajyot-Parab · 2024-09-30T07:19:16Z

/ok-to-test
/easycla

Karthik-K-N · 2024-10-01T03:57:41Z

cloud/scope/powervs_cluster_test.go

 	"go.uber.org/mock/gomock"

 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"

+	"sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"


I think you should use the existing import infrav1beta2 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"

Used existing import

carmal891 · 2024-10-04T05:24:45Z

@Amulyam24 Adjusted UT as per issue #1937

carmal891 · 2024-10-04T06:34:57Z

/easycla

Amulyam24

Thank you for the PR @carmal891!
Minor suggestions, overall LGTM

Amulyam24 · 2024-10-04T11:39:30Z

cloud/scope/powervs_cluster_test.go

+
+		loadBalancerStatus, ok := clusterScope.IBMPowerVSCluster.Status.LoadBalancers["test-lb"]
+		g.Expect(ok).To(BeTrue())
+		g.Expect(loadBalancerStatus.State).To(BeEquivalentTo(infrav1beta2.VPCLoadBalancerStateActive))


would be good to check all values set in status wherever applicable such as

g.Expect(loadBalancerStatus.ControllerCreated).To(BeFalse()) g.Expect(loadBalancerStatus.Hostname).To(Equal("test-lb-hostname"))

cloud/scope/powervs_cluster_test.go

Amulyam24 · 2024-10-04T11:45:18Z

cloud/scope/powervs_cluster_test.go

+
+		loadBalancer, ok := clusterScope.IBMPowerVSCluster.Status.LoadBalancers["test-lb"]
+		g.Expect(ok).To(BeTrue())
+		g.Expect(loadBalancer.State).To(BeEquivalentTo(infrav1beta2.VPCLoadBalancerStateActive))


would be good to check all values set in status

Amulyam24 · 2024-10-04T11:50:57Z

cloud/scope/powervs_cluster_test.go

+							ID:   nil,
+						},
+					},
+					VPCSubnets: nil,


I think no need to specify explicitly, the value would be nil by default right?

True that the default value for VPCSubnets would be nil, I think explicitly setting it to nil improves readability and clarity. Let me know your opinion

Makes sense 👍🏼

I personally think its not needed as it just increases number of lines of code, Its up to you to keep it or remove..

corrected as to stay uniform with existing style in codebase

cloud/scope/powervs_cluster_test.go

Amulyam24

Overall LGTM apart from a minor comment!

Amulyam24 · 2024-10-15T06:33:21Z

cloud/scope/powervs_cluster_test.go

+
+		loadBalancer, ok := clusterScope.IBMPowerVSCluster.Status.LoadBalancers["test-lb"]
+		g.Expect(ok).To(BeTrue())
+		g.Expect(loadBalancer.State).To(BeEquivalentTo(infrav1beta2.VPCLoadBalancerStateActive))


How about we verify the values of ControllerCreated and Hostname in status when the resource is created via controller?

Karthik-K-N

Non blocking minor things, LGTM.

Karthik-K-N · 2024-10-15T06:38:08Z

cloud/scope/powervs_cluster_test.go

+		}
+
+		mockVpc.EXPECT().GetLoadBalancerByName(gomock.Any()).Return(nil, nil)
+		mockVpc.EXPECT().CreateLoadBalancer(gomock.Any()).Return(nil, nil, errors.New("Failed loadBalancer creation"))


Not a blocking one, But its better to make sure errors are in small case.

Suggested change

mockVpc.EXPECT().CreateLoadBalancer(gomock.Any()).Return(nil, nil, errors.New("Failed loadBalancer creation"))

mockVpc.EXPECT().CreateLoadBalancer(gomock.Any()).Return(nil, nil, errors.New("failed loadBalancer creation"))

Karthik-K-N · 2024-10-15T06:38:50Z

cloud/scope/powervs_cluster_test.go

+							ID:   nil,
+						},
+					},
+					VPCSubnets: nil,


I personally think its not needed as it just increases number of lines of code, Its up to you to keep it or remove..

carmal891 · 2024-10-20T14:35:18Z

/retest

Karthik-K-N · 2024-10-21T13:38:09Z

/easycla

Karthik-K-N

One small change, Otherwise LGTM

Karthik-K-N · 2024-10-25T07:34:23Z

cloud/scope/powervs_cluster_test.go

+				Spec: infrav1beta2.IBMPowerVSClusterSpec{
+					LoadBalancers: []infrav1beta2.VPCLoadBalancerSpec{
+						{
+							ID: core.StringPtr("test-lb-instanceid"),


Previously we were using core package for pointer conversion, Lately we are using "k8s.io/utils/ptr" so lets use ptr.To()
(Wherever applicable in the file)

Karthik-K-N · 2024-10-28T06:41:12Z

Just a quick update, @dharaneeshvrd is submitting a fix for #2026, So which might require slight change in this UT, so lets keep an eye on this and update it accordingly.

carmal891 · 2024-11-04T01:37:19Z

@Karthik-K-N Adjusted as per fix for #2026. Additionally added UT for individual sub functions as discussed

Amulyam24 · 2024-11-05T06:05:26Z

cloud/scope/powervs_cluster_test.go

+
+		mockVpc.EXPECT().GetLoadBalancer(gomock.Any()).Return(nil, nil, errors.New("failed to fetch VPC load balancer details"))
+
+		requeue, err := clusterScope.ReconcileLoadBalancers()


Suggested change

requeue, err := clusterScope.ReconcileLoadBalancers()

loadBalancerReady, err := clusterScope.ReconcileLoadBalancers()

Please change variable and test case name wherever applicable.

Amulyam24 · 2024-11-05T06:07:19Z

cloud/scope/powervs_cluster_test.go

+		g.Expect(err).ToNot(BeNil())
+	})
+
+	t.Run("When createLoadBalancer returns error as resource group id is empty", func(*testing.T) {


I see a couple of redundant test cases here and in TestCreateLoadbalancer, can we remove from one function?

Removed redundant cases

Karthik-K-N

/lgtm

carmal891 · 2024-11-05T09:55:46Z

/assign @Prajyot-Parab

Karthik-K-N

/lgtm

Prajyot-Parab

/lgtm

k8s-ci-robot · 2024-11-07T07:56:36Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Amulyam24, carmal891, Prajyot-Parab

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [Prajyot-Parab]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

k8s-ci-robot added the area/provider/ibmcloud Issues or PRs related to ibmcloud provider label Sep 29, 2024

k8s-ci-robot requested review from Karthik-K-N and mkumatag September 29, 2024 17:46

k8s-ci-robot added the cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. label Sep 29, 2024

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Sep 29, 2024

k8s-ci-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Sep 29, 2024

k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 30, 2024

Karthik-K-N reviewed Oct 1, 2024

View reviewed changes

carmal891 force-pushed the UTReconcileLB branch from c12d1a3 to f7735d8 Compare October 4, 2024 05:20

carmal891 requested a review from Karthik-K-N October 4, 2024 05:25

carmal891 force-pushed the UTReconcileLB branch from f7735d8 to 9c6bdf5 Compare October 4, 2024 05:51

Amulyam24 reviewed Oct 4, 2024

View reviewed changes

carmal891 force-pushed the UTReconcileLB branch from 7a6cc35 to e747c23 Compare October 7, 2024 18:32

carmal891 requested a review from Amulyam24 October 7, 2024 18:39

carmal891 force-pushed the UTReconcileLB branch from e747c23 to 9660420 Compare October 11, 2024 05:19

Amulyam24 reviewed Oct 15, 2024

View reviewed changes

Karthik-K-N reviewed Oct 15, 2024

View reviewed changes

carmal891 requested review from Amulyam24 and Karthik-K-N October 20, 2024 14:09

carmal891 force-pushed the UTReconcileLB branch from df0e4e0 to fd724d2 Compare October 21, 2024 14:15

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Oct 23, 2024

carmal891 force-pushed the UTReconcileLB branch from 47f36d6 to 4e59684 Compare October 23, 2024 09:57

Karthik-K-N reviewed Oct 25, 2024

View reviewed changes

carmal891 force-pushed the UTReconcileLB branch from 4e59684 to 29511df Compare October 28, 2024 06:36

carmal891 requested a review from Karthik-K-N October 28, 2024 06:36

mkumatag added this to the v0.9.0 milestone Oct 29, 2024

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 1, 2024

carmal891 force-pushed the UTReconcileLB branch from 34e722a to e43c107 Compare November 4, 2024 01:32

Amulyam24 reviewed Nov 5, 2024

View reviewed changes

carmal891 requested a review from Amulyam24 November 5, 2024 07:01

Karthik-K-N reviewed Nov 5, 2024

View reviewed changes

k8s-ci-robot assigned Karthik-K-N Nov 5, 2024

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 5, 2024

Amulyam24 approved these changes Nov 5, 2024

View reviewed changes

carmal891 force-pushed the UTReconcileLB branch from 4446e21 to f652f65 Compare November 5, 2024 09:25

k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 5, 2024

Adds UT for ReconcileLoadBalancers function

2232256

carmal891 force-pushed the UTReconcileLB branch from 38621ea to 2232256 Compare November 5, 2024 09:30

k8s-ci-robot assigned Prajyot-Parab Nov 5, 2024

Karthik-K-N reviewed Nov 7, 2024

View reviewed changes

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 7, 2024

Prajyot-Parab approved these changes Nov 7, 2024

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 7, 2024

k8s-ci-robot merged commit b4a2ff4 into kubernetes-sigs:main Nov 7, 2024
13 checks passed

	mockVpc.EXPECT().CreateLoadBalancer(gomock.Any()).Return(nil, nil, errors.New("Failed loadBalancer creation"))
	mockVpc.EXPECT().CreateLoadBalancer(gomock.Any()).Return(nil, nil, errors.New("failed loadBalancer creation"))


		mockVpc.EXPECT().GetLoadBalancer(gomock.Any()).Return(nil, nil, errors.New("failed to fetch VPC load balancer details"))

		requeue, err := clusterScope.ReconcileLoadBalancers()

	requeue, err := clusterScope.ReconcileLoadBalancers()
	loadBalancerReady, err := clusterScope.ReconcileLoadBalancers()

Adds UT for ReconcileLoadBalancers function #1979

Adds UT for ReconcileLoadBalancers function #1979

Uh oh!

Conversation

carmal891 commented Sep 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

linux-foundation-easycla bot commented Sep 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Sep 29, 2024

Uh oh!

k8s-ci-robot commented Sep 29, 2024

Uh oh!

netlify bot commented Sep 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for kubernetes-sigs-cluster-api-ibmcloud ready!

Uh oh!

Prajyot-Parab commented Sep 30, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

carmal891 commented Oct 4, 2024

Uh oh!

carmal891 commented Oct 4, 2024

Uh oh!

Amulyam24 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Amulyam24 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Karthik-K-N left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

carmal891 commented Oct 20, 2024

Uh oh!

Karthik-K-N commented Oct 21, 2024

Uh oh!

Karthik-K-N left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Karthik-K-N commented Oct 28, 2024

Uh oh!

carmal891 commented Nov 4, 2024

Uh oh!

carmal891 commented Sep 29, 2024 •

edited

Loading

linux-foundation-easycla bot commented Sep 29, 2024 •

edited

Loading

netlify bot commented Sep 29, 2024 •

edited

Loading