Ssh driver

config/templates/devices/base_image.xml

@@ -5,7 +5,7 @@
     </source>
     <target dev='sda' bus='{{ vm.base_image.disk_controller }}'/>
 </disk>
-{% elif %}
+{% elif vm.base_image.storage.transport == "ssh" %}
 <disk type='volume' device='disk'>
     <driver name='qemu' type='{{ vm.base_image.format }}' cache="writeback" io="threads" />
     <source file='/images/{{ vm.id }}'/>

corecluster/agents/image_ssh.py

@@ -46,7 +46,7 @@ def task_failed(self, task, exception):
 
     def create(self, task):
         image = task.get_obj('Image')
-        system.call(['qemu-img', 'create', '-f', image.format, image.storage.path + '/' + image.libvirt_name, image.size])
+        system.call(['qemu-img', 'create', '-f', image.format, image.storage.path + '/' + image.libvirt_name, str(image.size)])
         image.size = os.stat(image.storage.path + '/' + image.libvirt_name).st_size
         image.set_state('ok')
         image.save()
@@ -89,7 +89,7 @@ def upload_url(self, task):
             image.save()
 
         remote.close()
-        f.close()
+        volume.close()
 
         log(msg="Rebasing image to no backend", tags=('agent', 'image', 'info'), context=task.logger_ctx)
         if image.format in ['qcow2', 'qed']:

corecluster/agents/storage_ssh.py

@@ -51,8 +51,12 @@ def task_failed(self, task, exception):
 
 
     def mount(self, task):
-        pass
+        storage = task.get_obj('Storage')
+        storage.state = 'ok'
+        storage.save()
 
 
-    def umount(self, operation):
-        pass
+    def umount(self, task):
+        storage = task.get_obj('Storage')
+        storage.state = 'locked'
+        storage.save()

corecluster/models/core/storage.py

@@ -60,7 +60,10 @@ def path(self):
             conn.storagePoolLookupByName(self.name)
         except:
             raise CoreException('storage_not_mounted')
-        return '/var/lib/cc1/storages/%s/' % self.name
+        if self.transport == 'ssh':
+            return self.dir
+        else:
+            return '/var/lib/cloudOver/storages/%s/' % self.name
 
 
     @property

debian/changelog

@@ -1,4 +1,4 @@
-corecluster (16.10.02) stable; urgency=low
+corecluster (16.10.03) stable; urgency=low
 
   * Fixed image_create for large sizes
 

setup.py

@@ -10,7 +10,7 @@ def version():
 setup(
   name = 'corecluster',
   packages = find_packages(exclude=['config', 'config.*']),
-  version = '16.09.20',
+  version = '16.10.03',
   description = 'CloudOver core IaaS system',
   author = 'Marta Nabozny',
   author_email = 'martastrzet@gmail.com',