Merge branch 'vm' of https://git.ik.bme.hu/RECIRCLE/interface-openstack into DEV

implementation/vm/instance.py

@@ -52,7 +52,7 @@ class OSVirtualMachineManager(InstanceInterface):
 
 
     @openstackError
     @openstackError
     def create_vm_from_template(self, name, image, flavor, networks):
     def create_vm_from_template(self, name, image, flavor, networks):
-        self.create_multiple_vm_from_template(name, image, flavor, networks, 1)
+        return self.create_multiple_vm_from_template(name, image, flavor, networks, 1)
 
 
     @openstackError
     @openstackError
     def create_multiple_vm_from_template(self, name, image, flavor, networks,
     def create_multiple_vm_from_template(self, name, image, flavor, networks,
@@ -190,9 +190,6 @@ class OSVirtualMachineManager(InstanceInterface):
     def attach_volume(self, server_id, volume_id, device=None):
     def attach_volume(self, server_id, volume_id, device=None):
         self.openstack.compute.create_volume_attachment(server_id,
         self.openstack.compute.create_volume_attachment(server_id,
                                                         {"volumeId": volume_id,
                                                         {"volumeId": volume_id,
-                                                    # server = interface.openstack.compute.get_server("8e94c162-f8ed-4872-b9e5-50bf33040b5b")
-#
-# print(server)     "device": device
                                                          })
                                                          })
 
 
     @openstackError
     @openstackError