Added Opts validation to CreateBackup

Author: Russell Troxel

openstack/compute/v2/extensions/adminactions/requests.go

@@ -1,6 +1,10 @@
 package adminactions
 
-import "github.com/rackspace/gophercloud"
+import (
+	"fmt"
+
+	"github.com/rackspace/gophercloud"
+)
 
 func actionURL(client *gophercloud.ServiceClient, id string) string {
 	return client.ServiceURL("servers", id, "action")
@@ -21,12 +25,17 @@ type CreateBackupOpts struct {
 func (opts CreateBackupOpts) ToCreateBackupMap() (map[string]interface{}, error) {
 	backup := make(map[string]interface{})
 
-	if opts.Name != "" {
-		backup["name"] = opts.Name
+	if opts.Name == "" {
+		return nil, fmt.Errorf("CreateBackupOpts.Name cannot be blank.")
+	}
+	if opts.BackupType == "" {
+		return nil, fmt.Errorf("CreateBackupOpts.BackupType cannot be blank.")
 	}
-	if opts.BackupType != "" {
-		backup["backup_type"] = opts.BackupType
+	if opts.Rotation < 0 {
+		return nil, fmt.Errorf("CreateBackupOpts.Rotation must 0 or greater.")
 	}
+	backup["name"] = opts.Name
+	backup["backup_type"] = opts.BackupType
 	backup["rotation"] = opts.Rotation
 
 	return map[string]interface{}{"createBackup": backup}, nil

openstack/compute/v2/extensions/adminactions/requests_test.go

@@ -1,6 +1,7 @@
 package adminactions
 
 import (
+	"fmt"
 	"testing"
 
 	th "github.com/rackspace/gophercloud/testhelper"
@@ -23,6 +24,53 @@ func TestCreateBackup(t *testing.T) {
 	th.AssertNoErr(t, err)
 }
 
+func TestCreateBackupNoName(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+
+	mockCreateBackupResponse(t, serverID)
+
+	err := CreateBackup(client.ServiceClient(), serverID, CreateBackupOpts{
+		BackupType: "daily",
+		Rotation:   1,
+	}).ExtractErr()
+	if err == nil {
+		fmt.Errorf("CreateBackup without a specified Name should throw an Error.")
+	}
+}
+
+func TestCreateBackupNegativeRotation(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+
+	mockCreateBackupResponse(t, serverID)
+
+	err := CreateBackup(client.ServiceClient(), serverID, CreateBackupOpts{
+		Name:       "Backup 1",
+		BackupType: "daily",
+		Rotation:   -1,
+	}).ExtractErr()
+	if err == nil {
+		fmt.Errorf("CreateBackup without a negative Rotation should throw an Error.")
+	}
+}
+
+func TestCreateBackupNoType(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+
+	mockCreateBackupResponse(t, serverID)
+
+	err := CreateBackup(client.ServiceClient(), serverID, CreateBackupOpts{
+		Name: "Backup 1",
+
+		Rotation: 1,
+	}).ExtractErr()
+	if err == nil {
+		fmt.Errorf("CreateBackup without a specified BackupType should throw an Error.")
+	}
+}
+
 func TestInjectNetworkInfo(t *testing.T) {
 	th.SetupHTTP()
 	defer th.TeardownHTTP()