opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-31 02:38:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): azure resource group

Browse Source
This commit is contained in:
ioito
2022-10-08 21:27:52 +08:00
parent 59fd4f61be
commit e8bb88247d
6 changed files with 114 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/guestdrivers/esxi.go
+1 -1
View File
@@ -418,7 +418,7 @@ func (self *SESXiGuestDriver) RequestDeployGuestOnHost(ctx context.Context, gues
return errors.Wrapf(err, "GetExternalProjectsByProjectIdOrName(%s,%s)", project.Id, project.Name)
}
extProj := account.GetAvailableExternalProject(project, projects)
extProj := models.GetAvailableExternalProject(project, projects)
if extProj != nil {
config.Add(jsonutils.NewString(extProj.Name), "desc", "resource_pool")
} else {
pkg/compute/models/cloudaccounts.go
+2 -2
View File
@@ -2574,7 +2574,7 @@ func (account *SCloudaccount) GetUsages() []db.IUsage {
}
}
func (self *SCloudaccount) GetAvailableExternalProject(local *db.STenant, projects []SExternalProject) *SExternalProject {
func GetAvailableExternalProject(local *db.STenant, projects []SExternalProject) *SExternalProject {
var ret *SExternalProject = nil
for i := 0; i < len(projects); i++ {
if projects[i].Status == api.EXTERNAL_PROJECT_STATUS_AVAILABLE {
@@ -2615,7 +2615,7 @@ func (self *SCloudaccount) SyncProject(ctx context.Context, userCred mcclient.To
return "", errors.Wrapf(err, "GetExternalProjectsByProjectIdOrName(%s,%s)", projectId, project.Name)
}
extProj := self.GetAvailableExternalProject(project, projects)
extProj := GetAvailableExternalProject(project, projects)
if extProj != nil {
return extProj.ExternalId, nil
}
pkg/compute/models/cloudproviders.go
+92
View File
@@ -1735,6 +1735,9 @@ func (provider *SCloudprovider) GetChangeOwnerCandidateDomainIds() []string {
}
func (self *SCloudprovider) SyncProject(ctx context.Context, userCred mcclient.TokenCredential, id string) (string, error) {
if self.Provider == api.CLOUD_PROVIDER_AZURE {
return self.SyncAzureProject(ctx, userCred, id)
}
account, err := self.GetCloudaccount()
if err != nil {
return "", errors.Wrapf(err, "GetCloudaccount")
@@ -1742,6 +1745,95 @@ func (self *SCloudprovider) SyncProject(ctx context.Context, userCred mcclient.T
return account.SyncProject(ctx, userCred, id)
}
func (self *SCloudprovider) GetExternalProjectsByProjectIdOrName(projectId, name string) ([]SExternalProject, error) {
projects := []SExternalProject{}
q := ExternalProjectManager.Query().Equals("manager_id", self.Id)
q = q.Filter(
sqlchemy.OR(
sqlchemy.Equals(q.Field("name"), name),
sqlchemy.Equals(q.Field("tenant_id"), projectId),
),
)
err := db.FetchModelObjects(ExternalProjectManager, q, &projects)
if err != nil {
return nil, errors.Wrap(err, "db.FetchModelObjects")
}
return projects, nil
}
func (self *SCloudprovider) SyncAzureProject(ctx context.Context, userCred mcclient.TokenCredential, id string) (string, error) {
lockman.LockRawObject(ctx, "projects", self.Id)
defer lockman.ReleaseRawObject(ctx, "projects", self.Id)
account, err := self.GetCloudaccount()
if err != nil {
return "", errors.Wrapf(err, "GetCloudaccount")
}
provider, err := self.GetProvider(ctx)
if err != nil {
return "", errors.Wrap(err, "GetProvider")
}
project, err := db.TenantCacheManager.FetchTenantById(ctx, id)
if err != nil {
return "", errors.Wrapf(err, "FetchTenantById(%s)", id)
}
projects, err := self.GetExternalProjectsByProjectIdOrName(id, project.Name)
if err != nil {
return "", errors.Wrapf(err, "GetExternalProjectsByProjectIdOrName(%s,%s)", id, project.Name)
}
extProj := GetAvailableExternalProject(project, projects)
if extProj != nil {
idx := strings.Index(extProj.ExternalId, "/")
if idx > -1 {
return extProj.ExternalId[idx+1:], nil
}
return extProj.ExternalId, nil
}
retry := 1
if len(projects) > 0 {
retry = 10
}
var iProject cloudprovider.ICloudProject = nil
projectName := project.Name
for i := 0; i < retry; i++ {
iProject, err = provider.CreateIProject(projectName)
if err == nil {
break
}
projectName = fmt.Sprintf("%s-%d", project.Name, i)
}
if err != nil {
if errors.Cause(err) != cloudprovider.ErrNotImplemented && errors.Cause(err) != cloudprovider.ErrNotSupported {
logclient.AddSimpleActionLog(self, logclient.ACT_CREATE, err, userCred, false)
}
return "", errors.Wrapf(err, "CreateIProject(%s)", projectName)
}
extProj, err = ExternalProjectManager.newFromCloudProject(ctx, userCred, account, project, iProject)
if err != nil {
return "", errors.Wrap(err, "newFromCloudProject")
}
db.Update(extProj, func() error {
extProj.ManagerId = self.Id
return nil
})
idx := strings.Index(extProj.ExternalId, "/")
if idx > -1 {
return extProj.ExternalId[idx+1:], nil
}
return extProj.ExternalId, nil
}
func (self *SCloudprovider) GetSchedtags() []SSchedtag {
return GetSchedtags(CloudproviderschedtagManager, self.Id)
}
pkg/multicloud/azure/azure.go
+6 -8
View File
@@ -976,29 +976,27 @@ func getResourceGroup(id string) string {
}
}
if idx > 0 && idx < len(info)-1 {
return info[idx]
return fmt.Sprintf("%s/%s", info[1], info[idx])
}
return ""
}
func (self *SAzureClient) GetIProjects() ([]cloudprovider.ICloudProject, error) {
subscriptionId := self.subscriptionId
groups := map[string]*SResourceGroup{}
groups := []SResourceGroup{}
for _, sub := range self.subscriptions {
self.subscriptionId = sub.SubscriptionId
resourceGroups, err := self.ListResourceGroups()
if err != nil {
return nil, errors.Wrapf(err, "ListResourceGroups")
}
for i := range resourceGroups {
groups[strings.ToLower(resourceGroups[i].Name)] = &resourceGroups[i]
}
groups = append(groups, resourceGroups...)
}
self.subscriptionId = subscriptionId
iprojects := []cloudprovider.ICloudProject{}
for _, group := range groups {
group.client = self
iprojects = append(iprojects, group)
for i := range groups {
groups[i].client = self
iprojects = append(iprojects, &groups[i])
}
return iprojects, nil
}
pkg/multicloud/azure/region.go
+9 -5
View File
@@ -638,12 +638,16 @@ func (self *SRegion) checkResourceGroup(resourceGroup string) (string, error) {
if len(resourceGroup) == 0 {
resourceGroup = "Default"
}
projs, err := self.client.GetIProjects()
resourceGroups, err := self.client.ListResourceGroups()
if err != nil {
return "", errors.Wrapf(err, "GetIProjects")
return "", errors.Wrapf(err, "ListResourceGroups")
}
for _, proj := range projs {
if strings.ToLower(proj.GetGlobalId()) == strings.ToLower(resourceGroup) {
for i := range resourceGroups {
proj := resourceGroups[i]
if strings.ToLower(proj.GetName()) == strings.ToLower(resourceGroup) ||
proj.GetGlobalId() == resourceGroup ||
(strings.Contains(resourceGroup, "/") && strings.HasSuffix(proj.GetGlobalId(), resourceGroup)) {
return resourceGroup, nil
}
}
@@ -680,7 +684,7 @@ func (self *SRegion) create(resourceGroup string, _body jsonutils.JSONObject, re
}
resourceGroup, err = self.checkResourceGroup(resourceGroup)
if err != nil {
return errors.Wrapf(err, "checkResourceGroup")
return errors.Wrapf(err, "checkResourceGroup(%s)", resourceGroup)
}
info.Name, err = self.client.getUniqName(resourceGroup, info.Type, info.Name)
if err != nil {
pkg/multicloud/azure/resourcegroup.go
+4 -4
View File
@@ -43,21 +43,21 @@ type SResourceGroup struct {
}
func (self *SRegion) GetResourceGroupDetail(groupName string) (*SResourceGroup, error) {
resourceGroup := SResourceGroup{}
resourceGroup := SResourceGroup{client: self.client, subId: self.client._subscriptionId()}
idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.client._subscriptionId(), groupName)
return &resourceGroup, self.get(idStr, url.Values{}, &resourceGroup)
}
// not support update, resource group name is immutable???
func (self *SRegion) UpdateResourceGroup(groupName string, newName string) error {
resourceGroup := SResourceGroup{Name: newName}
resourceGroup := SResourceGroup{Name: newName, client: self.client, subId: self.client._subscriptionId()}
resource := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.client.subscriptionId, groupName)
_, err := self.client.patch(resource, jsonutils.Marshal(&resourceGroup))
return err
}
func (self *SRegion) CreateResourceGroup(groupName string) (jsonutils.JSONObject, error) {
resourceGroup := SResourceGroup{Location: self.Name}
resourceGroup := SResourceGroup{Location: self.Name, client: self.client, subId: self.client._subscriptionId()}
idStr := fmt.Sprintf("subscriptions/%s/resourcegroups/%s", self.client._subscriptionId(), groupName)
return self.client.put(idStr, jsonutils.Marshal(resourceGroup))
}
@@ -80,7 +80,7 @@ func (self *SResourceGroup) GetAccountId() string {
}
func (r *SResourceGroup) GetGlobalId() string {
return strings.ToLower(r.Name)
return strings.ToLower(fmt.Sprintf("%s/%s", r.subId, r.Name))
}
func (r *SResourceGroup) GetStatus() string {