Skip to content

Commit 16d07e7

Browse files
committed
Refactor TestCreateNetwork: Setup identity client in setUp() in TestCreateNetworkIdentityV3
This patch setup the v3 identity client only once in setUp() for TestCreateNetworkIdentityV3. Change-Id: Ia20db01af85f868a88bf905174b8556979b0a39a Implements: blueprint osc-network-unit-test-refactor Related-to: blueprint neutron-client
1 parent 3cc38d2 commit 16d07e7

1 file changed

Lines changed: 24 additions & 17 deletions

File tree

openstackclient/tests/network/v2/test_network.py

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,30 @@ def setUp(self):
8383
# Get the command object to test
8484
self.cmd = network.CreateNetwork(self.app, self.namespace)
8585

86+
# Set identity client v3. And get a shortcut to Identity client.
87+
identity_client = identity_fakes_v3.FakeIdentityv3Client(
88+
endpoint=fakes.AUTH_URL,
89+
token=fakes.AUTH_TOKEN,
90+
)
91+
self.app.client_manager.identity = identity_client
92+
self.identity = self.app.client_manager.identity
93+
94+
# Get a shortcut to the ProjectManager Mock
95+
self.projects_mock = self.identity.projects
96+
self.projects_mock.get.return_value = fakes.FakeResource(
97+
None,
98+
copy.deepcopy(identity_fakes_v3.PROJECT),
99+
loaded=True,
100+
)
101+
102+
# Get a shortcut to the DomainManager Mock
103+
self.domains_mock = self.identity.domains
104+
self.domains_mock.get.return_value = fakes.FakeResource(
105+
None,
106+
copy.deepcopy(identity_fakes_v3.DOMAIN),
107+
loaded=True,
108+
)
109+
86110
def test_create_no_options(self):
87111
arglist = [
88112
FAKE_NAME,
@@ -120,23 +144,6 @@ def test_create_all_options(self):
120144
('project_domain', identity_fakes_v3.domain_name),
121145
('name', FAKE_NAME),
122146
]
123-
identity_client = identity_fakes_v3.FakeIdentityv3Client(
124-
endpoint=fakes.AUTH_URL,
125-
token=fakes.AUTH_TOKEN,
126-
)
127-
self.app.client_manager.identity = identity_client
128-
self.projects_mock = self.app.client_manager.identity.projects
129-
self.projects_mock.get.return_value = fakes.FakeResource(
130-
None,
131-
copy.deepcopy(identity_fakes_v3.PROJECT),
132-
loaded=True,
133-
)
134-
self.domains_mock = self.app.client_manager.identity.domains
135-
self.domains_mock.get.return_value = fakes.FakeResource(
136-
None,
137-
copy.deepcopy(identity_fakes_v3.DOMAIN),
138-
loaded=True,
139-
)
140147

141148
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
142149
result = list(self.cmd.take_action(parsed_args))

0 commit comments

Comments
 (0)