openstack/rally
Code Issues Proposed changes

Remove cueclient

Browse Source 
cue project seems to be dead now and python-cueclient
dependancies shows lots of deprecation warnings at run time.

Change-Id: I9e023276798e04820384b15d12cd7952aec441ce
This commit is contained in:
Anton Studenov 2016-12-27 17:17:29 +03:00
parent b6c0c41874
commit 29c433241b
4 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
rally/osclients.py
View File

@ -634,22 +634,6 @@ class Monasca(OSClient):
return client
@configure("cue", default_version="1", default_service_type="message-broker")
class Cue(OSClient):
def create_client(self, service_type=None):
"""Return cue client."""
from cueclient.v1 import client as cue
version = self.choose_version()
api_url = self._get_endpoint(service_type)
api_url += "v%s" % version
session = self.keystone.get_session()[0]
endpoint_type = self.credential.endpoint_type
return cue.Client(session=session, interface=endpoint_type)
@configure("senlin", default_version="1", default_service_type="clustering",
supported_versions=["1"])
class Senlin(OSClient):

1
requirements.txt
View File

@ -31,7 +31,6 @@ keystoneauth1>=2.14.0 # Apache Software License
os-faults>=0.1.5 # Apache Software License
python-ceilometerclient>=2.5.0 # Apache Software License
python-cinderclient>=1.6.0,!=1.7.0,!=1.7.1 # Apache Software License
python-cueclient>=1.0.0 # Apache License, Version 2.0
python-designateclient>=1.5.0 # Apache License, Version 2.0
python-glanceclient>=2.5.0 # Apache License, Version 2.0
python-heatclient>=1.5.0 # Apache Software License

6
tests/unit/fakes.py
View File

@ -1553,12 +1553,6 @@ class FakeEC2Client(object):
pass
class FakeCueClient(object):
def __init__(self):
pass
class FakeSenlinClient(object):
def __init__(self):

17
tests/unit/test_osclients.py
View File

@ -739,23 +739,6 @@ class OSClientsTestCase(test.TestCase):
key += "%s" % {"version": version}
self.assertEqual(fake_designate, self.clients.cache[key])
@mock.patch("rally.osclients.Keystone.get_session")
def test_cue(self, mock_keystone_get_session):
fake_cue = fakes.FakeCueClient()
mock_cue = mock.MagicMock()
mock_cue.client.Client = mock.MagicMock(return_value=fake_cue)
mock_keystone_get_session.return_value = ("fake_session",
"fake_auth_plugin")
self.assertNotIn("cue", self.clients.cache)
with mock.patch.dict("sys.modules", {"cueclient": mock_cue,
"cueclient.v1": mock_cue}):
client = self.clients.cue()
self.assertEqual(fake_cue, client)
mock_cue.client.Client.assert_called_once_with(
interface=self.credential.endpoint_type,
session="fake_session")
self.assertEqual(fake_cue, self.clients.cache["cue"])
def test_senlin(self):
mock_senlin = mock.MagicMock()
self.assertNotIn("senlin", self.clients.cache)