summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
Diffstat (limited to 'server')
-rwxr-xr-xserver/Test/AppTestClass.php36
-rw-r--r--server/Test/computeTest.php20
-rwxr-xr-x[-rw-r--r--]server/core/App.php15
-rw-r--r--server/core/Compute.php200
-rw-r--r--server/core/Image.php571
-rwxr-xr-x[-rw-r--r--]server/core/LibOverride/genTokenOptions.php10
-rw-r--r--server/index.php16
7 files changed, 715 insertions, 153 deletions
diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
index 311b9bf..4d7cab5 100755
--- a/server/Test/AppTestClass.php
+++ b/server/Test/AppTestClass.php
@@ -6,6 +6,7 @@ class AppTest{
protected $openstack;
protected $pluginsApi;
+ protected $postParams;
protected $tokenClass;
protected $tokenPost;
protected $output;
@@ -16,7 +17,9 @@ class AppTest{
$this->tokenClass = new genTokenOptions($args);
$this->openstack = new OpenStack\OpenStack([]);
$this->pluginsApi = plugin_api::getInstance();
+ $this->errorClass = new errorManagement($this);
$this->output = array();
+ $this->postParams = $_POST;
}
@@ -40,6 +43,16 @@ class AppTest{
$opt = $this->tokenClass->getOptions($service);
return $this->openstack->imagesV2($opt);
break;
+ case "Compute":
+ if($this->tokenPost == NULL) $this->tokenClass->genComputeToken();
+ $opt = $this->tokenClass->getOptions($service);
+ return $this->openstack->computeV2($opt);
+ break;
+ case "Network":
+ if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();
+ $opt = $this->tokenClass->getOptions($service);
+ return $this->openstack->networkingV2($opt);
+ break;
}
}
@@ -53,10 +66,21 @@ class AppTest{
$this->tokenClass->genNetworkToken();
$this->setOutput("token", $this->tokenClass->getBackup());
- }catch(Exception $e){
- echo $e;
- exit();
- }
+ }catch(BadResponseError $e){
+ $this->errorClass->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->errorClass->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->errorClass->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->errorClass->NotImplementedHandler($e);
+ }
+
+ }
+
+ public function getPostParam($name){
+
+ return $this->postParams[$name];
}
@@ -67,7 +91,7 @@ class AppTest{
}
public function show(){
- echo json_encode($this->output);
+ return json_encode($this->output);
}
-} \ No newline at end of file
+}
diff --git a/server/Test/computeTest.php b/server/Test/computeTest.php
new file mode 100644
index 0000000..3ce1f2e
--- /dev/null
+++ b/server/Test/computeTest.php
@@ -0,0 +1,20 @@
+re '../vendor/autoload.php';
+include('/istic-openstack/server/init.php');
+include_once("../core/Compute.php");
+$compute = new compute($App);
+
+$servers = $compute->listServers();
+
+$servers= $compute->listServers(true);
+foreach($servers as $server){
+ //print_r($server);
+ echo $server->name." ".$server->id."<br>";
+
+//$opt = Array();
+//$opt['name'] = "Test";
+//$serverid = Array("id"=>"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd");
+//$serverid["id"] = "{69d5bcc4-2fab-4634-b0d2-f455fee5b7bd}";
+//unset($server);
+//$server = $compute->getServer($serverid);
+//echo $server->name." ".$server->image;
+//$server->update(array('name' => 'test'));
diff --git a/server/core/App.php b/server/core/App.php
index babb3d9..edb75f6 100644..100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -33,7 +33,7 @@ class App{
public function setToken($token){
$this->tokenPost = $token;
- $this->tokenClass->loadBackup($his->tokenPost);
+ $this->tokenClass->loadBackup($this->tokenPost);
}
@@ -50,6 +50,16 @@ class App{
$opt = $this->tokenClass->getOptions($service);
return $this->openstack->imagesV2($opt);
break;
+ case "Network":
+ if($this->tokenPost == NULL) $this->tokenClass->genNetworkToken();
+ $opt = $this->tokenClass->getOptions($service);
+ return $this->openstack->networkingV2($opt);
+ break;
+ case "Compute":
+ if($this->tokenPost == NULL) $this->tokenClass->genComputeToken();
+ $opt = $this->tokenClass->getOptions($service);
+ return $this->openstack->computeV2($opt);
+ break;
}
}
@@ -95,6 +105,7 @@ class App{
public function show(){
echo json_encode($this->output);
+ //error_log(var_dump(json_encode($this->output), true), 0);
}
-} \ No newline at end of file
+}
diff --git a/server/core/Compute.php b/server/core/Compute.php
index 8d1c8b6..a5b8375 100644
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -1 +1,201 @@
+<?php
+//namespace istic-openstack\Server\core;
+// TODO introduce error-handling based on errors specific to the compute module
+use OpenStack\Common\Error;
+
+class compute
+{
+ /** @var App $app protected, contains the main app object */
+ protected $app;
+
+ /** @var OpenStack\Identity $libClass protected, contains the library Compute object */
+ protected $libClass;
+
+
+ public function __construct($app)
+ {
+ $this->app = $app;
+ $this->libClass = $app->getLibClass("Compute");
+ }
+ /**
+ * Execute an action
+ *
+ * @param String $action name of another function of this class
+ *
+ * @return void
+ */
+ public function action($action){
+
+ $this->{$action.""}();
+
+ }
+ /**
+ * List servers.
+ * @return array
+ */
+ public function 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;
+ }
+ /**
+ * List flavors.
+ * @return array
+ */
+ public function 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;
+ }
+ /**
+ * List images.
+ * @return array
+ */
+ public function 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;
+ }
+ /**
+ * Create server.
+ * @return array
+ *
+ public function createServer()
+ {
+
+ $server = $this->libClass->createServer();
+ }
+ */
+ /**
+ * Get server details.
+ * @return array
+ */
+ public function getServer()
+ {
+ $serverId = $this->app->getPostParam("serverId");
+ $opt = array('id' => $serverId);
+ $server = $this->libClass->getServer($opt);
+ $server->retrieve();
+ $this->app->setOutput("MyServer", $server);
+ return;
+ }
+ /**
+ * Get flavor details.
+ * @return array
+ */
+ public function getFlavor()
+ {
+ $flavorId = $this->app->getPostParam("flavorId");
+ $opt = array('id' => $flavorId);
+ $flavor = $this->libClass->getFlavor($opt);
+ $flavor->retrieve();
+ $this->app->setOutput("MyFlavor", $flavor);
+ return;
+ }
+ /**
+ * Get image details.
+ * @return array
+ */
+ public function getImage()
+ {
+ $imageId = $this->app->getPostParam("imageId");
+ $opt = array('id' => $imageId);
+ $image = $this->libClass->getImage($opt);
+ $image->retrieve();
+ $this->app->setOutput("MyImage", $image);
+ return;
+ }
+ /* working on tests
+
+ public function update()
+ {
+ $image = $this->app->getServer(array $options = []);
+
+ }
+ public function delete()
+ {
+ //TODO
+ }
+ public function changePassword($newPassword)
+ {
+ //TODO
+ }
+ public function reboot($type = Enum::REBOOT_SOFT)
+ {
+ //TODO
+ }
+ public function rebuild(array $options)
+ {
+ //TODO
+ }
+ public function resize($flavorId)
+ {
+ //TODO
+ }
+ public function confirmResize()
+ {
+ //TODO
+ }
+ public function revertResize()
+ {
+ //TODO
+ }
+ public function createImage(array $options)
+ {
+ //TODO
+ }
+ public function listAddresses(array $options = [])
+ {
+ //TODO
+ }
+ public function getMetadata()
+ {
+ //TODO
+ }
+ public function resetMetadata(array $metadata)
+ {
+ //TODO
+ }
+ public function mergeMetadata(array $metadata)
+ {
+ //TODO
+ }
+ public function getMetadataItem($key)
+ {
+ //TODO
+ }
+ public function deleteMetadataItem($key)
+ {
+ //TODO
+ }
+*/
+}
diff --git a/server/core/Image.php b/server/core/Image.php
index 3001eea..4025595 100644
--- a/server/core/Image.php
+++ b/server/core/Image.php
@@ -1,7 +1,4 @@
<?php
-
-//require 'CoreInterface.php';
-
/**
* File containing the Image Class.
*
@@ -12,16 +9,18 @@
*
* @todo Complete the functions with errors detection and finish the descriptions
*/
-
-
+use OpenStack\Common\Error\BadResponseError;
+use OpenStack\Common\Error\BaseError;
+use OpenStack\Common\Error\NotImplementedError;
+use OpenStack\Common\Error\UserInputError;
+
/**
* Image Class of the back-end application
*
* ADD CLASS DESCRIPTION
*
*/
-class image{
- //implements Core
+class image implements Core{
/** @var App $app protected, contains the main app object */
protected $app;
@@ -29,10 +28,6 @@ class image{
/** @var OpenStack\Identity $libClass protected, contains the library Identity object */
protected $libClass;
- /** @var array $actions protected, contains the functions which can be call by the front-end */
- protected $actions = array();
-
-
/**
* Image constructor
*
@@ -43,12 +38,36 @@ class image{
* @return Image
*/
public function __construct($app){
- $this->app = $app;
- $this->libClass = $app->getLibClass("Image");
+ if(!isset($app)){
+ $this->app->setOutput("Error", "Incorrect parameter");
+ }
+ try{
+ $this->app = $app;
+ $this->libClass = $app->getLibClass("Image");
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
}
-
+ /**
+ * Execute an action
+ *
+ * @param String $action name of another function of this class
+ *
+ * @return void
+ */
+ public function action($action){
+
+ $this->{$action.""}();
+
+ }
/**
* Details about an image
@@ -57,55 +76,96 @@ class image{
* options for the image creation
*
**/
- public function create_image(array $opt){
- // VOIR SI MAUVAIS TYPE
- $options = Array();
- if(isset($opt['name'])){ // string, rendre le nom obligatoire, vérifier nom pas déjà pris
- }
- else{
- //ERROR
- }
- if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
- $options['id'] = $opt['id'];
- }
- if(isset($opt['visibility'])){ // public, private
- $options['visibility'] = $opt['visibility'];
- }
- if(isset($opt['tags'])){ // list
- $options['tags'] = $opt['tags'];
- }
- if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker
- $options['containerFormat'] = $opt['containerFormat'];
- }
- if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso
- $options['diskFormat'] = $opt['diskFormat'];
- }
- if(isset($opt['minDisk'])){ //int
- $options['minDisk'] = $opt['minDisk'];
- }
- if(isset($opt['minRam'])){ // int
- $options['minRam'] = $opt['minRam'];
- }
- if(isset($opt['protected'])){ // boolean
- $options['protected'] = $opt['protected'];
+ private function createImage(array $opt){
+
+ if(!isset($opt)){
+ $this->app->setOutput("Error", "Incorrect parameter");
}
- if(isset($opt['properties'])){ // type dict ?
- $options['properties'] = $opt['properties'];
- }
- $image = $this->oidentity->createImage($options);
+ try{
+ // VOIR SI MAUVAIS TYPE
+ $options = Array();
+ if(isset($opt['name'])){ // if the image name already exists -> error
+ $imagesList = listImage();
+ if(isset($images)){
+ foreach($imagesList as $image){
+ if(strcmp($image->name, $opt['name']) == 0){
+
+ }
+ }
+ }
+
+ }
+ else{
+ $this->app->setOutput("Error", "Image name already exists");
+ }
+ if(isset($opt['id'])){ // UUID : nnnnnnnn-nnnn-nnnn-nnnn-nnnnnnnnnnnn
+ if($this->libClass->getImage($opt['id']) != null){ // if the id already exists -> error
+
+ }
+ $options['id'] = $opt['id'];
+ }
+ if(isset($opt['visibility'])){ // public, private
+ $options['visibility'] = $opt['visibility'];
+ }
+ if(isset($opt['tags'])){ // list
+ $options['tags'] = $opt['tags'];
+ }
+ if(isset($opt['containerFormat'])){ // string : ami, ari, aki, bare, ovf, ova, docker
+ $options['containerFormat'] = $opt['containerFormat'];
+ }
+ if(isset($opt['diskFormat'])){ // string : ami, ari, aki, vhd, vmdk, raw, qcow2, vdi, iso
+ $options['diskFormat'] = $opt['diskFormat'];
+ }
+ if(isset($opt['minDisk'])){ //int
+ $options['minDisk'] = $opt['minDisk'];
+ }
+ if(isset($opt['minRam'])){ // int
+ $options['minRam'] = $opt['minRam'];
+ }
+ if(isset($opt['protected'])){ // boolean
+ $options['protected'] = $opt['protected'];
+ }
+ if(isset($opt['properties'])){ // type dict ?
+ $options['properties'] = $opt['properties'];
+ }
+
+ $image = $this->libClass->createImage($options);
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
return $image;
}
- /*
- * List images
+ /**
+ * List the images of the server
+ *
+ * @return the list with all images on the server
*/
- public function list_images(){
- // vérifier si au moins une image
- $service = $this->oidentity;
- $images = $service->listImages();
- return $images;
+ private function listImage(){
+ try{
+ $l = $this->libClass->listImages();
+ if(!isset($l)){ // if the list is empty there is no images
+ $this->app->setOutput("Error", "No image");
+ }
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
+ return $l;
+
}
/**
@@ -115,11 +175,27 @@ class image{
* identifier of the image
*
**/
- public function image_details($id){
- //vérifier existence image
- $service = $this->oidentity;
- $image = $service->getImage($id);
- return $image;
+ private function detailsImage($id){
+ if(!isset($id)){
+ // Renvoyer erreur
+ }
+ try{
+ $service = $this->libClass;
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+
+ return $image;
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
}
/**
@@ -131,33 +207,53 @@ class image{
* @param array $opt
* options for the image creation
**/
- public function update_image($id, array $opt){
- //vérifier existence image
- $service = $this->oidentity;
- $image = $service->getImage($id);
- $options = Array();
-
- // Voir vérification des types
- if(isset($opt['name'])){ //string
- $options['name'] = $opt['name'];
- }
- if(isset($opt['minDisk'])){ //int
- $options['minDisk'] = $opt['minDisk'];
- }
- if(isset($opt['minRam'])){ // int
- $options['minRam'] = $opt['minRam'];
- }
- if(isset($opt['protected'])){ // boolean
- $options['protected'] = $opt['protected'];
+ private function updateImage($id, array $opt){
+ if(!isset($id)){
+ $this->app->setOutput("Error", "Incorrect id parameter");
}
- if(isset($opt['visibility'])){ // public, private
- $options['visibility'] = $opt['visibility'];
+ if(!isset($opt)){
+ $this->app->setOutput("Error", "Incorrect opt parameter");
}
- if(isset($opt['tags'])){ // list
- $options['tags'] = $opt['tags'];
- }
- $image->update($options);
+ try{
+ //vérifier existence image
+ $service = $this->libClass;
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+
+ $options = Array();
+
+ // Voir vérification des types
+ if(isset($opt['name'])){ //string
+ $options['name'] = $opt['name'];
+ }
+ if(isset($opt['minDisk'])){ //int
+ $options['minDisk'] = $opt['minDisk'];
+ }
+ if(isset($opt['minRam'])){ // int
+ $options['minRam'] = $opt['minRam'];
+ }
+ if(isset($opt['protected'])){ // boolean
+ $options['protected'] = $opt['protected'];
+ }
+ if(isset($opt['visibility'])){ // public, private
+ $options['visibility'] = $opt['visibility'];
+ }
+ if(isset($opt['tags'])){ // list
+ $options['tags'] = $opt['tags'];
+ }
+ $image->update($options);
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
return $image;
}
@@ -167,11 +263,30 @@ class image{
* @param string $id
* identifier of the image
**/
- public function delete_image($id){
+ private function deleteImage($id){
// si protected = true, demander de le mettre a false
// vérifier existence image
- $service = $this->oidentity;
- $service->getImage($id)->delete();
+ if(!isset($id)){
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+
+ try{
+ $service = $this->libClass;
+ $image = $this->libClass->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+ $image->delete();
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
+
}
/**
@@ -180,11 +295,27 @@ class image{
* @param string $id
* identifier of the image
**/
- public function reactivate_image($id){
- // vérifier existence image
- $service = $this->oidentity;
- $image = $service->getImage($id);
- $image->reactivate();
+ private function reactivateImage($id){
+ if(!isset($id)){
+ $this->app->setOutput("Error", "Incorrect parameter");
+ }
+ try{
+ // vérifier existence image
+ $service = $this->libClass;
+ $image = $service->getImage($id);
+ 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);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
}
/**
@@ -193,11 +324,27 @@ class image{
* @param string $id
* identifier of the image
**/
- public function desactivate_image($id){
- // vérifier existence image
- $service = $this->oidentity;
- $image = $service->getImage($id);
- $image->deactivate();
+ private function desactivateImage($id){
+ if(!isset($id)){
+ $this->app->setOutput("Error", "Incorrect parameter");
+ }
+ try{
+ // vérifier existence image
+ $service = $this->libClass;
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+ $image->deactivate();
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
}
/**
@@ -209,12 +356,31 @@ class image{
* @param string $file_name
* path of the image
**/
- public function upload_image($id, $file_name){
- // vérifier existence image
- $service = $this->oidentity;
- $image = $service->getImage($id);
- $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR
- $image->uploadData($stream);
+ private function uploadImage($id, $file_name){
+ if(!isset($id)){
+ $this->app->setOutput("Error", "Incorrect id parameter");
+ }
+ if(!isset($file_name)){
+ $this->app->setOutput("Error", "Incorrect file_name parameter");
+ }
+ try{
+ // vérifier existence image
+ $service = $this->libClass;
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+ $stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r'));
+ $image->uploadData($stream);
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
}
/**
@@ -223,12 +389,28 @@ class image{
* @param string $id
* identifier of the image
**/
- public function download_image($id){
- // vérifier existence image
- $service = $this->oidentity;
- $image = $service->getImage($id);
- $stream = $image->downloadData();
- return $stream;
+ private function downloadImage($id){
+ if(!isset($id)){
+ $this->app->setOutput("Error", "Incorrect parameter");
+ }
+ try{
+ // vérifier existence image
+ $service = $this->libClass;
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+ $stream = $image->downloadData();
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
+ return $stream;
}
/**
@@ -240,12 +422,30 @@ class image{
* @param string $member_id
* identifier of the member
**/
- public function add_member($image_id, $member_id){
- // vérifier existence image
- // on doit être le proprio de l'image
- // vérifier membre existe
- $service = $this->oidentity;
- $member_id = $service>getImage($image_id)->addMember($member_id);
+ private function addMemberImage($image_id, $member_id){
+ if(!isset($image_id)){
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
+ }
+ if(!isset($member_id)){
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
+ }
+ try{
+ $service = $this->libClass;
+
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+ $member_id = $image->addMember($member_id);
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
}
@@ -255,11 +455,33 @@ class image{
* @param string $image_id
* identifier of the image
**/
- public function list_member($image_id, $member_id){
- // vérifier existence image
- $service = $this->oidentity;
- $image = $service->getImage($image_id);
- $members = $image->listMembers();
+ private function listMemberImage($image_id, $member_id){
+ if(!isset($image_id)){
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
+ }
+ if(!isset($member_id)){
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
+ }
+ try{
+ // vérifier existence image
+ $service = $this->libClass;
+ $image = $service->getImage($image_id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+ $members = $image->listMembers();
+ if($member == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "No member");
+ }
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
return $members;
}
@@ -272,12 +494,37 @@ class image{
* @param string $member_id
* identifier of the member
**/
- public function detail_member($image_id, $member_id){
- // vérifier existence image
- // on doit être le proprio de l'image
- // vérifier membre existe
- $service = $this->oidentity;
- $member = $service>getImage($image_id)->getMember($member_id);
+ private function detailMemberImage($image_id, $member_id){
+ if(!isset($image_id)){
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
+ }
+ if(!isset($member_id)){
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
+ }
+ try{
+ // vérifier existence image
+ // on doit être le proprio de l'image
+ // vérifier membre existe
+ $service = $this->libClass;
+
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+
+ $member = $image->getMember($member_id);
+ if($member == null){ // if the member don't exists -> error
+ $this->app->setOutput("Error", "Member doesn't exist");
+ }
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
return $member;
}
@@ -290,12 +537,34 @@ class image{
* @param string $member_id
* identifier of the member
**/
- public function remove_member($image_id, $member_id){
- // vérifier existence image
- // on doit être le proprio de l'image
- // vérifier membre existe
- $service = $this->oidentity;
- $service>getImage($image_id)->getMember($member_id)->delete();
+ private function removeMemberImage($image_id, $member_id){
+ if(!isset($image_id)){
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
+ }
+ if(!isset($member_id)){
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
+ }
+ try{
+ $service = $this->libClass;
+
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+ $member = $image->getMember($member_id);
+ if($member == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Member doesn't exist");
+ }
+ $member->delete();
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
}
/**
@@ -310,13 +579,35 @@ class image{
* @param string $status
* new status for the member
**/
- public function update_member($image_id, $member_id, $status){
- // vérifier existence image
- // on doit être le proprio de l'image
- // vérifier membre existe
- $service = $this->oidentity;
- $member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status);
+ private function updateMemberImage($image_id, $member_id, $status){
+ if(!isset($image_id)){
+ $this->app->setOutput("Error", "Incorrect parameter image_id");
+ }
+ if(!isset($member_id)){
+ $this->app->setOutput("Error", "Incorrect parameter member_id");
+ }
+ try{
+ $service = $this->libClass;
+
+ $image = $service->getImage($id);
+ if($image == null){ // if the image don't exists -> error
+ $this->app->setOutput("Error", "Image doesn't exist");
+ }
+ $member = $image->getMember($member_id);
+ if($member == null){ // if the member don't exists -> error
+ $this->app->setOutput("Error", "Member doesn't exist");
+ }
+ $member->updateStatus($status);
+ }catch(BadResponseError $e){
+ $this->app->getErrorInstance()->BadResponseHandler($e);
+ }catch(UserInputError $e){
+ $this->app->getErrorInstance->UserInputHandler($e);
+ }catch(BaseError $e){
+ $this->app->getErrorInstance->BaseErrorHandler($e);
+ }catch(NotImplementedError $e){
+ $this->app->getErrorInstance->NotImplementedHandler($e);
+ }
}
}
-?>
+?> \ No newline at end of file
diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index b71defa..50826ed 100644..100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -260,13 +260,14 @@ class genTokenOptions
public function loadBackup($back){
$backup = unserialize($back);
+
$this->backup["roles"] = $backup["roles"];
$this->backup["project"] = $backup["project"];
$this->backup["user"] = $backup["user"];
- loadComputeBackup($backup["Compute"]);
- loadIdentityBackup($backup["Identity"]);
- loadImageBackup($backup["Image"]);
- loadNetworkBackup($backup["Network"]);
+ $this->loadComputeBackup($backup["Compute"]);
+ $this->loadIdentityBackup($backup["Identity"]);
+ $this->loadImageBackup($backup["Image"]);
+ $this->loadNetworkBackup($backup["Network"]);
}
@@ -324,6 +325,7 @@ class genTokenOptions
private function unserializeToken($tokenSerialized){
$Saved = file_get_contents("core/LibOverride/projectTokenData/".$this->backup["project"]);
+ $Saved = unserialize($Saved);
$api = new Api();
$token = new Models\Token($this->httpClient, $api);
$token->methods = unserialize($tokenSerialized["methods"]);
diff --git a/server/index.php b/server/index.php
index 166e82e..f888671 100644
--- a/server/index.php
+++ b/server/index.php
@@ -27,12 +27,26 @@
$identityObject->action($action);
$App->show();
break;
-
+
+ case "network":
+ include_once("core/Network.php");
+ $networkObject = new network($App);
+ $networkObject->action($action);
+ $App->show();
+ break;
+
case "image":
include_once("core/Image.php");
$imageObject = new image($App);
$imageObject->action($action);
$App->show();
break;
+
+ case "compute":
+ include_once("core/Compute.php");
+ $computeObject = new compute($App);
+ $computeObject->action($action);
+ $App->show();
+ break;
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-16 16:06:34 +0000