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

Modifications in error management and correct error in Image.php

Browse source
This commit is contained in:
Yoggzo 2016-03-27 19:24:03 +02:00
parent dcf0d8b2ba
commit e9c7477ff0
5 changed files with 124 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/Test/AppTestClass.php
View file

@ -89,9 +89,11 @@ class AppTest{
}
public function getPostParam($name){
if(isset($this->postParams[$name])){
return $this->postParams[$name];
}else{
$this->setOutput("Error", "Missing parameter ".$name);
}
}
public function setPostParam($name, $value){

93
server/Test/imageTests.php
View file

@ -6,6 +6,9 @@ include_once("../core/Compute.php");
$image = new Image($App);
$compute = new Compute($App);
// Création image
/*
echo "Création image :</br>";
$opt = Array();
$opt['name'] = "Test";
$opt['tags'] = ['test', 'openstack'];
@ -16,28 +19,86 @@ $opt['minDisk'] = 1;
$opt['protected'] = false;
$opt['minRam'] = 10;
//$App->setPostParam('id', 'sdfihlus154dfhj');
//$err = $image->action("createImage");
$App->setPostParam('opt', $opt);
$image->action("createImage");
$retCreate = json_decode($App->show(), true)["Images"];
$idNew = $retCreate['id'];
*/
/*
// Delete Image
$App->setPostParam('id', $idNew);
$image->action("deleteImage");
*/
//Liste des images
// Liste images
$image->action("listImage");
$im = $App->show();
$images = json_decode($im, true)["Images"];
echo "Images présentes :";
echo "</br>";
echo "List images :</br>";
foreach($images as $i){
$recup = $i;
echo $recup['name'];
echo "</br>";
//echo $recup['id'];
echo $i['name']."</br>"; // Nom
echo $i['status']."</br>"; // Status
$id = $i['id']; // Id
echo $id."</br>";
foreach ($i['tags'] as $tag) { // Tags
echo $tag."</br>";
}
echo "</br>";
}
// Details images
echo "Détail image :</br>";
$App->setPostParam('id', $id);
$image->action("detailsImage");
$retDetails = json_decode($App->show(), true)["Images"];
echo $retDetails['id']."</br>";
echo "</br>";
/*
// Download image
$App->setPostParam('id', $id);
$image->action("downloadImage");
*/
// Desactivate Images
echo "Desactivate image : </br>";
echo $id."</br>";
$App->setPostParam('id', $id);
$err = $image->action("desactivateImage");
echo "</br>";
/*
// Resactivate Images
echo $id."</br>";
$App->setPostParam('id', $id);
$err = $image->action("resactivateImage");
*/
/*
// Details images
echo "Update image :</br>";
$optUpdate = Array();
$optUpdate['tags'] = ['ciros', 'testUpdate'];
$App->setPostParam('id', $id);
$App->setPostParam('opt', $optUpdate);
$image->action("updateImage");
$retDetails = json_decode($App->show(), true)["Images"];
foreach ($retDetails['tags'] as $tag) { // Tags
echo $tag."</br>";
}
*/
/*
echo "Flavors: ";
echo "</br>";
$compute->action("listFlavors");
$flavors = json_decode($App->show(), true)["Flavors"];
@ -49,17 +110,5 @@ foreach($flavors as $f){
echo "vcpus=".$f['vcpus'];
echo "</br>";
}
/*
$App->setPostParam('id', 354);
$err = $image->action("deleteImage");
$temp = $App->show();
$ret = json_decode($temp, true)["Images"];
echo $ret['id'];
*/
?>

9
server/core/App.php
View file

@ -113,13 +113,18 @@ class App{
public function getPostParam($name){
if(isset($this->postParams[$name])){
return $this->postParams[$name];
}else{
$this->setOutput("Error", "Missing parameter ".$name);
}
}
public function setPostParam($name, $value){
$this->postParams[$name]= $value;
public function setPostParam($param, $value){
$this->postParams[$param] = $value;
}

37
server/core/ErrorManagement.php
View file

@ -18,19 +18,48 @@ Class errorManagement{
}
public function BaseErrorHandler($error){
$this->app->setOutput("Error", "BaseError");
}
public function BadResponseHandler($error){
$this->app->setOutput("Error", "Erreur Interne, Merci de contacter un administrateur!");
$statusCode = $error->getResponse()->getStatusCode();
switch ($statusCode) {
case 400:
$this->app->setOutput("Error", "Invalid input.");
break;
case 401:
$this->app->setOutput("Error", "Authentification failed.");
break;
case 403:
$this->app->setOutput("Error", "Operation forbidden.");
break;
case 404:
$this->app->setOutput("Error", "Ressource not found.");
break;
case 500:
$this->app->setOutput("Error", "Internal server error, please contact an administrator.");
break;
case 503:
$this->app->setOutput("Error", "Service unvailable for the moment.");
break;
default:
$this->app->setOutput("Error", "Unknow error, please contact an administrator.");
break;
}
}
public function NotImplementedHandler($error){
$this->app->setOutput("Error", "Erreur Interne, Merci de contacter un administrateur!");
$this->app->setOutput("Error", "Internal error (not implemented yet), please contact an administrator");
}
public function UserInputHandler($error){
$this->app->setOutput("Error", "UserInputError");
}
public function OtherException($error){

8
server/core/Image.php
View file

@ -76,7 +76,7 @@ class image implements Core{
// Check the image name
if(isset($opt['name'])){
$imagesList = listImage();
$imagesList = $this->listImage();
if(isset($imagesList)){
foreach($imagesList as $image){
if(strcmp($image->name, $opt['name']) == 0){ // if the image name already exists -> error
@ -84,7 +84,7 @@ class image implements Core{
}
}
}
$options['name'] = $opt['name'];
}
else{
$this->app->setOutput("Error", "Missing parameter 'name' for the new image");
@ -118,7 +118,7 @@ class image implements Core{
if(isset($opt['protected'])){ // boolean
$options['protected'] = $opt['protected'];
}
if(isset($opt['properties'])){ // type dict ?
if(isset($opt['properties'])){ // type dict
$options['properties'] = $opt['properties'];
}
@ -187,7 +187,6 @@ class image implements Core{
$this->app->setOutput("Error", "Image doesn't exist");
}
else{
echo 'toto';
$this->app->setOutput("Images", $image);
}
}catch(BadResponseError $e){
@ -326,6 +325,7 @@ class image implements Core{
if($image == null){ // if the image don't exists -> error
$this->app->setOutput("Error", "Image doesn't exist");
}
$image->reactivate();
}catch(BadResponseError $e){
$this->app->getErrorInstance()->BadResponseHandler($e);