summaryrefslogtreecommitdiff
path: root/openstackclient
diff options
context:
space:
mode:
authorTang Chen <tangchen@cn.fujitsu.com>2015-12-01 20:05:36 +0800
committerTang Chen <tangchen@cn.fujitsu.com>2015-12-05 10:52:05 +0800
commit16d07e71015e4a1696a891804b2ed78d51ff6add (patch)
treeae999a34cd6a5a851103758d8fdd2a5fcf4ed147 /openstackclient
parent3cc38d2844408ac2ce0b29d7d8f07ef8dea22417 (diff)
downloadpython-openstackclient-16d07e71015e4a1696a891804b2ed78d51ff6add.tar.gz
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
Diffstat (limited to 'openstackclient')
-rw-r--r--openstackclient/tests/network/v2/test_network.py41
1 files changed, 24 insertions, 17 deletions
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index c45d624b..b00ae660 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -83,6 +83,30 @@ class TestCreateNetworkIdentityV3(TestNetwork):
# Get the command object to test
self.cmd = network.CreateNetwork(self.app, self.namespace)
+ # Set identity client v3. And get a shortcut to Identity client.
+ identity_client = identity_fakes_v3.FakeIdentityv3Client(
+ 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.projects
+ self.projects_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes_v3.PROJECT),
+ loaded=True,
+ )
+
+ # Get a shortcut to the DomainManager Mock
+ self.domains_mock = self.identity.domains
+ self.domains_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes_v3.DOMAIN),
+ loaded=True,
+ )
+
def test_create_no_options(self):
arglist = [
FAKE_NAME,
@@ -120,23 +144,6 @@ class TestCreateNetworkIdentityV3(TestNetwork):
('project_domain', identity_fakes_v3.domain_name),
('name', FAKE_NAME),
]
- identity_client = identity_fakes_v3.FakeIdentityv3Client(
- endpoint=fakes.AUTH_URL,
- token=fakes.AUTH_TOKEN,
- )
- self.app.client_manager.identity = identity_client
- self.projects_mock = self.app.client_manager.identity.projects
- self.projects_mock.get.return_value = fakes.FakeResource(
- None,
- copy.deepcopy(identity_fakes_v3.PROJECT),
- loaded=True,
- )
- self.domains_mock = self.app.client_manager.identity.domains
- self.domains_mock.get.return_value = fakes.FakeResource(
- None,
- copy.deepcopy(identity_fakes_v3.DOMAIN),
- loaded=True,
- )
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
result = list(self.cmd.take_action(parsed_args))