Fin Token

This commit is contained in:
Eole 2016-01-31 12:16:31 +01:00
parent d9db6e5748
commit 4c0fb05590
2 changed files with 17 additions and 10 deletions

View file

@ -111,11 +111,12 @@ class genTokenOptions
$tokenSerialized = [];
$tokenSerialized["methods"] = serialize($token->methods);
$tokenSerialized["roles"] = [];
//var_dump($token->roles);
foreach($token->roles as $role){
$tokenSerialized["roles"][serialize($role->name)]["links"] = serialize($role->links);
$tokenSerialized["roles"][serialize($role->name)]["id"] = serialize($role->id);
}
$tokenSerialized["roles"][serialize($role->id)]["links"] = serialize($role->links);
$tokenSerialized["roles"][serialize($role->id)]["name"] = serialize($role->name);
}
$tokenSerialized["expires"] = serialize($token->expires);
$tokenSerialized["project"]["domainId"] = serialize($token->project->domainId);
$tokenSerialized["project"]["parentId"] = serialize($token->project->parentId);
@ -124,6 +125,7 @@ class genTokenOptions
$tokenSerialized["project"]["id"] = serialize($token->project->id);
$tokenSerialized["project"]["links"] = serialize($token->project->links);
$tokenSerialized["project"]["name"] = serialize($token->project->name);
foreach($token->catalog->services as $service){
$tokenSerialized["catalog"][serialize($service->id)]["name"] = serialize($service->name);
$tokenSerialized["catalog"][serialize($service->id)]["description"] = serialize($service->description);
@ -158,14 +160,17 @@ class genTokenOptions
$token = new Models\Token($this->httpClient, $api);
$token->methods = unserialize($tokenSerialized["methods"]);
$token->roles = [];
$i = 0;
foreach($tokenSerialized["roles"] as $key => $role){
$tmp = new Models\Role($this->httpClient, $api);
$tmp->name = unserialize($key);
$tmp->id = unserialize($key);
$tmp->links = unserialize($role["links"]);
$tmp->id = unserialize($role["id"]);
if(isset($role["name"]))
$tmp->name = unserialize($role["name"]);
$token->roles[] = $tmp;
$i++;
}
$token->expires = unserialize($tokenSerialized["expires"]);
@ -178,7 +183,8 @@ class genTokenOptions
$token->project->links = unserialize($tokenSerialized["project"]["links"]);
$token->project->name = unserialize($tokenSerialized["project"]["name"]);
$token->catalog = [];
$token->catalog = new Models\Catalog($this->httpClient, $api);
$token->catalog->services = [];
foreach($tokenSerialized["catalog"] as $key => $service){
$tmp = new Models\Service($this->httpClient, $api);
@ -198,8 +204,9 @@ class genTokenOptions
$tmpEnd->url = unserialize($end["url"]);
$tmp->endpoints[] = $tmpEnd;
}
$tmp->links = unserialize($service["links"]);
$token->catalog[] = $tmp;
if(isset($service["links"]))
$tmp->links = unserialize($service["links"]);
$token->catalog->services[] = $tmp;
}
$token->extras = unserialize($tokenSerialized["extras"]);

View file

@ -25,6 +25,6 @@
$computeTest = $openstackTest->computeV2($array);
$serversTest = $computeTest->listServers(true);
foreach($serversTest as $server){
// echo $server->id." %%%%%% ";
echo $server->id." %%%%%% ";
}
// var_dump($openstack_api->getBuilderOptions());