Added support for export deletion

-Retrieve pirvate ip for mount target and fixed system tests
-Ignore linting mock_interfaces
-Fix for config file for creating rc with volume claim

Author: MadalinaPatrichi

examples/example-pod-fss.template

@@ -0,0 +1,20 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: demooci-fss-pod-{{TEST_ID}}
+  labels:
+    name: demooci-fss-pod-{{TEST_ID}}
+spec:
+  containers:
+    - name: demooci-fss-pod-{{TEST_ID}}
+      image: fedora/nginx
+      ports:
+        - name: web
+          containerPort: 80
+      volumeMounts:
+        - name: nginx
+          mountPath: /usr/share/nginx/html
+  volumes:
+    - name: nginx
+      persistentVolumeClaim:
+        claimName: demooci-fss-{{TEST_ID}}

test/system/replication-controller-with-volume-claim.yaml.template renamed to examples/example-replication-controller-with-volume-claim.template

@@ -21,9 +21,8 @@ set -o nounset
 set -o pipefail
 
 TARGETS=$(for d in "$@"; do echo ./$d/...; done)
-
 echo -n "Checking golint: "
-ERRS=$(golint ${TARGETS} 2>&1 || true)
+ERRS=$(golint ${TARGETS} | grep -v mock_interfaces.go 2>&1 || true)
 if [ -n "${ERRS}" ]; then
     echo "FAIL"
     echo "${ERRS}"

test/system/replication-controller.yaml.template renamed to examples/example-replication-controller.template

@@ -29,6 +29,9 @@ var (
 	// VolumeBackupID of backup volume
 	VolumeBackupID = "dummyVolumeBackupId"
 	fileSystemID   = "dummyFileSystemId"
+	exportID       = "dummyExportID"
+	serverIPs      = []string{"dummyServerIP"}
+	privateIP      = "127.0.0.1"
 )
 
 // MockBlockStorageClient mocks BlockStorage client implementation
