Merge pull request #11503 from ioito/hotfix/qx-opslog-id

fi(region): avoid opslog without resource id
This commit is contained in:
Zexi Li
2021-06-28 19:41:40 +08:00
committed by GitHub
@@ -16,6 +16,7 @@ package models
import (
"context"
"fmt"
"sort"
"yunion.io/x/pkg/errors"
@@ -52,6 +53,14 @@ type SCloudproviderCapability struct {
Capability string `width:"18" charset:"ascii" nullable:"false" primary:"true"`
}
func (self *SCloudproviderCapability) GetId() string {
return fmt.Sprintf("%s/%s", self.CloudregionId, self.CloudproviderId)
}
func (self *SCloudproviderCapability) GetName() string {
return self.Capability
}
func (manager *SCloudproviderCapabilityManager) setCapabilities(ctx context.Context, userCred mcclient.TokenCredential, cloudproviderId string, capabilities []string) error {
return manager.setRegionCapabilities(ctx, userCred, cloudproviderId, "", capabilities)
}