diff --git a/cinder/tests/unit/test_utils.py b/cinder/tests/unit/test_utils.py index 38c4d5c4687..b8a21f3f83c 100644 --- a/cinder/tests/unit/test_utils.py +++ b/cinder/tests/unit/test_utils.py @@ -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')) diff --git a/cinder/utils.py b/cinder/utils.py index e2b1082ec54..fe711f2a125 100644 --- a/cinder/utils.py +++ b/cinder/utils.py @@ -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.