Skip to content

Commit d20d97f

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Set identity v3 client in networkv2 fake"
2 parents 3e1d542 + e7fa892 commit d20d97f

8 files changed

Lines changed: 34 additions & 92 deletions

File tree

‎openstackclient/tests/network/v2/fakes.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import uuid
1818

1919
from openstackclient.tests import fakes
20+
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
2021
from openstackclient.tests import utils
2122

2223

@@ -57,6 +58,13 @@ def setUp(self):
5758
token=fakes.AUTH_TOKEN,
5859
)
5960

61+
self.app.client_manager.identity = (
62+
identity_fakes_v3.FakeIdentityv3Client(
63+
endpoint=fakes.AUTH_URL,
64+
token=fakes.AUTH_TOKEN,
65+
)
66+
)
67+
6068

6169
class FakeAddressScope(object):
6270
"""Fake one or more address scopes."""

‎openstackclient/tests/network/v2/test_address_scope.py‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from osc_lib import exceptions
1818

1919
from openstackclient.network.v2 import address_scope
20-
from openstackclient.tests import fakes
2120
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
2221
from openstackclient.tests.network.v2 import fakes as network_fakes
2322
from openstackclient.tests import utils as tests_utils
@@ -30,6 +29,10 @@ def setUp(self):
3029

3130
# Get a shortcut to the network client
3231
self.network = self.app.client_manager.network
32+
# Get a shortcut to the ProjectManager Mock
33+
self.projects_mock = self.app.client_manager.identity.projects
34+
# Get a shortcut to the DomainManager Mock
35+
self.domains_mock = self.app.client_manager.identity.domains
3336

3437

3538
class TestCreateAddressScope(TestAddressScope):
@@ -66,20 +69,7 @@ def setUp(self):
6669
# Get the command object to test
6770
self.cmd = address_scope.CreateAddressScope(self.app, self.namespace)
6871

69-
# Set identity client v3. And get a shortcut to Identity client.
70-
identity_client = identity_fakes_v3.FakeIdentityv3Client(
71-
endpoint=fakes.AUTH_URL,
72-
token=fakes.AUTH_TOKEN,
73-
)
74-
self.app.client_manager.identity = identity_client
75-
self.identity = self.app.client_manager.identity
76-
77-
# Get a shortcut to the ProjectManager Mock
78-
self.projects_mock = self.identity.projects
7972
self.projects_mock.get.return_value = self.project
80-
81-
# Get a shortcut to the DomainManager Mock
82-
self.domains_mock = self.identity.domains
8373
self.domains_mock.get.return_value = self.domain
8474

8575
def test_create_no_options(self):

‎openstackclient/tests/network/v2/test_ip_availability.py‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from osc_lib import utils as common_utils
1717

1818
from openstackclient.network.v2 import ip_availability
19-
from openstackclient.tests import fakes
2019
from openstackclient.tests.identity.v3 import fakes as identity_fakes
2120
from openstackclient.tests.network.v2 import fakes as network_fakes
2221
from openstackclient.tests import utils as tests_utils
@@ -30,16 +29,9 @@ def setUp(self):
3029
# Get a shortcut to the network client
3130
self.network = self.app.client_manager.network
3231

33-
# Set identity client v3. And get a shortcut to Identity client.
34-
identity_client = identity_fakes.FakeIdentityv3Client(
35-
endpoint=fakes.AUTH_URL,
36-
token=fakes.AUTH_TOKEN,
37-
)
38-
self.app.client_manager.identity = identity_client
39-
self.identity = self.app.client_manager.identity
40-
4132
# Get a shortcut to the ProjectManager Mock
42-
self.projects_mock = self.identity.projects
33+
self.projects_mock = self.app.client_manager.identity.projects
34+
4335
self.project = identity_fakes.FakeProject.create_one_project()
4436
self.projects_mock.get.return_value = self.project
4537

‎openstackclient/tests/network/v2/test_network.py‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ def setUp(self):
3535

