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

implementation/vm/instance.py

@@ -190,8 +190,11 @@ class OSVirtualMachineManager(InstanceInterface):
     def attach_volume(self, server_id, volume_id, device=None):
         self.openstack.compute.create_volume_attachment(server_id,
                                                         {"volumeId": volume_id,
-                                                         "device": device
+                                                    # server = interface.openstack.compute.get_server("8e94c162-f8ed-4872-b9e5-50bf33040b5b")
+#
+# print(server)     "device": device
                                                          })
+
     @openstackError
     def detach_volume(self, server_id, volume_id, device=None):
         self.openstack.compute.delete_volume_attachment(server_id,
@@ -199,17 +202,16 @@ class OSVirtualMachineManager(InstanceInterface):
                                                          "device": device
                                                          })
 
-
     def convert_server_to_instance(self, server):
         if not server.image:
             image_id = None
         else:
-            image_id = server.image.id
+            image_id = server.image_id
         return Instance(id=server.id,
-                        flavor=server.flavor.id,
+                        flavor=server.flavor_id,
                         name=server.name,
                         image_id=image_id,
-                        disks=server.volumes,
+                        disks=server.attached_volumes,
                         status=server.status,
                         launched_at=server.launched_at,
                         terminated_at=server.terminated_at,

main.py

@@ -23,14 +23,20 @@ print('#'*40)
 
 # interface.create_vm_from_template('new_server', resource, "cirros-0.4.0-x86_64-disk")
 # interface.stop_vm('a6bc504f-a422-4492-b429-e5dad2df12f4')
-# server = interface.get_vm("8e94c162-f8ed-4872-b9e5-50bf33040b5b")
-
+# server = interface.openstack.compute.get_server("8e94c162-f8ed-4872-b9e5-50bf33040b5b")
+#
+# print(server)
 # print(interface.delete_flavor("flavorTest"))
 
 for flavor in interface.list_flavors():
     print(flavor.JSON())
 
-# print(interface.create_base_vm("BaseTest", "2", networks, block_dev_map))
+for vm in interface.list_all_vm():
+    print(vm.JSON())
+print("*" * 50)
+
+print(interface.create_base_vm("BaseTest", "2", networks, block_dev_map).JSON())
+
 
 # print(interface.convert_server_to_instance(server).JSON())