summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xserver/Test/AppTestClass.php73
-rwxr-xr-xserver/Test/InitTest.php28
-rwxr-xr-xserver/core/App.php10
3 files changed, 106 insertions, 5 deletions
diff --git a/server/Test/AppTestClass.php b/server/Test/AppTestClass.php
new file mode 100755
index 0000000..311b9bf
--- /dev/null
+++ b/server/Test/AppTestClass.php
@@ -0,0 +1,73 @@
+<?php
+include_once("../core/Plugin_Api.php");
+include_once("../core/LibOverride/genTokenOptions.php");
+
+class AppTest{
+
+ protected $openstack;
+ protected $pluginsApi;
+ protected $tokenClass;
+ protected $tokenPost;
+ protected $output;
+
+ public function __construct($args){
+
+ $this->tokenPost = NULL;
+ $this->tokenClass = new genTokenOptions($args);
+ $this->openstack = new OpenStack\OpenStack([]);
+ $this->pluginsApi = plugin_api::getInstance();
+ $this->output = array();
+
+ }
+
+ public function setToken($token){
+
+ $this->tokenPost = $token;
+ $this->tokenClass->loadBackup($his->tokenPost);
+
+ }
+
+ public function getLibClass($service){
+
+ switch($service){
+ case "Identity":
+ if($this->tokenPost == NULL) $this->tokenClass->genIdentityToken();
+ $opt = $this->tokenClass->getOptions($service);
+ return $this->openstack->identityV3($opt);
+ break;
+ case "Image":
+ if($this->tokenPost == NULL) $this->tokenClass->genImageToken();
+ $opt = $this->tokenClass->getOptions($service);
+ return $this->openstack->imagesV2($opt);
+ break;
+ }
+
+ }
+
+ public function authenticate(){
+
+ try{
+ $this->tokenClass->genIdentityToken();
+ $this->tokenClass->genComputeToken();
+ $this->tokenClass->genImageToken();
+ $this->tokenClass->genNetworkToken();
+
+ $this->setOutput("token", $this->tokenClass->getBackup());
+ }catch(Exception $e){
+ echo $e;
+ exit();
+ }
+
+ }
+
+ public function setOutput($key, $out){
+
+ $this->output[$key] = $out;
+
+ }
+
+ public function show(){
+ echo json_encode($this->output);
+ }
+
+} \ No newline at end of file
diff --git a/server/Test/InitTest.php b/server/Test/InitTest.php
new file mode 100755
index 0000000..c1900a6
--- /dev/null
+++ b/server/Test/InitTest.php
@@ -0,0 +1,28 @@
+<?php
+ include_once("../config.inc.php");
+ include_once("AppTestClass.php");
+
+ $user = "demo";
+ $password = "demopass";
+ $project = "demo";
+
+ $Args = Array(
+ "user" => Array(
+ "name" => $user,
+ "password" => $password,
+ "domain" => Array(
+ "name" => "Default")
+ ),
+ "scope" => Array(
+ "project" => Array(
+ "name" => $project,
+ "domain" => Array(
+ "name" => "Default")
+ )
+ ),
+ "authUrl" => $config["urlAuth"]
+ );
+
+ $App = new AppTest($Args);
+
+?>
diff --git a/server/core/App.php b/server/core/App.php
index dafdaad..bba99b4 100755
--- a/server/core/App.php
+++ b/server/core/App.php
@@ -31,14 +31,14 @@ class App{
switch($service){
case "Identity":
- if($tokenPost == NULL) $tokenClass->genIdentityToken();
- $opt = $tokenClass->getOptions($service);
+ if($this->tokenPost == NULL) $this->tokenClass->genIdentityToken();
+ $opt = $this->tokenClass->getOptions($service);
return $this->openstack->identityV3($opt);
break;
case "Image":
- if($tokenPost == NULL) $tokenClass->genImageToken();
- $opt = $tokenClass->getOptions($service);
- return $this->$openstack->imagesV2($opt);
+ if($this->tokenPost == NULL) $this->tokenClass->genImageToken();
+ $opt = $this->tokenClass->getOptions($service);
+ return $this->openstack->imagesV2($opt);
break;
}