set serviceUid as opc-retry-token

Author: pranavsriram8

pkg/cloudprovider/providers/oci/instances_test.go

@@ -439,7 +439,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme
 	return nil, nil
 }
 
-func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 
@@ -533,7 +533,7 @@ func (c *MockNetworkLoadBalancerClient) ListWorkRequests(ctx context.Context, co
 	return nil, nil
 }
 
-func (c *MockNetworkLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockNetworkLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 

pkg/cloudprovider/providers/oci/load_balancer.go

@@ -394,7 +394,8 @@ func (clb *CloudLoadBalancerProvider) createLoadBalancer(ctx context.Context, sp
 		}
 	}
 
-	wrID, err := clb.lbClient.CreateLoadBalancer(ctx, &details)
+	serviceUid := fmt.Sprintf("%s", spec.service.UID)
+	wrID, err := clb.lbClient.CreateLoadBalancer(ctx, &details, &serviceUid)
 	if err != nil {
 		return nil, "", errors.Wrap(err, "creating load balancer")
 	}

pkg/csi/driver/bv_controller_test.go

@@ -465,7 +465,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme
 	return nil, nil
 }
 
-func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 

pkg/oci/client/load_balancer.go

@@ -39,7 +39,7 @@ type loadbalancerClientStruct struct {
 }
 
 type GenericLoadBalancerInterface interface {
-	CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails) (string, error)
+	CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails, serviceUid *string) (string, error)
 
 	GetLoadBalancer(ctx context.Context, id string) (*GenericLoadBalancer, error)
 	GetLoadBalancerByName(ctx context.Context, compartmentID, name string) (*GenericLoadBalancer, error)
@@ -111,11 +111,10 @@ func (c *loadbalancerClientStruct) GetLoadBalancerByName(ctx context.Context, co
 	return nil, errors.WithStack(errNotFound)
 }
 
-func (c *loadbalancerClientStruct) CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails) (string, error) {
+func (c *loadbalancerClientStruct) CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	if !c.rateLimiter.Writer.TryAccept() {
 		return "", RateLimitError(true, "CreateLoadBalancer")
 	}
-
 	resp, err := c.loadbalancer.CreateLoadBalancer(ctx, loadbalancer.CreateLoadBalancerRequest{
 		CreateLoadBalancerDetails: loadbalancer.CreateLoadBalancerDetails{
 			CompartmentId:           details.CompartmentId,
@@ -133,7 +132,7 @@ func (c *loadbalancerClientStruct) CreateLoadBalancer(ctx context.Context, detai
 			DefinedTags:             details.DefinedTags,
 		},
 		RequestMetadata: c.requestMetadata,
-		OpcRetryToken:   details.DisplayName,
+		OpcRetryToken:   serviceUid,
 	})
 	incRequestCounter(err, createVerb, loadBalancerResource)
 

pkg/oci/client/network_load_balancer.go

@@ -84,7 +84,7 @@ func (c *networkLoadbalancer) GetLoadBalancerByName(ctx context.Context, compart
 	return nil, errors.WithStack(errNotFound)
 }
 
-func (c *networkLoadbalancer) CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails) (string, error) {
+func (c *networkLoadbalancer) CreateLoadBalancer(ctx context.Context, details *GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	if !c.rateLimiter.Writer.TryAccept() {
 		return "", RateLimitError(true, "CreateLoadBalancer")
 	}
@@ -104,7 +104,7 @@ func (c *networkLoadbalancer) CreateLoadBalancer(ctx context.Context, details *G
 			DefinedTags:                 details.DefinedTags,
 		},
 		RequestMetadata: c.requestMetadata,
-		OpcRetryToken:   details.DisplayName,
+		OpcRetryToken:   serviceUid,
 	})
 	incRequestCounter(err, createVerb, networkLoadBalancerResource)
 

pkg/oci/client/networking.go

@@ -232,7 +232,7 @@ func (c *client) CreateNetworkSecurityGroup(ctx context.Context, compartmentId,
 			DisplayName:   &displayName,
 			FreeformTags:  map[string]string{"CreatedBy": "CCM", "ServiceUid": serviceUid},
 		},
-		OpcRetryToken:   &displayName,
+		OpcRetryToken:   &serviceUid,
 		RequestMetadata: requestMetadata,
 	})
 

pkg/volume/provisioner/block/block_test.go

@@ -393,7 +393,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme
 	return nil, nil
 }
 
-func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }
 

pkg/volume/provisioner/fss/fss_test.go

@@ -392,7 +392,7 @@ func (c *MockLoadBalancerClient) ListWorkRequests(ctx context.Context, compartme
 	return nil, nil
 }
 
-func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails) (string, error) {
+func (c *MockLoadBalancerClient) CreateLoadBalancer(ctx context.Context, details *client.GenericCreateLoadBalancerDetails, serviceUid *string) (string, error) {
 	return "", nil
 }