moved remove_version to common.py

4 files changed, 8 insertions, 12 deletions

diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index aa8911b62..8794bca6d 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -134,3 +134,6 @@ def get_id_from_href(href):
     except:
         LOG.debug(_("Error extracting id from href: %s") % href)
         raise webob.exc.HTTPBadRequest(_('could not parse id from href'))
+
+def remove_version(base_url):
+    return base_url.rsplit('/', 1).pop(0)
diff --git a/nova/api/openstack/views/flavors.py b/nova/api/openstack/views/flavors.py
index 4e609930c..d967c2af0 100644
--- a/nova/api/openstack/views/flavors.py
+++ b/nova/api/openstack/views/flavors.py
@@ -92,8 +92,5 @@ class ViewBuilderV11(ViewBuilder):
 
     def generate_bookmark(self, flavor_id):
         """Create an url that refers to a specific flavor id."""
-        return "%s/flavors/%s" % (self._remove_version(self.base_url),
+        return "%s/flavors/%s" % (common.remove_version(self.base_url),
             flavor_id)
-
-    def _remove_version(self, base_url):
-        return base_url.rsplit('/', 1).pop(0)
diff --git a/nova/api/openstack/views/images.py b/nova/api/openstack/views/images.py
index 5ab02671c..9d6722326 100644
--- a/nova/api/openstack/views/images.py
+++ b/nova/api/openstack/views/images.py
@@ -17,6 +17,8 @@
 
 import os.path
 
+from nova.api.openstack import common
+
 
 class ViewBuilder(object):
     """Base class for generating responses to OpenStack API image requests."""
@@ -122,8 +124,5 @@ class ViewBuilderV11(ViewBuilder):
 
     def generate_bookmark(self, image_id):
         """Create an url that refers to a specific flavor id."""
-        return os.path.join(self._remove_version(self._url),
+        return os.path.join(common.remove_version(self._url),
             "images", str(image_id))
-
-    def _remove_version(self, base_url):
-        return base_url.rsplit('/', 1).pop(0)
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py
index 1c6dbf87d..b85fceb19 100644
--- a/nova/api/openstack/views/servers.py
+++ b/nova/api/openstack/views/servers.py
@@ -177,8 +177,5 @@ class ViewBuilderV11(ViewBuilder):
 
     def generate_bookmark(self, server_id):
         """Create an url that refers to a specific flavor id."""
-        return os.path.join(self._remove_version(self.base_url),
+        return os.path.join(common.remove_version(self.base_url),
             "servers", str(server_id))
-
-    def _remove_version(self, base_url):
-        return base_url.rsplit('/', 1).pop(0)