Merge "Move global glance opts into nova.image.glance"

5 files changed, 42 insertions, 41 deletions

diff --git a/nova/tests/api/openstack/compute/test_images.py b/nova/tests/api/openstack/compute/test_images.py
index 89a09fa2f..09e727da3 100644
--- a/nova/tests/api/openstack/compute/test_images.py
+++ b/nova/tests/api/openstack/compute/test_images.py
@@ -29,10 +29,10 @@ from nova.api.openstack.compute import images
 from nova.api.openstack.compute.views import images as images_view
 from nova.api.openstack import xmlutil
 from nova import exception
+from nova.image import glance
 from nova import test
 from nova.tests.api.openstack import fakes
 from nova.tests import matchers
-from nova import utils
 
 NS = "{http://docs.openstack.org/compute/api/v1.1}"
 ATOMNS = "{http://www.w3.org/2005/Atom}"
@@ -62,7 +62,7 @@ class ImagesControllerTest(test.TestCase):
 
         href = "http://localhost/v2/fake/images/124"
         bookmark = "http://localhost/fake/images/124"
-        alternate = "%s/fake/images/124" % utils.generate_glance_url()
+        alternate = "%s/fake/images/124" % glance.generate_glance_url()
         server_uuid = "aa640691-d1a7-4a67-9d3c-d35ee6b3cc74"
         server_href = "http://localhost/v2/fake/servers/" + server_uuid
         server_bookmark = "http://localhost/fake/servers/" + server_uuid
@@ -200,7 +200,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": alternate % (utils.generate_glance_url(), 123),
+                "href": alternate % (glance.generate_glance_url(), 123),
             }],
         },
         {
@@ -238,7 +238,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": alternate % (utils.generate_glance_url(), 124),
+                "href": alternate % (glance.generate_glance_url(), 124),
             }],
         },
         {
@@ -276,7 +276,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": "%s/fake/images/125" % utils.generate_glance_url()
+                "href": "%s/fake/images/125" % glance.generate_glance_url()
             }],
         },
         {
@@ -314,7 +314,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": "%s/fake/images/126" % utils.generate_glance_url()
+                "href": "%s/fake/images/126" % glance.generate_glance_url()
             }],
         },
         {
@@ -352,7 +352,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": "%s/fake/images/127" % utils.generate_glance_url()
+                "href": "%s/fake/images/127" % glance.generate_glance_url()
             }],
         },
         {
@@ -390,7 +390,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": "%s/fake/images/128" % utils.generate_glance_url()
+                "href": "%s/fake/images/128" % glance.generate_glance_url()
             }],
         },
         {
@@ -428,7 +428,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": "%s/fake/images/129" % utils.generate_glance_url()
+                "href": "%s/fake/images/129" % glance.generate_glance_url()
             }],
         },
         {
@@ -452,7 +452,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": "%s/fake/images/130" % utils.generate_glance_url()
+                "href": "%s/fake/images/130" % glance.generate_glance_url()
             }],
         },
         ]
@@ -491,7 +491,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": alternate % (utils.generate_glance_url(), 123),
+                "href": alternate % (glance.generate_glance_url(), 123),
             }],
         },
         {
@@ -529,7 +529,7 @@ class ImagesControllerTest(test.TestCase):
             {
                 "rel": "alternate",
                 "type": "application/vnd.openstack.image",
-                "href": alternate % (utils.generate_glance_url(), 124),
+                "href": alternate % (glance.generate_glance_url(), 124),
             }],
         }]
 
@@ -656,7 +656,7 @@ class ImagesControllerTest(test.TestCase):
         view = images_view.ViewBuilder()
         request = fakes.HTTPRequest.blank('/v2/fake/images/1')
         generated_url = view._get_alternate_link(request, 1)
-        actual_url = "%s/fake/images/1" % utils.generate_glance_url()
+        actual_url = "%s/fake/images/1" % glance.generate_glance_url()
         self.assertEqual(generated_url, actual_url)
 
     def test_delete_image(self):
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 190503e86..b25ae191a 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -41,6 +41,7 @@ from nova.compute import vm_states
 from nova import context
 from nova import db
 from nova import exception
+from nova.image import glance
 from nova.network import api as network_api
 from nova.network import model as network_model
 from nova.openstack.common import cfg
