Merge pull request #440 from yussufsh/clean

use instance storage type instead of querying for image

Author: k8s-ci-robot

pkg/cloud/cloud_interface.go

@@ -33,6 +33,5 @@ type Cloud interface {
 	GetPVMInstanceByID(instanceID string) (instance *PVMInstance, err error)
 	GetPVMInstanceDetails(instanceID string) (*models.PVMInstance, error)
 	UpdateStoragePoolAffinity(instanceID string) error
-	GetImageByID(imageID string) (image *PVMImage, err error)
 	IsAttached(volumeID string, nodeID string) (attached bool, err error)
 }

pkg/cloud/mocks/mock_cloud.go

@@ -54,21 +54,14 @@ type powerVSCloud struct {
 
 	cloudInstanceID string
 
-	imageClient        *instance.IBMPIImageClient
 	pvmInstancesClient *instance.IBMPIInstanceClient
 	volClient          *instance.IBMPIVolumeClient
 }
 
 type PVMInstance struct {
-	ID      string
-	ImageID string
-	Name    string
-}
-
-type PVMImage struct {
 	ID       string
-	Name     string
 	DiskType string
+	Name     string
 }
 
 func NewPowerVSCloud(cloudInstanceID, zone string, debug bool) (Cloud, error) {
@@ -104,12 +97,10 @@ func newPowerVSCloud(cloudInstanceID, zone string, debug bool) (Cloud, error) {
 	backgroundContext := context.Background()
 	volClient := instance.NewIBMPIVolumeClient(backgroundContext, piSession, cloudInstanceID)
 	pvmInstancesClient := instance.NewIBMPIInstanceClient(backgroundContext, piSession, cloudInstanceID)
-	imageClient := instance.NewIBMPIImageClient(backgroundContext, piSession, cloudInstanceID)
 
 	return &powerVSCloud{
 		piSession:          piSession,
 		cloudInstanceID:    cloudInstanceID,
-		imageClient:        imageClient,
 		pvmInstancesClient: pvmInstancesClient,
 		volClient:          volClient,
 	}, nil
@@ -123,9 +114,9 @@ func (p *powerVSCloud) GetPVMInstanceByName(name string) (*PVMInstance, error) {
 	for _, pvmInstance := range in.PvmInstances {
 		if name == *pvmInstance.ServerName {
 			return &PVMInstance{
-				ID:      *pvmInstance.PvmInstanceID,
-				ImageID: *pvmInstance.ImageID,
-				Name:    *pvmInstance.ServerName,
+				ID:       *pvmInstance.PvmInstanceID,
+				DiskType: pvmInstance.StorageType,
+				Name:     *pvmInstance.ServerName,
 			}, nil
 		}
 	}
@@ -139,21 +130,9 @@ func (p *powerVSCloud) GetPVMInstanceByID(instanceID string) (*PVMInstance, erro
 	}
 
 	return &PVMInstance{
-		ID:      *in.PvmInstanceID,
-		ImageID: *in.ImageID,
-		Name:    *in.ServerName,
-	}, nil
-}
-
-func (p *powerVSCloud) GetImageByID(imageID string) (*PVMImage, error) {
-	image, err := p.imageClient.Get(imageID)
-	if err != nil {
-		return nil, err
-	}
-	return &PVMImage{
-		ID:       *image.ImageID,
-		Name:     *image.Name,
-		DiskType: *image.StorageType,
+		ID:       *in.PvmInstanceID,
+		DiskType: *in.StorageType,
+		Name:     *in.ServerName,
 	}, nil
 }
 

pkg/cloud/powervs.go

@@ -575,13 +575,9 @@ func (d *nodeService) NodeGetInfo(ctx context.Context, req *csi.NodeGetInfoReque
 		klog.Errorf("failed to get the instance for pvmInstanceId %s, err: %s", d.pvmInstanceId, err)
 		return nil, fmt.Errorf("failed to get the instance for pvmInstanceId %s, err: %s", d.pvmInstanceId, err)
 	}
-	image, err := d.cloud.GetImageByID(in.ImageID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get the image details for %s, err: %s", in.ImageID, err)
-	}
 
 	segments := map[string]string{
-		DiskTypeKey: image.DiskType,
+		DiskTypeKey: in.DiskType,
 	}
 
 	topology := &csi.Topology{Segments: segments}

pkg/driver/node.go

@@ -1096,14 +1096,8 @@ func TestNodeGetInfo(t *testing.T) {
 			mockCloud := cloudmocks.NewMockCloud(mockCtl)
 
 			mockCloud.EXPECT().GetPVMInstanceByID(tc.instanceID).Return(&cloud.PVMInstance{
-				ID:      tc.instanceID,
-				Name:    tc.name,
-				ImageID: "test-image",
-			}, nil)
-
-			mockCloud.EXPECT().GetImageByID(gomock.Eq("test-image")).Return(&cloud.PVMImage{
-				ID:       "test-image",
-				Name:     "test-image",
+				ID:       tc.instanceID,
+				Name:     tc.name,
 				DiskType: "tier3",
 			}, nil)
 

pkg/driver/node_test.go

@@ -134,21 +134,19 @@ func newFakeCloudProvider() *fakeCloudProvider {
 }
 
 func (p *fakeCloudProvider) GetPVMInstanceByName(name string) (*cloud.PVMInstance, error) {
-
 	return &cloud.PVMInstance{
-		ID:      name + "-" + "id",
-		ImageID: name + "-" + "image",
-		Name:    name,
+		ID:       name + "-" + "id",
+		DiskType: "tier3",
+		Name:     name,
 	}, nil
 
 }
 
 func (p *fakeCloudProvider) GetPVMInstanceByID(instanceID string) (*cloud.PVMInstance, error) {
-
 	return &cloud.PVMInstance{
-		ID:      instanceID,
-		ImageID: strings.Split(instanceID, "-")[0] + "-" + "image",
-		Name:    strings.Split(instanceID, "-")[0],
+		ID:       instanceID,
+		DiskType: "tier3",
+		Name:     strings.Split(instanceID, "-")[0],
 	}, nil
 }
 
@@ -166,15 +164,6 @@ func (p *fakeCloudProvider) UpdateStoragePoolAffinity(instanceID string) error {
 	return nil
 }
 
-func (p *fakeCloudProvider) GetImageByID(imageID string) (*cloud.PVMImage, error) {
-
-	return &cloud.PVMImage{
-		ID:       imageID,
-		Name:     strings.Split(imageID, "-")[0] + "-" + "image",
-		DiskType: "tier3",
-	}, nil
-}
-
 func (c *fakeCloudProvider) CreateDisk(volumeName string, diskOptions *cloud.DiskOptions) (*cloud.Disk, error) {
 	r1 := rand.New(rand.NewSource(time.Now().UnixNano()))