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

Merge branch 'develop' of github.com:manzerbredes/istic-openstack into develop

Browse source
This commit is contained in:
manzerbredes 2016-03-01 16:13:38 +01:00
commit 44bdffd577
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
server/core/Compute.php
View file

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