loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into Evan

Browse source
This commit is contained in:
Yoggzo 2016-03-02 10:58:01 +01:00
commit d1bd9b4a0c
10 changed files with 229 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

31
server/core/Compute.php
View file

@ -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;
}