opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #104 in YUNIONIO/onecloud from ~QIUJIAN/onecloud:hotfix/qj-filter-network-status-available to release/2.0.0

Browse Source 
* commit '32d56101dfe81f42f44d29e585422512c50f230f':
  minor updates
  增加VM操作日志
  修正：创建主机时只选择状态为 available 的网络
This commit is contained in:
邱剑
2018-08-24 17:49:31 +08:00
parent c4692f0d5b 32d56101df
commit 183405a31d
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/wires.go
+1
View File
@@ -347,6 +347,7 @@ func (self *SWire) getNetworks() ([]SNetwork, error) {
func (self *SWire) getGatewayNetworkQuery() *sqlchemy.SQuery {
q := self.getNetworkQuery()
q = q.IsNotNull("guest_gateway").IsNotEmpty("guest_gateway")
q = q.Equals("status", NETWORK_STATUS_AVAILABLE)
return q
}
pkg/util/aliyun/instance.go
+3
View File
@@ -422,6 +422,7 @@ func (self *SInstance) waitStatus(target string, interval time.Duration, timeout
func (self *SRegion) StartVM(instanceId string) error {
status, _ := self.GetInstanceStatus(instanceId)
if status != InstanceStatusStopped {
log.Errorf("StartVM: vm status is %s expect %s", status, InstanceStatusStopped)
return cloudprovider.ErrInvalidStatus
}
return self.doStartVM(instanceId)
@@ -434,6 +435,7 @@ func (self *SRegion) StartVM(instanceId string) error {
func (self *SRegion) StopVM(instanceId string, isForce bool) error {
status, _ := self.GetInstanceStatus(instanceId)
if status != InstanceStatusRunning {
log.Errorf("StopVM: vm status is %s expect %s", status, InstanceStatusRunning)
return cloudprovider.ErrInvalidStatus
}
return self.doStopVM(instanceId, isForce)
@@ -451,6 +453,7 @@ func (self *SRegion) DeleteVM(instanceId string) error {
return err
}
} else if status != InstanceStatusStopped {
log.Errorf("DeleteVM: vm status is %s expect %s", status, InstanceStatusStopped)
return cloudprovider.ErrInvalidStatus
}
return self.doDeleteVM(instanceId)