opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix wire status close #10737

Browse Source
This commit is contained in:
Qu Xuan
2021-04-15 14:45:10 +08:00
parent 9468493156
commit be0117dd71
14 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/wires.go
+2
View File
@@ -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 {
pkg/multicloud/aliyun/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/apsara/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/aws/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/azure/classic_wire.go
+2 -1
View File
@@ -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) {
pkg/multicloud/azure/wire.go
+2 -1
View File
@@ -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) {
pkg/multicloud/ctyun/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/ecloud/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/google/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/huawei/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/openstack/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/qcloud/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/ucloud/wire.go
+2 -1
View File
@@ -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 {
pkg/multicloud/zstack/wire.go
+2 -1
View File
@@ -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 {