imageservice: Avoid using pointers for CreateOps fields

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

Author: Samuel Ortiz

acceptance/openstack/imageservice/v2/common.go

@@ -53,9 +53,9 @@ func createTestImage(t *testing.T, client *gophercloud.ServiceClient) images.Ima
 	//creating image
 	imageName := tools.RandomString("ACCPT", 16)
 	containerFormat := "ami"
-	createResult := images.Create(client, images.CreateOpts{Name: &imageName,
-		ContainerFormat: &containerFormat,
-		DiskFormat:      &containerFormat})
+	createResult := images.Create(client, images.CreateOpts{Name: imageName,
+		ContainerFormat: containerFormat,
+		DiskFormat:      containerFormat})
 	th.AssertNoErr(t, createResult.Err)
 	image, err := createResult.Extract()
 	th.AssertNoErr(t, err)
@@ -75,7 +75,7 @@ func createTestImage(t *testing.T, client *gophercloud.ServiceClient) images.Ima
 	image, err = images.Get(client, image.ID).Extract()
 	th.AssertNoErr(t, err)
 	th.AssertEquals(t, image.Status, images.ImageStatusActive)
-	th.AssertEquals(t, *image.SizeBytes, 9)
+	th.AssertEquals(t, image.SizeBytes, 9)
 	return *image
 }
 

openstack/imageservice/v2/images/fixtures.go

@@ -159,6 +159,7 @@ func HandleImageCreationSuccessfully(t *testing.T) {
 		th.TestJSONRequest(t, r, `{
 			"id": "e7db3b45-8db7-47ad-8109-3fb55c2c24fd",
 			"name": "Ubuntu 12.10",
+			"protected": false,
 			"tags": [
 				"ubuntu",
 				"quantal"
@@ -170,6 +171,7 @@ func HandleImageCreationSuccessfully(t *testing.T) {
 		fmt.Fprintf(w, `{
 			"status": "queued",
 			"name": "Ubuntu 12.10",
+			"protected": false,
 			"tags": ["ubuntu","quantal"],
 			"container_format": "bare",
 			"created_at": "2014-11-11T20:47:55Z",
@@ -200,6 +202,7 @@ func HandleImageCreationSuccessfullyNulls(t *testing.T) {
 		th.TestJSONRequest(t, r, `{
 			"id": "e7db3b45-8db7-47ad-8109-3fb55c2c24fd",
 			"name": "Ubuntu 12.10",
+			"protected": false,
 			"tags": [
 				"ubuntu",
 				"quantal"
@@ -211,6 +214,7 @@ func HandleImageCreationSuccessfullyNulls(t *testing.T) {
 		fmt.Fprintf(w, `{
 			"status": "queued",
 			"name": "Ubuntu 12.10",
+			"protected": false,
 			"tags": ["ubuntu","quantal"],
 			"container_format": "bare",
 			"created_at": "2014-11-11T20:47:55Z",

openstack/imageservice/v2/images/requests.go

@@ -114,10 +114,10 @@ type CreateOptsBuilder interface {
 // CreateOpts implements CreateOptsBuilder
 type CreateOpts struct {
 	// Name [required] is the name of the new image.
-	Name *string
+	Name string
 
 	// Id [optional] is the the image ID.
-	ID *string
+	ID string
 
 	// Visibility [optional] defines who can see/use the image.
 	Visibility *ImageVisibility
@@ -127,23 +127,23 @@ type CreateOpts struct {
 
 	// ContainerFormat [optional] is the format of the
 	// container. Valid values are ami, ari, aki, bare, and ovf.
-	ContainerFormat *string
+	ContainerFormat string
 
 	// DiskFormat [optional] is the format of the disk. If set,
 	// valid values are ami, ari, aki, vhd, vmdk, raw, qcow2, vdi,
 	// and iso.
-	DiskFormat *string
+	DiskFormat string
 
 	// MinDiskGigabytes [optional] is the amount of disk space in
 	// GB that is required to boot the image.
-	MinDiskGigabytes *int
+	MinDiskGigabytes int
 
 	// MinRAMMegabytes [optional] is the amount of RAM in MB that
 	// is required to boot the image.
-	MinRAMMegabytes *int
+	MinRAMMegabytes int
 
 	// protected [optional] is whether the image is not deletable.
-	Protected *bool
+	Protected bool
 
 	// properties [optional] is a set of properties, if any, that
 	// are associated with the image.
@@ -154,12 +154,12 @@ type CreateOpts struct {
 // a CreateOpts.
 func (opts CreateOpts) ToImageCreateMap() (map[string]interface{}, error) {
 	body := map[string]interface{}{}
-	if opts.Name == nil {
+	if opts.Name == "" {
 		return body, fmt.Errorf("'Name' field is requered, but is not set (was: %v)'", opts.Name)
 	}
 
 	body["name"] = opts.Name
-	if opts.ID != nil {
+	if opts.ID != "" {
 		body["id"] = opts.ID
 	}
 	if opts.Visibility != nil {
@@ -168,22 +168,22 @@ func (opts CreateOpts) ToImageCreateMap() (map[string]interface{}, error) {
 	if opts.Tags != nil {
 		body["tags"] = opts.Tags
 	}
-	if opts.ContainerFormat != nil {
+	if opts.ContainerFormat != "" {
 		body["container_format"] = opts.ContainerFormat
 	}
-	if opts.DiskFormat != nil {
+	if opts.DiskFormat != "" {
 		body["disk_format"] = opts.DiskFormat
 	}
-	if opts.MinDiskGigabytes != nil {
+	if opts.MinDiskGigabytes != 0 {
 		body["min_disk"] = opts.MinDiskGigabytes
 	}
-	if opts.MinRAMMegabytes != nil {
+	if opts.MinRAMMegabytes != 0 {
 		body["min_ram"] = opts.MinRAMMegabytes
 
 	}
-	if opts.Protected != nil {
-		body["protected"] = opts.Protected
-	}
+
+	body["protected"] = opts.Protected
+
 	if opts.Properties != nil {
 		body["properties"] = opts.Properties
 	}

openstack/imageservice/v2/images/requests_test.go

@@ -56,8 +56,8 @@ func TestCreateImage(t *testing.T) {
 	name := "Ubuntu 12.10"
 
 	actualImage, err := Create(fakeclient.ServiceClient(), CreateOpts{
-		ID:   &id,
-		Name: &name,
+		ID:   id,
+		Name: name,
 		Tags: []string{"ubuntu", "quantal"},
 	}).Extract()
 
@@ -103,8 +103,8 @@ func TestCreateImageNulls(t *testing.T) {
 	name := "Ubuntu 12.10"
 
 	actualImage, err := Create(fakeclient.ServiceClient(), CreateOpts{
-		ID:   &id,
-		Name: &name,
+		ID:   id,
+		Name: name,
 		Tags: []string{"ubuntu", "quantal"},
 	}).Extract()