fix(region): sync tags for vpc and network

This commit is contained in:
ioito
2022-01-17 20:36:19 +08:00
parent 4935993b85
commit ada6d9c179
4 changed files with 10 additions and 2 deletions
+1 -1
View File
@@ -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 {
+1 -1
View File
@@ -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())
+4
View File
@@ -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
+4
View File
@@ -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 {