From 3b8f1f54136a67ba4c306e47b25b686328ec23b5 Mon Sep 17 00:00:00 2001
From: Brian Waldon <brian.waldon@rackspace.com>
Date: Thu, 24 Mar 2011 10:15:50 -0400
Subject: making servers.generate_href more robust

---
 nova/api/openstack/views/servers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'nova')

diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 08b53177b..4e7f62eb3 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -16,6 +16,7 @@
 #    under the License.
 
 import hashlib
+import os
 
 from nova.compute import power_state
 import nova.compute
@@ -164,4 +165,4 @@ class ViewBuilderV11(ViewBuilder):
 
     def generate_href(self, server_id):
         """Create an url that refers to a specific server id."""
-        return "%s/servers/%s" % (self.base_url, server_id)
+        return os.path.join(self.base_url, "servers", str(server_id))
-- 
cgit