OpenStack Glance support

	* added show image member details API support
	* added delete image member API support
 	* added updated image member API support
	* added acceptense tests
	* bugfixes

Author: funrun11

acceptance/openstack/imageservice/v2/imageservice_test.go

@@ -5,8 +5,10 @@ package v2
 import (
 	"bytes"
 	"io/ioutil"
+	"os"
 	"testing"
 
+	"github.com/rackspace/gophercloud"
 	"github.com/rackspace/gophercloud/acceptance/tools"
 	images "github.com/rackspace/gophercloud/openstack/imageservice/v2"
 	"github.com/rackspace/gophercloud/pagination"
@@ -137,6 +139,96 @@ func TestUploadDownloadImage(t *testing.T) {
 func TestUpdateImage(t *testing.T) {
 	client := newClient(t)
 
+	//creating image
+	image := createTestImage(t, client)
+
+	t.Logf("Image tags %v", image.Tags)
+
+	tags := []string{"acceptance-testing"}
+	updatedImage, err := images.Update(client, image.ID, images.UpdateOpts{
+		images.ReplaceImageTags{
+			NewTags: tags}}).Extract()
+	th.AssertNoErr(t, err)
+	t.Logf("Received tags '%v'", tags)
+	th.AssertDeepEquals(t, updatedImage.Tags, tags)
+}
+
+func TestImageMemberCreateListDelete(t *testing.T) {
+	client := newClient(t)
+
+	//creating image
+	image := createTestImage(t, client)
+	defer deleteImage(t, client, image)
+
+	//creating member
+	member, err := images.CreateMember(client, image.ID, "tenant").Extract()
+	th.AssertNoErr(t, err)
+	th.AssertNotNil(t, member)
+
+	//listing member
+	var members *[]images.ImageMember
+	members, err = images.ListMembers(client, image.ID).Extract()
+	th.AssertNoErr(t, err)
+	th.AssertNotNil(t, members)
+	th.AssertEquals(t, 1, len(*members))
+
+	t.Logf("Members after adding one %v", members)
+
+	//checking just created member
+	m := (*members)[0]
+	th.AssertEquals(t, "pending", m.Status)
+	th.AssertEquals(t, "tenant", m.MemberID)
+
+	//deleting member
+	deleteResult := images.DeleteMember(client, image.ID, "tenant")
+	th.AssertNoErr(t, deleteResult.Err)
+
+	//listing member
+	members, err = images.ListMembers(client, image.ID).Extract()
+	th.AssertNoErr(t, err)
+	th.AssertNotNil(t, members)
+	th.AssertEquals(t, 0, len(*members))
+
+	t.Logf("Members after deleting one %v", members)
+}
+
+func TestImageMemberDetailsAndUpdate(t *testing.T) {
+	// getting current tenant id
+	memberTenantID := os.Getenv("OS_TENANT_ID")
+	if memberTenantID == "" {
+		t.Fatalf("Please define OS_TENANT_ID for image member updating test was '%s'", memberTenantID)
+	}
+
+	client := newClient(t)
+
+	//creating image
+	image := createTestImage(t, client)
+	defer deleteImage(t, client, image)
+
+	//creating member
+	member, err := images.CreateMember(client, image.ID, memberTenantID).Extract()
+	th.AssertNoErr(t, err)
+	th.AssertNotNil(t, member)
+
+	//checking image member details
+	member, err = images.ShowMemberDetails(client, image.ID, memberTenantID).Extract()
+	th.AssertNoErr(t, err)
+	th.AssertNotNil(t, member)
+
+	th.AssertEquals(t, memberTenantID, member.MemberID)
+	th.AssertEquals(t, "pending", member.Status)
+
+	t.Logf("Updating image's %s member status for tenant %s to 'accepted' ", image.ID, memberTenantID)
+
+	//updating image
+	member, err = images.UpdateMember(client, image.ID, memberTenantID, "accepted").Extract()
+	th.AssertNoErr(t, err)
+	th.AssertNotNil(t, member)
+	th.AssertEquals(t, "accepted", member.Status)
+
+}
+
+func createTestImage(t *testing.T, client *gophercloud.ServiceClient) images.Image {
 	//creating image
 	imageName := tools.RandomString("ACCPT", 16)
 	containerFormat := "ami"
@@ -152,14 +244,11 @@ func TestUpdateImage(t *testing.T) {
 	image, err = images.Get(client, image.ID).Extract()
 	th.AssertNoErr(t, err)
 	th.AssertEquals(t, image.Status, images.ImageStatusQueued)
+	return *image
+}
 
-	t.Logf("Image tags %v", image.Tags)
-
-	tags := []string{"acceptance-testing"}
-	updatedImage, err := images.Update(client, image.ID, images.UpdateOpts{
-		images.ReplaceImageTags{
-			NewTags: tags}}).Extract()
-	th.AssertNoErr(t, err)
-	t.Logf("Received tags '%v'", tags)
-	th.AssertDeepEquals(t, updatedImage.Tags, tags)
+func deleteImage(t *testing.T, client *gophercloud.ServiceClient, image images.Image) {
+	//deteting image
+	deleteResult := images.Delete(client, image.ID)
+	th.AssertNoErr(t, deleteResult.Err)
 }

openstack/imageservice/v2/fixtures.go

@@ -447,3 +447,79 @@ func HandleImageMemberEmptyList(t *testing.T) {
 		}`)
 	})
 }
+
+// HandleImageMemberDetails setup
+func HandleImageMemberDetails(t *testing.T) {
+	th.Mux.HandleFunc("/images/da3b75d9-3f4a-40e7-8a2c-bfab23927dea/members/8989447062e04a818baf9e073fd04fa7", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "GET")
+		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
+
+		w.WriteHeader(http.StatusOK)
+		fmt.Fprintf(w, `{
+		    "status": "pending",
+		    "created_at": "2013-11-26T07:21:21Z",
+		    "updated_at": "2013-11-26T07:21:21Z",
+		    "image_id": "da3b75d9-3f4a-40e7-8a2c-bfab23927dea",
+		    "member_id": "8989447062e04a818baf9e073fd04fa7",
+		    "schema": "/v2/schemas/member"
+		}`)
+	})
+}
+
+// HandleImageMemberDeleteSuccessfully setup
+func HandleImageMemberDeleteSuccessfully(t *testing.T) *CallsCounter {
+	var counter CallsCounter
+	th.Mux.HandleFunc("/images/da3b75d9-3f4a-40e7-8a2c-bfab23927dea/members/8989447062e04a818baf9e073fd04fa7", func(w http.ResponseWriter, r *http.Request) {
+		counter.Counter = counter.Counter + 1
+
+		th.TestMethod(t, r, "DELETE")
+		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
+
+		w.WriteHeader(http.StatusNoContent)
+	})
+	return &counter
+}
+
+// HandleImageMemberDeleteByNonOwner setup
+func HandleImageMemberDeleteByNonOwner(t *testing.T) *CallsCounter {
+	var counter CallsCounter
+	th.Mux.HandleFunc("/images/da3b75d9-3f4a-40e7-8a2c-bfab23927dea/members/8989447062e04a818baf9e073fd04fa7", func(w http.ResponseWriter, r *http.Request) {
+		counter.Counter = counter.Counter + 1
+
+		th.TestMethod(t, r, "DELETE")
+		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
+
+		w.WriteHeader(http.StatusForbidden)
+	})
+	return &counter
+}
+
+// HandleImageMemberUpdate setup
+func HandleImageMemberUpdate(t *testing.T) *CallsCounter {
+	var counter CallsCounter
+	th.Mux.HandleFunc("/images/da3b75d9-3f4a-40e7-8a2c-bfab23927dea/members/8989447062e04a818baf9e073fd04fa7", func(w http.ResponseWriter, r *http.Request) {
+		counter.Counter = counter.Counter + 1
+
+		th.TestMethod(t, r, "PUT")
+		th.TestHeader(t, r, "X-Auth-Token", fakeclient.TokenID)
+
+		th.TestJSONRequest(t, r, `{"status": "accepted"}`)
+
+		w.WriteHeader(http.StatusOK)
+
+		fmt.Fprintf(w, `{
+		    "status": "accepted",
+		    "created_at": "2013-11-26T07:21:21Z",
+		    "updated_at": "2013-11-26T07:21:21Z",
+		    "image_id": "da3b75d9-3f4a-40e7-8a2c-bfab23927dea",
+		    "member_id": "8989447062e04a818baf9e073fd04fa7",
+		    "schema": "/v2/schemas/member"
+		}`)
+	})
+	return &counter
+}
+
+// CallsCounter for checking if request handler was called at all
+type CallsCounter struct {
+	Counter int
+}

openstack/imageservice/v2/requests.go

@@ -221,6 +221,7 @@ func CreateMember(client *gophercloud.ServiceClient, id string, member string) C
 }
 
 // ListMembers returns list of members for specifed image id
+// More details: http://developer.openstack.org/api-ref-image-v2.html#listImageMembers-v2
 func ListMembers(client *gophercloud.ServiceClient, id string) ListMembersResult {
 	var res ListMembersResult
 	_, res.Err = client.Get(listMembersURL(client, id), &res.Body, &gophercloud.RequestOpts{OkCodes: []int{200}})
@@ -239,6 +240,47 @@ func Update(client *gophercloud.ServiceClient, id string, opts UpdateOptsBuilder
 	return res
 }
 
+// ShowMemberDetails Shows image member details.
+// More details: http://developer.openstack.org/api-ref-image-v2.html#getImageMember-v2
+func ShowMemberDetails(client *gophercloud.ServiceClient, imageID string, memberID string) MemberDetailsResult {
+	var res MemberDetailsResult
+	_, res.Err = client.Get(imageMemberURL(client, imageID, memberID), &res.Body, &gophercloud.RequestOpts{OkCodes: []int{200}})
+	return res
+}
+
+// DeleteMember Deletes membership for given image.
+// Callee should be image owner
+// More details: http://developer.openstack.org/api-ref-image-v2.html#deleteImageMember-v2
+func DeleteMember(client *gophercloud.ServiceClient, imageID string, memberID string) MemberDeleteResult {
+	var res MemberDeleteResult
+	response, err := client.Delete(imageMemberURL(client, imageID, memberID), &gophercloud.RequestOpts{OkCodes: []int{204, 403}})
+
+	//some problems in http stack or lower
+	if err != nil {
+		res.Err = err
+		return res
+	}
+
+	// Callee is not owner of specified image
+	if response.StatusCode == 403 {
+		res.Err = fmt.Errorf("You must be the owner of the specified image. "+
+			"(image '%s')", imageID)
+		return res
+	}
+	return res
+}
+
+// UpdateMember fuction updates member
+// More details: http://developer.openstack.org/api-ref-image-v2.html#updateImageMember-v2
+func UpdateMember(client *gophercloud.ServiceClient, imageID string, memberID string, status string) MemberUpdateResult {
+	var res MemberUpdateResult
+	body := map[string]interface{}{}
+	body["status"] = status
+	_, res.Err = client.Put(imageMemberURL(client, imageID, memberID), body, &res.Body,
+		&gophercloud.RequestOpts{OkCodes: []int{200}})
+	return res
+}
+
 // UpdateOptsBuilder implemets UpdateOptsBuilder
 type UpdateOptsBuilder interface {
 	// returns value implementing json.Marshaler which when marshaled matches the patch schema:
@@ -249,7 +291,7 @@ type UpdateOptsBuilder interface {
 // UpdateOpts implements UpdateOpts
 type UpdateOpts []Patch
 
-// ToImageUpdateMap TODO
+// ToImageUpdateMap builder
 func (opts UpdateOpts) ToImageUpdateMap() []interface{} {
 	m := make([]interface{}, len(opts))
 	for i, patch := range opts {
@@ -265,12 +307,26 @@ type Patch interface {
 	ToImagePatchMap() map[string]interface{}
 }
 
+// UpdateVisibility updated visibility
+type UpdateVisibility struct {
+	Visibility ImageVisibility
+}
+
+// ToImagePatchMap builder
+func (u UpdateVisibility) ToImagePatchMap() map[string]interface{} {
+	m := map[string]interface{}{}
+	m["op"] = "relace"
+	m["path"] = "/visibility"
+	m["value"] = u.Visibility
+	return m
+}
+
 // ReplaceImageName implements Patch
 type ReplaceImageName struct {
 	NewName string
 }
 
-// ToImagePatchMap TODO
+// ToImagePatchMap builder
 func (r ReplaceImageName) ToImagePatchMap() map[string]interface{} {
 	m := map[string]interface{}{}
 	m["op"] = "replace"
@@ -284,7 +340,7 @@ type ReplaceImageTags struct {
 	NewTags []string
 }
 
-// ToImagePatchMap TODO
+// ToImagePatchMap builder
 func (r ReplaceImageTags) ToImagePatchMap() map[string]interface{} {
 	m := map[string]interface{}{}
 	m["op"] = "replace"