loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implementation Token Multi Service ENd

Browse source
This commit is contained in:
Eole 2016-01-31 14:34:43 +01:00
parent 3914858d7a
commit 4f062230bc
3 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/core/LibOverride/genTokenOptions.php
View file

@ -56,9 +56,11 @@ class genTokenOptions
$options['catalogType'] = 'false'; $options['catalogType'] = 'false';
$options['region'] = 'RegionOne'; $options['region'] = 'RegionOne';
list($token, $baseUrl) = $options['identityService']->authenticate($options); //list($token, $baseUrl) = $options['identityService']->authenticate($options);
$baseUrl = $options["authUrl"];
$this->stack->push(Middleware::authHandler($options['authHandler'], $token)); $token = $options['identityService']->generateToken($options);
$this->stack->push(Middleware::authHandler($options['authHandler'], $token));
$this->addDebugMiddleware($options, $this->stack); $this->addDebugMiddleware($options, $this->stack);
@ -227,8 +229,8 @@ class genTokenOptions
return serialize($this->backup[$service]); return serialize($this->backup[$service]);
} }
public function getOptionsCompute(){ public function getOptions($service){
return $this->optionsGlobal['Compute']; return $this->optionsGlobal[$service];
} }
private function serializeToken($token){ private function serializeToken($token){

27
server/index.php
View file

@ -10,21 +10,26 @@
//$id = new identity($openstack_api, $pluginApi); //$id = new identity($openstack_api, $pluginApi);
// var_dump($id->genToken()); // var_dump($id->genToken());
$compute = $openstack_api->computeV2($array); // $identity = $openstack_api->identityV3($Args);
$servers = $compute->listServers(true); //$tmp = $identity->listEndpoints();
//foreach($tmp as $cred){
// echo $cred->id." %%%%%% ";
//}
//$servers = $compute->listServers(true);
//var_dump($servers); //var_dump($servers);
foreach($servers as $server){ //foreach($servers as $server){
// echo $server->id." !!!!!!!!! "; // echo $server->id." !!!!!!!!! ";
} //}
$tmp = new genTokenOptions($Args); $tmp = new genTokenOptions($Args);
$tmp->loadComputeBackup($computBack); $tmp->loadIdentityBackup($identityBack);
$array = $tmp->getOptionsCompute(); $array = $tmp->getOptions("Identity");
$openstackTest = new OpenStack\OpenStack([]); $openstackTest = new OpenStack\OpenStack([]);
$computeTest = $openstackTest->computeV2($array); $identityTest = $openstackTest->identityV3($array);
$serversTest = $computeTest->listServers(true); $domainsTest = $identityTest->listDomains();
foreach($serversTest as $server){ foreach($domainsTest as $domain){
echo $server->id." %%%%%% "; echo $domain->id." %%%%%% ";
} }
// var_dump($openstack_api->getBuilderOptions()); // var_dump($openstack_api->getBuilderOptions());

6
server/init.php
View file

@ -62,11 +62,11 @@
//$token = $id->genToken(); //$token = $id->genToken();
$tmp = new genTokenOptions($Args); $tmp = new genTokenOptions($Args);
$tmp->genComputeToken(); $tmp->genIdentityToken();
$array = $tmp->getOptionsCompute(); $array = $tmp->getOptions("Identity");
$openstack_api = new OpenStack\OpenStack([]); $openstack_api = new OpenStack\OpenStack([]);
$computBack = $tmp->getBackup("Compute"); $identityBack = $tmp->getBackup("Identity");
//file_put_contents("token", serialize($tmp)); //file_put_contents("token", serialize($tmp));
?> ?>