3636
# Get a shortcut to the network client
3737
self.network = self.app.client_manager.network
38+
# Get a shortcut to the ProjectManager Mock
39+
self.projects_mock = self.app.client_manager.identity.projects
40+
# Get a shortcut to the DomainManager Mock
41+
self.domains_mock = self.app.client_manager.identity.domains
3842

3943

4044
class TestCreateNetworkIdentityV3(TestNetwork):
@@ -89,20 +93,7 @@ def setUp(self):
8993
# Get the command object to test
9094
self.cmd = network.CreateNetwork(self.app, self.namespace)
9195

92-
# Set identity client v3. And get a shortcut to Identity client.
93-
identity_client = identity_fakes_v3.FakeIdentityv3Client(
94-
endpoint=fakes.AUTH_URL,
95-
token=fakes.AUTH_TOKEN,
96-
)
97-
self.app.client_manager.identity = identity_client
98-
self.identity = self.app.client_manager.identity
99-
100-
# Get a shortcut to the ProjectManager Mock
101-
self.projects_mock = self.identity.projects
10296
self.projects_mock.get.return_value = self.project
103-
104-
# Get a shortcut to the DomainManager Mock
105-
self.domains_mock = self.identity.domains
10697
self.domains_mock.get.return_value = self.domain
10798

10899
def test_create_no_options(self):

‎openstackclient/tests/network/v2/test_security_group.py‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
from openstackclient.network.v2 import security_group
2020
from openstackclient.tests.compute.v2 import fakes as compute_fakes
21-
from openstackclient.tests import fakes
2221
from openstackclient.tests.identity.v3 import fakes as identity_fakes
2322
from openstackclient.tests.network.v2 import fakes as network_fakes
2423
from openstackclient.tests import utils as tests_utils
@@ -31,6 +30,10 @@ def setUp(self):
3130

3231
# Get a shortcut to the network client
3332
self.network = self.app.client_manager.network
33+
# Get a shortcut to the ProjectManager Mock
34+
self.projects_mock = self.app.client_manager.identity.projects
35+
# Get a shortcut to the DomainManager Mock
36+
self.domains_mock = self.app.client_manager.identity.domains
3437

3538

3639
class TestSecurityGroupCompute(compute_fakes.TestComputev2):
@@ -72,20 +75,7 @@ def setUp(self):
7275
self.network.create_security_group = mock.Mock(
7376
return_value=self._security_group)
7477

75-
# Set identity client v3. And get a shortcut to Identity client.
76-
identity_client = identity_fakes.FakeIdentityv3Client(
77-
endpoint=fakes.AUTH_URL,
78-
token=fakes.AUTH_TOKEN,
79-
)
80-
self.app.client_manager.identity = identity_client
81-
self.identity = self.app.client_manager.identity
82-
83-
# Get a shortcut to the ProjectManager Mock
84-
self.projects_mock = self.identity.projects
8578
self.projects_mock.get.return_value = self.project
86-
87-
# Get a shortcut to the DomainManager Mock
88-
self.domains_mock = self.identity.domains
8979
self.domains_mock.get.return_value = self.domain
9080

9181
# Get the command object to test

‎openstackclient/tests/network/v2/test_security_group_rule.py‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ def setUp(self):
3333

3434
# Get a shortcut to the network client
3535
self.network = self.app.client_manager.network
36+
# Get a shortcut to the ProjectManager Mock
37+
self.projects_mock = self.app.client_manager.identity.projects
38+
# Get a shortcut to the DomainManager Mock
39+
self.domains_mock = self.app.client_manager.identity.domains
3640

3741

3842
class TestSecurityGroupRuleCompute(compute_fakes.TestComputev2):
@@ -95,20 +99,7 @@ def setUp(self):
9599
self.network.find_security_group = mock.Mock(
96100
return_value=self._security_group)
97101