@@ -1455,7 +1456,7 @@ class ComputeTestCase(BaseTestCase):
         self.assertTrue('created_at' in payload)
         self.assertTrue('launched_at' in payload)
         self.assertTrue(payload['launched_at'])
-        image_ref_url = utils.generate_image_url(FAKE_IMAGE_REF)
+        image_ref_url = glance.generate_image_url(FAKE_IMAGE_REF)
         self.assertEquals(payload['image_ref_url'], image_ref_url)
         self.compute.terminate_instance(self.context,
                 instance=jsonutils.to_primitive(inst_ref))
@@ -1496,7 +1497,7 @@ class ComputeTestCase(BaseTestCase):
         self.assertTrue('launched_at' in payload)
         self.assertTrue('deleted_at' in payload)
         self.assertEqual(payload['deleted_at'], timeutils.strtime(cur_time))
-        image_ref_url = utils.generate_image_url(FAKE_IMAGE_REF)
+        image_ref_url = glance.generate_image_url(FAKE_IMAGE_REF)
         self.assertEquals(payload['image_ref_url'], image_ref_url)
 
     def test_run_instance_existing(self):
@@ -1824,8 +1825,8 @@ class ComputeTestCase(BaseTestCase):
 
         instance = db.instance_get_by_uuid(self.context, inst_ref['uuid'])
 
-        image_ref_url = utils.generate_image_url(image_ref)
-        new_image_ref_url = utils.generate_image_url(new_image_ref)
+        image_ref_url = glance.generate_image_url(image_ref)
+        new_image_ref_url = glance.generate_image_url(new_image_ref)
 
         self.assertEquals(len(test_notifier.NOTIFICATIONS), 3)
         msg = test_notifier.NOTIFICATIONS[0]
@@ -1904,7 +1905,7 @@ class ComputeTestCase(BaseTestCase):
         self.assertTrue('created_at' in payload)
         self.assertTrue('launched_at' in payload)
         self.assertEqual(payload['launched_at'], timeutils.strtime(cur_time))
-        image_ref_url = utils.generate_image_url(FAKE_IMAGE_REF)
+        image_ref_url = glance.generate_image_url(FAKE_IMAGE_REF)
         self.assertEquals(payload['image_ref_url'], image_ref_url)
         self.compute.terminate_instance(self.context,
             instance=jsonutils.to_primitive(new_instance))
@@ -1951,7 +1952,7 @@ class ComputeTestCase(BaseTestCase):
         self.assertTrue('display_name' in payload)
         self.assertTrue('created_at' in payload)
         self.assertTrue('launched_at' in payload)
-        image_ref_url = utils.generate_image_url(FAKE_IMAGE_REF)
+        image_ref_url = glance.generate_image_url(FAKE_IMAGE_REF)
         self.assertEquals(payload['image_ref_url'], image_ref_url)
         self.compute.terminate_instance(self.context, instance=new_instance)
 
diff --git a/nova/tests/compute/test_compute_utils.py b/nova/tests/compute/test_compute_utils.py
index bdd42d4f1..23374994f 100644
--- a/nova/tests/compute/test_compute_utils.py
+++ b/nova/tests/compute/test_compute_utils.py
@@ -24,6 +24,7 @@ from nova.compute import utils as compute_utils
 from nova import context
 from nova import db
 from nova import exception
+from nova.image import glance
 from nova.network import api as network_api
 from nova.openstack.common import cfg
 from nova.openstack.common import importutils
@@ -33,7 +34,6 @@ from nova.openstack.common.notifier import test_notifier
 from nova import test
 from nova.tests import fake_network
 import nova.tests.image.fake
-from nova import utils
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
@@ -281,7 +281,7 @@ class UsageInfoTestCase(test.TestCase):
                             msg="Key %s not in payload" % attr)
         self.assertEquals(payload['image_meta'],
                 {'md_key1': 'val1', 'md_key2': 'val2'})
-        image_ref_url = "%s/images/1" % utils.generate_glance_url()
+        image_ref_url = "%s/images/1" % glance.generate_glance_url()
         self.assertEquals(payload['image_ref_url'], image_ref_url)
         self.compute.terminate_instance(self.context, instance)
 
@@ -317,7 +317,7 @@ class UsageInfoTestCase(test.TestCase):
                             msg="Key %s not in payload" % attr)
         self.assertEquals(payload['image_meta'],
                 {'md_key1': 'val1', 'md_key2': 'val2'})
