diff options
Diffstat (limited to 'openstackclient/tests')
| -rw-r--r-- | openstackclient/tests/common/test_extension.py | 6 | ||||
| -rw-r--r-- | openstackclient/tests/compute/v2/test_server.py | 17 | ||||
| -rw-r--r-- | openstackclient/tests/network/test_common.py | 57 | ||||
| -rw-r--r-- | openstackclient/tests/network/v2/fakes.py | 20 |
4 files changed, 25 insertions, 75 deletions
diff --git a/openstackclient/tests/common/test_extension.py b/openstackclient/tests/common/test_extension.py index 6d34bdd8..5f5588a7 100644 --- a/openstackclient/tests/common/test_extension.py +++ b/openstackclient/tests/common/test_extension.py @@ -34,9 +34,9 @@ class TestExtension(utils.TestCommand): self.app.client_manager.identity.extensions) self.identity_extensions_mock.reset_mock() - network = network_fakes.FakeNetworkV2Client() - self.app.client_manager.network = network - self.network_extensions_mock = network.list_extensions + network_client = network_fakes.FakeNetworkV2Client() + self.app.client_manager.network = network_client + self.network_extensions_mock = network_client.extensions self.network_extensions_mock.reset_mock() diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py index d6dcde1a..82f32051 100644 --- a/openstackclient/tests/compute/v2/test_server.py +++ b/openstackclient/tests/compute/v2/test_server.py @@ -215,12 +215,17 @@ class TestServerCreate(TestServer): self.app.client_manager.auth_ref.service_catalog.get_endpoints = ( get_endpoints) - list_networks = mock.Mock() - list_ports = mock.Mock() - self.app.client_manager.network.list_networks = list_networks - self.app.client_manager.network.list_ports = list_ports - list_networks.return_value = {'networks': [{'id': 'net1_uuid'}]} - list_ports.return_value = {'ports': [{'id': 'port1_uuid'}]} + find_network = mock.Mock() + find_port = mock.Mock() + network_client = self.app.client_manager.network + network_client.find_network = find_network + network_client.find_port = find_port + netty = mock.Mock() + netty.id = 'net1_uuid' + porty = mock.Mock() + porty.id = 'port1_uuid' + find_network.return_value = netty + find_port.return_value = porty # Mock sdk APIs. _network = mock.Mock() diff --git a/openstackclient/tests/network/test_common.py b/openstackclient/tests/network/test_common.py deleted file mode 100644 index 58586ac0..00000000 --- a/openstackclient/tests/network/test_common.py +++ /dev/null @@ -1,57 +0,0 @@ -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations -# under the License. -# - -import mock - -from openstackclient.network import common -from openstackclient.tests import utils - -RESOURCE = 'resource' -RESOURCES = 'resources' -NAME = 'matrix' -ID = 'Fishburne' - - -class TestFind(utils.TestCase): - def setUp(self): - super(TestFind, self).setUp() - self.mock_client = mock.Mock() - self.list_resources = mock.Mock() - self.mock_client.find_resource = self.list_resources - self.resource = mock.Mock() - self.resource.id = ID - - def test_name(self): - self.list_resources.return_value = self.resource - - result = common.find(self.mock_client, RESOURCE, RESOURCES, NAME) - - self.assertEqual(ID, result) - self.list_resources.assert_called_with(NAME, ignore_missing=False) - - def test_id(self): - self.list_resources.return_value = self.resource - - result = common.find(self.mock_client, RESOURCE, RESOURCES, NAME) - - self.assertEqual(ID, result) - self.list_resources.assert_called_with(NAME, ignore_missing=False) - - def test_nameo(self): - self.list_resources.return_value = self.resource - - result = common.find(self.mock_client, RESOURCE, RESOURCES, NAME, - name_attr='nameo') - - self.assertEqual(ID, result) - self.list_resources.assert_called_with(NAME, ignore_missing=False) diff --git a/openstackclient/tests/network/v2/fakes.py b/openstackclient/tests/network/v2/fakes.py index 10814f96..9e999114 100644 --- a/openstackclient/tests/network/v2/fakes.py +++ b/openstackclient/tests/network/v2/fakes.py @@ -27,19 +27,21 @@ extension_updated = '2013-07-09T12:00:0-00:00' extension_alias = 'Dystopian' extension_links = '[{"href":''"https://github.com/os/network", "type"}]' -NETEXT = { - 'name': extension_name, - 'namespace': extension_namespace, - 'description': extension_description, - 'updated': extension_updated, - 'alias': extension_alias, - 'links': extension_links, -} + +def create_extension(): + extension = mock.Mock() + extension.name = extension_name + extension.namespace = extension_namespace + extension.description = extension_description + extension.updated = extension_updated + extension.alias = extension_alias + extension.links = extension_links + return extension class FakeNetworkV2Client(object): def __init__(self, **kwargs): - self.list_extensions = mock.Mock(return_value={'extensions': [NETEXT]}) + self.extensions = mock.Mock(return_value=[create_extension()]) class TestNetworkV2(utils.TestCommand): |