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
Download patch file Download diff file Expand all files Collapse all files

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