From 1371f639ac5ea701a97e9513cec44252e1310414 Mon Sep 17 00:00:00 2001 From: Anders Ingemann Date: Mon, 7 Apr 2014 21:45:45 +0200 Subject: [PATCH] Move volume imports in fs/__init__ --- bootstrapvz/base/fs/__init__.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/bootstrapvz/base/fs/__init__.py b/bootstrapvz/base/fs/__init__.py index b575b87..a683504 100644 --- a/bootstrapvz/base/fs/__init__.py +++ b/bootstrapvz/base/fs/__init__.py @@ -9,10 +9,6 @@ def load_volume(data, bootloader): Returns: Volume. The volume that represents all information pertaining to the volume we bootstrap on """ - from bootstrapvz.common.fs.loopbackvolume import LoopbackVolume - from bootstrapvz.providers.ec2.ebsvolume import EBSVolume - from bootstrapvz.common.fs.virtualdiskimage import VirtualDiskImage - from bootstrapvz.common.fs.virtualmachinedisk import VirtualMachineDisk # Create a mapping between valid partition maps in the manifest and their corresponding classes from partitionmaps.gpt import GPTPartitionMap from partitionmaps.msdos import MSDOSPartitionMap @@ -23,7 +19,12 @@ def load_volume(data, bootloader): } # Instantiate the partition map partition_map = partition_maps.get(data['partitions']['type'])(data['partitions'], bootloader) + # Create a mapping between valid volume backings in the manifest and their corresponding classes + from bootstrapvz.common.fs.loopbackvolume import LoopbackVolume + from bootstrapvz.providers.ec2.ebsvolume import EBSVolume + from bootstrapvz.common.fs.virtualdiskimage import VirtualDiskImage + from bootstrapvz.common.fs.virtualmachinedisk import VirtualMachineDisk volume_backings = {'raw': LoopbackVolume, 's3': LoopbackVolume, 'vdi': VirtualDiskImage,