tests

1 files changed, 24 insertions, 26 deletions

diff --git a/server/core/Image.php b/server/core/Image.php
index 3001eea..125f6ad 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,7 +9,7 @@
 * 
 * @todo Complete the functions with errors detection and finish the descriptions
 */
- 
+use OpenStack\Common\Error; 
  
 /**
 * Image Class of the back-end application
@@ -20,7 +17,7 @@
 * ADD CLASS DESCRIPTION
 *
 */
-class image{ 
+class image implements Core{ 
 	//implements Core
 
 	/** @var App $app protected, contains the main app object */
@@ -48,7 +45,7 @@ class image{
 	}
 
 
-	
+	$images = array();
 
 	/**
 	* Details about an image
@@ -57,7 +54,7 @@ class image{
 	*	options for the image creation
 	*
 	**/
-	public function create_image(array $opt){
+	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
@@ -93,19 +90,20 @@ class image{
 			$options['properties'] = $opt['properties'];
 		}	
 
-		$image = $this->oidentity->createImage($options);
+		$image = $this->libClass->createImage($options);
 
 		return $image;
 	}
 
-	/*
-	* List images
+	/**
+	* List the images of the server
+	*
+	* @return the list with all images on the server
 	*/
-	public function list_images(){
+	$images["listImages"] = function() {
 		// vérifier si au moins une image
-		$service = $this->oidentity;
-		$images = $service->listImages();
-		return $images;
+		$this->libClass->listImages();
+		//return $l;
 	}
 
 	/**
@@ -117,7 +115,7 @@ class image{
 	**/
 	public function image_details($id){
 		//vérifier existence image
-		$service = $this->oidentity;
+		$service = $this->libClass;
 		$image = $service->getImage($id);
 		return $image;
 	}
@@ -133,7 +131,7 @@ class image{
 	**/
 	public function update_image($id, array $opt){
 		//vérifier existence image
-		$service = $this->oidentity;
+		$service = $this->libClass;
 		$image = $service->getImage($id);
 		$options = Array();
 
@@ -170,7 +168,7 @@ class image{
 	public function delete_image($id){
 		// si protected = true, demander de le mettre a false
 		// vérifier existence image
-		$service = $this->oidentity;
+		$service = $this->libClass;
 		$service->getImage($id)->delete();
 	}
 
@@ -182,7 +180,7 @@ class image{
 	**/
 	public function reactivate_image($id){
 		// vérifier existence image
-		$service = $this->oidentity;
+		$service = $this->libClass;
 		$image = $service->getImage($id);
 		$image->reactivate();
 	}
@@ -195,7 +193,7 @@ class image{
 	**/
 	public function desactivate_image($id){
 		// vérifier existence image
-		$service = $this->oidentity;
+		$service = $this->libClass;
 		$image = $service->getImage($id);
 		$image->deactivate();
 	}
@@ -211,7 +209,7 @@ class image{
 	**/
 	public function upload_image($id, $file_name){
 		// vérifier existence image
-		$service = $this->oidentity;
+		$service = $this->libClass;
 		$image  = $service->getImage($id);
 		$stream = \GuzzleHttp\Psr7\stream_for(fopen($file_name, 'r')); // A VOIR
 		$image->uploadData($stream);
@@ -225,7 +223,7 @@ class image{
 	**/
 	public function download_image($id){
 		// vérifier existence image 
-		$service = $this->oidentity;
+		$service = $this->libClass;
 		$image  = $service->getImage($id);
 		$stream = $image->downloadData();
 		return $stream;
@@ -244,7 +242,7 @@ class image{
 		// vérifier existence image
 		// on doit être le proprio de l'image
 		// vérifier membre existe
-		$service = $this->oidentity;		
+		$service = $this->libClass;		
 		$member_id = $service>getImage($image_id)->addMember($member_id);
 	}
 
@@ -257,7 +255,7 @@ class image{
 	**/
 	public function list_member($image_id, $member_id){
 		// vérifier existence image
-		$service = $this->oidentity;
+		$service = $this->libClass;
 		$image = $service->getImage($image_id);
 		$members = $image->listMembers();
 		return $members;
@@ -276,7 +274,7 @@ class image{
 		// vérifier existence image
 		// on doit être le proprio de l'image
 		// vérifier membre existe
-		$service = $this->oidentity;		
+		$service = $this->libClass;		
 		$member = $service>getImage($image_id)->getMember($member_id);
 		return $member;
 	}
@@ -294,7 +292,7 @@ class image{
 		// vérifier existence image
 		// on doit être le proprio de l'image
 		// vérifier membre existe
-		$service = $this->oidentity;		
+		$service = $this->libClass;		
 		$service>getImage($image_id)->getMember($member_id)->delete();
 	}
 
@@ -314,7 +312,7 @@ class image{
 		// vérifier existence image
 		// on doit être le proprio de l'image
 		// vérifier membre existe
-		$service = $this->oidentity;		
+		$service = $this->libClass;		
 		$member = $service>getImage($image_id)->getMember($member_id)->updateStatus($status);
 	}