Merge branch 'DEV'

implementation/image/OpenstackImageManager.py

 from openstack.exceptions import ResourceNotFound
 from openstack.exceptions import ResourceNotFound
 
 
-from interface.image.ImageManager import ImageManager
-from interface.image.Image import Image
+from interface_openstack.interface.image.ImageManager import ImageManager
+from interface_openstack.interface.image.Image import Image
 
 
 
 
 class OpenstackImageManager(ImageManager):
 class OpenstackImageManager(ImageManager):

implementation/storage/OpenstackSnapshotManager.py

 from openstack.exceptions import ResourceNotFound
 from openstack.exceptions import ResourceNotFound
 
 
-from interface.storage.Snapshot import Snapshot
-from interface.storage.SnapshotManager import SnapshotManager
+from interface_openstack.interface.storage.Snapshot import Snapshot
+from interface_openstack.interface.storage.SnapshotManager import SnapshotManager
 
 
 
 
 class OpenstackSnapshotManager(SnapshotManager):
 class OpenstackSnapshotManager(SnapshotManager):

implementation/storage/OpenstackStorageManager.py

 from openstack.exceptions import ResourceNotFound
 from openstack.exceptions import ResourceNotFound
 
 
-from interface.storage.StorageManager import StorageManager
-from interface.storage.Volume import Volume
+from interface_openstack.interface.storage.StorageManager import StorageManager
+from interface_openstack.interface.storage.Volume import Volume
 
 
 
 
 class OpenstackStorageManager(StorageManager):
 class OpenstackStorageManager(StorageManager):

implementation/vm/instance.py

-from interface.vm.instance import InstanceInterface
-from interface.vm.resources import Instance, Flavor
+from interface_openstack.interface.vm.instance import InstanceInterface
+from interface_openstack.interface.vm.resources import Instance, Flavor
 from openstack.exceptions import SDKException
 from openstack.exceptions import SDKException
 from novaclient import client
 from novaclient import client
 import logging
 import logging