diff --git a/pkg/compute/models/networks.go b/pkg/compute/models/networks.go index 3cbee13d00..586f2bcc3d 100644 --- a/pkg/compute/models/networks.go +++ b/pkg/compute/models/networks.go @@ -731,7 +731,7 @@ func (self *SNetwork) SyncWithCloudNetwork(ctx context.Context, userCred mcclien }) } - syncVirtualResourceMetadata(ctx, userCred, self, extNet) + //syncVirtualResourceMetadata(ctx, userCred, self, extNet) SyncCloudProject(userCred, self, syncOwnerId, extNet, vpc.ManagerId) if provider != nil { diff --git a/pkg/compute/models/vpcs.go b/pkg/compute/models/vpcs.go index b36cea20bc..360142d3ca 100644 --- a/pkg/compute/models/vpcs.go +++ b/pkg/compute/models/vpcs.go @@ -552,7 +552,7 @@ func (self *SVpc) SyncWithCloudVpc(ctx context.Context, userCred mcclient.TokenC return err } - syncMetadata(ctx, userCred, self, extVPC) + //syncMetadata(ctx, userCred, self, extVPC) if provider != nil { SyncCloudDomain(userCred, self, provider.GetOwnerId()) diff --git a/pkg/multicloud/qcloud/network.go b/pkg/multicloud/qcloud/network.go index 51bcea0841..f7b8b03c00 100644 --- a/pkg/multicloud/qcloud/network.go +++ b/pkg/multicloud/qcloud/network.go @@ -111,6 +111,10 @@ func (self *SNetwork) GetAllocTimeoutSeconds() int { return 120 // 2 minutes } +func (self *SNetwork) SetTags(tags map[string]string, replace bool) error { + return self.wire.vpc.region.SetResourceTags("vpc", "subnet", []string{self.SubnetId}, tags, replace) +} + func (self *SNetwork) GetGateway() string { pref, _ := netutils.NewIPV4Prefix(self.CidrBlock) endIp := pref.Address.BroadcastAddr(pref.MaskLen) // 255 diff --git a/pkg/multicloud/qcloud/vpc.go b/pkg/multicloud/qcloud/vpc.go index 622468e9e3..ff136b4d34 100644 --- a/pkg/multicloud/qcloud/vpc.go +++ b/pkg/multicloud/qcloud/vpc.go @@ -82,6 +82,10 @@ func (self *SVpc) Delete() error { return self.region.DeleteVpc(self.VpcId) } +func (self *SVpc) SetTags(tags map[string]string, replace bool) error { + return self.region.SetResourceTags("vpc", "vpc", []string{self.VpcId}, tags, replace) +} + func (self *SVpc) GetISecurityGroups() ([]cloudprovider.ICloudSecurityGroup, error) { secgroups := make([]SSecurityGroup, 0) for {