From 2d0a01358def95161d45d41f728b9bec93d652dc Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Mon, 29 Feb 2016 16:59:27 +0100
Subject: fixed list function output format

---
 server/core/Compute.php | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

(limited to 'server/core/Compute.php')

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;
         }
-- 
cgit v1.2.3


From 3bf50ae06f84d60a5890454ef216c9251d3670d2 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 13:19:39 +0100
Subject: fixed syntax error

---
 server/core/Compute.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'server/core/Compute.php')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 6bdb46a..17cd2ea 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -38,11 +38,11 @@ class compute
                 $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";
+		$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;
@@ -56,8 +56,8 @@ class compute
                 $flavorList = $this->libClass->listFlavors();
 		$flavors = Array();
 		foreach($flavorList as $flavor){
-		$flavors["$flavor->id"]["id"]  = "$flavor->id;
-		$flavors["$flavor->id"]["name"] = "$flavor->name";
+		$flavors["$flavor->id"]["id"]  = $flavor->id;
+		$flavors["$flavor->id"]["name"] = $flavor->name;
 		}
 		$this->app->setOutput("Flavors", $flavors);
                 return;
@@ -71,8 +71,8 @@ class compute
                 $imageList = $this->libClass->listImages();
 		$images = Array();
 		foreach($imageList as $image){
-		$images["$image->id"]["id"]  = "$image->id;
-		$images["$image->id"]["name"] = "$image->name";
+		$images["$image->id"]["id"]  = $image->id;
+		$images["$image->id"]["name"] = $image->name;
 		}
 		$this->app->setOutput("Images", $images);
                 return;
-- 
cgit v1.2.3


From dfd0566a9dfb8c012db832b4aea119858056a7d2 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 16:12:19 +0100
Subject: minor correction in list output format

---
 server/core/Compute.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'server/core/Compute.php')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 17cd2ea..bdc9753 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -38,11 +38,11 @@ class compute
                 $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;
+		$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;
@@ -56,8 +56,8 @@ class compute
                 $flavorList = $this->libClass->listFlavors();
 		$flavors = Array();
 		foreach($flavorList as $flavor){
-		$flavors["$flavor->id"]["id"]  = $flavor->id;
-		$flavors["$flavor->id"]["name"] = $flavor->name;
+		$flavors[$flavor->id]["id"]  = $flavor->id;
+		$flavors[$flavor->id]["name"] = $flavor->name;
 		}
 		$this->app->setOutput("Flavors", $flavors);
                 return;
@@ -71,8 +71,8 @@ class compute
                 $imageList = $this->libClass->listImages();
 		$images = Array();
 		foreach($imageList as $image){
-		$images["$image->id"]["id"]  = $image->id;
-		$images["$image->id"]["name"] = $image->name;
+		$images[$image->id]["id"]  = $image->id;
+		$images[$image->id]["name"] = $image->name;
 		}
 		$this->app->setOutput("Images", $images);
                 return;
-- 
cgit v1.2.3


From 53c507194d2304254f0ce7541568be29377f65c8 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 16:29:49 +0100
Subject: further fix for 2-dimensional array output

---
 server/core/Compute.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'server/core/Compute.php')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index bdc9753..1aad8a9 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -38,6 +38,7 @@ class compute
                 $serverList = $this->libClass->listServers();
 		$servers = Array();
 		foreach($serverList as $server){
+		$servers[$server->id] = Array();
 		$servers[$server->id]["id"]  = $server->id;
 		$servers[$server->id]["name"] = $server->name;
 		$servers[$server->id]["imageId"] = $server->image->id; 
@@ -56,6 +57,7 @@ class compute
                 $flavorList = $this->libClass->listFlavors();
 		$flavors = Array();
 		foreach($flavorList as $flavor){
+		$flavors[$flavor->id] = Array();
 		$flavors[$flavor->id]["id"]  = $flavor->id;
 		$flavors[$flavor->id]["name"] = $flavor->name;
 		}
@@ -71,6 +73,7 @@ class compute
                 $imageList = $this->libClass->listImages();
 		$images = Array();
 		foreach($imageList as $image){
+		$images[$image->id] = Array();
 		$images[$image->id]["id"]  = $image->id;
 		$images[$image->id]["name"] = $image->name;
 		}
-- 
cgit v1.2.3


From f551dffd8a960d4a322ba2b99fd98a02dd98b402 Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 16:53:23 +0100
Subject: compute listServers fix

---
 server/core/Compute.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server/core/Compute.php')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 1aad8a9..131d02c 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -35,7 +35,7 @@ class compute
      	*/
         public function listServers()
         {
-                $serverList = $this->libClass->listServers();
+                $serverList = $this->libClass->listServers(true);
 		$servers = Array();
 		foreach($serverList as $server){
 		$servers[$server->id] = Array();
-- 
cgit v1.2.3


From 3c1fe7e6dcd80b19ed01ecf15fd0a69812a1bffa Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 18:52:29 +0100
Subject: added disksize and ram to listServers

---
 server/core/Compute.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'server/core/Compute.php')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 131d02c..720ab0c 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -44,6 +44,8 @@ class compute
 		$servers[$server->id]["imageId"] = $server->image->id; 
 		$servers[$server->id]["flavorId"] = $server->flavor->id; 
 		$servers[$server->id]["status"] = $server->status;
+		$servers[$server->id]["ram"] = $server->flavor->ram;
+		$servers[$server->id]["disk"] = $server->flavor->disk;
 		}
 		$this->app->setOutput("Servers", $servers);
                 return;
-- 
cgit v1.2.3


From 603645dbeb9e4a20f0b086c15fbc418bdee58d2b Mon Sep 17 00:00:00 2001
From: stupidon <bhupendra.siyag@gmail.com>
Date: Tue, 1 Mar 2016 20:02:27 +0100
Subject: fetch ram and disk for server's flavor in listServers

---
 server/core/Compute.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'server/core/Compute.php')

diff --git a/server/core/Compute.php b/server/core/Compute.php
index 720ab0c..a5b8375 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -39,6 +39,8 @@ class compute
 		$servers = Array();
 		foreach($serverList as $server){
 		$servers[$server->id] = Array();
+		$server->flavor->retrieve();
+		$server->image->retrieve();
 		$servers[$server->id]["id"]  = $server->id;
 		$servers[$server->id]["name"] = $server->name;
 		$servers[$server->id]["imageId"] = $server->image->id; 
-- 
cgit v1.2.3