summaryrefslogtreecommitdiff
path: root/server/core
diff options
context:
space:
mode:
Diffstat (limited to 'server/core')
-rw-r--r--server/core/Compute.php31
-rw-r--r--server/core/Image.php89
2 files changed, 95 insertions, 25 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;
}
diff --git a/server/core/Image.php b/server/core/Image.php
index 4025595..b192716 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -14,6 +14,10 @@ use OpenStack\Common\Error\BaseError;
use OpenStack\Common\Error\NotImplementedError;
use OpenStack\Common\Error\UserInputError;
+
+include("CoreInterface.php");
+
+
/**
* Image Class of the back-end application
*
@@ -78,6 +82,9 @@ class image implements Core{
**/
private function createImage(array $opt){
+ $opt = $this->app->getPostParam("opt");
+
+
if(!isset($opt)){
$this->app->setOutput("Error", "Incorrect parameter");
}
@@ -141,7 +148,8 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
- return $image;
+ $this->app->setOutput("Images", $image);
+
}
/**
@@ -151,9 +159,10 @@ class image implements Core{
*/
private function listImage(){
try{
+ $result = array();
$l = $this->libClass->listImages();
- if(!isset($l)){ // if the list is empty there is no images
- $this->app->setOutput("Error", "No image");
+ foreach($l as $tmp){
+ $result[] = $tmp;
}
}catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e);
@@ -164,7 +173,8 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
- return $l;
+
+ $this->app->setOutput("Images", $result);
}
@@ -175,9 +185,11 @@ class image implements Core{
* identifier of the image
*
**/
- private function detailsImage($id){
+ private function detailsImage(){
+ $id = $this->app->getPostParam("id");
if(!isset($id)){
- // Renvoyer erreur
+ $this->app->setOutput("Error", "Incorrect id parameter");
+
}
try{
$service = $this->libClass;
@@ -185,8 +197,9 @@ class image implements Core{
if($image == null){ // if the image don't exists -> error
$this->app->setOutput("Error", "Image doesn't exist");
}
-
- return $image;
+
+ $this->app->setOutput("Images", $image);
+
}catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e);
}catch(UserInputError $e){
@@ -207,7 +220,11 @@ class image implements Core{
* @param array $opt
* options for the image creation
**/
- private function updateImage($id, array $opt){
+
+ private function updateImage(){
+ $id = $this->app->getPostParam("id");
+ $opt = $this->app->getPostParam("opt");
+
if(!isset($id)){
$this->app->setOutput("Error", "Incorrect id parameter");
}
@@ -254,7 +271,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
- return $image;
+ $this->app->setOutput("Images", $image);
}
/**
@@ -263,9 +280,10 @@ class image implements Core{
* @param string $id
* identifier of the image
**/
- private function deleteImage($id){
+ private function deleteImage(){
// si protected = true, demander de le mettre a false
// vérifier existence image
+ $id = $this->app->getPostParam("id");
if(!isset($id)){
$this->app->setOutput("Error", "Image doesn't exist");
}
@@ -285,8 +303,7 @@ class image implements Core{
$this->app->getErrorInstance->BaseErrorHandler($e);
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
- }
-
+ }
}
/**
@@ -295,7 +312,9 @@ class image implements Core{
* @param string $id
* identifier of the image
**/
- private function reactivateImage($id){
+ private function reactivateImage(){
+ $id = $this->app->getPostParam("id");
+
if(!isset($id)){
$this->app->setOutput("Error", "Incorrect parameter");
}
@@ -324,7 +343,9 @@ class image implements Core{
* @param string $id
* identifier of the image
**/
- private function desactivateImage($id){
+ private function desactivateImage(){
+ $id = $this->app->getPostParam("id");
+
if(!isset($id)){
$this->app->setOutput("Error", "Incorrect parameter");
}
@@ -357,6 +378,10 @@ class image implements Core{
* path of the image
**/
private function uploadImage($id, $file_name){
+ $id = $this->app->getPostParam("id");
+ $file_name = $this->app->getPostParam("file_name");
+
+
if(!isset($id)){
$this->app->setOutput("Error", "Incorrect id parameter");
}
@@ -390,6 +415,10 @@ class image implements Core{
* identifier of the image
**/
private function downloadImage($id){
+<<<<<<< HEAD
+=======
+ $id = $this->app->getPostParam("id");
+>>>>>>> develop
if(!isset($id)){
$this->app->setOutput("Error", "Incorrect parameter");
}
@@ -410,7 +439,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
- return $stream;
+ $this->app->setOutput("Images", $stream);
}
/**
@@ -422,7 +451,10 @@ class image implements Core{
* @param string $member_id
* identifier of the member
**/
- private function addMemberImage($image_id, $member_id){
+ private function addMemberImage(){
+ $image_id = $this->app->getPostParam("image_id");
+ $member_id = $this->app->getPostParam("member_id");
+
if(!isset($image_id)){
$this->app->setOutput("Error", "Incorrect parameter image_id");
}
@@ -455,7 +487,10 @@ class image implements Core{
* @param string $image_id
* identifier of the image
**/
- private function listMemberImage($image_id, $member_id){
+ private function listMemberImage(){
+ $image_id = $this->app->getPostParam("image_id");
+ $member_id = $this->app->getPostParam("member_id");
+
if(!isset($image_id)){
$this->app->setOutput("Error", "Incorrect parameter image_id");
}
@@ -482,7 +517,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
- return $members;
+ $this->app->setOutput("Images", $member);
}
/**
@@ -494,7 +529,10 @@ class image implements Core{
* @param string $member_id
* identifier of the member
**/
- private function detailMemberImage($image_id, $member_id){
+ private function detailMemberImage(){
+ $image_id = $this->app->getPostParam("image_id");
+ $member_id = $this->app->getPostParam("member_id");
+
if(!isset($image_id)){
$this->app->setOutput("Error", "Incorrect parameter image_id");
}
@@ -525,7 +563,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
- return $member;
+ $this->app->setOutput("Images", $member);
}
/**
@@ -537,7 +575,10 @@ class image implements Core{
* @param string $member_id
* identifier of the member
**/
- private function removeMemberImage($image_id, $member_id){
+ private function removeMemberImage(){
+ $image_id = $this->app->getPostParam("image_id");
+ $member_id = $this->app->getPostParam("member_id");
+
if(!isset($image_id)){
$this->app->setOutput("Error", "Incorrect parameter image_id");
}
@@ -580,6 +621,10 @@ class image implements Core{
* new status for the member
**/
private function updateMemberImage($image_id, $member_id, $status){
+ $image_id = $this->app->getPostParam("image_id");
+ $member_id = $this->app->getPostParam("member_id");
+ $status = $this->app->getPostParam("status");
+
if(!isset($image_id)){
$this->app->setOutput("Error", "Incorrect parameter image_id");
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-16 08:15:55 +0000