Merge pull request #2968 from till/create-server-hostname

mandre · web-flow · commit b74d3b1c8cb9 · 2024-03-10T12:36:19.000+01:00
compute: Allow setting the hostname when creating a server
diff --git a/openstack/compute/v2/servers/requests.go b/openstack/compute/v2/servers/requests.go
@@ -241,6 +241,12 @@ type CreateOpts struct {
 	// Tags allows a server to be tagged with single-word metadata.
 	// Requires microversion 2.52 or later.
 	Tags []string `json:"tags,omitempty"`
+
+	// (Available from 2.90) Hostname specifies the hostname to configure for the
+	// instance in the metadata service. Starting with microversion 2.94, this can
+	// be a Fully Qualified Domain Name (FQDN) of up to 255 characters in length.
+	// If not set, OpenStack will derive the server's hostname from the Name field.
+	Hostname string `json:"hostname,omitempty"`
 }
 
 // ToServerCreateMap assembles a request body based on the contents of a
diff --git a/openstack/compute/v2/servers/testing/fixtures_test.go b/openstack/compute/v2/servers/testing/fixtures_test.go
@@ -267,6 +267,7 @@ const SingleServerBody = `
 		"OS-EXT-STS:task_state": null,
 		"OS-EXT-STS:vm_state": "active",
 		"OS-EXT-SRV-ATTR:instance_name": "instance-0000001d",
+		"OS-EXT-SRV-ATTR:hostname": "derp.local",
 		"OS-SRV-USG:launched_at": "2014-09-25T13:04:49.000000",
 		"OS-EXT-SRV-ATTR:hypervisor_hostname": "devstack",
 		"flavor": {
@@ -849,6 +850,25 @@ func HandleServerCreationWithCustomFieldSuccessfully(t *testing.T, response stri
 	})
 }
 
+func HandleServerCreationWithHostname(t *testing.T, response string) {
+	th.Mux.HandleFunc("/servers", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "POST")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+		th.TestJSONRequest(t, r, `{
+			"server": {
+				"name": "derp",
+				"hostname": "derp.local",
+				"imageRef": "f90f6034-2570-4974-8351-6b49732ef2eb",
+				"flavorRef": "1"
+			}
+		}`)
+
+		w.WriteHeader(http.StatusAccepted)
+		w.Header().Add("Content-Type", "application/json")
+		fmt.Fprintf(w, response)
+	})
+}
+
 // HandleServerCreationWithUserdata sets up the test server to respond to a server creation request
 // with a given response.
 func HandleServerCreationWithUserdata(t *testing.T, response string) {
diff --git a/openstack/compute/v2/servers/testing/requests_test.go b/openstack/compute/v2/servers/testing/requests_test.go
@@ -204,6 +204,22 @@ func TestCreateServerWithUserdataEncoded(t *testing.T) {
 	th.CheckDeepEquals(t, ServerDerp, *actual)
 }
 
+func TestCreateServerWithHostname(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+	HandleServerCreationWithHostname(t, SingleServerBody)
+
+	actual, err := servers.Create(context.TODO(), client.ServiceClient(), servers.CreateOpts{
+		Name:      "derp",
+		ImageRef:  "f90f6034-2570-4974-8351-6b49732ef2eb",
+		FlavorRef: "1",
+		Hostname:  "derp.local",
+	}).Extract()
+	th.AssertNoErr(t, err)
+
+	th.CheckDeepEquals(t, ServerDerp, *actual)
+}
+
 func TestDeleteServer(t *testing.T) {
 	th.SetupHTTP()
 	defer th.TeardownHTTP()
