Fix for issue#533

Author: marcin-krolik

openstack/blockstorage/v1/apiversions/urls.go

@@ -2,6 +2,7 @@ package apiversions
 
 import (
 	"strings"
+	"net/url"
 
 	"github.com/rackspace/gophercloud"
 )
@@ -11,5 +12,7 @@ func getURL(c *gophercloud.ServiceClient, version string) string {
 }
 
 func listURL(c *gophercloud.ServiceClient) string {
-	return c.ServiceURL("")
+	u, _ := url.Parse(c.ServiceURL(""))
+	u.Path = "/"
+	return u.String()
 }

openstack/blockstorage/v1/apiversions/urls_test.go

@@ -8,19 +8,24 @@ import (
 )
 
 const endpoint = "http://localhost:57909/"
+const endpoint2 = "http://localhost:57909/v1/3a02ee0b5cf14816b41b17e851d29a94"
 
 func endpointClient() *gophercloud.ServiceClient {
 	return &gophercloud.ServiceClient{Endpoint: endpoint}
 }
 
+func endpointClient2() *gophercloud.ServiceClient {
+	return &gophercloud.ServiceClient{Endpoint: endpoint2}
+}
+
 func TestGetURL(t *testing.T) {
 	actual := getURL(endpointClient(), "v1")
 	expected := endpoint + "v1/"
 	th.AssertEquals(t, expected, actual)
 }
 
 func TestListURL(t *testing.T) {
-	actual := listURL(endpointClient())
+	actual := listURL(endpointClient2())
 	expected := endpoint
 	th.AssertEquals(t, expected, actual)
 }