@@ -66,12 +69,17 @@ func (c *MockFileStorageClient) DeleteFileSystem(ctx context.Context, request fi
 
 // CreateExport mocks the FileStorage CreateExport implementation
 func (c *MockFileStorageClient) CreateExport(ctx context.Context, request filestorage.CreateExportRequest) (response filestorage.CreateExportResponse, err error) {
-	return filestorage.CreateExportResponse{}, nil
+	return filestorage.CreateExportResponse{Export: filestorage.Export{Id: common.String(exportID)}}, nil
+}
+
+// DeleteExport mocks the FileStorage DeleteExport implementation
+func (c *MockFileStorageClient) DeleteExport(ctx context.Context, request filestorage.DeleteExportRequest) (response filestorage.DeleteExportResponse, err error) {
+	return filestorage.DeleteExportResponse{}, nil
 }
 
 // CreateMountTarget mocks the FileStorage CreateMountTarget implementation
 func (c *MockFileStorageClient) CreateMountTarget(ctx context.Context, request filestorage.CreateMountTargetRequest) (response filestorage.CreateMountTargetResponse, err error) {
-	return filestorage.CreateMountTargetResponse{}, nil
+	return filestorage.CreateMountTargetResponse{MountTarget: filestorage.MountTarget{PrivateIpIds: serverIPs}}, nil
 }
 
 // GetMountTarget mocks the FileStorage GetMountTarget implementation
@@ -84,6 +92,15 @@ func (c *MockFileStorageClient) ListMountTargets(ctx context.Context, request fi
 	return filestorage.ListMountTargetsResponse{}, nil
 }
 
+// MockVirtualNetworkClient mocks VirtualNetwork client implementation
+type MockVirtualNetworkClient struct {
+}
+
+// GetPrivateIp mocks the VirtualNetwork GetPrivateIp implementation
+func (c *MockVirtualNetworkClient) GetPrivateIp(ctx context.Context, request core.GetPrivateIpRequest) (response core.GetPrivateIpResponse, err error) {
+	return core.GetPrivateIpResponse{PrivateIp: core.PrivateIp{IpAddress: common.String(privateIP)}}, nil
+}
+
 // MockIdentityClient mocks identity client structure
 type MockIdentityClient struct {
 	common.BaseClient
@@ -108,6 +125,11 @@ func (p *MockProvisionerClient) FileStorage() client.FileStorage {
 	return &MockFileStorageClient{}
 }
 
+// VirtualNetwork mocks client VirtualNetwork implementation
+func (p *MockProvisionerClient) VirtualNetwork() client.VirtualNetwork {
+	return &MockVirtualNetworkClient{}
+}
+
 // Identity mocks client Identity implementation
 func (p *MockProvisionerClient) Identity() client.Identity {
 	return &MockIdentityClient{}

hack/check-golint.sh

@@ -40,13 +40,14 @@ import (
 
 // ProvisionerClient wraps the OCI sub-clients required for volume provisioning.
 type provisionerClient struct {
-	cfg          *Config
-	blockStorage *core.BlockstorageClient
-	identity     *identity.IdentityClient
-	fileStorage  *filestorage.FileStorageClient
-	context      context.Context
-	timeout      time.Duration
-	metadata     *instancemeta.InstanceMetadata
+	cfg            *Config
+	blockStorage   *core.BlockstorageClient
+	identity       *identity.IdentityClient
+	fileStorage    *filestorage.FileStorageClient
+	virtualNetwork *core.VirtualNetworkClient
+	context        context.Context
+	timeout        time.Duration
+	metadata       *instancemeta.InstanceMetadata
 }
 
 // BlockStorage specifies the subset of the OCI core API utilised by the provisioner.
@@ -67,15 +68,22 @@ type FileStorage interface {
 	DeleteFileSystem(ctx context.Context, request filestorage.DeleteFileSystemRequest) (response filestorage.DeleteFileSystemResponse, err error)
 	CreateMountTarget(ctx context.Context, request filestorage.CreateMountTargetRequest) (response filestorage.CreateMountTargetResponse, err error)
 	CreateExport(ctx context.Context, request filestorage.CreateExportRequest) (response filestorage.CreateExportResponse, err error)
+	DeleteExport(ctx context.Context, request filestorage.DeleteExportRequest) (response filestorage.DeleteExportResponse, err error)
 	GetMountTarget(ctx context.Context, request filestorage.GetMountTargetRequest) (response filestorage.GetMountTargetResponse, err error)
 	ListMountTargets(ctx context.Context, request filestorage.ListMountTargetsRequest) (response filestorage.ListMountTargetsResponse, err error)
 }
 
+//VirtualNetwork specifies the subset of the OCI core API utilised by the provisioner.
+type VirtualNetwork interface {
+	GetPrivateIp(ctx context.Context, request core.GetPrivateIpRequest) (response core.GetPrivateIpResponse, err error)
+}
+
 // ProvisionerClient is passed to all sub clients to provision a volume
 type ProvisionerClient interface {
 	BlockStorage() BlockStorage
 	Identity() Identity
 	FileStorage() FileStorage
+	VirtualNetwork() VirtualNetwork
 	Context() context.Context
 	Timeout() time.Duration
 	CompartmentOCID() string
@@ -94,6 +102,10 @@ func (p *provisionerClient) FileStorage() FileStorage {
 	return p.fileStorage
 }
 
+func (p *provisionerClient) VirtualNetwork() VirtualNetwork {
+	return p.virtualNetwork
+}
+
 func (p *provisionerClient) Context() context.Context {
 	return p.context
 }
@@ -141,6 +153,11 @@ func FromConfig(cfg *Config) (ProvisionerClient, error) {
 		return nil, err
 	}
 
+	virtualNetwork, err := core.NewVirtualNetworkClientWithConfigurationProvider(config)
+	if err != nil {
+		return nil, err
+	}
+
 	identity, err := identity.NewIdentityClientWithConfigurationProvider(config)
 	if err != nil {
 		return nil, err
@@ -156,13 +173,14 @@ func FromConfig(cfg *Config) (ProvisionerClient, error) {
 	}
 
 	return &provisionerClient{
-		cfg:          cfg,
-		blockStorage: &blockStorage,
-		identity:     &identity,
-		fileStorage:  &fileStorage,
-		timeout:      3 * time.Minute,
-		context:      context.Background(),
-		metadata:     metadata,
+		cfg:            cfg,
+		blockStorage:   &blockStorage,
+		identity:       &identity,
+		fileStorage:    &fileStorage,
+		virtualNetwork: &virtualNetwork,
+		timeout:        3 * time.Minute,
+		context:        context.Background(),
+		metadata:       metadata,
 	}, nil
 }
 

pkg/helpers/mock_interfaces.go

@@ -25,6 +25,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/kubernetes-incubator/external-storage/lib/controller"
 	"github.com/oracle/oci-go-sdk/common"
+	"github.com/oracle/oci-go-sdk/core"
 	"github.com/oracle/oci-go-sdk/filestorage"
 	"github.com/oracle/oci-go-sdk/identity"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -36,6 +37,7 @@ import (
 
 const (
 	ociVolumeID            = "ociVolumeID"
+	ociExportID            = "ociExportID"
 	volumePrefixEnvVarName = "OCI_VOLUME_NAME_PREFIX"
 	fsType                 = "fsType"
 	subnetID               = "subnetId"
@@ -128,28 +130,42 @@ func (filesystem *filesystemProvisioner) Provision(
 	}
 
 	glog.Infof("Creating export set")
-	_, err = fileStorageClient.CreateExport(ctx, filestorage.CreateExportRequest{
+	createExportResponse, err := fileStorageClient.CreateExport(ctx, filestorage.CreateExportRequest{
 		CreateExportDetails: filestorage.CreateExportDetails{
 			ExportSetId:  mntTargetResp.ExportSetId,
 			FileSystemId: response.FileSystem.Id,
-			Path:         common.String("/"),
+			Path:         common.String("/" + *response.FileSystem.Id),
 		},
 	})
 
 	if err != nil {
 		glog.Errorf("Failed to create export:%s", err)
 		return nil, err
 	}
-	mntTargetSubnetIDPtr := ""
-	if mntTargetResp.SubnetId != nil {
-		mntTargetSubnetIDPtr = *mntTargetResp.SubnetId
+	serverIP := ""
+	if len(mntTargetResp.PrivateIpIds) != 0 {
+		privateIPID := mntTargetResp.PrivateIpIds[rand.Int()%len(mntTargetResp.PrivateIpIds)]
+		virtualNetworkClient := filesystem.client.VirtualNetwork()
+		getPrivateIPResponse, err := virtualNetworkClient.GetPrivateIp(ctx, core.GetPrivateIpRequest{
+			PrivateIpId: common.String(privateIPID),
+		})
+		if err != nil {
+			glog.Errorf("Failed to retrieve IP address for mount target:%s", err)
+			return nil, err
+		}
+		serverIP = *getPrivateIPResponse.PrivateIp.IpAddress
+	} else {
+		glog.Errorf("Failed to find server IDs associated with the mount target to provision a persistent volume")
+		return nil, fmt.Errorf("Failed to find server IDs associated with the mount target")
 	}
-	glog.Infof("Creating persistent volume")
+
+	glog.Infof("Creating persistent volume on mount target with private IP address %s", serverIP)
 	return &v1.PersistentVolume{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: *response.FileSystem.Id,
 			Annotations: map[string]string{
 				ociVolumeID: *response.FileSystem.Id,
+				ociExportID: *createExportResponse.Export.Id,
 			},
 			Labels: map[string]string{},
 		},
@@ -162,8 +178,9 @@ func (filesystem *filesystemProvisioner) Provision(
 			},
 			PersistentVolumeSource: v1.PersistentVolumeSource{
 				NFS: &v1.NFSVolumeSource{
-					Server:   mntTargetSubnetIDPtr,
-					Path:     "/",
+					// Randomnly select IP address associated with the mount target to use for attachment
+					Server:   serverIP,
+					Path:     *common.String("/" + *response.FileSystem.Id),
 					ReadOnly: false,
 				},
 			},
@@ -173,14 +190,27 @@ func (filesystem *filesystemProvisioner) Provision(
 
 // Delete destroys a OCI volume created by Provision
 func (filesystem *filesystemProvisioner) Delete(volume *v1.PersistentVolume) error {
+	exportID, ok := volume.Annotations[ociExportID]
+	if !ok {
+		return errors.New("Export ID annotation not found on PV")
+	}
 	filesystemID, ok := volume.Annotations[ociVolumeID]
 	if !ok {
-		return errors.New("filesystemid annotation not found on PV")
+		return errors.New("Filesystem ID annotation not found on PV")
 	}
-	glog.Infof("Deleting volume %v with filesystemID %v", volume, filesystemID)
 	ctx, cancel := context.WithTimeout(filesystem.client.Context(), filesystem.client.Timeout())
 	defer cancel()
-	_, err := filesystem.client.FileStorage().DeleteFileSystem(ctx,
+	glog.Infof("Deleting export for filesystemID %v", filesystemID)
+	_, err := filesystem.client.FileStorage().DeleteExport(ctx,
+		filestorage.DeleteExportRequest{
+			ExportId: &exportID,
+		})
+	if err != nil {
+		glog.Errorf("Failed to delete export:%s, %s", exportID, err)
+		return err
+	}
+	glog.Infof("Deleting volume %v with filesystemID %v", volume, filesystemID)
+	_, err = filesystem.client.FileStorage().DeleteFileSystem(ctx,
 		filestorage.DeleteFileSystemRequest{
 			FileSystemId: &filesystemID,
 		})