Revert "Merge branch 'unstable'"

This reverts commit 929c337e8b, reversing
changes made to b9bc73fd01.
This commit is contained in:
Julien Duponchelle committed 2015-04-30 16:43:30 +02:00
1 parent d18293ae7c
commit 359abb0286
24 files changed
+217 -677

No files matched your search

-19
View File
@@ -407,25 +407,6 @@ class BaseManager:
return os.path.basename(path)
return path
@asyncio.coroutine
def list_images(self):
"""
Return the list of available images for this VM type
:returns: Array of hash
"""
try:
files = os.listdir(self.get_images_directory())
except FileNotFoundError:
return []
files.sort()
images = []
for filename in files:
if filename[0] != ".":
images.append({"filename": filename})
return images
def get_images_directory(self):
"""
Get the image directory on disk
+1 -1
View File
@@ -160,7 +160,7 @@ class VirtualBox(BaseManager):
continue
@asyncio.coroutine
def list_images(self):
def get_list(self):
"""
Gets VirtualBox VM list.
"""