Skip to content

Commit 75a970d

Browse files
authored
Merge pull request #3195 from gophercloud/bp-v2-9c94b95
[v2] [core]: handle empty response body
2 parents 0a100e1 + 113e3c4 commit 75a970d

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

openstack/networking/v2/extensions/bgp/speakers/requests.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func RemoveBGPPeer(ctx context.Context, c *gophercloud.ServiceClient, bgpSpeaker
142142
r.Err = err
143143
return
144144
}
145-
resp, err := c.Put(ctx, removeBGPPeerURL(c, bgpSpeakerID), b, &r.Body, &gophercloud.RequestOpts{
145+
resp, err := c.Put(ctx, removeBGPPeerURL(c, bgpSpeakerID), b, nil, &gophercloud.RequestOpts{
146146
OkCodes: []int{200},
147147
})
148148
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)
@@ -207,7 +207,7 @@ func RemoveGatewayNetwork(ctx context.Context, c *gophercloud.ServiceClient, bgp
207207
r.Err = err
208208
return
209209
}
210-
resp, err := c.Put(ctx, removeGatewayNetworkURL(c, bgpSpeakerID), b, &r.Body, &gophercloud.RequestOpts{
210+
resp, err := c.Put(ctx, removeGatewayNetworkURL(c, bgpSpeakerID), b, nil, &gophercloud.RequestOpts{
211211
OkCodes: []int{200},
212212
})
213213
_, r.Header, r.Err = gophercloud.ParseResponse(resp, err)

openstack/networking/v2/extensions/bgp/speakers/testing/requests_test.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package testing
33
import (
44
"context"
55
"fmt"
6-
"io"
76
"net/http"
87
"testing"
98

@@ -195,7 +194,7 @@ func TestRemoveBGPPeer(t *testing.T) {
195194

196195
opts := speakers.RemoveBGPPeerOpts{BGPPeerID: bgpPeerID}
197196
err := speakers.RemoveBGPPeer(context.TODO(), fake.ServiceClient(), bgpSpeakerID, opts).ExtractErr()
198-
th.AssertEquals(t, err, io.EOF)
197+
th.AssertNoErr(t, err)
199198
}
200199

201200
func TestGetAdvertisedRoutes(t *testing.T) {
@@ -279,5 +278,5 @@ func TestRemoveGatewayNetwork(t *testing.T) {
279278

280279
opts := speakers.RemoveGatewayNetworkOpts{NetworkID: networkID}
281280
err := speakers.RemoveGatewayNetwork(context.TODO(), fake.ServiceClient(), bgpSpeakerID, opts).ExtractErr()
282-
th.AssertEquals(t, err, io.EOF)
281+
th.AssertNoErr(t, err)
283282
}

0 commit comments

Comments
 (0)