Made error handling changes in FSS GetPrivateIP flow

Author: YashasG98

pkg/csi/driver/bv_controller_test.go

@@ -449,6 +449,9 @@ func (c *MockVirtualNetworkClient) UpdateNetworkSecurityGroupSecurityRules(ctx c
 
 // GetPrivateIp mocks the VirtualNetwork GetPrivateIp implementation
 func (c *MockVirtualNetworkClient) GetPrivateIp(ctx context.Context, id string) (*core.PrivateIp, error) {
+	if id == "private-ip-fetch-error" {
+		return nil, errors.New("private IP fetch failed")
+	}
 	privateIpAddress := "10.0.20.1"
 	return &core.PrivateIp{
 		IpAddress: &privateIpAddress,

pkg/csi/driver/fss_controller.go

@@ -27,6 +27,7 @@ import (
 	"github.com/oracle/oci-cloud-controller-manager/pkg/metrics"
 	"github.com/oracle/oci-cloud-controller-manager/pkg/oci/client"
 	"github.com/oracle/oci-cloud-controller-manager/pkg/util"
+	"github.com/oracle/oci-go-sdk/v65/core"
 	fss "github.com/oracle/oci-go-sdk/v65/filestorage"
 	authv1 "k8s.io/api/authentication/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -462,19 +463,21 @@ func (d *FSSControllerDriver) getOrCreateMountTarget(ctx context.Context, storag
 	var ipType string
 	// TODO: Uncomment after SDK Supports Ipv6 - 10 lines
 	//if len(activeMountTarget.MountTargetIpv6Ids) > 0 {
-	//	ipType = "ipv6"
 	//	// Ipv6 Mount Target
+	//	var ipv6IpObject *core.Ipv6
+	//	ipType = "ipv6"
 	//	mountTargetIpId = activeMountTarget.MountTargetIpv6Ids[0]
 	//	log.With("mountTargetIpId", mountTargetIpId).Infof("Getting Ipv6 IP of mount target")
-	//	if ipv6IpObject, err := networkingClient.GetIpv6(ctx, mountTargetIpId); err == nil {
+	//	if ipv6IpObject, err = networkingClient.GetIpv6(ctx, mountTargetIpId); err == nil {
 	//		mountTargetIp = *ipv6IpObject.IpAddress
 	//	}
 	//} else {
 	// Ipv4 Mount Target
+	var privateIpObject *core.PrivateIp
 	mountTargetIpId = activeMountTarget.PrivateIpIds[0]
 	ipType = "privateIp"
 	log.With("mountTargetIpId", mountTargetIpId).Infof("Getting private IP of mount target")
-	if privateIpObject, err := networkingClient.GetPrivateIp(ctx, mountTargetIpId); err == nil {
+	if privateIpObject, err = networkingClient.GetPrivateIp(ctx, mountTargetIpId); err == nil {
 		mountTargetIp = *privateIpObject.IpAddress
 	}
 	//}

pkg/csi/driver/fss_controller_test.go

@@ -55,6 +55,13 @@ var (
 			AvailabilityDomain: common.String("NWuj:PHX-AD-2"),
 			Id:                 common.String("mount-target-stuck-creating"),
 		},
+		"private-ip-fetch-error": {
+			DisplayName:        common.String("private-ip-fetch-error"),
+			LifecycleState:     fss.MountTargetLifecycleStateActive,
+			AvailabilityDomain: common.String("NWuj:PHX-AD-2"),
+			Id:                 common.String("private-ip-fetch-error"),
+			PrivateIpIds:       []string{"private-ip-fetch-error"},
+		},
 	}
 
 	fileSystems = map[string]*fss.FileSystem{
@@ -360,18 +367,7 @@ func (c *MockFileStorageClient) AwaitMountTargetActive(ctx context.Context, logg
 	}, ctx.Done()); err != nil {
 		return nil, err
 	}
-	idMt := "oc1.mounttarget.xxxx"
-	ad := "zkJl:US-ASHBURN-AD-1"
-	privateIpIds := []string{"10.0.20.1"}
-	displayName := "mountTarget"
-	idEx := "oc1.export.xxxx"
-	return &filestorage.MountTarget{
-		Id:                 &idMt,
-		AvailabilityDomain: &ad,
-		DisplayName:        &displayName,
-		PrivateIpIds:       privateIpIds,
-		ExportSetId:        &idEx,
-	}, nil
+	return mt, nil
 }
 
 // CreateMountTarget mocks the FileStorage CreateMountTarget implementation.
@@ -545,6 +541,24 @@ func TestFSSControllerDriver_CreateVolume(t *testing.T) {
 			want:    nil,
 			wantErr: errors.New("Neither Mount Target Ocid nor Mount Target Subnet Ocid provided in storage class"),
 		},
+		{
+			name:   "Error during mount target IP fetch",
+			fields: fields{},
+			args: args{
+				ctx: context.Background(),
+				req: &csi.CreateVolumeRequest{
+					Name:       "private-ip-fetch-error",
+					Parameters: map[string]string{"availabilityDomain": "US-ASHBURN-AD-1", "mountTargetSubnetOcid": "oc1.subnet.xxxx"},
+					VolumeCapabilities: []*csi.VolumeCapability{{
+						AccessMode: &csi.VolumeCapability_AccessMode{
+							Mode: csi.VolumeCapability_AccessMode_SINGLE_NODE_WRITER,
+						},
+					}},
+				},
+			},
+			want:    nil,
+			wantErr: errors.New("Failed to get mount target privateIp ip from ip id"),
+		},
 		{
 			name:   "Time out during file system idempotency check",
 			fields: fields{},

pkg/oci/client/networking.go

@@ -241,14 +241,14 @@ func (c *client) GetPrivateIp(ctx context.Context, id string) (*core.PrivateIp,
 		RequestMetadata: c.requestMetadata,
 	})
 	if resp.OpcRequestId != nil {
-		c.logger.With("service", "Networking", "verb", getVerb).
+		c.logger.With("service", "Networking", "verb", getVerb, "mountTargetIpId", id).
 			With("OpcRequestId", *(resp.OpcRequestId)).With("statusCode", util.GetHttpStatusCode(err)).
-			Info("OPC Request ID recorded for GetIpv6GetPrivateIp call.")
+			Info("OPC Request ID recorded for GetPrivateIp call.")
 	}
 	incRequestCounter(err, getVerb, privateIPResource)
 
 	if err != nil {
-		c.logger.With(id).Infof("GetPrivateIp failed %s", pointer.StringDeref(resp.OpcRequestId, ""))
+		c.logger.With("mountTargetIpId", id).Infof("GetPrivateIp failed %s", pointer.StringDeref(resp.OpcRequestId, ""))
 		return nil, errors.WithStack(err)
 	}