Architecture modification

This commit is contained in:
Yoggzo 2016-03-02 16:00:46 +01:00
parent b6d7d2c30e
commit 0298591cee
2 changed files with 79 additions and 81 deletions

View file

@ -14,6 +14,8 @@ 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
*
@ -77,6 +79,7 @@ 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 +144,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
return $image;
$this->app->setOutput("Images", $image);
}
/**
@ -151,9 +154,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,8 +168,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
return $l;
$this->app->setOutput("Images", $result);
}
/**
@ -175,9 +178,10 @@ 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 +189,7 @@ 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 +210,9 @@ 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 +259,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
return $image;
$this->app->setOutput("Images", $image);
}
/**
@ -263,9 +268,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 +291,7 @@ class image implements Core{
$this->app->getErrorInstance->BaseErrorHandler($e);
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
}
}
/**
@ -295,7 +300,8 @@ 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 +330,8 @@ 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 +364,9 @@ 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 +400,7 @@ class image implements Core{
* identifier of the image
**/
private function downloadImage($id){
$id = $this->app->getPostParam("id");
if(!isset($id)){
$this->app->setOutput("Error", "Incorrect parameter");
}
@ -410,7 +421,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
return $stream;
$this->app->setOutput("Images", $stream);
}
/**
@ -422,7 +433,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 +469,9 @@ 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 +498,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
return $members;
$this->app->setOutput("Images", $member);
}
/**
@ -494,7 +510,9 @@ 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 +543,7 @@ class image implements Core{
}catch(NotImplementedError $e){
$this->app->getErrorInstance->NotImplementedHandler($e);
}
return $member;
$this->app->setOutput("Images", $member);
}
/**
@ -537,7 +555,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 +601,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");
}