[chore] add migrateStatus field into the volume entity

vngcloud · Jul 1, 2024 · 1dd2a50 · 1dd2a50
1 parent 6b5680c
commit 1dd2a50
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 22 deletions.
diff --git a/test/volume_test.go b/test/volume_test.go
@@ -139,7 +139,7 @@ func TestGetBlockVolumeByIdFailure(t *ltesting.T) {
 
 func TestGetBlockVolumeByIdSuccess(t *ltesting.T) {
 	vngcloud := validSdkConfig()
-	opt := v2.NewGetBlockVolumeByIdRequest("vol-17dc6df0-43d3-4ad2-be88-69ddaef2f146")
+	opt := v2.NewGetBlockVolumeByIdRequest("vol-aa784f76-a13d-4f92-b807-d2df3180e030")
 	volume, sdkerr := vngcloud.VServerGateway().V2().VolumeService().GetBlockVolumeById(opt)
 	if sdkerr != nil {
 		t.Fatalf("Expect nil but got %v", sdkerr)

diff --git a/vngcloud/entity/volume.go b/vngcloud/entity/volume.go
@@ -14,6 +14,7 @@ type Volume struct {
 	PersistentVolume bool
 	AttachedMachine  []string
 	UnderId          string
+	MigrateState     string
 }
 
 type ListVolumes struct {

diff --git a/vngcloud/services/volume/v2/blockvolume_response.go b/vngcloud/services/volume/v2/blockvolume_response.go
@@ -51,6 +51,7 @@ type (
 		Location           *string  `json:"location"`
 		Product            string   `json:"product"`
 		PersistentVolume   bool     `json:"persistentVolume"`
+		MigrateState       string   `json:"migrateState,omitempty"`
 	}
 )
 
@@ -67,27 +68,6 @@ func (s *ListBlockVolumesResponse) ToEntityListVolumes() *lsentity.ListVolumes {
 	return lstVolumes
 }
 
-func (s *ListBlockVolumesResponse) toEntityVolume(pIdx int) *lsentity.Volume {
-	if s == nil {
-		return nil
-	}
-
-	if pIdx >= 0 && pIdx < len(s.ListData) {
-		vol := s.ListData[pIdx]
-		return &lsentity.Volume{
-			Id:        vol.UUID,
-			Name:      vol.Name,
-			Size:      vol.Size,
-			Status:    vol.Status,
-			CreatedAt: vol.CreatedAt,
-			UpdatedAt: vol.UpdatedAt,
-			VmId:      vol.ServerID,
-		}
-	}
-
-	return nil
-}
-
 func (s *BlockVolume) toEntityVolume() *lsentity.Volume {
 	return &lsentity.Volume{
 		Id:              s.UUID,
@@ -99,6 +79,7 @@ func (s *BlockVolume) toEntityVolume() *lsentity.Volume {
 		VmId:            s.ServerID,
 		AttachedMachine: s.ServerIDList,
 		VolumeTypeID:    s.VolumeTypeID,
+		MigrateState:    s.MigrateState,
 	}
 }