[build][enhance] implement zone conversion functions for CreateVolume and NodeGetInfo

Author: tytv2

pkg/driver/controller.go

@@ -91,10 +91,8 @@ func (s *controllerService) CreateVolume(pctx lctx.Context, preq *lcsi.CreateVol
 	volName := preq.GetName()              // get the name of the volume, always in the format of pvc-<random-uuid>
 	volCap := preq.GetVolumeCapabilities() // get volume capabilities
 	multiAttach := isMultiAttach(volCap)   // check if the volume is multi-attach, true if multi-attach, false otherwise
-	zone := pickAvailabilityZone(preq.GetAccessibilityRequirements())
-	if zone == "AZ01" {
-		zone = "HCM03-1A"
-	}
+	zone := lsutil.ConvertVMZoneToPortalZone(pickAvailabilityZone(preq.GetAccessibilityRequirements()))
+
 	llog.V(5).InfoS("[INFO] - CreateVolume: zone info", "zone", zone)
 
 	// Validate volume size, if volume size is less than the default volume size of cloud provider, set it to the default volume size

pkg/driver/node.go

@@ -5,6 +5,9 @@ import (
 	"encoding/json"
 	"fmt"
 	lcsi "github.com/container-storage-interface/spec/lib/go/csi"
+	lscloud "github.com/vngcloud/vngcloud-blockstorage-csi-driver/pkg/cloud"
+	lsinternal "github.com/vngcloud/vngcloud-blockstorage-csi-driver/pkg/driver/internal"
+	lsutil "github.com/vngcloud/vngcloud-blockstorage-csi-driver/pkg/util"
 	lsdkClientV2 "github.com/vngcloud/vngcloud-go-sdk/v2/client"
 	computev2 "github.com/vngcloud/vngcloud-go-sdk/v2/vngcloud/services/compute/v2"
 	lsdkPortalSvcV1 "github.com/vngcloud/vngcloud-go-sdk/v2/vngcloud/services/portal/v1"
@@ -25,9 +28,6 @@ import (
 	"strconv"
 	"strings"
 	"time"
-
-	lscloud "github.com/vngcloud/vngcloud-blockstorage-csi-driver/pkg/cloud"
-	lsinternal "github.com/vngcloud/vngcloud-blockstorage-csi-driver/pkg/driver/internal"
 )
 
 type JSONPatch struct {
@@ -556,10 +556,7 @@ func (s *nodeService) NodeGetInfo(_ lctx.Context, _ *lcsi.NodeGetInfoRequest) (*
 			klog.ErrorS(sdkErr.GetError(), "[ERROR] - GetServerByID: ", "nodeUUID", nodeUUID)
 			return nil, sdkErr.GetError()
 		}
-		zone = server.ZoneId
-		if zone == "HCM03-1A" {
-			zone = "AZ01"
-		}
+		zone = lsutil.ConvertPortalZoneToVMZone(server.ZoneId)
 		klog.InfoS("[INFO] - NodeGetInfo: Get the server info successfully",
 			"nodeId", nodeUUID, "zone", zone, "projectId", projectID)
 	} else {

pkg/util/util.go

@@ -62,3 +62,37 @@ func RoundUpGiB(volumeSizeBytes int64) int64 {
 func GiBToBytes(volumeSizeGiB int64) int64 {
 	return volumeSizeGiB * GiB
 }
+
+func ConvertPortalZoneToVMZone(zone string) string {
+	switch zone {
+	case "HCM03-1A":
+		return "AZ01"
+	case "HCM03-1B":
+		return "HCM-1B"
+	case "HCM03-1C":
+		return "HCM-1C"
+	case "BKK-01":
+		return "BKK01"
+	case "HAN-01":
+		return "az01"
+	default:
+		return zone
+	}
+}
+
+func ConvertVMZoneToPortalZone(zone string) string {
+	switch zone {
+	case "AZ01":
+		return "HCM03-1A"
+	case "HCM-1B":
+		return "HCM03-1B"
+	case "HCM-1C":
+		return "HCM03-1C"
+	case "BKK01":
+		return "BKK-01"
+	case "az01":
+		return "HAN-01"
+	default:
+		return zone
+	}
+}