Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Compute V2: Fix not found logic for the flavor access #856

Merged
merged 1 commit into from
Sep 6, 2019
Merged

Compute V2: Fix not found logic for the flavor access #856

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions openstack/resource_openstack_compute_flavor_access_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,14 +95,14 @@ func resourceComputeFlavorAccessV2Delete(d *schema.ResourceData, meta interface{

flavorAccess, err := getFlavorAccess(computeClient, d)
if err != nil {
return fmt.Errorf("Error getting flavor access: %s", err)
return CheckDeleted(d, err, "Error getting flavor access")
}

removeAccessOpts := flavors.RemoveAccessOpts{Tenant: flavorAccess.TenantID}
log.Printf("[DEBUG] RemoveAccess Options: %#v", removeAccessOpts)

if _, err := flavors.RemoveAccess(computeClient, flavorAccess.FlavorID, removeAccessOpts).Extract(); err != nil {
return fmt.Errorf("Error removing tenant %s access from flavor %s: %s", flavorAccess.TenantID, flavorAccess.FlavorID, err)
return CheckDeleted(d, err, fmt.Sprintf("Error removing tenant %s access from flavor %s", flavorAccess.TenantID, flavorAccess.FlavorID))
}

return nil
Expand All @@ -127,6 +127,7 @@ func getFlavorAccess(computeClient *gophercloud.ServiceClient, d *schema.Resourc
return access, err
}

found := false
pager := flavors.ListAccesses(computeClient, flavorID)
err = pager.EachPage(func(page pagination.Page) (bool, error) {
accessList, err := flavors.ExtractAccesses(page)
Expand All @@ -137,12 +138,17 @@ func getFlavorAccess(computeClient *gophercloud.ServiceClient, d *schema.Resourc
for _, a := range accessList {
if a.TenantID == tenantID && a.FlavorID == flavorID {
access = a
found = true
return false, nil
}
}

return true, nil
})

if !found {
return access, gophercloud.ErrDefault404{}
}

return access, err
}