Merge branch 'develop' into loic

1 files changed, 21 insertions, 3 deletions

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 94e219c..6bdb46a 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -35,7 +35,15 @@ class compute
      	*/
         public function listServers()
         {
-                $servers = $this->libClass->listServers();
+                $serverList = $this->libClass->listServers();
+		$servers = Array();
+		foreach($serverList as $server){
+		$servers["$server->id"]["id"]  = "$server->id;
+		$servers["$server->id"]["name"] = "$server->name";
+		$servers["$server->id"]["imageId"] = "$server->image->id"; 
+		$servers["$server->id"]["flavorId"] = "$server->flavor->id"; 
+		$servers["$server->id"]["status"] = "$server->status";
+		}
 		$this->app->setOutput("Servers", $servers);
                 return;
         }
@@ -45,7 +53,12 @@ class compute
          */
         public function listFlavors()
         {
-                $flavors = $this->libClass->listFlavors();
+                $flavorList = $this->libClass->listFlavors();
+		$flavors = Array();
+		foreach($flavorList as $flavor){
+		$flavors["$flavor->id"]["id"]  = "$flavor->id;
+		$flavors["$flavor->id"]["name"] = "$flavor->name";
+		}
 		$this->app->setOutput("Flavors", $flavors);
                 return;
         }
@@ -55,7 +68,12 @@ class compute
          */
         public function listImages()
         {
-                $images = $this->libClass->listImages();
+                $imageList = $this->libClass->listImages();
+		$images = Array();
+		foreach($imageList as $image){
+		$images["$image->id"]["id"]  = "$image->id;
+		$images["$image->id"]["name"] = "$image->name";
+		}
 		$this->app->setOutput("Images", $images);
                 return;
         }