Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add resource provider traits API for placement #1899

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.

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

Merged
merged 1 commit into from
Mar 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 25 additions & 0 deletions acceptance/openstack/placement/v1/resourceproviders_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,28 @@ func TestResourceProviderInventories(t *testing.T) {

tools.PrintResource(t, usage)
}

func TestResourceProviderTraits(t *testing.T) {
clients.RequireAdmin(t)

client, err := clients.NewPlacementV1Client()
th.AssertNoErr(t, err)

// first create new resource provider
name := tools.RandomString("TESTACC-", 8)
t.Logf("Attempting to create resource provider: %s", name)

createOpts := resourceproviders.CreateOpts{
Name: name,
}

client.Microversion = "1.20"
resourceProvider, err := resourceproviders.Create(client, createOpts).Extract()
th.AssertNoErr(t, err)

// now get the traits for the newly created resource provider
usage, err := resourceproviders.GetTraits(client, resourceProvider.UUID).Extract()
th.AssertNoErr(t, err)

tools.PrintResource(t, usage)
}
7 changes: 7 additions & 0 deletions openstack/placement/v1/resourceproviders/doc.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,12 @@ Example to get resource providers inventories
panic(err)
}

Example to get resource providers traits

rp, err := resourceproviders.GetTraits(placementClient, resourceProviderID).Extract()
if err != nil {
panic(err)
}

*/
package resourceproviders
5 changes: 5 additions & 0 deletions openstack/placement/v1/resourceproviders/requests.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,8 @@ func GetInventories(client *gophercloud.ServiceClient, resourceProviderID string
_, r.Err = client.Get(getResourceProviderInventoriesURL(client, resourceProviderID), &r.Body, nil)
return
}

func GetTraits(client *gophercloud.ServiceClient, resourceProviderID string) (r GetTraitsResult) {
_, r.Err = client.Get(getResourceProviderTraitsURL(client, resourceProviderID), &r.Body, nil)
return
}
22 changes: 20 additions & 2 deletions openstack/placement/v1/resourceproviders/results.go
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,12 @@ type ResourceProviderInventories struct {
Inventories map[string]Inventory `json:"inventories"`
}

// resourceProviderResult is the resposne of a base ResourceProvider result.
type ResourceProviderTraits struct {
ResourceProviderGeneration int `json:"resource_provider_generation"`
Traits []string `json:"traits"`
}

// resourceProviderResult is the response of a base ResourceProvider result.
type resourceProviderResult struct {
gophercloud.Result
}
Expand Down Expand Up @@ -104,7 +109,7 @@ func (r GetUsagesResult) Extract() (*ResourceProviderUsage, error) {
return &s, err
}

// GetInventoriesResult is the response of a Get usage operations. Call its Extract method
// GetInventoriesResult is the response of a Get inventories operations. Call its Extract method
// to interpret it as a ResourceProviderInventories.
type GetInventoriesResult struct {
gophercloud.Result
Expand All @@ -116,3 +121,16 @@ func (r GetInventoriesResult) Extract() (*ResourceProviderInventories, error) {
err := r.ExtractInto(&s)
return &s, err
}

// GetTraitsResult is the response of a Get traits operations. Call its Extract method
// to interpret it as a ResourceProviderTraits.
type GetTraitsResult struct {
gophercloud.Result
}

// Extract interprets a GetTraitsResult as a ResourceProviderTraits.
func (r GetTraitsResult) Extract() (*ResourceProviderTraits, error) {
var s ResourceProviderTraits
err := r.ExtractInto(&s)
return &s, err
}
33 changes: 33 additions & 0 deletions openstack/placement/v1/resourceproviders/testing/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,16 @@ const InventoriesBody = `
}
`

const TraitsBody = `
{
"resource_provider_generation": 1,
"traits": [
"CUSTOM_HW_FPGA_CLASS1",
"CUSTOM_HW_FPGA_CLASS3"
]
}
`

var ExpectedResourceProvider1 = resourceproviders.ResourceProvider{
Generation: 1,
UUID: "99c09379-6e52-4ef8-9a95-b9ce6f68452e",
Expand Down Expand Up @@ -177,6 +187,14 @@ var ExpectedInventories = resourceproviders.ResourceProviderInventories{
},
}

var ExpectedTraits = resourceproviders.ResourceProviderTraits{
ResourceProviderGeneration: 1,
Traits: []string{
"CUSTOM_HW_FPGA_CLASS1",
"CUSTOM_HW_FPGA_CLASS3",
},
}

func HandleResourceProviderList(t *testing.T) {
th.Mux.HandleFunc("/resource_providers",
func(w http.ResponseWriter, r *http.Request) {
Expand Down Expand Up @@ -231,3 +249,18 @@ func HandleResourceProviderGetInventories(t *testing.T) {
fmt.Fprintf(w, InventoriesBody)
})
}

func HandleResourceProviderGetTraits(t *testing.T) {
traitsTestUrl := fmt.Sprintf("/resource_providers/%s/traits", ResourceProviderTestID)

th.Mux.HandleFunc(traitsTestUrl,
func(w http.ResponseWriter, r *http.Request) {
th.TestMethod(t, r, "GET")
th.TestHeader(t, r, "X-Auth-Token", fake.TokenID)

w.Header().Add("Content-Type", "application/json")
w.WriteHeader(http.StatusOK)

fmt.Fprintf(w, TraitsBody)
})
}
11 changes: 11 additions & 0 deletions openstack/placement/v1/resourceproviders/testing/requests_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -77,3 +77,14 @@ func TestGetResourceProvidersInventories(t *testing.T) {
th.AssertNoErr(t, err)
th.AssertDeepEquals(t, ExpectedInventories, *actual)
}

func TestGetResourceProvidersTraits(t *testing.T) {
th.SetupHTTP()
defer th.TeardownHTTP()

HandleResourceProviderGetTraits(t)

actual, err := resourceproviders.GetTraits(fake.ServiceClient(), ResourceProviderTestID).Extract()
th.AssertNoErr(t, err)
th.AssertDeepEquals(t, ExpectedTraits, *actual)
}
4 changes: 4 additions & 0 deletions openstack/placement/v1/resourceproviders/urls.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,7 @@ func getResourceProviderUsagesURL(client *gophercloud.ServiceClient, resourcePro
func getResourceProviderInventoriesURL(client *gophercloud.ServiceClient, resourceProviderID string) string {
return client.ServiceURL(apiName, resourceProviderID, "inventories")
}

func getResourceProviderTraitsURL(client *gophercloud.ServiceClient, resourceProviderID string) string {
return client.ServiceURL(apiName, resourceProviderID, "traits")
}