98-
# Set identity client v3. And get a shortcut to Identity client.
99-
identity_client = identity_fakes.FakeIdentityv3Client(
100-
endpoint=fakes.AUTH_URL,
101-
token=fakes.AUTH_TOKEN,
102-
)
103-
self.app.client_manager.identity = identity_client
104-
self.identity = self.app.client_manager.identity
105-
106-
# Get a shortcut to the ProjectManager Mock
107-
self.projects_mock = self.identity.projects
108102
self.projects_mock.get.return_value = self.project
109-
110-
# Get a shortcut to the DomainManager Mock
111-
self.domains_mock = self.identity.domains
112103
self.domains_mock.get.return_value = self.domain
113104

114105
# Get the command object to test

‎openstackclient/tests/network/v2/test_subnet.py‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from osc_lib import utils
1919

2020
from openstackclient.network.v2 import subnet as subnet_v2
21-
from openstackclient.tests import fakes
2221
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
2322
from openstackclient.tests.network.v2 import fakes as network_fakes
2423
from openstackclient.tests import utils as tests_utils
@@ -31,6 +30,10 @@ def setUp(self):
3130

3231
# Get a shortcut to the network client
3332
self.network = self.app.client_manager.network
33+
# Get a shortcut to the ProjectManager Mock
34+
self.projects_mock = self.app.client_manager.identity.projects
35+
# Get a shortcut to the DomainManager Mock
36+
self.domains_mock = self.app.client_manager.identity.domains
3437

3538

3639
class TestCreateSubnet(TestSubnet):
@@ -178,20 +181,7 @@ def setUp(self):
178181
# Get the command object to test
179182
self.cmd = subnet_v2.CreateSubnet(self.app, self.namespace)
180183

181-
# Set identity client v3. And get a shortcut to Identity client.
182-
identity_client = identity_fakes_v3.FakeIdentityv3Client(
183-
endpoint=fakes.AUTH_URL,
184-
token=fakes.AUTH_TOKEN,
185-
)
186-
self.app.client_manager.identity = identity_client
187-
self.identity = self.app.client_manager.identity
188-
189-
# Get a shortcut to the ProjectManager Mock
190-
self.projects_mock = self.identity.projects
191184
self.projects_mock.get.return_value = self.project
192-
193-
# Get a shortcut to the DomainManager Mock
194-
self.domains_mock = self.identity.domains
195185
self.domains_mock.get.return_value = self.domain
196186

197187
# Mock SDK calls for all tests.

‎openstackclient/tests/network/v2/test_subnet_pool.py‎

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
from osc_lib import utils
2020

2121
from openstackclient.network.v2 import subnet_pool
22-
from openstackclient.tests import fakes
2322
from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3
2423
from openstackclient.tests.network.v2 import fakes as network_fakes
2524
from openstackclient.tests import utils as tests_utils
@@ -32,6 +31,10 @@ def setUp(self):
3231

3332
# Get a shortcut to the network client
3433
self.network = self.app.client_manager.network
34+
# Get a shortcut to the ProjectManager Mock
35+
self.projects_mock = self.app.client_manager.identity.projects
36+
# Get a shortcut to the DomainManager Mock
37+
self.domains_mock = self.app.client_manager.identity.domains
3538

3639

3740
class TestCreateSubnetPool(TestSubnetPool):
@@ -84,20 +87,7 @@ def setUp(self):
8487
self.network.find_address_scope = mock.Mock(
8588
return_value=self._address_scope)
8689

87-
# Set identity client. And get a shortcut to Identity client.
88-
identity_client = identity_fakes_v3.FakeIdentityv3Client(
89-
endpoint=fakes.AUTH_URL,
90-
token=fakes.AUTH_TOKEN,
91-
)
92-
self.app.client_manager.identity = identity_client
93-
self.identity = self.app.client_manager.identity
94-
95-
# Get a shortcut to the ProjectManager Mock
96-
self.projects_mock = self.identity.projects
9790
self.projects_mock.get.return_value = self.project
98-
99-
# Get a shortcut to the DomainManager Mock
100-
self.domains_mock = self.identity.domains
10191
self.domains_mock.get.return_value = self.domain
10292

10393
def test_create_no_options(self):

0 commit comments

Comments
 (0)