← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ironic/vivid-updates

« back to all changes in this revision

Viewing changes to ironic/tests/test_glance_service.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-03-30 11:14:57 UTC
  • mfrom: (1.2.6)
  • Revision ID: package-import@ubuntu.com-20150330111457-kr4ju3guf22m4vbz
Tags: 2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1358820
https://launchpad.net/bugs/1429962
* New upstream release.
  + d/control: 
    - Align with upstream dependencies.
    - Add dh-python to build-dependencies.
    - Add psmisc as a dependency. (LP: #1358820)
  + d/p/fix-requirements.patch: Rediffed.
  + d/ironic-conductor.init.in: Fixed typos in LSB headers,
    thanks to JJ Asghar. (LP: #1429962)

Show diffs side-by-side

added added

removed removed

Lines of Context:
ironic/tests/test_glance_service.py
20
20
import tempfile
21
21
 
22
22
import mock
 
23
from oslo_context import context
23
24
import testtools
24
25
 
25
26
 
27
28
from ironic.common.glance_service import base_image_service
28
29
from ironic.common.glance_service import service_utils
29
30
from ironic.common import image_service as service
30
 
from ironic.openstack.common import context
31
31
from ironic.tests import base
32
32
from ironic.tests import matchers
33
33
from ironic.tests import stubs
106
106
        self.context = context.RequestContext(auth_token=True)
107
107
        self.context.user_id = 'fake'
108
108
        self.context.project_id = 'fake'
109
 
        self.service = service.Service(client, 1, self.context)
 
109
        self.service = service.GlanceImageService(client, 1, self.context)
110
110
 
111
111
        self.config(glance_host='localhost', group='glance')
112
112
        try:
474
474
        stub_context = context.RequestContext(auth_token=True)
475
475
        stub_context.user_id = 'fake'
476
476
        stub_context.project_id = 'fake'
477
 
        stub_service = service.Service(stub_client, 1, stub_context)
 
477
        stub_service = service.GlanceImageService(stub_client, 1, stub_context)
478
478
        image_id = 1  # doesn't matter
479
479
        writer = NullWriter()
480
480
 
513
513
        (outfd, tmpfname) = tempfile.mkstemp(prefix='directURLdst')
514
514
        writer = os.fdopen(outfd, 'w')
515
515
 
516
 
        stub_service = service.Service(stub_client,
517
 
                                       context=stub_context,
518
 
                                       version=2)
 
516
        stub_service = service.GlanceImageService(stub_client,
 
517
                                                  context=stub_context,
 
518
                                                  version=2)
519
519
        image_id = 1  # doesn't matter
520
520
 
521
521
        self.config(allowed_direct_url_schemes=['file'], group='glance')
539
539
        stub_context = context.RequestContext(auth_token=True)
540
540
        stub_context.user_id = 'fake'
541
541
        stub_context.project_id = 'fake'
542
 
        stub_service = service.Service(stub_client, 1, stub_context)
 
542
        stub_service = service.GlanceImageService(stub_client, 1, stub_context)
543
543
        image_id = 1  # doesn't matter
544
544
        writer = NullWriter()
545
545
        self.assertRaises(exception.ImageNotAuthorized, stub_service.download,
555
555
        stub_context = context.RequestContext(auth_token=True)
556
556
        stub_context.user_id = 'fake'
557
557
        stub_context.project_id = 'fake'
558
 
        stub_service = service.Service(stub_client, 1, stub_context)
 
558
        stub_service = service.GlanceImageService(stub_client, 1, stub_context)
559
559
        image_id = 1  # doesn't matter
560
560
        writer = NullWriter()
561
561
        self.assertRaises(exception.ImageNotAuthorized, stub_service.download,
571
571
        stub_context = context.RequestContext(auth_token=True)
572
572
        stub_context.user_id = 'fake'
573
573
        stub_context.project_id = 'fake'
574
 
        stub_service = service.Service(stub_client, 1, stub_context)
 
574
        stub_service = service.GlanceImageService(stub_client, 1, stub_context)
575
575
        image_id = 1  # doesn't matter
576
576
        writer = NullWriter()
577
577
        self.assertRaises(exception.ImageNotFound, stub_service.download,
587
587
        stub_context = context.RequestContext(auth_token=True)
588
588
        stub_context.user_id = 'fake'
589
589
        stub_context.project_id = 'fake'
590
 
        stub_service = service.Service(stub_client, 1, stub_context)
 
590
        stub_service = service.GlanceImageService(stub_client, 1, stub_context)
591
591
        image_id = 1  # doesn't matter
592
592
        writer = NullWriter()
593
593
        self.assertRaises(exception.ImageNotFound, stub_service.download,
643
643
        super(TestGlanceSwiftTempURL, self).setUp()
644
644
        client = stubs.StubGlanceClient()
645
645
        self.context = context.RequestContext()
646
 
        self.service = service.Service(client, 2, self.context)
 
646
        self.service = service.GlanceImageService(client, 2, self.context)
647
647
        self.config(swift_temp_url_key='correcthorsebatterystaple',
648
648
                    group='glance')
649
649
        self.config(swift_endpoint_url='https://swift.example.com',
795
795
        self.assertEqual('https://123.123.123.123:1234/images/image_uuid',
796
796
                         generated_url)
797
797
 
 
798
    def test_is_glance_image(self):
 
799
        image_href = 'uuid'
 
800
        self.assertTrue(service_utils.is_glance_image(image_href))
 
801
        image_href = 'glance://uuid'
 
802
        self.assertTrue(service_utils.is_glance_image(image_href))
 
803
        image_href = 'http://aaa/bbb'
 
804
        self.assertFalse(service_utils.is_glance_image(image_href))
 
805
        image_href = None
 
806
        self.assertFalse(service_utils.is_glance_image(image_href))
 
807
 
798
808
 
799
809
class TestGlanceAPIServers(base.TestCase):
800
810