Fix conversion type error

implementation/utils/connection.py

@@ -13,9 +13,8 @@ class OpenStackConnection(object):
         self.openstack = openstack.connect(auth_url=auth["auth_url"],
         self.openstack = openstack.connect(auth_url=auth["auth_url"],
                                            username=auth["username"],
                                            username=auth["username"],
                                            password=auth["password"],
                                            password=auth["password"],
-                                           project_id=auth["project_id"],
                                            project_name=auth["project_name"],
                                            project_name=auth["project_name"],
-                                           region_name=auth["region_name"]
+                                           region_name=auth["region_name"],
                                            )
                                            )
         client_auth = v3.Password(auth_url=auth["auth_url"],
         client_auth = v3.Password(auth_url=auth["auth_url"],
                                   username=auth["username"],
                                   username=auth["username"],

implementation/vm/instance.py

@@ -45,7 +45,8 @@ class OSVirtualMachineManager(InstanceInterface, OpenStackConnection):
                  networks=networks,
                  networks=networks,
                  block_device_mapping=devices
                  block_device_mapping=devices
                  )
                  )
-        return self.convert_server_to_instance(new_server)
+        server = self._get_openstack_server(new_server.id)
+        return self.convert_server_to_instance(server)
 
 
     @openstackError
     @openstackError
     def create_vm_from_template(self, name, image, flavor, networks):
     def create_vm_from_template(self, name, image, flavor, networks):
@@ -68,7 +69,8 @@ class OSVirtualMachineManager(InstanceInterface, OpenStackConnection):
                                            networks=networks,
                                            networks=networks,
                                            min_count=number,
                                            min_count=number,
                                            )
                                            )
-        return self.convert_server_to_instance(new_server)
+        server = self._get_openstack_server(new_server.id)
+        return self.convert_server_to_instance(server)
 
 
     @openstackError
     @openstackError
     def create_flavor(self, name, ram, vcpus, initial_disk):
     def create_flavor(self, name, ram, vcpus, initial_disk):
@@ -183,12 +185,10 @@ class OSVirtualMachineManager(InstanceInterface, OpenStackConnection):
             server=server_id)
             server=server_id)
 
 
     def convert_server_to_instance(self, server):
     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"]
+        flavor = server.flavor["id"]
         return Instance(id=server.id,
         return Instance(id=server.id,
-                        flavor=server.flavor["id"],
+                        flavor=flavor,
                         name=server.name,
                         name=server.name,
                         image_id=image_id,
                         image_id=image_id,
                         disks=server.attached_volumes,
                         disks=server.attached_volumes,