From be0117dd71408a88ffda3272eb9866102c0c85bd Mon Sep 17 00:00:00 2001
From: Qu Xuan <quxuan@yunionyun.com>
Date: Thu, 15 Apr 2021 14:45:10 +0800
Subject: [PATCH] fix wire status close #10737

---
 pkg/compute/models/wires.go          | 2 ++
 pkg/multicloud/aliyun/wire.go        | 3 ++-
 pkg/multicloud/apsara/wire.go        | 3 ++-
 pkg/multicloud/aws/wire.go           | 3 ++-
 pkg/multicloud/azure/classic_wire.go | 3 ++-
 pkg/multicloud/azure/wire.go         | 3 ++-
 pkg/multicloud/ctyun/wire.go         | 3 ++-
 pkg/multicloud/ecloud/wire.go        | 3 ++-
 pkg/multicloud/google/wire.go        | 3 ++-
 pkg/multicloud/huawei/wire.go        | 3 ++-
 pkg/multicloud/openstack/wire.go     | 3 ++-
 pkg/multicloud/qcloud/wire.go        | 3 ++-
 pkg/multicloud/ucloud/wire.go        | 3 ++-
 pkg/multicloud/zstack/wire.go        | 3 ++-
 14 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/pkg/compute/models/wires.go b/pkg/compute/models/wires.go
