openstack
/
cinder
Code Issues Proposed changes

Merge "Remove generate_glance_url"

This commit is contained in:
Jenkins 2015-06-29 04:21:27 +00:00 committed by Gerrit Code Review
parent 574dbff305 e815afb74f
commit 09a213facc
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/test_utils.py
View File

@ -324,12 +324,6 @@ class GenericUtilsTestCase(test.TestCase):
self.assertTrue(utils.is_valid_boolstr(0))
self.assertTrue(utils.is_valid_boolstr('0'))
def test_generate_glance_url(self):
generated_url = utils.generate_glance_url()
actual_url = "http://%s:%d" % (CONF.glance_host,
CONF.glance_port)
self.assertEqual(generated_url, actual_url)
@mock.patch('os.path.join', side_effect=lambda x, y: '/'.join((x, y)))
def test_make_dev_path(self, mock_join):
self.assertEqual('/dev/xvda', utils.make_dev_path('xvda'))

7
cinder/utils.py
View File

@ -436,13 +436,6 @@ def monkey_patch():
decorator("%s.%s" % (module, key), func))
def generate_glance_url():
"""Generate the URL to glance."""
# TODO(jk0): This will eventually need to take SSL into consideration
# when supported in glance.
return "http://%s:%d" % (CONF.glance_host, CONF.glance_port)
def make_dev_path(dev, partition=None, base='/dev'):
"""Return a path to a particular device.