From 58aecb256d43b765f69d6060236cb5268577827b Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Fri, 24 Aug 2018 16:15:13 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E4=B8=BB=E6=9C=BA=E6=97=B6=E5=8F=AA=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=20available=20=E7=9A=84=E7=BD=91?= =?UTF-8?q?=E7=BB=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/wires.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/compute/models/wires.go b/pkg/compute/models/wires.go index 22fa6d9a6f..d522c53e58 100644 --- a/pkg/compute/models/wires.go +++ b/pkg/compute/models/wires.go @@ -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 } From 931ee5cef64fe6407f8067739f449a62fa96ca7e Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Fri, 24 Aug 2018 16:30:56 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A2=9E=E5=8A=A0VM=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/util/aliyun/instance.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/util/aliyun/instance.go b/pkg/util/aliyun/instance.go index 292a231193..5d90dedd32 100644 --- a/pkg/util/aliyun/instance.go +++ b/pkg/util/aliyun/instance.go @@ -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, InstanceStatusStopped) 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) From 32d56101dfe81f42f44d29e585422512c50f230f Mon Sep 17 00:00:00 2001 From: Qiu Jian Date: Fri, 24 Aug 2018 16:32:08 +0800 Subject: [PATCH 3/3] minor updates --- pkg/util/aliyun/instance.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/aliyun/instance.go b/pkg/util/aliyun/instance.go index 5d90dedd32..12cc379e68 100644 --- a/pkg/util/aliyun/instance.go +++ b/pkg/util/aliyun/instance.go @@ -435,7 +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, InstanceStatusStopped) + log.Errorf("StopVM: vm status is %s expect %s", status, InstanceStatusRunning) return cloudprovider.ErrInvalidStatus } return self.doStopVM(instanceId, isForce)