Skip to content

Commit 3eb2800

Browse files
author
Jamie Hannaford
committed
Merge pull request #55 from haphan/catalog-name
[rfr] Add catalog name and type for identity service
2 parents 43e54b1 + 37d4a69 commit 3eb2800

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/OpenStack.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public function networkingV2ExtSecGroups(array $options = []): \OpenStack\Networ
118118
*/
119119
public function identityV2(array $options = []): \OpenStack\Identity\v2\Service
120120
{
121-
$defaults = ['catalogName' => false, 'catalogType' => false];
121+
$defaults = ['catalogName' => 'keystone', 'catalogType' => 'identity'];
122122
return $this->builder->createService('Identity\\v2', array_merge($defaults, $options));
123123
}
124124

@@ -131,7 +131,7 @@ public function identityV2(array $options = []): \OpenStack\Identity\v2\Service
131131
*/
132132
public function identityV3(array $options = []): \OpenStack\Identity\v3\Service
133133
{
134-
$defaults = ['catalogName' => false, 'catalogType' => false];
134+
$defaults = ['catalogName' => 'keystone', 'catalogType' => 'identity'];
135135
return $this->builder->createService('Identity\\v3', array_merge($defaults, $options));
136136
}
137137

tests/unit/OpenStackTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public function test_it_supports_compute_v2()
3232
public function test_it_supports_identity_v2()
3333
{
3434
$this->builder
35-
->createService('Identity\\v2', ['catalogName' => false, 'catalogType' => false])
35+
->createService('Identity\\v2', ['catalogName' => 'keystone', 'catalogType' => 'identity'])
3636
->shouldBeCalled()
3737
->willReturn($this->service('Identity', 2));
3838

@@ -42,7 +42,7 @@ public function test_it_supports_identity_v2()
4242
public function test_it_supports_identity_v3()
4343
{
4444
$this->builder
45-
->createService('Identity\\v3', ['catalogName' => false, 'catalogType' => false])
45+
->createService('Identity\\v3', ['catalogName' => 'keystone', 'catalogType' => 'identity'])
4646
->shouldBeCalled()
4747
->willReturn($this->service('Identity', 3));
4848

0 commit comments

Comments
 (0)