Fix get subnet csp id for vm provisioning

src/core/common/utility.go

@@ -216,7 +216,6 @@ func GenResourceKey(nsId string, resourceType string, resourceId string) string
 		resourceType == model.StrVNet ||
 		resourceType == model.StrSecurityGroup ||
 		resourceType == model.StrDataDisk {
-		//resourceType == "subnet" ||
 		//resourceType == "publicIp" ||
 		//resourceType == "vNic" {
 		return "/ns/" + nsId + "/resources/" + resourceType + "/" + resourceId

src/core/infra/provisioning.go

@@ -1318,8 +1318,14 @@ func CreateVm(nsId string, mciId string, vmInfoData *model.TbVmInfo, option stri
 			return err
 		}
 
-		// TODO: needs to be enhnaced to use GetCspResourceId (GetCspResourceId needs to be updated as well)
-		requestBody.ReqInfo.SubnetName = vmInfoData.SubnetId //resource.GetCspResourceId(nsId, model.StrVNet, vmInfoData.SubnetId)
+		// retrieve csp subnet id
+		subnetInfo, err := resource.GetSubnet(nsId, vmInfoData.VNetId, vmInfoData.SubnetId)
+		if err != nil {
+			log.Error().Err(err).Msg("Cannot find the Subnet ID: " + vmInfoData.SubnetId)
+			return err
+		}
+
+		requestBody.ReqInfo.SubnetName = subnetInfo.CspSubnetName
 		if requestBody.ReqInfo.SubnetName == "" {
 			log.Error().Err(err).Msg("")
 			return err

src/core/resource/common.go

@@ -2115,6 +2115,8 @@ type resourceIds struct { // Tumblebug
 	CspVNicName          string
 	CspDataDiskId        string
 	CspDataDiskName      string
+	CspSubnetId          string
+	CspSubnetName        string
 
 	ConnectionName string
 }
@@ -2170,14 +2172,10 @@ func GetCspResourceId(nsId string, resourceType string, resourceId string) (stri
 	// 	content := resourceIds{}
 	// 	json.Unmarshal([]byte(keyValue.Value), &content)
 	// 	return content.CspSpecName, nil
-	case model.StrVNet:
+	case model.StrSubnet:
 		content := resourceIds{}
 		json.Unmarshal([]byte(keyValue.Value), &content)
-		return content.CspVNetName, nil // contains CspSubnetId
-	// case "subnet":
-	// 	content := subnetInfo{}
-	// 	json.Unmarshal([]byte(keyValue.Value), &content)
-	// 	return content.CspSubnetId
+		return content.CspSubnetName, nil
 	case model.StrSecurityGroup:
 		content := resourceIds{}
 		json.Unmarshal([]byte(keyValue.Value), &content)