[NCP Classic/VPC] Update for VM Status check when running GetVM() and ListVM(), Apply Updated Parameter Return Values on VMImage/MyImage #1244
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -62,7 +62,7 @@ func init() { | |
| func (vmHandler *NcpVpcVMHandler) StartVM(vmReqInfo irs.VMReqInfo) (irs.VMInfo, error) { | ||
| cblogger.Info("NCPVPC Cloud driver: called StartVM()!!") | ||
| InitLog() | ||
| callLogInfo := GetCallLogScheme(vmHandler.RegionInfo.Region, call.VM, vmReqInfo.IId.NameId, "StartVM()") | ||
|
|
||
| if strings.EqualFold(vmReqInfo.IId.NameId, "") { | ||
| newErr := fmt.Errorf("Invalid VM Name required") | ||
|
|
@@ -334,11 +334,11 @@ func (vmHandler *NcpVpcVMHandler) GetVM(vmIID irs.IID) (irs.VMInfo, error) { | |
|
|
||
| // Since it's impossible to get VM info. during Creation, ... | ||
| switch string(curStatus) { | ||
| case "Creating": | ||
| cblogger.Infof("The VM status is '%s', so wait for the VM creation before inquiring the info.", string(curStatus)) | ||
| return irs.VMInfo{}, errors.New("The VM status is 'Creating', so wait for the VM creation before inquiring the info. : " + vmIID.SystemId) | ||
| default: | ||
| cblogger.Infof("===> The VM status is not 'Creating', you can get the VM info.") | ||
| } | ||
|
|
||
| /* | ||
|
|
@@ -776,7 +776,7 @@ func ConvertVMStatusString(vmStatus string) (irs.VMStatus, error) { | |
| //Caution!! | ||
| resultStatus = "Booting" | ||
| } else if strings.EqualFold(vmStatus, "setting up") { | ||
| resultStatus = "Setting_up" | ||
| } else if strings.EqualFold(vmStatus, "running") { | ||
| resultStatus = "Running" | ||
| } else if strings.EqualFold(vmStatus, "shutting down") { | ||
|
|
@@ -901,36 +901,30 @@ func (vmHandler *NcpVpcVMHandler) ListVM() ([]*irs.VMInfo, error) { | |
| return nil, newErr | ||
| } | ||
| LoggingInfo(callLogInfo, callLogStart) | ||
| cblogger.Info("Succeeded in Getting ServerInstanceList from NCP!!") | ||
|
|
||
| var vmInfoList []*irs.VMInfo | ||
| for _, vm := range result.ServerInstanceList { | ||
| curStatus, statusErr := vmHandler.GetVMStatus(irs.IID{SystemId: *vm.ServerInstanceNo}) | ||
| if statusErr != nil { | ||
| newErr := fmt.Errorf("Failed to Get the Status of VM : [%s], [%v]", *vm.ServerInstanceNo, statusErr.Error()) | ||
| cblogger.Error(newErr.Error()) | ||
| return nil, newErr | ||
| } else { | ||
| cblogger.Infof("Succeeded in Getting the Status of VM [%s] : [%s]", *vm.ServerInstanceNo, string(curStatus)) | ||
| } | ||
| cblogger.Infof("===> VM Status : [%s]", string(curStatus)) | ||
|
|
||
| if (string(curStatus) != "Creating") && (string(curStatus) != "Terminating") { | ||
| cblogger.Infof("===> The VM Status not 'Creating' or 'Terminating', you can get the VM info.") | ||
| vmInfo, error := vmHandler.GetVM(irs.IID{SystemId: *vm.ServerInstanceNo}) | ||
| if error != nil { | ||
| cblogger.Error(error.Error()) | ||
| return nil, error | ||
| } | ||
| vmInfoList = append(vmInfoList, &vmInfo) | ||
| } | ||
| } | ||
| return vmInfoList, nil | ||
| } | ||
|
|
||
|
|
@@ -1349,9 +1343,9 @@ func (vmHandler *NcpVpcVMHandler) WaitToGetInfo(vmIID irs.IID) (irs.VMStatus, er | |
| cblogger.Infof("===> VM Status : [%s]", curStatus) | ||
|
|
||
| switch string(curStatus) { | ||
| case "Creating", "Booting", "Setting_up": | ||
|
There was a problem hiding this comment. @powerkimhub There was a problem hiding this comment.
|
||
| curRetryCnt++ | ||
| cblogger.Infof("The VM is 'Creating' and 'Booting', so wait for a second more before inquiring the VM info.") | ||
| time.Sleep(time.Second * 5) | ||
| if curRetryCnt > maxRetryCnt { | ||
| cblogger.Errorf("Despite waiting for a long time(%d sec), the VM status is '%s', so it is forcibly finishied.", maxRetryCnt, curStatus) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@innodreamer
Setting_up은,cb-spider/cloud-control-manager/cloud-driver/drivers/ncpvpc/resources/VMHandler.go
Line 840 in 72add2b
Setting_up는 정의되어 있지 않습니다.Setting_up상태가 끝날 때까지 waiting하는 등의 처리가 필요합니다.cb-spider/cloud-control-manager/cloud-driver/interfaces/resources/VMHandler.go
Line 64 in 1f0682f