Skip to content

Commit

Permalink
[NCP Classic] Update Tag management features
Browse files Browse the repository at this point in the history
  • Loading branch information
@innodreamer
innodreamer committed Nov 1, 2024
1 parent 2c74d37 commit 167b269
Show file tree
Hide file tree
Showing 3 changed files with 77 additions and 75 deletions.
10 changes: 5 additions & 5 deletions cloud-control-manager/cloud-driver/drivers/ncp/resources/DiskHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ func (diskHandler *NcpDiskHandler) CreateDisk(diskReqInfo irs.DiskInfo) (irs.Dis
return irs.DiskInfo{}, rtnErr
}
var instanceNo string
if len(instanceList) < 1 {
cblogger.Info("### VM Instance does Not Exist!!")
rtnErr := logAndReturnError(callLogInfo, "At least one VM is required to create new disk volume in case of NCP.", "")
if len(instanceList) < 1 {
rtnErr := logAndReturnError(callLogInfo, "At least one VM is required on a zone to create new disk volume in case of NCP.", "")
cblogger.Error("### There is no VM in the zone.!!")
return irs.DiskInfo{}, rtnErr
} else {
instanceNo = *instanceList[0].ServerInstanceNo // InstanceNo of any VM on the Zone
Expand Down Expand Up @@ -650,7 +650,7 @@ func (diskHandler *NcpDiskHandler) MappingDiskInfo(storage server.BlockStorageIn
RegionInfo: diskHandler.RegionInfo,
VMClient: diskHandler.VMClient,
}
subnetZone, err := vmHandler.getVMSubnetZone(ncloud.StringValue(storage.ServerInstanceNo))
subnetZone, err := vmHandler.getVMSubnetZone(storage.ServerInstanceNo)
if err != nil {
newErr := fmt.Errorf("Failed to Get the Subnet Zone info of the VM!! : [%v]", err)
cblogger.Debug(newErr.Error())
Expand All @@ -667,7 +667,7 @@ func (diskHandler *NcpDiskHandler) MappingDiskInfo(storage server.BlockStorageIn
return irs.DiskInfo{}, newErr
}
} else {
ncpVMInfo, vmErr = vmHandler.GetNcpTargetZoneVMInfo(ncloud.StringValue(storage.ServerInstanceNo))
ncpVMInfo, vmErr = vmHandler.GetNcpTargetZoneVMInfo(storage.ServerInstanceNo)
if vmErr != nil {
newErr := fmt.Errorf("Failed to Get the VM Info of the Zone : [%s], [%v]", subnetZone, vmErr)
cblogger.Error(newErr.Error())
Expand Down
27 changes: 16 additions & 11 deletions cloud-control-manager/cloud-driver/drivers/ncp/resources/TagHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"fmt"
"strings"
"time"
// "github.com/davecgh/go-spew/spew"

ncloud "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
server "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/server"
Expand Down Expand Up @@ -83,19 +84,23 @@ func (tagHandler *NcpTagHandler) ListTag(resType irs.RSType, resIID irs.IID) ([]
tagList, err := tagHandler.getVMTagListWithVMId(&resIID.SystemId)
if err != nil {
newErr := fmt.Errorf("Failed to Get the Tag List with the VM SystemID : [%v]", err)
cblogger.Error(newErr.Error())
cblogger.Debug(newErr.Error())
return nil, newErr
}

var kvList []irs.KeyValue
for _, curTag := range tagList {
kv := irs.KeyValue {
Key : ncloud.StringValue(curTag.TagKey),
Value: ncloud.StringValue(curTag.TagValue),
if len(tagList) > 0 {
for _, curTag := range tagList {
kv := irs.KeyValue {
Key : ncloud.StringValue(curTag.TagKey),
Value: ncloud.StringValue(curTag.TagValue),
}
kvList = append(kvList, kv)
}
kvList = append(kvList, kv)
}
return kvList, nil
return kvList, nil
} else {
return nil, nil
}
}

func (tagHandler *NcpTagHandler) GetTag(resType irs.RSType, resIID irs.IID, key string) (irs.KeyValue, error) {
Expand Down Expand Up @@ -274,12 +279,12 @@ func (tagHandler *NcpTagHandler) getVMTagListWithVMId(vmID *string) ([]*server.I
}
if len(tagListResult.InstanceTagList) < 1 {
newErr := fmt.Errorf("Failed to Find Any Tag with the VM SystemID!!")
cblogger.Debug(newErr.Error())
cblogger.Error(newErr.Error())
return nil, newErr
} else {
cblogger.Infof("Tag Listing Result : [%s]", *tagListResult.ReturnMessage)
}
return tagListResult.InstanceTagList, nil
return tagListResult.InstanceTagList, nil
}
}

func (tagHandler *NcpTagHandler) getVMTagValue(vmID *string, key *string) (string, error) {
Expand Down
115 changes: 56 additions & 59 deletions cloud-control-manager/cloud-driver/drivers/ncp/resources/VMHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ func (vmHandler *NcpVMHandler) GetVM(vmIID irs.IID) (irs.VMInfo, error) {
return irs.VMInfo{}, newErr
}

subnetZone, err := vmHandler.getVMSubnetZone(vmIID.SystemId)
subnetZone, err := vmHandler.getVMSubnetZone(&vmIID.SystemId)
if err != nil {
newErr := fmt.Errorf("Failed to Get the Subnet Zone info of the VM!! : [%v]", err)
cblogger.Debug(newErr.Error())
Expand All @@ -599,7 +599,7 @@ func (vmHandler *NcpVMHandler) GetVM(vmIID irs.IID) (irs.VMInfo, error) {
return irs.VMInfo{}, newErr
}
} else {
ncpVMInfo, vmErr = vmHandler.GetNcpTargetZoneVMInfo(vmIID.SystemId)
ncpVMInfo, vmErr = vmHandler.GetNcpTargetZoneVMInfo(&vmIID.SystemId)
if vmErr != nil {
newErr := fmt.Errorf("Failed to Get the VM Info of the Zone : [%s], [%v]", subnetZone, vmErr)
cblogger.Error(newErr.Error())
Expand Down Expand Up @@ -846,15 +846,6 @@ func (vmHandler *NcpVMHandler) TerminateVM(vmIID irs.IID) (irs.VMStatus, error)
cblogger.Infof("VM Status : 'Suspended'. so it Can be Terminated!!")
cblogger.Infof("vmID : [%s]", *serverInstanceNo[0])

// To Delete Tags of the VM instance
Result, error := vmHandler.DeleteVMTags(serverInstanceNo[0])
if error != nil {
rtnErr := logAndReturnError(callLogInfo, "Failed to Delete Tags of the VM instance! : ", error)
return irs.VMStatus("Failed. "), rtnErr
} else {
cblogger.Infof("# DeleteVMTags Result : [%t]", Result)
}

// To Terminate the VM instance
req := server.TerminateServerInstancesRequest{
ServerInstanceNoList: serverInstanceNo,
Expand All @@ -868,6 +859,15 @@ func (vmHandler *NcpVMHandler) TerminateVM(vmIID irs.IID) (irs.VMStatus, error)
LoggingInfo(callLogInfo, callLogStart)
cblogger.Info(runResult)

// To Delete Tags of the VM instance
Result, error := vmHandler.DeleteVMTags(serverInstanceNo[0])
if error != nil {
rtnErr := logAndReturnError(callLogInfo, "Failed to Delete Tags of the VM instance! : ", error)
return irs.VMStatus("Failed. "), rtnErr
} else {
cblogger.Infof("# DeleteVMTags Result : [%t]", Result)
}

// If the NCP instance has a 'Public IP', delete it after termination of the instance.
if ncloud.String(vmInfo.PublicIP) != nil {
// Delete the PublicIP of the VM
Expand Down Expand Up @@ -922,15 +922,6 @@ func (vmHandler *NcpVMHandler) TerminateVM(vmIID irs.IID) (irs.VMStatus, error)
}
cblogger.Info("# SuspendVM() Finished")

// To Delete Tags of the VM instance
Result, error := vmHandler.DeleteVMTags(serverInstanceNo[0])
if error != nil {
rtnErr := logAndReturnError(callLogInfo, "Failed to Delete Tags of the VM instance!! : ", error)
return irs.VMStatus("Failed. "), rtnErr
} else {
cblogger.Infof("# DeleteVMTags Result : [%t]", Result)
}

// To Terminate the VM instance
req := server.TerminateServerInstancesRequest{
ServerInstanceNoList: serverInstanceNo,
Expand All @@ -942,7 +933,16 @@ func (vmHandler *NcpVMHandler) TerminateVM(vmIID irs.IID) (irs.VMStatus, error)
return irs.VMStatus("Failed. "), rtnErr
}
LoggingInfo(callLogInfo, callLogStart)
cblogger.Info(runResult)
cblogger.Info(*runResult.ReturnMessage)

// To Delete Tags of the VM instance
Result, error := vmHandler.DeleteVMTags(serverInstanceNo[0])
if error != nil {
rtnErr := logAndReturnError(callLogInfo, "Failed to Delete Tags of the VM instance!! : ", error)
return irs.VMStatus("Failed. "), rtnErr
} else {
cblogger.Infof("# DeleteVMTags Result : [%t]", Result)
}

// If the NCP instance has a 'Public IP', delete it after termination of the instance.
if ncloud.String(vmInfo.PublicIP) != nil {
Expand Down Expand Up @@ -1030,7 +1030,9 @@ func (vmHandler *NcpVMHandler) GetVMStatus(vmIID irs.IID) (irs.VMStatus, error)
InitLog()
callLogInfo := GetCallLogScheme(vmHandler.RegionInfo.Zone, call.VM, vmIID.NameId, "GetVMStatus()")

subnetZone, err := vmHandler.getVMSubnetZone(vmIID.SystemId)
cblogger.Infof("### Target Zone : [%s]", vmHandler.RegionInfo.TargetZone)

subnetZone, err := vmHandler.getVMSubnetZone(&vmIID.SystemId)
if err != nil {
newErr := fmt.Errorf("Failed to Get the Subnet Zone info of the VM!! : [%v]", err)
cblogger.Debug(newErr.Error())
Expand Down Expand Up @@ -1108,32 +1110,32 @@ func (vmHandler *NcpVMHandler) ListVMStatus() ([]*irs.VMStatusInfo, error) {
LoggingInfo(callLogInfo, callLogStart)
if len(result.ServerInstanceList) < 1 {
newErr := fmt.Errorf("Failed to Find Any VM info in the Zone : [%s]", vmHandler.RegionInfo.Zone)
cblogger.Error(newErr.Error())
cblogger.Debug(newErr.Error())
return nil, newErr
} else {
cblogger.Info("Succeeded in Getting ServerInstanceList in the Zone!!")
}

var vmStatusList []*irs.VMStatusInfo
for _, vm := range result.ServerInstanceList {
//*vm.ServerInstanceStatusName
//*vm.ServerName
vmStatus, err := ConvertVMStatusString(*vm.ServerInstanceStatusName)
if err != nil {
cblogger.Error(err)
LoggingError(callLogInfo, err)
return []*irs.VMStatusInfo{}, err
}
// cblogger.Info(" VM Status : ", vmStatus)
var vmStatusList []*irs.VMStatusInfo
for _, vm := range result.ServerInstanceList {
//*vm.ServerInstanceStatusName
//*vm.ServerName
vmStatus, err := ConvertVMStatusString(*vm.ServerInstanceStatusName)
if err != nil {
cblogger.Error(err)
LoggingError(callLogInfo, err)
return []*irs.VMStatusInfo{}, err
}
// cblogger.Info(" VM Status : ", vmStatus)

vmStatusInfo := irs.VMStatusInfo{
IId: irs.IID{NameId: *vm.ServerName, SystemId: *vm.ServerInstanceNo},
VmStatus: vmStatus,
vmStatusInfo := irs.VMStatusInfo{
IId: irs.IID{NameId: *vm.ServerName, SystemId: *vm.ServerInstanceNo},
VmStatus: vmStatus,
}
cblogger.Infof(" VM Status of [%s] : [%s]", vmStatusInfo.IId.SystemId, vmStatusInfo.VmStatus)
vmStatusList = append(vmStatusList, &vmStatusInfo)
}
cblogger.Infof(" VM Status of [%s] : [%s]", vmStatusInfo.IId.SystemId, vmStatusInfo.VmStatus)
vmStatusList = append(vmStatusList, &vmStatusInfo)
return vmStatusList, err
}
return vmStatusList, err
}

// VM List on 'All Zone' in the Region
Expand All @@ -1143,7 +1145,7 @@ func (vmHandler *NcpVMHandler) ListVM() ([]*irs.VMInfo, error) {
ncpVMList, err := vmHandler.getNcpVMListWithRegion(vmHandler.RegionInfo.Region)
if err != nil {
newErr := fmt.Errorf("Failed to Get NCP VM List : [%v]", err.Error())
cblogger.Error(newErr.Error())
cblogger.Debug(newErr.Error())
return nil, newErr
}

Expand Down Expand Up @@ -1318,7 +1320,6 @@ func (vmHandler *NcpVMHandler) DeletePublicIP(vmInfo irs.VMInfo) (irs.VMStatus,
break
}
}

// spew.Dump(vmInfo.PublicIP)
// spew.Dump(publicIPId)

Expand Down Expand Up @@ -1421,10 +1422,9 @@ func (vmHandler *NcpVMHandler) GetVPCnSubnetNameFromTag(vmID *string) (string, s
tagList, err := tagHandler.getVMTagListWithVMId(vmID)
if err != nil {
newErr := fmt.Errorf("Failed to Get the Tag List with the VM SystemID : [%v]", err)
cblogger.Error(newErr.Error())
cblogger.Debug(newErr.Error())
return "", "", newErr
}

if len(tagList) < 1 {
newErr := fmt.Errorf("Failed to Get Any Tag info with the VM SystemID!!")
return "", "", newErr
Expand Down Expand Up @@ -1520,12 +1520,10 @@ func (vmHandler *NcpVMHandler) GetNcpVMInfo(vmId string) (*server.ServerInstance
return result.ServerInstanceList[0], nil
}

func (vmHandler *NcpVMHandler) GetNcpTargetZoneVMInfo(vmId string) (*server.ServerInstance, error) {
func (vmHandler *NcpVMHandler) GetNcpTargetZoneVMInfo(vmId *string) (*server.ServerInstance, error) {
cblogger.Info("NCP Classic Cloud driver: called GetNcpTargetZoneVMInfo()")

cblogger.Infof("\n ### vmHandler.RegionInfo.TargetZone : [%s]", vmHandler.RegionInfo.TargetZone)

if strings.EqualFold(vmId, "") {
if strings.EqualFold(*vmId, "") {
newErr := fmt.Errorf("Invalid VM ID!!")
cblogger.Error(newErr.Error())
return nil, newErr
Expand All @@ -1550,18 +1548,18 @@ func (vmHandler *NcpVMHandler) GetNcpTargetZoneVMInfo(vmId string) (*server.Serv
return nil, err
}
instanceReq := server.GetServerInstanceListRequest{
ServerInstanceNoList: []*string{ncloud.String(vmId)},
ServerInstanceNoList: []*string{vmId},
RegionNo: regionNo,
ZoneNo: reqZoneNo, // For Zone-based control!!
}
result, err := vmHandler.VMClient.V2Api.GetServerInstanceList(&instanceReq)
if err != nil {
newErr := fmt.Errorf("Failed to Find VM list with the SystemId from NCP : [%s], [%v]", vmId, err)
newErr := fmt.Errorf("Failed to Find VM list with the SystemId from NCP : [%s], [%v]", *vmId, err)
cblogger.Error(newErr.Error())
return nil, newErr
}
if len(result.ServerInstanceList) < 1 {
newErr := fmt.Errorf("Failed to Find Any VM info with the SystemId : [%s]", vmId)
newErr := fmt.Errorf("Failed to Find Any VM info with the SystemId : [%s]", *vmId)
cblogger.Error(newErr.Error())
return nil, newErr
}
Expand Down Expand Up @@ -1977,7 +1975,7 @@ func (vmHandler *NcpVMHandler) getNcpVMListWithRegion(regionCode string) ([]*ser
return nil, newErr
}

// Get NCP VM info list (in the Region)
// Get NCP VM info list on 'Every Zone' in the Region
var ncpVMList []*server.ServerInstance
for _, zone := range regionInfo.ZoneList {
// For Zone-based control!!
Expand Down Expand Up @@ -2016,7 +2014,6 @@ func (vmHandler *NcpVMHandler) getNcpVMListWithRegion(regionCode string) ([]*ser
cblogger.Error(newErr.Error())
return nil, newErr
}

ncpVMList = append(ncpVMList, result.ServerInstanceList...)
}
// cblogger.Info("\n\n### ncpVMList : \n")
Expand All @@ -2030,24 +2027,24 @@ func (vmHandler *NcpVMHandler) getNcpVMListWithRegion(regionCode string) ([]*ser
return ncpVMList, nil
}

func (vmHandler *NcpVMHandler) getVMSubnetZone(vmId string) (string, error) {
func (vmHandler *NcpVMHandler) getVMSubnetZone(vmId *string) (string, error) {
cblogger.Info("KT Cloud Driver: called getVMSubnetZone()")

// Get the VPC Name from Tag of the VM
vpcName, subnetName, error := vmHandler.GetVPCnSubnetNameFromTag(&vmId)
vpcName, subnetName, error := vmHandler.GetVPCnSubnetNameFromTag(vmId)
if error != nil {
newErr := fmt.Errorf("Failed to Get VPC Name from Tag of the VM instance!! : [%v]", error)
cblogger.Debug(newErr.Error())
// return irs.VMInfo{}, error // Caution!!
// return irs.VMInfo{}, newErr // Caution!!
}
// cblogger.Infof("# vpcName : [%s]", vpcName)
// cblogger.Infof("# subnetName : [%s]", subnetName)

var reqZoneId string
getErr := errors.New("")

if len(vpcName) < 1 {
cblogger.Debug("Failed to Get VPC Name from Tag!!")
if strings.EqualFold(vpcName, "") || strings.EqualFold(subnetName, ""){
cblogger.Debug("Failed to Get the VPC and Subnet Name from Tag!!")
} else {
// Get Zone ID of the Requested Subnet
vpcHandler := NcpVPCHandler {
Expand Down

0 comments on commit 167b269

Please sign in to comment.