Set healthmonitor domain name optional

Author: chuliang

openstack/loadbalancer/v2/monitors/requests.go

@@ -107,7 +107,7 @@ type CreateOpts struct {
 
 	// The domain name, which be injected into the HTTP Host Header to
 	// the backend server for HTTP health check. New in version 2.10.
-	DomainName string `json:"domain_name"`
+	DomainName string `json:"domain_name,omitempty"`
 
 	// Maximum number of seconds for a Monitor to wait for a ping reply
 	// before it times out. The value must be less than the delay value.
@@ -205,7 +205,7 @@ type UpdateOpts struct {
 
 	// The domain name, which be injected into the HTTP Host Header to
 	// the backend server for HTTP health check. New in version 2.10.
-	DomainName string `json:"domain_name"`
+	DomainName string `json:"domain_name,omitempty"`
 
 	// Maximum number of seconds for a Monitor to wait for a ping reply
 	// before it times out. The value must be less than the delay value.

openstack/loadbalancer/v2/monitors/testing/fixtures.go

@@ -70,6 +70,24 @@ const SingleHealthmonitorBody = `
 }
 `
 
+// CreatePingHealthmonitorBody is the canned body of a POST request to create a ping healthmonitor.
+const CreatePingHealthmonitorBody = `
+{
+	"healthmonitor": {
+		"admin_state_up":true,
+		"project_id":"83657cfcdfe44cd5920adaf26c48ceea",
+		"delay":10,
+		"name":"web",
+		"max_retries":1,
+		"max_retries_down":7,
+		"timeout":1,
+		"type":"PING",
+		"pools": [{"id": "84f1b61f-58c4-45bf-a8a9-2dafb9e5214d"}],
+		"id":"466c8345-28d8-4f84-a246-e04380b0461d"
+	}
+}
+`
+
 // PostUpdateHealthmonitorBody is the canned response body of a Update request on an existing healthmonitor.
 const PostUpdateHealthmonitorBody = `
 {
@@ -93,6 +111,24 @@ const PostUpdateHealthmonitorBody = `
 }
 `
 
+// PostUpdatePingHealthmonitorBody is the canned response body of a Update request on an existing healthmonitor.
+const PostUpdatePingHealthmonitorBody = `
+{
+	"healthmonitor": {
+		"admin_state_up":true,
+		"project_id":"83657cfcdfe44cd5920adaf26c48ceea",
+		"delay":10,
+		"name":"web",
+		"max_retries":1,
+		"max_retries_down":7,
+		"timeout":1,
+		"type":"PING",
+		"pools": [{"id": "84f1b61f-58c4-45bf-a8a9-2dafb9e5214d"}],
+		"id":"466c8345-28d8-4f84-a246-e04380b0461d"
+	}
+}
+`
+
 var (
 	HealthmonitorWeb = monitors.Monitor{
 		AdminStateUp:   true,
@@ -140,6 +176,18 @@ var (
 		ID:             "5d4b5228-33b0-4e60-b225-9b727c1a20e7",
 		Pools:          []monitors.PoolID{{ID: "d459f7d8-c6ee-439d-8713-d3fc08aeed8d"}},
 	}
+	HealthmonitorWebUpdated = monitors.Monitor{
+		AdminStateUp:   true,
+		Name:           "web",
+		ProjectID:      "83657cfcdfe44cd5920adaf26c48ceea",
+		Delay:          10,
+		MaxRetries:     1,
+		MaxRetriesDown: 7,
+		Timeout:        1,
+		Type:           "PING",
+		ID:             "466c8345-28d8-4f84-a246-e04380b0461d",
+		Pools:          []monitors.PoolID{{ID: "84f1b61f-58c4-45bf-a8a9-2dafb9e5214d"}},
+	}
 )
 
 // HandleHealthmonitorListSuccessfully sets up the test server to respond to a healthmonitor List request.
@@ -191,6 +239,31 @@ func HandleHealthmonitorCreationSuccessfully(t *testing.T, response string) {
 	})
 }
 
+// HandlePingHealthmonitorCreationSuccessfully sets up the test server to respond to a ping healthmonitor creation request
+// with a given response.
+func HandlePingHealthmonitorCreationSuccessfully(t *testing.T, response string) {
+	th.Mux.HandleFunc("/v2.0/lbaas/healthmonitors", 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, `{
+			"healthmonitor": {
+				"type":"PING",
+				"pool_id":"84f1b61f-58c4-45bf-a8a9-2dafb9e5214d",
+				"project_id":"83657cfcdfe44cd5920adaf26c48ceea",
+				"delay":10,
+				"name":"web",
+				"timeout":1,
+				"max_retries":1,
+				"max_retries_down":7
+			}
+		}`)
+
+		w.WriteHeader(http.StatusAccepted)
+		w.Header().Add("Content-Type", "application/json")
+		fmt.Fprintf(w, response)
+	})
+}
+
 // HandleHealthmonitorGetSuccessfully sets up the test server to respond to a healthmonitor Get request.
 func HandleHealthmonitorGetSuccessfully(t *testing.T) {
 	th.Mux.HandleFunc("/v2.0/lbaas/healthmonitors/5d4b5228-33b0-4e60-b225-9b727c1a20e7", func(w http.ResponseWriter, r *http.Request) {
@@ -236,3 +309,24 @@ func HandleHealthmonitorUpdateSuccessfully(t *testing.T) {
 		fmt.Fprintf(w, PostUpdateHealthmonitorBody)
 	})
 }
+
+// HandlePingHealthmonitorUpdateSuccessfully sets up the test server to respond to a healthmonitor Update request.
+func HandlePingHealthmonitorUpdateSuccessfully(t *testing.T) {
+	th.Mux.HandleFunc("/v2.0/lbaas/healthmonitors/5d4b5228-33b0-4e60-b225-9b727c1a20e7", func(w http.ResponseWriter, r *http.Request) {
+		th.TestMethod(t, r, "PUT")
+		th.TestHeader(t, r, "X-Auth-Token", client.TokenID)
+		th.TestHeader(t, r, "Accept", "application/json")
+		th.TestHeader(t, r, "Content-Type", "application/json")
+		th.TestJSONRequest(t, r, `{
+			"healthmonitor": {
+				"delay":3,
+				"name":"NewHealthmonitorName",
+				"timeout":20,
+				"max_retries":10,
+				"max_retries_down":8
+			}
+		}`)
+
+		fmt.Fprintf(w, PostUpdatePingHealthmonitorBody)
+	})
+}

openstack/loadbalancer/v2/monitors/testing/requests_test.go

@@ -76,6 +76,26 @@ func TestCreateHealthmonitor(t *testing.T) {
 	th.CheckDeepEquals(t, HealthmonitorDb, *actual)
 }
 
+func TestCreatePingHealthmonitor(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+	HandlePingHealthmonitorCreationSuccessfully(t, CreatePingHealthmonitorBody)
+
+	actual, err := monitors.Create(fake.ServiceClient(), monitors.CreateOpts{
+		Type:           "PING",
+		Name:           "web",
+		PoolID:         "84f1b61f-58c4-45bf-a8a9-2dafb9e5214d",
+		ProjectID:      "83657cfcdfe44cd5920adaf26c48ceea",
+		Delay:          10,
+		Timeout:        1,
+		MaxRetries:     1,
+		MaxRetriesDown: 7,
+	}).Extract()
+	th.AssertNoErr(t, err)
+
+	th.CheckDeepEquals(t, HealthmonitorWeb, *actual)
+}
+
 func TestRequiredCreateOpts(t *testing.T) {
 	res := monitors.Create(fake.ServiceClient(), monitors.CreateOpts{})
 	if res.Err == nil {
@@ -135,6 +155,27 @@ func TestUpdateHealthmonitor(t *testing.T) {
 	th.CheckDeepEquals(t, HealthmonitorUpdated, *actual)
 }
 
+func TestUpdatePingHealthmonitor(t *testing.T) {
+	th.SetupHTTP()
+	defer th.TeardownHTTP()
+	HandlePingHealthmonitorUpdateSuccessfully(t)
+
+	client := fake.ServiceClient()
+	name := "NewHealthmonitorName"
+	actual, err := monitors.Update(client, "5d4b5228-33b0-4e60-b225-9b727c1a20e7", monitors.UpdateOpts{
+		Name:           &name,
+		Delay:          3,
+		Timeout:        20,
+		MaxRetries:     10,
+		MaxRetriesDown: 8,
+	}).Extract()
+	if err != nil {
+		t.Fatalf("Unexpected Update error: %v", err)
+	}
+
+	th.CheckDeepEquals(t, HealthmonitorWebUpdated, *actual)
+}
+
 func TestDelayMustBeGreaterOrEqualThanTimeout(t *testing.T) {
 	_, err := monitors.Create(fake.ServiceClient(), monitors.CreateOpts{
 		Type:          "HTTP",