openstack
/
python-openstackclient
Code Issues Proposed changes

Ensure that image and identity clients are constructed properly. 

Also removed tests that don't test anything.

Change-Id: I0cb420248c8a1374110c014063fe029686e90216
This commit is contained in:
Josh Kearney 2013-01-29 12:06:31 -06:00
parent 4297e5781b
commit 64cd45b03d
5 changed files with 139 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/compute/test_compute.py
View File

@ -20,40 +20,31 @@ from openstackclient.compute import client as compute_client
from tests import utils
AUTH_TOKEN = "foobar"
AUTH_URL = "http://0.0.0.0"
class FakeClient(object):
def __init__(self, endpoint=None, **kwargs):
self.client = mock.MagicMock()
self.servers = mock.MagicMock()
self.client.auth_url = kwargs['auth_url']
self.client.auth_url = AUTH_URL
class TestCompute(utils.TestCase):
def setUp(self):
super(TestCompute, self).setUp()
self.auth_token = "foobar"
self.auth_url = "http://0.0.0.0"
api_version = {"compute": "2"}
compute_client.API_VERSIONS = {
"2": "tests.compute.test_compute.FakeClient"
}
self.cm = clientmanager.ClientManager(token=self.auth_token,
url=self.auth_url,
auth_url=self.auth_url,
self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,
url=AUTH_URL,
auth_url=AUTH_URL,
api_version=api_version)
def test_make_client(self):
test_servers = [
["id 1", "name 1", "status 1", "networks 1"],
["id 2", "name 2", "status 2", "networks 2"]
]
self.cm.compute.servers.list.return_value = test_servers
self.assertEqual(self.cm.compute.servers.list(), test_servers)
self.assertEqual(self.cm.compute.client.auth_token, self.auth_token)
self.assertEqual(self.cm.compute.client.auth_url, self.auth_url)
self.assertEqual(self.cm.compute.client.auth_token, AUTH_TOKEN)
self.assertEqual(self.cm.compute.client.auth_url, AUTH_URL)

14
tests/identity/__init__.py Normal file
View File

@ -0,0 +1,14 @@
# Copyright 2013 OpenStack, LLC.
#
# 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.
#

50
tests/identity/test_identity.py Normal file
View File

@ -0,0 +1,50 @@
# Copyright 2013 OpenStack, LLC.
#
# 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.common import clientmanager
from openstackclient.identity import client as identity_client
from tests import utils
AUTH_TOKEN = "foobar"
AUTH_URL = "http://0.0.0.0"
class FakeClient(object):
def __init__(self, endpoint=None, **kwargs):
self.auth_token = AUTH_TOKEN
self.auth_url = AUTH_URL
class TestIdentity(utils.TestCase):
def setUp(self):
super(TestIdentity, self).setUp()
api_version = {"identity": "2.0"}
identity_client.API_VERSIONS = {
"2.0": "tests.identity.test_identity.FakeClient"
}
self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,
url=AUTH_URL,
auth_url=AUTH_URL,
api_version=api_version)
def test_make_client(self):
self.assertEqual(self.cm.identity.auth_token, AUTH_TOKEN)
self.assertEqual(self.cm.identity.auth_url, AUTH_URL)

14
tests/image/__init__.py Normal file
View File

@ -0,0 +1,14 @@
# Copyright 2013 OpenStack, LLC.
#
# 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.
#

51
tests/image/test_image.py Normal file
View File

@ -0,0 +1,51 @@
# Copyright 2013 OpenStack, LLC.
#
# 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.common import clientmanager
from openstackclient.image import client as image_client
from tests import utils
AUTH_TOKEN = "foobar"
AUTH_URL = "http://0.0.0.0"
class FakeClient(object):
def __init__(self, endpoint=None, **kwargs):
self.client = mock.MagicMock()
self.client.auth_token = AUTH_TOKEN
self.client.auth_url = AUTH_URL
class TestImage(utils.TestCase):
def setUp(self):
super(TestImage, self).setUp()
api_version = {"image": "2"}
image_client.API_VERSIONS = {
"2": "tests.image.test_image.FakeClient"
}
self.cm = clientmanager.ClientManager(token=AUTH_TOKEN,
url=AUTH_URL,
auth_url=AUTH_URL,
api_version=api_version)
def test_make_client(self):
self.assertEqual(self.cm.image.client.auth_token, AUTH_TOKEN)
self.assertEqual(self.cm.image.client.auth_url, AUTH_URL)