Add VCH uuid into image storage usage calculation (vmware#8418)

hashicorp · Dec 18, 2018 · e2f1b28 · e2f1b28
1 parent 9676e9f
commit e2f1b28
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/apiservers/portlayer/restapi/handlers/storage_handlers.go b/lib/apiservers/portlayer/restapi/handlers/storage_handlers.go
@@ -733,12 +733,12 @@ func (h *StorageHandlersImpl) StatPath(params storage.StatPathParams) middleware
 
 }
 
-// ListImages returns a list of images in a store
+// GetImageStorageUsage returns images storage usage for this VCH
 func (h *StorageHandlersImpl) GetImageStorageUsage(params storage.GetImageStorageUsageParams) middleware.Responder {
 	op := trace.NewOperationFromID(context.Background(), params.OpID, "GetImageStorageUsage(%s)", params.StoreName)
 	defer trace.End(trace.Begin("GetImageStorageUsage", op))
 
-	result, err := h.imageCache.DataStore.GetImageStorageUsage(op)
+	result, err := h.imageCache.DataStore.GetImageStorageUsage(op, params.StoreName)
 	if err != nil {
 		op.Errorf("Error gettting image storage usage: %s", err)
 		return storage.NewGetImageStorageUsageDefault(500)

diff --git a/lib/portlayer/storage/image/image.go b/lib/portlayer/storage/image/image.go
@@ -77,7 +77,7 @@ type ImageStorer interface {
 	DeleteImage(op trace.Operation, image *Image) (*Image, error)
 
 	// GetImageStorageUsage gets the image storage usage from the image store.
-	GetImageStorageUsage(op trace.Operation) (int64, error)
+	GetImageStorageUsage(op trace.Operation, storeName string) (int64, error)
 
 	storage.Resolver
 	storage.Importer

diff --git a/lib/portlayer/storage/image/mock/store.go b/lib/portlayer/storage/image/mock/store.go
@@ -187,6 +187,6 @@ func (c *MockDataStore) DeleteImage(op trace.Operation, image *image.Image) (*im
 	return image, nil
 }
 
-func (c *MockDataStore) GetImageStorageUsage(op trace.Operation) (int64, error) {
+func (c *MockDataStore) GetImageStorageUsage(op trace.Operation, storeName string) (int64, error) {
 	return 0, nil
 }
diff --git a/lib/portlayer/storage/image/vsphere/store.go b/lib/portlayer/storage/image/vsphere/store.go
@@ -590,8 +590,8 @@ func (v *ImageStore) ListImages(op trace.Operation, store *url.URL, IDs []string
 	return images, nil
 }
 
-func (v *ImageStore) GetImageStorageUsage(op trace.Operation) (int64, error) {
-	return v.Helper.GetFilesSize(op, "", true, "*.vmdk")
+func (v *ImageStore) GetImageStorageUsage(op trace.Operation, storeName string) (int64, error) {
+	return v.Helper.GetFilesSize(op, v.imageStorePath(storeName), true, "*.vmdk")
 }
 
 // DeleteImage deletes an image from the image store.  If the image is in