openstack/python-openstackclient
Code Issues Proposed changes

Merge "Refactor TestCreateNetwork: Setup identity client in setUp() in TestCreateNetworkIdentityV2"

Browse Source
This commit is contained in:
Jenkins
2015-12-05 20:17:03 +00:00
committed by Gerrit Code Review
parent 08ba88da48 ee6855858f
commit 27037a43db
1 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
openstackclient/tests/network/v2/test_network.py
View File

@@ -194,6 +194,24 @@ class TestCreateNetworkIdentityV2(TestNetwork):
# Get the command object to test # Get the command object to test
self.cmd = network.CreateNetwork(self.app, self.namespace) self.cmd = network.CreateNetwork(self.app, self.namespace)
# Set identity client v2. And get a shortcut to Identity client.
identity_client = identity_fakes_v2.FakeIdentityv2Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.identity = identity_client
self.identity = self.app.client_manager.identity
# Get a shortcut to the ProjectManager Mock
self.projects_mock = self.identity.tenants
self.projects_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes_v2.PROJECT),
loaded=True,
)
# There is no DomainManager Mock in fake identity v2.
def test_create_with_project_identityv2(self): def test_create_with_project_identityv2(self):
arglist = [ arglist = [
"--project", identity_fakes_v2.project_name, "--project", identity_fakes_v2.project_name,
@@ -205,17 +223,6 @@ class TestCreateNetworkIdentityV2(TestNetwork):
('name', FAKE_NAME), ('name', FAKE_NAME),
('project', identity_fakes_v2.project_name), ('project', identity_fakes_v2.project_name),
] ]
identity_client = identity_fakes_v2.FakeIdentityv2Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.identity = identity_client
self.projects_mock = self.app.client_manager.identity.tenants
self.projects_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes_v2.PROJECT),
loaded=True,
)
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = list(self.cmd.take_action(parsed_args)) result = list(self.cmd.take_action(parsed_args))
@@ -242,17 +249,6 @@ class TestCreateNetworkIdentityV2(TestNetwork):
('project_domain', identity_fakes_v3.domain_name), ('project_domain', identity_fakes_v3.domain_name),
('name', FAKE_NAME), ('name', FAKE_NAME),
] ]
identity_client = identity_fakes_v2.FakeIdentityv2Client(
endpoint=fakes.AUTH_URL,
token=fakes.AUTH_TOKEN,
)
self.app.client_manager.identity = identity_client
self.projects_mock = self.app.client_manager.identity.tenants
self.projects_mock.get.return_value = fakes.FakeResource(
None,
copy.deepcopy(identity_fakes_v2.PROJECT),
loaded=True,
)
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)