imageservice: Group all images exported types in types.go

And document them.

Signed-off-by: Samuel Ortiz <[email protected]>

Author: Samuel Ortiz

openstack/imageservice/v2/images/requests.go

@@ -9,32 +9,6 @@ import (
 	"github.com/rackspace/gophercloud/pagination"
 )
 
-type Visibility string
-type MemberStatus string
-type Status string
-
-const (
-	Accepted MemberStatus = "accepted"
-	Pending               = "pending"
-	Rejected              = "rejected"
-	All                   = "all"
-)
-
-const (
-	Public  Visibility = "public"
-	Private            = "private"
-	Shared             = "shared"
-)
-
-const (
-	Queued        Status = "queued"
-	Saving               = "saving"
-	Active               = "active"
-	Killed               = "killed"
-	Deleted              = "deleted"
-	PendingDelete        = "pending_delete"
-)
-
 // ListOptsBuilder allows extensions to add additional parameters to the
 // List request.
 type ListOptsBuilder interface {
@@ -53,16 +27,16 @@ type ListOpts struct {
 	// UUID of the server at which you want to set a marker.
 	Marker string `q:"marker"`
 
-	Name         string       `q:"name"`
-	Visibility   Visibility   `q:"visibility"`
-	MemberStatus MemberStatus `q:"member_status"`
-	Owner        string       `q:"owner"`
-	Status       Status       `q:"status"`
-	SizeMin      int64        `q:"size_min"`
-	SizeMax      int64        `q:"size_max"`
-	SortKey      string       `q:"sort_key"`
-	SortDir      string       `q:"sort_dir"`
-	Tag          string       `q:"tag"`
+	Name         string            `q:"name"`
+	Visibility   ImageVisibility   `q:"visibility"`
+	MemberStatus ImageMemberStatus `q:"member_status"`
+	Owner        string            `q:"owner"`
+	Status       ImageStatus       `q:"status"`
+	SizeMin      int64             `q:"size_min"`
+	SizeMax      int64             `q:"size_max"`
+	SortKey      string            `q:"sort_key"`
+	SortDir      string            `q:"sort_dir"`
+	Tag          string            `q:"tag"`
 }
 
 // ToImageListQuery formats a ListOpts into a query string.

openstack/imageservice/v2/images/types.go

@@ -1,20 +1,33 @@
 package images
 
 // ImageStatus image statuses
-//http://docs.openstack.org/developer/glance/statuses.html
+// http://docs.openstack.org/developer/glance/statuses.html
 type ImageStatus string
 
 const (
-	// ImageStatusQueued The image identifier has been reserved for an
-	// image in the Glance registry. No image data has been uploaded to Glance
-	// and the image size was not explicitly set to zero on creation.
+	// ImageStatusQueued is a status for an image which identifier has
+	// been reserved for an image in the image registry.
 	ImageStatusQueued ImageStatus = "queued"
 
-	// ImageStatusActive Denotes an image that is fully available in Glance.
-	// This occurs when the image data is uploaded, or the image size is
-	// explicitly set to zero on creation.
+	// ImageStatusSaving denotes that an image’s raw data is currently being uploaded to Glance
+	ImageStatusSaving ImageStatus = "saving"
+
+	// ImageStatusActive denotes an image that is fully available in Glance.
 	ImageStatusActive ImageStatus = "active"
-	// TODO not all image statuses are defined
+
+	// ImageStatusKilled denotes that an error occurred during the uploading
+	// of an image’s data, and that the image is not readable.
+	ImageStatusKilled ImageStatus = "killed"
+
+	// ImageStatusDeleted is used for an image that is no longer available to use.
+	// The image information is retained in the image registry.
+	ImageStatusDeleted ImageStatus = "deleted"
+
+	// ImageStatusPendingDelete is similar to Delete, but the image is not yet deleted.
+	ImageStatusPendingDelete ImageStatus = "pending_delete"
+
+	// ImageStatusDeactivated denotes that access to image data is not allowed to any non-admin user.
+	ImageStatusDeactivated ImageStatus = "deactivated"
 )
 
 // ImageVisibility denotes an image that is fully available in Glance.
@@ -27,6 +40,36 @@ type ImageVisibility string
 const (
 	// ImageVisibilityPublic all users
 	ImageVisibilityPublic ImageVisibility = "public"
+
 	// ImageVisibilityPrivate users with tenantId == tenantId(owner)
 	ImageVisibilityPrivate ImageVisibility = "private"
+
+	// ImageVisibilityShared images are visible to:
+	// - users with tenantId == tenantId(owner)
+	// - users with tenantId in the member-list of the image
+	// - users with tenantId in the member-list with member_status == 'accepted'
+	ImageVisibilityShared ImageVisibility = "shared"
+
+	// ImageVisibilityCommunity images:
+	// - all users can see and boot it
+	// - users with tenantId in the member-list of the image with member_status == 'accepted'
+	//   have this image in their default image-list
+	ImageVisibilityCommunity ImageVisibility = "community"
+)
+
+// MemberStatus is a status for adding a new member (tenant) to an image member list.
+type ImageMemberStatus string
+
+const (
+	// ImageMemberStatusAccepted is the status for an accepted image member.
+	ImageMemberStatusAccepted ImageMemberStatus = "accepted"
+
+	// ImageMemberStatusPending shows that the member addition is pending
+	ImageMemberStatusPending ImageMemberStatus = "pending"
+
+	// ImageMemberStatusAccepted is the status for a rejected image member
+	ImageMemberStatusRejected ImageMemberStatus = "rejected"
+
+	// ImageMemberStatusAll
+	ImageMemberStatusAll ImageMemberStatus = "all"
 )