diff options
| author | Yoggzo <yogg@epsina.com> | 2016-03-02 10:58:01 +0100 |
|---|---|---|
| committer | Yoggzo <yogg@epsina.com> | 2016-03-02 10:58:01 +0100 |
| commit | d1bd9b4a0c3168eec28ea1c3992748afe1953218 (patch) | |
| tree | 538ef3d0b37e1dcb0528ce6395c3a82a672a5089 /server/core | |
| parent | ae1100c16880d4bae77513ec433ac6734da8dea4 (diff) | |
| parent | b6d7d2c30efe5e9758072bb82ea3a947bda7fd1d (diff) | |
Merge branch 'develop' into Evan
Diffstat (limited to 'server/core')
| -rw-r--r-- | server/core/Compute.php | 31 |
1 files changed, 28 insertions, 3 deletions
diff --git a/server/core/Compute.php b/server/core/Compute.php index 94e219c..a5b8375 100644 --- a/server/core/Compute.php +++ b/server/core/Compute.php @@ -35,7 +35,20 @@ class compute */ public function listServers() { - $servers = $this->libClass->listServers(); + $serverList = $this->libClass->listServers(true); + $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; + $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; } @@ -45,7 +58,13 @@ class compute */ public function listFlavors() { - $flavors = $this->libClass->listFlavors(); + $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; + } $this->app->setOutput("Flavors", $flavors); return; } @@ -55,7 +74,13 @@ class compute */ public function listImages() { - $images = $this->libClass->listImages(); + $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; + } $this->app->setOutput("Images", $images); return; } |