Merge branch 'personality' of github.com:doubledutch/gophercloud
Conflicts:
openstack/compute/v2/servers/requests_test.go
diff --git a/openstack/compute/v2/servers/requests.go b/openstack/compute/v2/servers/requests.go
index aa8c1a8..93a340a 100644
--- a/openstack/compute/v2/servers/requests.go
+++ b/openstack/compute/v2/servers/requests.go
@@ -2,6 +2,7 @@
import (
"encoding/base64"
+ "encoding/json"
"errors"
"fmt"
@@ -95,6 +96,29 @@
FixedIP string
}
+// Personality is an array of files that are injected into the server at launch.
+type Personality []*File
+
+// File is used within CreateOpts and RebuildOpts to inject a file into the server at launch.
+type File struct {
+ // Path of the file
+ Path string
+ // Contents of the file. Maximum content size is 255 bytes.
+ Contents []byte
+}
+
+// MarshalJSON marshals the escaped file, base64 encoding the contents.
+func (f *File) MarshalJSON() ([]byte, error) {
+ file := struct {
+ Path string `json:"path"`
+ Contents string `json:"contents"`
+ }{
+ Path: f.Path,
+ Contents: base64.StdEncoding.EncodeToString(f.Contents),
+ }
+ return json.Marshal(file)
+}
+
// CreateOpts specifies server creation parameters.
type CreateOpts struct {
// Name [required] is the name to assign to the newly launched server.
@@ -124,9 +148,9 @@
// Metadata [optional] contains key-value pairs (up to 255 bytes each) to attach to the server.
Metadata map[string]string
- // Personality [optional] includes the path and contents of a file to inject into the server at launch.
- // The maximum size of the file is 255 bytes (decoded).
- Personality []byte
+ // Personality [optional] includes files to inject into the server at launch.
+ // Create will base64-encode file contents for you.
+ Personality Personality
// ConfigDrive [optional] enables metadata injection through a configuration drive.
ConfigDrive bool
@@ -154,10 +178,6 @@
encoded := base64.StdEncoding.EncodeToString(opts.UserData)
server["user_data"] = &encoded
}
- if opts.Personality != nil {
- encoded := base64.StdEncoding.EncodeToString(opts.Personality)
- server["personality"] = &encoded
- }
if opts.ConfigDrive {
server["config_drive"] = "true"
}
@@ -202,6 +222,10 @@
server["networks"] = networks
}
+ if len(opts.Personality) > 0 {
+ server["personality"] = opts.Personality
+ }
+
return map[string]interface{}{"server": server}, nil
}
@@ -391,9 +415,9 @@
// Metadata [optional] contains key-value pairs (up to 255 bytes each) to attach to the server.
Metadata map[string]string
- // Personality [optional] includes the path and contents of a file to inject into the server at launch.
- // The maximum size of the file is 255 bytes (decoded).
- Personality []byte
+ // Personality [optional] includes files to inject into the server at launch.
+ // Rebuild will base64-encode file contents for you.
+ Personality Personality
}
// ToServerRebuildMap formats a RebuildOpts struct into a map for use in JSON
@@ -429,9 +453,8 @@
server["metadata"] = opts.Metadata
}
- if opts.Personality != nil {
- encoded := base64.StdEncoding.EncodeToString(opts.Personality)
- server["personality"] = &encoded
+ if len(opts.Personality) > 0 {
+ server["personality"] = opts.Personality
}
return map[string]interface{}{"rebuild": server}, nil
diff --git a/openstack/compute/v2/servers/requests_test.go b/openstack/compute/v2/servers/requests_test.go
index 1f39fe1..88cb54d 100644
--- a/openstack/compute/v2/servers/requests_test.go
+++ b/openstack/compute/v2/servers/requests_test.go
@@ -1,6 +1,8 @@
package servers
import (
+ "encoding/base64"
+ "encoding/json"
"net/http"
"testing"
@@ -334,3 +336,38 @@
_, err := CreateImage(client.ServiceClient(), "serverimage", CreateImageOpts{Name: "test"}).ExtractImageID()
th.AssertNoErr(t, err)
}
+
+func TestMarshalPersonality(t *testing.T) {
+ name := "/etc/test"
+ contents := []byte("asdfasdf")
+
+ personality := Personality{
+ &File{
+ Path: name,
+ Contents: contents,
+ },
+ }
+
+ data, err := json.Marshal(personality)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ var actual []map[string]string
+ err = json.Unmarshal(data, &actual)
+ if err != nil {
+ t.Fatal(err)
+ }
+
+ if len(actual) != 1 {
+ t.Fatal("expected personality length 1")
+ }
+
+ if actual[0]["path"] != name {
+ t.Fatal("file path incorrect")
+ }
+
+ if actual[0]["contents"] != base64.StdEncoding.EncodeToString(contents) {
+ t.Fatal("file contents incorrect")
+ }
+}