index a2ddebf913..525f06b23c 100644
--- a/pkg/compute/models/wires.go
+++ b/pkg/compute/models/wires.go
@@ -371,6 +371,7 @@ func (self *SWire) syncWithCloudWire(ctx context.Context, userCred mcclient.Toke
 		self.Bandwidth = extWire.GetBandwidth() // 10G
 
 		self.IsEmulated = extWire.IsEmulated()
+		self.Status = extWire.GetStatus()
 
 		vpc := self.GetVpc()
 		if vpc != nil {
@@ -429,6 +430,7 @@ func (manager *SWireManager) newFromCloudWire(ctx context.Context, userCred mccl
 	wire.Name = newName
 	wire.ExternalId = extWire.GetGlobalId()
 	wire.Bandwidth = extWire.GetBandwidth()
+	wire.Status = extWire.GetStatus()
 	wire.VpcId = vpc.Id
 	region, err := vpc.GetRegion()
 	if err != nil {
diff --git a/pkg/multicloud/aliyun/wire.go b/pkg/multicloud/aliyun/wire.go
index ee8ec7d189..cd83907c31 100644
--- a/pkg/multicloud/aliyun/wire.go
+++ b/pkg/multicloud/aliyun/wire.go
@@ -19,6 +19,7 @@ import (
 
 	"yunion.io/x/log"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -44,7 +45,7 @@ func (self *SWire) IsEmulated() bool {
 }
 
 func (self *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SWire) Refresh() error {
diff --git a/pkg/multicloud/apsara/wire.go b/pkg/multicloud/apsara/wire.go
index aa2a99a692..47fa1497d3 100644
--- a/pkg/multicloud/apsara/wire.go
+++ b/pkg/multicloud/apsara/wire.go
@@ -19,6 +19,7 @@ import (
 
 	"yunion.io/x/log"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -44,7 +45,7 @@ func (self *SWire) IsEmulated() bool {
 }
 
 func (self *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SWire) Refresh() error {
diff --git a/pkg/multicloud/aws/wire.go b/pkg/multicloud/aws/wire.go
index 9be777b609..c22041a2f1 100644
--- a/pkg/multicloud/aws/wire.go
+++ b/pkg/multicloud/aws/wire.go
@@ -20,6 +20,7 @@ import (
 	"yunion.io/x/log"
 	"yunion.io/x/pkg/errors"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -45,7 +46,7 @@ func (self *SWire) GetGlobalId() string {
 }
 
 func (self *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SWire) Refresh() error {
diff --git a/pkg/multicloud/azure/classic_wire.go b/pkg/multicloud/azure/classic_wire.go
index 212859d655..adbc58881e 100644
--- a/pkg/multicloud/azure/classic_wire.go
+++ b/pkg/multicloud/azure/classic_wire.go
@@ -20,6 +20,7 @@ import (
 
 	"yunion.io/x/log"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -49,7 +50,7 @@ func (self *SClassicWire) IsEmulated() bool {
 }
 
 func (self *SClassicWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SClassicWire) CreateINetwork(opts *cloudprovider.SNetworkCreateOptions) (cloudprovider.ICloudNetwork, error) {
diff --git a/pkg/multicloud/azure/wire.go b/pkg/multicloud/azure/wire.go
index 2adf44e0b2..d8f8da831e 100644
--- a/pkg/multicloud/azure/wire.go
+++ b/pkg/multicloud/azure/wire.go
@@ -21,6 +21,7 @@ import (
 	"yunion.io/x/jsonutils"
 	"yunion.io/x/pkg/errors"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -50,7 +51,7 @@ func (self *SWire) IsEmulated() bool {
 }
 
 func (self *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SRegion) CreateNetwork(vpcId, name string, cidr string, desc string) (*SNetwork, error) {
diff --git a/pkg/multicloud/ctyun/wire.go b/pkg/multicloud/ctyun/wire.go
index ccf46848b6..2d2f0e90c5 100644
--- a/pkg/multicloud/ctyun/wire.go
+++ b/pkg/multicloud/ctyun/wire.go
@@ -20,6 +20,7 @@ import (
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/netutils"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -45,7 +46,7 @@ func (self *SWire) GetGlobalId() string {
 }
 
 func (self *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SWire) Refresh() error {
diff --git a/pkg/multicloud/ecloud/wire.go b/pkg/multicloud/ecloud/wire.go
index 0be1431995..09c15d70eb 100644
--- a/pkg/multicloud/ecloud/wire.go
+++ b/pkg/multicloud/ecloud/wire.go
@@ -17,6 +17,7 @@ package ecloud
 import (
 	"fmt"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -41,7 +42,7 @@ func (w *SWire) GetGlobalId() string {
 }
 
 func (w *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (w *SWire) Refresh() error {
diff --git a/pkg/multicloud/google/wire.go b/pkg/multicloud/google/wire.go
index 1a94e0ffad..a2e0ec13a7 100644
--- a/pkg/multicloud/google/wire.go
+++ b/pkg/multicloud/google/wire.go
@@ -17,6 +17,7 @@ package google
 import (
 	"fmt"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -85,7 +86,7 @@ func (wire *SWire) GetBandwidth() int {
 }
 
 func (wire *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (wire *SWire) IsEmulated() bool {
diff --git a/pkg/multicloud/huawei/wire.go b/pkg/multicloud/huawei/wire.go
index 5389239dfc..9eba93b218 100644
--- a/pkg/multicloud/huawei/wire.go
+++ b/pkg/multicloud/huawei/wire.go
@@ -23,6 +23,7 @@ import (
 	"yunion.io/x/pkg/errors"
 	"yunion.io/x/pkg/util/netutils"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -49,7 +50,7 @@ func (self *SWire) GetGlobalId() string {
 }
 
 func (self *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SWire) Refresh() error {
diff --git a/pkg/multicloud/openstack/wire.go b/pkg/multicloud/openstack/wire.go
index 488ad80a9a..192a12da46 100644
--- a/pkg/multicloud/openstack/wire.go
+++ b/pkg/multicloud/openstack/wire.go
@@ -17,6 +17,7 @@ package openstack
 import (
 	"yunion.io/x/pkg/errors"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -40,7 +41,7 @@ func (wire *SWire) IsEmulated() bool {
 }
 
 func (wire *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (wire *SWire) Refresh() error {
diff --git a/pkg/multicloud/qcloud/wire.go b/pkg/multicloud/qcloud/wire.go
index f1fc0ba19d..3c175f0520 100644
--- a/pkg/multicloud/qcloud/wire.go
+++ b/pkg/multicloud/qcloud/wire.go
@@ -19,6 +19,7 @@ import (
 
 	"yunion.io/x/log"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -44,7 +45,7 @@ func (self *SWire) IsEmulated() bool {
 }
 
 func (self *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SWire) Refresh() error {
diff --git a/pkg/multicloud/ucloud/wire.go b/pkg/multicloud/ucloud/wire.go
index 848e12bce9..44642f0f08 100644
--- a/pkg/multicloud/ucloud/wire.go
+++ b/pkg/multicloud/ucloud/wire.go
@@ -17,6 +17,7 @@ package ucloud
 import (
 	"fmt"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -43,7 +44,7 @@ func (self *SWire) GetGlobalId() string {
 }
 
 func (self *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (self *SWire) Refresh() error {
diff --git a/pkg/multicloud/zstack/wire.go b/pkg/multicloud/zstack/wire.go
index 5e0558bfd8..7e5f4fe38f 100644
--- a/pkg/multicloud/zstack/wire.go
+++ b/pkg/multicloud/zstack/wire.go
@@ -19,6 +19,7 @@ import (
 	"net/url"
 	"strings"
 
+	api "yunion.io/x/onecloud/pkg/apis/compute"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/multicloud"
 )
@@ -83,7 +84,7 @@ func (wire *SWire) IsEmulated() bool {
 }
 
 func (wire *SWire) GetStatus() string {
-	return "available"
+	return api.WIRE_STATUS_AVAILABLE
 }
 
 func (wire *SWire) Refresh() error {