3 files changed, 26 insertions, 19 deletions

diff --git a/server/core/LibOverride/genTokenOptions.php b/server/core/LibOverride/genTokenOptions.php
index 3e8414e..9cb4100 100755
--- a/server/core/LibOverride/genTokenOptions.php
+++ b/server/core/LibOverride/genTokenOptions.php
@@ -56,9 +56,11 @@ class genTokenOptions
 		$options['catalogType'] = 'false';
 		$options['region'] = 'RegionOne';
 		
-		list($token, $baseUrl) = $options['identityService']->authenticate($options);
-
-        $this->stack->push(Middleware::authHandler($options['authHandler'], $token));
+		//list($token, $baseUrl) = $options['identityService']->authenticate($options);
+		$baseUrl = $options["authUrl"];
+		$token = $options['identityService']->generateToken($options);
+		
+		$this->stack->push(Middleware::authHandler($options['authHandler'], $token));
 		
 		$this->addDebugMiddleware($options, $this->stack);
 		
@@ -227,8 +229,8 @@ class genTokenOptions
 		return serialize($this->backup[$service]);
 	}
 	
-	public function getOptionsCompute(){
-		return $this->optionsGlobal['Compute'];
+	public function getOptions($service){
+		return $this->optionsGlobal[$service];
 	}
 	
 	private function serializeToken($token){
diff --git a/server/index.php b/server/index.php
index 4d65c59..b3c061a 100755
--- a/server/index.php
+++ b/server/index.php
@@ -10,21 +10,26 @@
 	//$id = new identity($openstack_api, $pluginApi);
 
 //	var_dump($id->genToken());
-	$compute = $openstack_api->computeV2($array);
-	$servers = $compute->listServers(true);
+//	$identity = $openstack_api->identityV3($Args);
+	//$tmp = $identity->listEndpoints();
+	//foreach($tmp as $cred){
+//		echo $cred->id." %%%%%% ";
+	//}
+	//$servers = $compute->listServers(true);
 	//var_dump($servers);
-	foreach($servers as $server){
+	//foreach($servers as $server){
 	//	echo $server->id." !!!!!!!!! ";
-	}
+	//}
 
 	$tmp = new genTokenOptions($Args);
-	$tmp->loadComputeBackup($computBack);
-	$array = $tmp->getOptionsCompute();
+	$tmp->loadIdentityBackup($identityBack);
+	$array = $tmp->getOptions("Identity");
 
 	$openstackTest = new OpenStack\OpenStack([]);
-	$computeTest = $openstackTest->computeV2($array);
-	$serversTest = $computeTest->listServers(true);
-	foreach($serversTest as $server){
-		echo $server->id." %%%%%% ";
+	$identityTest = $openstackTest->identityV3($array);
+	$domainsTest = $identityTest->listDomains();
+	foreach($domainsTest as $domain){
+		echo $domain->id." %%%%%% ";
 	}
-//	var_dump($openstack_api->getBuilderOptions());	
+	//	var_dump($openstack_api->getBuilderOptions());	
+	
diff --git a/server/init.php b/server/init.php
index 9e0500b..2c07947 100755
--- a/server/init.php
+++ b/server/init.php
@@ -62,11 +62,11 @@
 	//$token = $id->genToken();
 	
 	$tmp = new genTokenOptions($Args);
-	$tmp->genComputeToken();
-	$array = $tmp->getOptionsCompute();
+	$tmp->genIdentityToken();
+	$array = $tmp->getOptions("Identity");
 	$openstack_api = new OpenStack\OpenStack([]);
 
-	$computBack = $tmp->getBackup("Compute");	
+	$identityBack = $tmp->getBackup("Identity");	
 	//file_put_contents("token", serialize($tmp));
 
 ?>