fix(vd): add download status

Signed-off-by: Isteb4k <[email protected]>
deckhouse · Jul 9, 2024 · 67b7a12 · 67b7a12
1 parent 04f5479
commit 67b7a12
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 242 deletions.
diff --git a/api/core/v1alpha2/image_status.go b/api/core/v1alpha2/image_status.go
@@ -28,11 +28,9 @@ const (
 )
 
 type ImageStatus struct {
-	DownloadSpeed ImageStatusSpeed `json:"downloadSpeed"`
-	Size          ImageStatusSize  `json:"size"`
-	Format        string           `json:"format,omitempty"`
-	// FIXME: create ClusterImageStatus without Capacity and PersistentVolumeClaim.
-	Capacity      string            `json:"capacity,omitempty"`
+	DownloadSpeed *StatusSpeed      `json:"downloadSpeed"`
+	Size          ImageStatusSize   `json:"size"`
+	Format        string            `json:"format,omitempty"`
 	CDROM         bool              `json:"cdrom"`
 	Target        ImageStatusTarget `json:"target"`
 	Phase         ImagePhase        `json:"phase,omitempty"`
@@ -47,13 +45,6 @@ type StatusSpeed struct {
 	CurrentBytes string `json:"currentBytes,omitempty"`
 }
 
-type ImageStatusSpeed struct {
-	Avg          string `json:"avg,omitempty"`
-	AvgBytes     string `json:"avgBytes,omitempty"`
-	Current      string `json:"current,omitempty"`
-	CurrentBytes string `json:"currentBytes,omitempty"`
-}
-
 type ImageStatusSize struct {
 	Stored        string `json:"stored,omitempty"`
 	StoredBytes   string `json:"storedBytes,omitempty"`

diff --git a/api/core/v1alpha2/virtual_disk.go b/api/core/v1alpha2/virtual_disk.go
@@ -43,7 +43,7 @@ type VirtualDiskSpec struct {
 }
 
 type VirtualDiskStatus struct {
-	DownloadSpeed             VirtualDiskDownloadSpeed `json:"downloadSpeed"`
+	DownloadSpeed             *StatusSpeed             `json:"downloadSpeed,omitempty"`
 	Capacity                  string                   `json:"capacity,omitempty"`
 	Target                    DiskTarget               `json:"target"`
 	Progress                  string                   `json:"progress,omitempty"`
@@ -87,13 +87,6 @@ const (
 	VirtualDiskObjectRefKindClusterVirtualImage VirtualDiskObjectRefKind = "ClusterVirtualImage"
 )
 
-type VirtualDiskDownloadSpeed struct {
-	Avg          string `json:"avg,omitempty"`
-	AvgBytes     string `json:"avgBytes,omitempty"`
-	Current      string `json:"current,omitempty"`
-	CurrentBytes string `json:"currentBytes,omitempty"`
-}
-
 type DiskTarget struct {
 	PersistentVolumeClaim string `json:"persistentVolumeClaimName,omitempty"`
 }

diff --git a/api/core/v1alpha2/zz_generated.deepcopy.go b/api/core/v1alpha2/zz_generated.deepcopy.go
diff --git a/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go b/api/pkg/apiserver/api/generated/openapi/zz_generated.openapi.go
diff --git a/images/virtualization-artifact/pkg/controller/cvi/internal/source/http.go b/images/virtualization-artifact/pkg/controller/cvi/internal/source/http.go
@@ -131,8 +131,8 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualIma
 		cvi.Status.CDROM = ds.statService.GetCDROM(pod)
 		cvi.Status.Format = ds.statService.GetFormat(pod)
 		cvi.Status.Progress = ds.statService.GetProgress(cvi.GetUID(), pod, cvi.Status.Progress)
-		cvi.Status.DownloadSpeed = ds.statService.GetDownloadSpeed(cvi.GetUID(), pod)
 		cvi.Status.Target.RegistryURL = ds.dvcrSettings.RegistryImageForCVMI(cvi.Name)
+		cvi.Status.DownloadSpeed = ds.statService.GetDownloadSpeed(cvi.GetUID(), pod)
 
 		ds.logger.Info("Ready", "cvi", cvi.Name, "progress", cvi.Status.Progress, "pod.phase", pod.Status.Phase)
 	default:
@@ -167,8 +167,8 @@ func (ds HTTPDataSource) Sync(ctx context.Context, cvi *virtv2.ClusterVirtualIma
 
 		cvi.Status.Phase = virtv2.ImageProvisioning
 		cvi.Status.Progress = ds.statService.GetProgress(cvi.GetUID(), pod, cvi.Status.Progress)
-		cvi.Status.DownloadSpeed = ds.statService.GetDownloadSpeed(cvi.GetUID(), pod)
 		cvi.Status.Target.RegistryURL = ds.dvcrSettings.RegistryImageForCVMI(cvi.Name)
+		cvi.Status.DownloadSpeed = ds.statService.GetDownloadSpeed(cvi.GetUID(), pod)
 
 		ds.logger.Info("Provisioning...", "cvi", cvi.Name, "progress", cvi.Status.Progress, "pod.phase", pod.Status.Phase)
 	}

diff --git a/images/virtualization-artifact/pkg/controller/cvi/internal/source/interfaces.go b/images/virtualization-artifact/pkg/controller/cvi/internal/source/interfaces.go
@@ -55,8 +55,7 @@ type Stat interface {
 	GetFormat(pod *corev1.Pod) string
 	GetCDROM(pod *corev1.Pod) bool
 	GetSize(pod *corev1.Pod) virtv2.ImageStatusSize
-	GetReasonError(pod *corev1.Pod) (string, string, error)
-	GetDownloadSpeed(ownerUID types.UID, pod *corev1.Pod) virtv2.ImageStatusSpeed
+	GetDownloadSpeed(ownerUID types.UID, pod *corev1.Pod) *virtv2.StatusSpeed
 	GetProgress(ownerUID types.UID, pod *corev1.Pod, prevProgress string, opts ...service.GetProgressOption) string
 	IsUploadStarted(ownerUID types.UID, pod *corev1.Pod) bool
 	CheckPod(pod *corev1.Pod) error