From 1c1a06c3731dd82b331f317ba52edbfe2110a40e Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Mon, 9 May 2011 11:47:33 -0400
Subject: clean up unused functions from virt/images.py

---
 nova/virt/images.py | 61 -----------------------------------------------------
 1 file changed, 61 deletions(-)

diff --git a/nova/virt/images.py b/nova/virt/images.py
index 2e3f2ee4d..1eb6f4a5f 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -51,67 +51,6 @@ def fetch(image_id, path, _user, _project):
         metadata = image_service.get(elevated, image_id, image_file)
     return metadata
 
-
-# NOTE(vish): The methods below should be unnecessary, but I'm leaving
-#             them in case the glance client does not work on windows.
-def _fetch_image_no_curl(url, path, headers):
-    request = urllib2.Request(url)
-    for (k, v) in headers.iteritems():
-        request.add_header(k, v)
-
-    def urlretrieve(urlfile, fpath):
-        chunk = 1 * 1024 * 1024
-        f = open(fpath, "wb")
-        while 1:
-            data = urlfile.read(chunk)
-            if not data:
-                break
-            f.write(data)
-
-    urlopened = urllib2.urlopen(request)
-    urlretrieve(urlopened, path)
-    LOG.debug(_("Finished retreving %(url)s -- placed in %(path)s") % locals())
-
-
-def _fetch_s3_image(image, path, user, project):
-    url = image_url(image)
-
-    # This should probably move somewhere else, like e.g. a download_as
-    # method on User objects and at the same time get rewritten to use
-    # a web client.
-    headers = {}
-    headers['Date'] = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime())
-
-    (_, _, url_path, _, _, _) = urlparse.urlparse(url)
-    access = manager.AuthManager().get_access_key(user, project)
-    signature = signer.Signer(user.secret.encode()).s3_authorization(headers,
-                                                                     'GET',
-                                                                     url_path)
-    headers['Authorization'] = 'AWS %s:%s' % (access, signature)
-
-    if sys.platform.startswith('win'):
-        return _fetch_image_no_curl(url, path, headers)
-    else:
-        cmd = ['/usr/bin/curl', '--fail', '--silent', url]
-        for (k, v) in headers.iteritems():
-            cmd += ['-H', '\'%s: %s\'' % (k, v)]
-
-        cmd += ['-o', path]
-        return utils.execute(*cmd)
-
-
-def _fetch_local_image(image, path, user, project):
-    source = _image_path(os.path.join(image, 'image'))
-    if sys.platform.startswith('win'):
-        return shutil.copy(source, path)
-    else:
-        return utils.execute('cp', source, path)
-
-
-def _image_path(path):
-    return os.path.join(FLAGS.images_path, path)
-
-
 # TODO(vish): xenapi should use the glance client code directly instead
 #             of retrieving the image using this method.
 def image_url(image):
-- 
cgit 


From 09b795b8d6f0b925dbd4bcd203f471607c42f368 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Mon, 9 May 2011 19:46:15 -0400
Subject: got rid of unnecessary imports

---
 nova/virt/images.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nova/virt/images.py b/nova/virt/images.py
index 1eb6f4a5f..8689c0ed3 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -21,19 +21,10 @@
 Handling of VM disk images.
 """
 
-import os.path
-import shutil
-import sys
-import time
-import urllib2
-import urlparse
-
 from nova import context
 from nova import flags
 from nova import log as logging
 from nova import utils
-from nova.auth import manager
-from nova.auth import signer
 
 
 FLAGS = flags.FLAGS
-- 
cgit 


From b2db9895c271825d1a58ade9c6de85ac90f760a7 Mon Sep 17 00:00:00 2001
From: William Wolf <throughnothing@gmail.com>
Date: Thu, 19 May 2011 22:56:23 -0400
Subject: fixed pep8 issue

---
 nova/virt/images.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/virt/images.py b/nova/virt/images.py
index 8689c0ed3..02c898fda 100644
--- a/nova/virt/images.py
+++ b/nova/virt/images.py
@@ -42,6 +42,7 @@ def fetch(image_id, path, _user, _project):
         metadata = image_service.get(elevated, image_id, image_file)
     return metadata
 
+
 # TODO(vish): xenapi should use the glance client code directly instead
 #             of retrieving the image using this method.
 def image_url(image):
-- 
cgit