-        image_ref_url = "%s/images/1" % utils.generate_glance_url()
+        image_ref_url = "%s/images/1" % glance.generate_glance_url()
         self.assertEquals(payload['image_ref_url'], image_ref_url)
 
     def test_notify_usage_exists_instance_not_found(self):
@@ -343,7 +343,7 @@ class UsageInfoTestCase(test.TestCase):
             self.assertTrue(attr in payload,
                             msg="Key %s not in payload" % attr)
         self.assertEquals(payload['image_meta'], {})
-        image_ref_url = "%s/images/1" % utils.generate_glance_url()
+        image_ref_url = "%s/images/1" % glance.generate_glance_url()
         self.assertEquals(payload['image_ref_url'], image_ref_url)
 
     def test_notify_about_instance_usage(self):
@@ -376,7 +376,7 @@ class UsageInfoTestCase(test.TestCase):
         self.assertEquals(payload['image_meta'],
                 {'md_key1': 'val1', 'md_key2': 'val2'})
         self.assertEquals(payload['image_name'], 'fake_name')
-        image_ref_url = "%s/images/1" % utils.generate_glance_url()
+        image_ref_url = "%s/images/1" % glance.generate_glance_url()
         self.assertEquals(payload['image_ref_url'], image_ref_url)
         self.compute.terminate_instance(self.context, instance)
 
diff --git a/nova/tests/image/test_glance.py b/nova/tests/image/test_glance.py
index e8baf4353..943b98cb2 100644
--- a/nova/tests/image/test_glance.py
+++ b/nova/tests/image/test_glance.py
@@ -25,11 +25,14 @@ import glanceclient.exc
 from nova import context
 from nova import exception
 from nova.image import glance
+from nova.openstack.common import cfg
 from nova import test
 from nova.tests.api.openstack import fakes
 from nova.tests.glance import stubs as glance_stubs
 from nova.tests import matchers
 
+CONF = cfg.CONF
+
 
 class NullWriter(object):
     """Used to test ImageService.get which takes a writer object"""
@@ -703,3 +706,17 @@ class TestGlanceClientWrapper(test.TestCase):
 
         client2.call(ctxt, 1, 'get', 'meow')
         self.assertEqual(info['num_calls'], 2)
+
+
+class TestGlanceUrl(test.TestCase):
+
+    def test_generate_glance_http_url(self):
+        generated_url = glance.generate_glance_url()
+        http_url = "http://%s:%d" % (CONF.glance_host, CONF.glance_port)
+        self.assertEqual(generated_url, http_url)
+
+    def test_generate_glance_https_url(self):
+        self.flags(glance_protocol="https")
+        generated_url = glance.generate_glance_url()
+        https_url = "https://%s:%d" % (CONF.glance_host, CONF.glance_port)
+        self.assertEqual(generated_url, https_url)
diff --git a/nova/tests/test_utils.py b/nova/tests/test_utils.py
index d2f3b2392..fc935e179 100644
--- a/nova/tests/test_utils.py
+++ b/nova/tests/test_utils.py
@@ -26,16 +26,10 @@ import mox
 
 import nova
 from nova import exception
-from nova.openstack.common import cfg
 from nova.openstack.common import timeutils
 from nova import test
 from nova import utils
 
-CONF = cfg.CONF
-CONF.import_opt('glance_host', 'nova.config')
-CONF.import_opt('glance_port', 'nova.config')
-CONF.import_opt('glance_protocol', 'nova.config')
-
 
 class ByteConversionTest(test.TestCase):
     def test_string_conversions(self):
@@ -380,17 +374,6 @@ class GenericUtilsTestCase(test.TestCase):
         self.assertFalse(utils.bool_from_str(None))
         self.assertFalse(utils.bool_from_str('junk'))
 
-    def test_generate_glance_http_url(self):
-        generated_url = utils.generate_glance_url()
-        http_url = "http://%s:%d" % (CONF.glance_host, CONF.glance_port)
-        self.assertEqual(generated_url, http_url)
-
-    def test_generate_glance_https_url(self):
-        self.flags(glance_protocol="https")
-        generated_url = utils.generate_glance_url()
-        https_url = "https://%s:%d" % (CONF.glance_host, CONF.glance_port)
-        self.assertEqual(generated_url, https_url)
-
     def test_read_cached_file(self):
         self.mox.StubOutWithMock(os.path, "getmtime")
         os.path.getmtime(mox.IgnoreArg()).AndReturn(1)